From 529b3a65b65536e20f6a1dab135233f52d19bcf3 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sun, 8 Aug 2010 23:04:47 -0800 Subject: refactoring: continued, builds [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7174] --- src/gpgpu-sim/dram_sched.cc | 4 ---- src/gpgpu-sim/gpu-sim.h | 6 ++++++ src/gpgpu-sim/mem_latency_stat.cc | 5 ++++- src/gpgpu-sim/warp_tracker.cc | 1 - 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gpgpu-sim/dram_sched.cc b/src/gpgpu-sim/dram_sched.cc index 03cc3ba..7e8b38c 100644 --- a/src/gpgpu-sim/dram_sched.cc +++ b/src/gpgpu-sim/dram_sched.cc @@ -74,10 +74,6 @@ extern unsigned max_mrq_latency; extern unsigned mrq_lat_table[24]; extern int gpgpu_memlatency_stat; extern unsigned int **concurrent_row_access; //concurrent_row_access[dram chip id][bank id] -extern unsigned int **row_access; //concurrent_row_access[dram chip id][bank id] -extern unsigned int **num_activates; //num_activates[dram chip id][bank id] -extern unsigned int **max_conc_access2samerow; //max_conc_access2samerow[dram chip id][bank id] -extern unsigned int **max_servicetime2samerow; ideal_dram_scheduler::ideal_dram_scheduler( dram_t *dm ) { diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h index 4c7bd72..d962111 100644 --- a/src/gpgpu-sim/gpu-sim.h +++ b/src/gpgpu-sim/gpu-sim.h @@ -128,5 +128,11 @@ extern bool gpgpu_reg_bankconflict; extern int gpgpu_dram_sched_queue_size; extern unsigned long long gpu_tot_sim_cycle; extern unsigned int gpu_n_warp_per_shader; +extern unsigned int **max_conc_access2samerow; +extern unsigned int **max_servicetime2samerow; +extern unsigned int **row_access; +extern unsigned int **num_activates; + +extern void check_time_vector_update(unsigned int uid,int slot ,long int latency,int type); #endif diff --git a/src/gpgpu-sim/mem_latency_stat.cc b/src/gpgpu-sim/mem_latency_stat.cc index eb560c1..16b71b0 100644 --- a/src/gpgpu-sim/mem_latency_stat.cc +++ b/src/gpgpu-sim/mem_latency_stat.cc @@ -64,11 +64,14 @@ * Vancouver, BC V6T 1Z4 */ +#include "../abstract_hardware_model.h" #include "mem_latency_stat.h" #include "gpu-sim.h" +#include "gpu-misc.h" #include "shader.h" #include "mem_fetch.h" -#include "../abstract_hardware_model.h" +#include "cflogger.h" +#include "../cuda-sim/ptx-stats.h" #include #include #include diff --git a/src/gpgpu-sim/warp_tracker.cc b/src/gpgpu-sim/warp_tracker.cc index 09f88d5..811961d 100644 --- a/src/gpgpu-sim/warp_tracker.cc +++ b/src/gpgpu-sim/warp_tracker.cc @@ -207,7 +207,6 @@ void init_warp_tracker( ) printf("%zd\n", free_wpt.size()); } -extern signed long long gpu_tot_sim_cycle; extern signed long long gpu_sim_cycle; void wpt_register_warp( int *tid_in, shader_core_ctx_t *shd ) -- cgit v1.3