[dv,chip,pwrmgr] update escalate parameter for running test shorter.
Signed-off-by: Jaedon Kim <jdonjdon@google.com>
diff --git a/hw/top_earlgrey/dv/env/seq_lib/chip_sw_deep_sleep_all_reset_vseq.sv b/hw/top_earlgrey/dv/env/seq_lib/chip_sw_deep_sleep_all_reset_vseq.sv
index 00e52f8..ba05299 100644
--- a/hw/top_earlgrey/dv/env/seq_lib/chip_sw_deep_sleep_all_reset_vseq.sv
+++ b/hw/top_earlgrey/dv/env/seq_lib/chip_sw_deep_sleep_all_reset_vseq.sv
@@ -54,7 +54,9 @@
// mimic external pull up in key in0
cfg.ast_supply_vif.force_key0_i(1'b1);
// Wait until we reach the SW test state.
- `DV_WAIT(cfg.sw_test_status_vif.sw_test_status == SwTestStatusInTest)
+ `DV_WAIT(cfg.sw_test_status_vif.sw_test_status == SwTestStatusInTest,
+ "Timed out waitingfor SwTestSTatusInTest",
+ 40_000_000)
`uvm_info(`gfn, "SW test ready", UVM_MEDIUM)
repeat (NumRound) begin
diff --git a/sw/device/tests/sim_dv/pwrmgr_random_sleep_all_reset_reqs_test.c b/sw/device/tests/sim_dv/pwrmgr_random_sleep_all_reset_reqs_test.c
index 1faaeb7..13573d7 100644
--- a/sw/device/tests/sim_dv/pwrmgr_random_sleep_all_reset_reqs_test.c
+++ b/sw/device/tests/sim_dv/pwrmgr_random_sleep_all_reset_reqs_test.c
@@ -90,18 +90,22 @@
* wdog is programed to bark.
*/
enum {
- kWdogBarkMicros = 3 * 1000, // 3 ms
- kWdogBiteMicros = 4 * 1000, // 4 ms
- kEscalationPhase0Micros = 1 * 1000, // 1 ms
+ kWdogBarkMicros = 3 * 100, // 300 us
+ kWdogBiteMicros = 4 * 100, // 400 us
+ kEscalationPhase0Micros = 1 * 100, // 100 us
// The cpu value is slightly larger as the busy_spin_micros
// routine cycle count comes out slightly smaller due to the
// fact that it does not divide by exactly 1M
// see sw/device/lib/runtime/hart.c
- kEscalationPhase0MicrosCpu = kEscalationPhase0Micros + 200, // 1.2 ms
- kEscalationPhase1Micros = 5 * 1000, // 5 ms
- kEscalationPhase2Micros = 500, // 500 us
+ kEscalationPhase0MicrosCpu = kEscalationPhase0Micros + 20, // 120 us
+ kEscalationPhase1Micros = 5 * 100, // 500 us
+ kEscalationPhase2Micros = 50, // 50 us
};
+uint32_t cycle_rescaling_factor() {
+ return kDeviceType == kDeviceSimDV ? 1 : 10;
+}
+
static_assert(
kWdogBarkMicros < kWdogBiteMicros &&
kWdogBarkMicros > kEscalationPhase0Micros &&
@@ -214,22 +218,29 @@
dif_alert_handler_escalation_phase_t esc_phases[] = {
{.phase = kDifAlertHandlerClassStatePhase0,
.signal = 0,
- .duration_cycles = udiv64_slow(
- kEscalationPhase0Micros * kClockFreqPeripheralHz, 1000000, NULL)},
+ .duration_cycles =
+ udiv64_slow(kEscalationPhase0Micros * kClockFreqPeripheralHz,
+ 1000000, NULL) *
+ cycle_rescaling_factor()},
{.phase = kDifAlertHandlerClassStatePhase1,
.signal = 1,
- .duration_cycles = udiv64_slow(
- kEscalationPhase1Micros * kClockFreqPeripheralHz, 1000000, NULL)},
+ .duration_cycles =
+ udiv64_slow(kEscalationPhase1Micros * kClockFreqPeripheralHz,
+ 1000000, NULL) *
+ cycle_rescaling_factor()},
{.phase = kDifAlertHandlerClassStatePhase2,
.signal = 3,
- .duration_cycles = udiv64_slow(
- kEscalationPhase2Micros * kClockFreqPeripheralHz, 1000000, NULL)}};
+ .duration_cycles =
+ udiv64_slow(kEscalationPhase2Micros * kClockFreqPeripheralHz,
+ 1000000, NULL) *
+ cycle_rescaling_factor()}};
dif_alert_handler_class_config_t class_config[] = {{
.auto_lock_accumulation_counter = kDifToggleDisabled,
.accumulator_threshold = 0,
.irq_deadline_cycles =
- udiv64_slow(10 * kClockFreqPeripheralHz, 1000000, NULL),
+ udiv64_slow(10 * kClockFreqPeripheralHz, 1000000, NULL) *
+ cycle_rescaling_factor(),
.escalation_phases = esc_phases,
.escalation_phases_len = ARRAYSIZE(esc_phases),
.crashdump_escalation_phase = kDifAlertHandlerClassStatePhase3,
@@ -259,9 +270,11 @@
static void config_escalate(dif_aon_timer_t *aon_timer,
const dif_pwrmgr_t *pwrmgr) {
uint64_t bark_cycles =
- udiv64_slow(kWdogBarkMicros * kClockFreqAonHz, 1000000, NULL);
+ udiv64_slow(kWdogBarkMicros * kClockFreqAonHz, 1000000, NULL) *
+ cycle_rescaling_factor();
uint64_t bite_cycles =
- udiv64_slow(kWdogBiteMicros * kClockFreqAonHz, 1000000, NULL);
+ udiv64_slow(kWdogBiteMicros * kClockFreqAonHz, 1000000, NULL) *
+ cycle_rescaling_factor();
CHECK(bite_cycles < UINT32_MAX,
"The value %u can't fit into the 32 bits timer counter.", bite_cycles);
