christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

ecos: use new timer iface to record benchmark runtime

Browse Source 
... instead of the previous TimerListener workaround.

Change-Id: I3e712540e93b668301f50ecf4f5a5760e0a8fdb3
This commit is contained in:
Horst Schirmeier
2013-04-24 17:25:50 +02:00
committed by Gerrit Code Review
parent 0887a53d1d
commit c0b36f6236
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/experiments/ecos_kernel_test/experiment.cc
View File

@ -35,8 +35,6 @@
#define MULTIPLE_SNAPSHOTS 0 #define MULTIPLE_SNAPSHOTS 0
#define MULTIPLE_SNAPSHOTS_DISTANCE 1000000 #define MULTIPLE_SNAPSHOTS_DISTANCE 1000000
#define TIMER_GRANULARITY 10 // microseconds
#define VIDEOMEM_START 0xb8000 #define VIDEOMEM_START 0xb8000
#define VIDEOMEM_SIZE (80*25*2 *2) // two text mode screens #define VIDEOMEM_SIZE (80*25*2 *2) // two text mode screens
#define VIDEOMEM_END (VIDEOMEM_START + VIDEOMEM_SIZE) #define VIDEOMEM_END (VIDEOMEM_START + VIDEOMEM_SIZE)
@ -199,13 +197,8 @@ bool EcosKernelTestExperiment::performTrace(guest_address_t addr_entry, guest_ad
simulator.addListener(&ev_count); simulator.addListener(&ev_count);
unsigned instr_counter = 0; unsigned instr_counter = 0;
// on the way, count elapsed time // measure elapsed time
TimerListener time_step(TIMER_GRANULARITY); //TODO: granularity? simtime_t time_start = simulator.getTimerTicks();
//elapsed_time.setCounter(0xFFFFFFFFU); // not working for TimerListener
simulator.addListener(&time_step);
unsigned elapsed_time = 1; // always run 1 step
// just increase elapsed_time counter by 1, which serves as time for ECC recovery algorithm
++elapsed_time; // (this is a rough guess ... TODO)
// on the way, record lowest and highest memory address accessed // on the way, record lowest and highest memory address accessed
MemAccessListener ev_mem(ANY_ADDR, MemAccessEvent::MEM_READWRITE); MemAccessListener ev_mem(ANY_ADDR, MemAccessEvent::MEM_READWRITE);
@ -227,13 +220,6 @@ bool EcosKernelTestExperiment::performTrace(guest_address_t addr_entry, guest_ad
} }
simulator.addListener(&ev_count); simulator.addListener(&ev_count);
} }
else if(ev == &time_step) {
if(elapsed_time++ == 0xFFFFFFFFU) {
log << "ERROR: elapsed_time overflowed" << endl;
return false;
}
simulator.addListener(&time_step);
}
else if(ev == &ev_mem) { else if(ev == &ev_mem) {
unsigned lo = ev_mem.getTriggerAddress(); unsigned lo = ev_mem.getTriggerAddress();
unsigned hi = lo + ev_mem.getTriggerWidth() - 1; unsigned hi = lo + ev_mem.getTriggerWidth() - 1;
@ -252,16 +238,14 @@ bool EcosKernelTestExperiment::performTrace(guest_address_t addr_entry, guest_ad
ev = simulator.resume(); ev = simulator.resume();
} }
unsigned long long estimated_timeout_overflow_check = ((unsigned long long)elapsed_time) * time_step.getTimeout(); unsigned long long estimated_timeout_overflow_check =
if(estimated_timeout_overflow_check > 0xFFFFFFFFU) { simulator.getTimerTicks() - time_start + 10000;
log << "Timeout estimation overflowed" << endl; unsigned estimated_timeout =
return false; (unsigned) (estimated_timeout_overflow_check * 1000000 / simulator.getTimerTicksPerSecond());
}
unsigned estimated_timeout = (unsigned)estimated_timeout_overflow_check;
log << dec << "tracing finished after " << instr_counter << " instructions" << endl; log << dec << "tracing finished after " << instr_counter << " instructions" << endl;
log << hex << "all memory accesses within [0x" << mem1_low << ", 0x" << mem1_high << "] u [0x" << mem2_low << ", 0x" << mem2_high << "] (ignoring VGA mem)" << endl; log << hex << "all memory accesses within [0x" << mem1_low << ", 0x" << mem1_high << "] u [0x" << mem2_low << ", 0x" << mem2_high << "] (ignoring VGA mem)" << endl;
log << dec << "elapsed simulated time (plus safety margin): " << (estimated_timeout * TIMER_GRANULARITY / 1000000.0) << "s" << endl; log << dec << "elapsed simulated time (plus safety margin): " << (estimated_timeout / 1000000.0) << "s" << endl;
// sanitize memory ranges // sanitize memory ranges
if (mem1_low > mem1_high) { if (mem1_low > mem1_high) {