From e5516925760944519a674d0e5ac94d7dbd4d2788 Mon Sep 17 00:00:00 2001
From: Ahmed El-Shafiey <a.shafiey@aucegypt.edu>
Date: Thu, 20 Dec 2012 23:19:36 -0800
Subject: 1- it seems like using #ifdef within a class definition confuses
 valgrind, replaced this with defining an empty class if #GPGPUSIM_POWER_MODEL
 is not defined. 2- fixing the makefile to make it actually compiles if the
 #GPGPUSIM_POWER_MODEL is not defined.

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14858]
---
 Makefile                 | 2 +-
 src/gpgpu-sim/gpu-sim.cc | 2 ++
 src/gpgpu-sim/gpu-sim.h  | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 93709a7..aa80c9f 100644
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ makedirs:
 	if [ ! -d $(SIM_OBJ_FILES_DIR)/libopencl ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/libopencl; fi;
 	if [ ! -d $(SIM_OBJ_FILES_DIR)/intersim ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/intersim; fi;
 	if [ ! -d $(SIM_OBJ_FILES_DIR)/cuobjdump_to_ptxplus ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/cuobjdump_to_ptxplus; fi;
-	if [ ! -d $(GPGPUSIM_POWER_MODEL)/obj_opt ] && [ -n $(GPGPUSIM_POWER_MODEL) ]; then mkdir -p $(GPGPUSIM_POWER_MODEL)/obj_opt; fi;
+	if [ ! -d $(GPGPUSIM_POWER_MODEL)/obj_opt ] && [ ! -n $(GPGPUSIM_POWER_MODEL) ]; then mkdir -p $(GPGPUSIM_POWER_MODEL)/obj_opt; fi;
 
 all:
 	$(MAKE) gpgpusim
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index 6cb237b..76137fb 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -64,6 +64,8 @@
 
 #ifdef GPGPUSIM_POWER_MODEL
 #include "power_interface.h"
+#else
+class  gpgpu_sim_wrapper {};
 #endif
 
 #include <stdio.h>
diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h
index 7fad76d..f8c2e2e 100644
--- a/src/gpgpu-sim/gpu-sim.h
+++ b/src/gpgpu-sim/gpu-sim.h
@@ -453,9 +453,7 @@ private:
    class shader_core_stats  *m_shader_stats;
    class memory_stats_t     *m_memory_stats;
    class power_stat_t *m_power_stats;
-#ifdef GPGPUSIM_POWER_MODEL
    class gpgpu_sim_wrapper *m_gpgpusim_wrapper;
-#endif
    unsigned long long  gpu_tot_issued_cta;
    unsigned long long  last_gpu_sim_insn;
 
-- 
cgit v1.3