folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TIMER: Use standard calibration techniques while throttling

Browse source 
Part of a previous change introduced logice which used the throttling
execution rate calibrated value to determine clock calibration when
throttling is enabled.  This provides significantly worse results than the
normal self correcting calibration process.  This commit reverses that
part of the previous change.
This commit is contained in:
Mark Pizzolato 2017-08-03 18:51:55 -07:00
parent 9f7519b886
commit b2b18de0ec
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sim_timer.c
View file

@ -888,10 +888,7 @@ if (rtc_hz[tmr] != ticksper) { /* changing tick rate? *
_rtcn_configure_calibrated_clock (tmr); _rtcn_configure_calibrated_clock (tmr);
if (ticksper != 0) { if (ticksper != 0) {
rtc_clock_tick_size[tmr] = 1.0 / ticksper; rtc_clock_tick_size[tmr] = 1.0 / ticksper;
if (sim_throt_type != SIM_THROT_NONE) rtc_currd[tmr] = (int32)(sim_timer_inst_per_sec () / ticksper);
rtc_currd[tmr] = (int32)(sim_throt_cps / ticksper);
else
rtc_currd[tmr] = (int32)(sim_timer_inst_per_sec () / ticksper);
} }
} }
if (ticksper == 0) /* running? */ if (ticksper == 0) /* running? */
@ -909,18 +906,11 @@ if (rtc_ticks[tmr] < ticksper) /* 1 sec yet? */
return rtc_currd[tmr]; return rtc_currd[tmr];
rtc_ticks[tmr] = 0; /* reset ticks */ rtc_ticks[tmr] = 0; /* reset ticks */
rtc_elapsed[tmr] = rtc_elapsed[tmr] + 1; /* count sec */ rtc_elapsed[tmr] = rtc_elapsed[tmr] + 1; /* count sec */
if (sim_throt_type != SIM_THROT_NONE) {
rtc_gtime[tmr] = sim_gtime(); /* save instruction time */
rtc_currd[tmr] = (int32)(sim_throt_cps / ticksper); /* use throttle calibration */
++rtc_calibrations[tmr]; /* count calibrations */
sim_debug (DBG_CAL, &sim_timer_dev, "using throttle calibrated value - result: %d\n", rtc_currd[tmr]);
return rtc_currd[tmr];
}
if (!rtc_avail) /* no timer? */ if (!rtc_avail) /* no timer? */
return rtc_currd[tmr]; return rtc_currd[tmr];
if (sim_calb_tmr != tmr) { if (sim_calb_tmr != tmr) {
rtc_currd[tmr] = (int32)(sim_timer_inst_per_sec()/ticksper); rtc_currd[tmr] = (int32)(sim_timer_inst_per_sec()/ticksper);
sim_debug (DBG_CAL, &sim_timer_dev, "calibrated calibrated tmr=%d against system tmr=%d, tickper=%d (result: %d)\n", tmr, sim_calb_tmr, ticksper, rtc_currd[tmr]); sim_debug (DBG_CAL, &sim_timer_dev, "calibrated calibrated tmr=%d against internal system tmr=%d, tickper=%d (result: %d)\n", tmr, sim_calb_tmr, ticksper, rtc_currd[tmr]);
return rtc_currd[tmr]; return rtc_currd[tmr];
} }
new_rtime = sim_os_msec (); /* wall time */ new_rtime = sim_os_msec (); /* wall time */
@ -1396,16 +1386,13 @@ DEVICE sim_timer_dev = {
SIM_NTIMERS+1, 0, 0, 0, 0, 0, SIM_NTIMERS+1, 0, 0, 0, 0, 0,
NULL, NULL, &sim_timer_clock_reset, NULL, NULL, NULL, NULL, NULL, &sim_timer_clock_reset, NULL, NULL, NULL,
NULL, DEV_DEBUG | DEV_NOSAVE, 0, NULL, DEV_DEBUG | DEV_NOSAVE, 0,
sim_timer_debug, NULL, NULL, NULL, NULL, NULL, sim_timer_debug};
sim_timer_description};
DEVICE sim_int_timer_dev = { DEVICE sim_int_timer_dev = {
"INT-TIMER", &sim_internal_timer_unit, NULL, NULL, "INT-TIMER", &sim_internal_timer_unit, NULL, NULL,
1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, DEV_NOSAVE, 0, NULL, DEV_NOSAVE};
NULL, NULL, NULL, NULL, NULL, NULL,
sim_int_timer_description};
DEVICE sim_stop_dev = { DEVICE sim_stop_dev = {
"INT-STOP", &sim_stop_unit, NULL, NULL, "INT-STOP", &sim_stop_unit, NULL, NULL,
@ -1416,12 +1403,7 @@ DEVICE sim_stop_dev = {
sim_int_stop_description}; sim_int_stop_description};
DEVICE sim_throttle_dev = { DEVICE sim_throttle_dev = {
"INT-THROTTLE", &sim_throttle_unit, sim_throttle_reg, NULL, 1, "INT-THROTTLE", &sim_throttle_unit, sim_throttle_reg, NULL, 1};
0, 0, 0, 0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
sim_throttle_description};
/* SET CLOCK command */ /* SET CLOCK command */
@ -2257,6 +2239,7 @@ _rtcn_configure_calibrated_clock (sim_calb_tmr);
sim_timer_dev.description = &sim_timer_description; sim_timer_dev.description = &sim_timer_description;
sim_throttle_dev.description = &sim_throttle_description; sim_throttle_dev.description = &sim_throttle_description;
sim_int_timer_dev.description = &sim_int_timer_description; sim_int_timer_dev.description = &sim_int_timer_description;
sim_stop_dev.description = &sim_int_stop_description;
if (sim_switches & SWMASK ('P')) { if (sim_switches & SWMASK ('P')) {
sim_cancel (&SIM_INTERNAL_UNIT); sim_cancel (&SIM_INTERNAL_UNIT);
sim_calb_tmr = -1; sim_calb_tmr = -1;