summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTayler Hetherington <[email protected]>2012-12-16 15:13:58 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:49:23 -0700
commite364e965be7ccb8d89c3eddf7737fcae8bbffbb1 (patch)
treea22e15fba90fbfa6f10af60cfa548e0cdfb62686
parentb0d4614f0acf5395b093567a078ed494f4c4cb71 (diff)
Changing mcpat.xml->gpuwattch_gtx480.xml in configs/GTX480.
Adding -gpuwattch_xml_file gpuwattch_gtx480.xml to configs/GTX480/gpgpusim.config. Default changed from mcpat.xml -> gpuwattch.xml. [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14808]
-rw-r--r--README6
-rw-r--r--configs/GTX480/gpgpusim.config1
-rw-r--r--src/gpgpu-sim/gpu-sim.cc6
3 files changed, 7 insertions, 6 deletions
diff --git a/README b/README
index 5cd0cf3..1b6cd6c 100644
--- a/README
+++ b/README
@@ -252,10 +252,10 @@ LD_LIBRARY_PATH environment variable.
The following GPGPU-Sim configuration options are used to enable GPUWattch
- power_simulation_enabled 1 (1=Enabled, 0=Not enabled)
- - mcpat_xml_file <filename>.xml
+ - gpuwattch_xml_file <filename>.xml
-The McPAT XML configuration file name is set to mcpat.xml by default and
-currently only supplied for GTX480. Please refer to
+The GPUWattch XML configuration file name is set to gpuwattch.xml by default and
+currently only supplied for GTX480 (default=gpuwattch_gtx480.xml). Please refer to
<http://gpgpu-sim.org/gpuwattch/> for more information.
Running OpenCL applications is identical to running CUDA applications. However,
diff --git a/configs/GTX480/gpgpusim.config b/configs/GTX480/gpgpusim.config
index 4fc7a13..e792bb3 100644
--- a/configs/GTX480/gpgpusim.config
+++ b/configs/GTX480/gpgpusim.config
@@ -115,3 +115,4 @@
# power model configs
-power_simulation_enabled 1
+-gpuwattch_xml_file gpuwattch_gtx480.xml
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index bb3dc8b..bea0ad9 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -101,9 +101,9 @@ void power_config::reg_options(class OptionParser * opp)
{
- option_parser_register(opp, "-mcpat_xml_file", OPT_CSTR,
- &g_power_config_name,"McPAT XML file",
- "mcpat.xml");
+ option_parser_register(opp, "-gpuwattch_xml_file", OPT_CSTR,
+ &g_power_config_name,"GPUWattch XML file",
+ "gpuwattch.xml");
option_parser_register(opp, "-power_simulation_enabled", OPT_BOOL,
&g_power_simulation_enabled, "Turn on power simulator (1=On, 0=Off)",