From fecd769d1e7813b6cf962218208810049e2ad777 Mon Sep 17 00:00:00 2001 From: Ahmed El-Shafiey Date: Thu, 20 Dec 2012 16:57:54 -0800 Subject: parsing the XML file only if the power simulator is enabled -- this bug was introduced from the prervious changelist [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14853] --- src/gpuwattch/gpgpu_sim_wrapper.cc | 8 +++++--- src/gpuwattch/gpgpu_sim_wrapper.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gpuwattch') diff --git a/src/gpuwattch/gpgpu_sim_wrapper.cc b/src/gpuwattch/gpgpu_sim_wrapper.cc index cf658cd..adbd03c 100644 --- a/src/gpuwattch/gpgpu_sim_wrapper.cc +++ b/src/gpuwattch/gpgpu_sim_wrapper.cc @@ -94,7 +94,7 @@ enum pwr_cmp_t { }; -gpgpu_sim_wrapper::gpgpu_sim_wrapper( char* xmlfile) { +gpgpu_sim_wrapper::gpgpu_sim_wrapper( bool power_simulation_enabled, char* xmlfile) { count=0; gcount=0; @@ -127,7 +127,7 @@ gpgpu_sim_wrapper::gpgpu_sim_wrapper( char* xmlfile) { g_metric_trace_filename = NULL; g_steady_state_tracking_filename = NULL; xml_filename= xmlfile; - g_power_simulation_enabled= false; + g_power_simulation_enabled= power_simulation_enabled; g_power_trace_enabled= false; g_steady_power_levels_enabled= false; g_power_trace_zlevel= 0; @@ -137,7 +137,9 @@ gpgpu_sim_wrapper::gpgpu_sim_wrapper( char* xmlfile) { gpu_stat_sample_freq=0; p=new ParseXML(); - p->parse(xml_filename); + if (g_power_simulation_enabled){ + p->parse(xml_filename); + } proc = new Processor(p); power_trace_file = NULL; metric_trace_file = NULL; diff --git a/src/gpuwattch/gpgpu_sim_wrapper.h b/src/gpuwattch/gpgpu_sim_wrapper.h index b88af66..97cffd3 100644 --- a/src/gpuwattch/gpgpu_sim_wrapper.h +++ b/src/gpuwattch/gpgpu_sim_wrapper.h @@ -46,7 +46,7 @@ using namespace std; class gpgpu_sim_wrapper { public: - gpgpu_sim_wrapper(char* xmlfile); + gpgpu_sim_wrapper(bool power_simulation_enabled, char* xmlfile); ~gpgpu_sim_wrapper(); void init_mcpat(char* xmlfile, char* powerfile, char* power_trace_file,char* metric_trace_file, -- cgit v1.3