christoph/fail
1
Fork 0
Code Releases Activity

ecos: store traceinfo.txt in correct location

Browse Source 
This commit completes the change introduced in commit
59e5fd3169.

Change-Id: I0a6ab7b35fbb69cbb8ef91e187b0d0bc32d01071
This commit is contained in:
Horst Schirmeier
2013-04-03 15:13:02 +02:00
parent 74bd3e99e5
commit 373c19dd68
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/experiments/ecos_kernel_test/campaign.cc
View File

@ -43,10 +43,11 @@ bool EcosKernelTestCampaign::readMemoryMap(fail::MemoryMap &mm, char const * con
return (count > 0); return (count > 0);
} }
bool EcosKernelTestCampaign::writeTraceInfo(unsigned instr_counter, unsigned timeout, unsigned lowest_addr, unsigned highest_addr) { bool EcosKernelTestCampaign::writeTraceInfo(unsigned instr_counter, unsigned timeout, unsigned lowest_addr, unsigned highest_addr,
ofstream ti(filename_traceinfo().c_str(), ios::out); const std::string& variant, const std::string& benchmark) {
ofstream ti(filename_traceinfo(variant, benchmark).c_str(), ios::out);
if (!ti.is_open()) { if (!ti.is_open()) {
cout << "failed to open " << filename_traceinfo() << endl; cout << "failed to open " << filename_traceinfo(variant, benchmark) << endl;
return false; return false;
} }
ti << instr_counter << endl << timeout << endl << lowest_addr << endl << highest_addr << endl; ti << instr_counter << endl << timeout << endl << lowest_addr << endl << highest_addr << endl;

2
src/experiments/ecos_kernel_test/campaign.hpp
View File

@ -49,7 +49,7 @@ public:
count_exp(0), count_exp_jobs(0), count_known(0), count_known_jobs(0) {} count_exp(0), count_exp_jobs(0), count_known(0), count_known_jobs(0) {}
virtual bool run(); virtual bool run();
static bool readMemoryMap(fail::MemoryMap &mm, char const * const filename); static bool readMemoryMap(fail::MemoryMap &mm, char const * const filename);
static bool writeTraceInfo(unsigned instr_counter, unsigned timeout, unsigned lowest_addr, unsigned highest_addr); static bool writeTraceInfo(unsigned instr_counter, unsigned timeout, unsigned lowest_addr, unsigned highest_addr, const std::string& variant = "", const std::string& benchmark = "");
static bool readTraceInfo(unsigned &instr_counter, unsigned &timeout, unsigned &lowest_addr, unsigned &highest_addr, const std::string& variant = "", const std::string& benchmark = ""); static bool readTraceInfo(unsigned &instr_counter, unsigned &timeout, unsigned &lowest_addr, unsigned &highest_addr, const std::string& variant = "", const std::string& benchmark = "");
static std::string filename_memorymap(const std::string& variant = "", const std::string& benchmark = ""); static std::string filename_memorymap(const std::string& variant = "", const std::string& benchmark = "");
static std::string filename_state(unsigned instr_offset, const std::string& variant = "", const std::string& benchmark = ""); static std::string filename_state(unsigned instr_offset, const std::string& variant = "", const std::string& benchmark = "");

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

@ -252,7 +252,8 @@ bool EcosKernelTestExperiment::performTrace(guest_address_t addr_entry, guest_ad
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 * TIMER_GRANULARITY / 1000000.0) << "s" << endl;
// save these values for experiment STEP 3 // save these values for experiment STEP 3
EcosKernelTestCampaign::writeTraceInfo(instr_counter, estimated_timeout, lowest_addr, highest_addr); EcosKernelTestCampaign::writeTraceInfo(instr_counter, estimated_timeout,
lowest_addr, highest_addr, m_variant, m_benchmark);
simulator.removeFlow(&tp); simulator.removeFlow(&tp);