refactor: moving extern variable declarations into headers

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7172]

9 files changed, 33 insertions, 41 deletions

diff --git a/libopencl/opencl_runtime_api.cc b/libopencl/opencl_runtime_api.cc
index 8b2b94e..0b2d45c 100644
--- a/libopencl/opencl_runtime_api.cc
+++ b/libopencl/opencl_runtime_api.cc
@@ -79,6 +79,7 @@
 #include "../src/cuda-sim/cuda-sim.h"
 #include "../src/gpgpusim_entrypoint.h"
 #include "../src/cuda-sim/ptx_loader.h"
+#include "../src/gpgpu-sim/gpu-sim.h"
 
 struct gpgpu_ptx_sim_arg {
    const void *m_start;
@@ -321,7 +322,6 @@ unsigned ptx_kernel_shmem_size( void *kernel_impl );
 unsigned ptx_kernel_nregs( void *kernel_impl );
 extern unsigned int gpgpu_shmem_size;
 extern unsigned int gpgpu_shader_registers;
-extern unsigned int gpu_n_thread_per_shader;
 
 #define min(a,b) ((a<b)?(a):(b))
 
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index bb228a5..9a16320 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -101,10 +101,6 @@
 
 bool g_interactive_debugger_enabled=false;
 
-extern unsigned L2_write_miss;
-extern unsigned L2_write_hit;
-extern unsigned L2_read_hit;
-extern unsigned L2_read_miss;
 unsigned made_read_mfs = 0;
 unsigned made_write_mfs = 0;
 unsigned freed_read_mfs = 0;
@@ -128,7 +124,6 @@ unsigned int **num_activates; //num_activates[dram chip id][bank id]
 unsigned int **row_access; //row_access[dram chip id][bank id]
 unsigned int **max_conc_access2samerow; //max_conc_access2samerow[dram chip id][bank id]
 unsigned int **max_servicetime2samerow; //max_servicetime2samerow[dram chip id][bank id]
-unsigned int mergemiss = 0;
 unsigned int L1_read_miss = 0;
 unsigned int L1_write_miss = 0;
 unsigned int L1_write_hit_on_miss = 0;
@@ -924,7 +919,6 @@ void gpu_print_stat()
    }
    printf("\n");
    // merge misses
-   printf("merge misses = %d\n", mergemiss);
    printf("L1 read misses = %d\n", L1_read_miss);
    printf("L1 write misses = %d\n", L1_write_miss);
    printf("L1 write hit on misses = %d\n", L1_write_hit_on_miss);
diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h
index 2e9794f..9cab0f2 100644
--- a/src/gpgpu-sim/gpu-sim.h
+++ b/src/gpgpu-sim/gpu-sim.h
@@ -107,4 +107,22 @@ unsigned int run_gpu_sim(int grid_num);
 extern void gpu_reg_options(class OptionParser * opp);
 extern void init_gpu();
 
+extern unsigned int L1_write_miss;
+extern unsigned int L1_read_miss;
+extern unsigned int L1_texture_miss;
+extern unsigned int L1_const_miss;
+extern unsigned int L1_write_hit_on_miss;
+extern unsigned int L1_writeback;
+extern unsigned int L1_const_miss;
+extern unsigned int finished_trace;
+extern bool gpgpu_perfect_mem;
+extern int gpgpu_no_dl1;
+extern char *gpgpu_cache_texl1_opt;
+extern char *gpgpu_cache_constl1_opt;
+extern char *gpgpu_cache_dl1_opt;
+extern unsigned int gpu_n_thread_per_shader;
+extern unsigned int gpu_n_mshr_per_shader;
+extern unsigned int gpu_n_shader;
+
+
 #endif
diff --git a/src/gpgpu-sim/l2cache.h b/src/gpgpu-sim/l2cache.h
index 449d47a..11bef11 100644
--- a/src/gpgpu-sim/l2cache.h
+++ b/src/gpgpu-sim/l2cache.h
@@ -32,9 +32,9 @@ unsigned L2c_get_linesize( dram_t *dram_p );
 
 // probe L2 cache for fullness 
 int L2c_full( dram_t *dram_p );
-void L2c_push( dram_t *dram_p, mem_fetch_t *mf );
-mem_fetch_t* L2c_pop( dram_t *dram_p );
-mem_fetch_t* L2c_top( dram_t *dram_p );
+void L2c_push( dram_t *dram_p, struct mem_fetch *mf );
+struct mem_fetch* L2c_pop( dram_t *dram_p );
+struct mem_fetch* L2c_top( dram_t *dram_p );
 
 void L2c_init_stat();
 void L2c_update_stat( dram_t* dram_p);
@@ -44,5 +44,9 @@ void L2c_print_debug();
 void L2c_log(int task);
 void L2c_latency_log_dump();
 
-void L2c_options(option_parser_t opp);
+void L2c_options(class OptionParser *opp);
 
+extern unsigned L2_write_miss;
+extern unsigned L2_write_hit;
+extern unsigned L2_read_hit;
+extern unsigned L2_read_miss;
diff --git a/src/gpgpu-sim/mem_fetch.h b/src/gpgpu-sim/mem_fetch.h
index dbd3a2a..1db348a 100644
--- a/src/gpgpu-sim/mem_fetch.h
+++ b/src/gpgpu-sim/mem_fetch.h
@@ -80,7 +80,7 @@ enum mf_type {
    N_MF_TYPE
 };
 
-typedef struct {
+typedef struct mem_fetch {
    unsigned request_uid;
    unsigned long long int addr;
    int nbytes_L1;
diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc
index 6cb83eb..07e7347 100644
--- a/src/gpgpu-sim/shader.cc
+++ b/src/gpgpu-sim/shader.cc
@@ -76,29 +76,14 @@
 #include "../cuda-sim/ptx_sim.h"
 #include "../cuda-sim/ptx-stats.h"
 #include "../cuda-sim/dram_callback.h"
+#include "../cuda-sim/cuda-sim.h"
+#include "gpu-sim.h"
 #include "mem_fetch.h"
 #include <string.h>
 
 #define PRIORITIZE_MSHR_OVER_WB 1
 #define MAX(a,b) (((a)>(b))?(a):(b))
 
-extern unsigned int mergemiss;
-extern unsigned int L1_write_miss;
-extern unsigned int L1_read_miss;
-extern unsigned int L1_write_hit_on_miss;
-extern unsigned int L1_writeback;
-extern unsigned int L1_texture_miss;
-extern unsigned int L1_const_miss;
-
-extern unsigned int finished_trace;
-extern int gpgpu_perfect_mem;
-extern int gpgpu_no_dl1;
-extern char *gpgpu_cache_texl1_opt;
-extern char *gpgpu_cache_constl1_opt;
-extern char *gpgpu_cache_dl1_opt;
-extern unsigned int gpu_n_thread_per_shader;
-extern unsigned int gpu_n_mshr_per_shader;
-extern unsigned int gpu_n_shader;
 extern unsigned int gpu_n_mem;
 extern int gpgpu_reg_bankconflict;
 extern int gpgpu_dram_sched_queue_size;
diff --git a/src/gpgpu-sim/visualizer.cc b/src/gpgpu-sim/visualizer.cc
index 0a2d920..6d21a8e 100644
--- a/src/gpgpu-sim/visualizer.cc
+++ b/src/gpgpu-sim/visualizer.cc
@@ -60,6 +60,7 @@
  */
 
 #include "gpu-sim.h"
+#include "l2cache.h"
 #include "shader.h"
 #include "../option_parser.h"
 #include <time.h>
@@ -71,14 +72,6 @@ extern unsigned int gpu_n_mem;
 extern unsigned int gpu_mem_n_bk;
 extern shader_core_ctx_t **sc;
 extern dram_t **dram;
-extern unsigned int L1_read_miss;
-extern unsigned int L1_write_miss;
-extern unsigned int L1_texture_miss;
-extern unsigned int L1_const_miss;
-extern unsigned L2_write_miss;
-extern unsigned L2_write_hit;
-extern unsigned L2_read_hit;
-extern unsigned L2_read_miss;
 extern unsigned long long int mf_total_lat;
 extern unsigned num_mfs;
 extern unsigned long long  gpu_sim_cycle;
diff --git a/src/gpgpu-sim/warp_tracker.cc b/src/gpgpu-sim/warp_tracker.cc
index 19f0e12..09f88d5 100644
--- a/src/gpgpu-sim/warp_tracker.cc
+++ b/src/gpgpu-sim/warp_tracker.cc
@@ -64,12 +64,12 @@
  */
 
 #include "warp_tracker.h"
+#include "gpu-sim.h"
 
 using namespace std;
 
 extern unsigned int warp_size;
 extern unsigned int gpu_n_shader;
-extern unsigned int gpu_n_thread_per_shader;
 
 #include <set>
 
diff --git a/src/intersim/interconnect_interface.cpp b/src/intersim/interconnect_interface.cpp
index bb30f81..6981e08 100644
--- a/src/intersim/interconnect_interface.cpp
+++ b/src/intersim/interconnect_interface.cpp
@@ -17,6 +17,7 @@
 #include "injection.hpp"
 #include "interconnect_interface.h"
 #include "../gpgpu-sim/mem_fetch.h"
+#include "../gpgpu-sim/gpu-sim.h"
 #include <string.h>
 
 extern unsigned long long gpu_sim_cycle;
@@ -383,9 +384,6 @@ extern int MATLAB_OUTPUT        ;
 extern int DISPLAY_LAT_DIST     ; 
 extern int DISPLAY_HOP_DIST     ; 
 extern int DISPLAY_PAIR_LATENCY ; 
-extern unsigned int gpu_n_thread_per_shader;
-extern char *gpgpu_cache_dl1_opt;
-extern int gpgpu_no_dl1;
 
 
 void init_interconnect (char* config_file,