summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMengchi Zhang <[email protected]>2019-07-10 00:11:38 -0400
committerMengchi Zhang <[email protected]>2019-07-10 00:11:38 -0400
commit717de45b61d12fd4aedea111515433167c7efab7 (patch)
treedd9a2580be0e07d8a71cceb26004b657fac0e145
parent8b4f4ac167fd57284cebf38746bf571a52cf3a0f (diff)
Move g_cuda_launch_blocking
Signed-off-by: Mengchi Zhang <[email protected]>
-rw-r--r--src/cuda-sim/cuda-sim.cc2
-rw-r--r--src/cuda-sim/cuda-sim.h2
-rw-r--r--src/gpgpusim_entrypoint.cc4
3 files changed, 3 insertions, 5 deletions
diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index 832a223..e9508ee 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -2031,8 +2031,6 @@ void gpgpu_ptx_sim_memcpy_symbol(const char *hostVar, const void *src, size_t co
extern int ptx_debug;
-bool g_cuda_launch_blocking = false;
-
void cuda_sim::read_sim_environment_variables()
{
ptx_debug = 0;
diff --git a/src/cuda-sim/cuda-sim.h b/src/cuda-sim/cuda-sim.h
index 0a1401a..6177986 100644
--- a/src/cuda-sim/cuda-sim.h
+++ b/src/cuda-sim/cuda-sim.h
@@ -133,6 +133,7 @@ class cuda_sim {
g_ptx_sim_num_insn = 0;
g_ptx_kernel_count = -1; // used for classification stat collection purposes
gpgpu_param_num_shaders = 0;
+ g_cuda_launch_blocking = false;
gpgpu_ctx = ctx;
}
//global variables
@@ -157,6 +158,7 @@ class cuda_sim {
int g_ptx_sim_mode; // if non-zero run functional simulation only (i.e., no notion of a clock cycle)
unsigned gpgpu_param_num_shaders;
class std::map<function_info*,rec_pts> g_rpts;
+ bool g_cuda_launch_blocking;
// backward pointer
class gpgpu_context* gpgpu_ctx;
//global functions
diff --git a/src/gpgpusim_entrypoint.cc b/src/gpgpusim_entrypoint.cc
index 683a695..816159f 100644
--- a/src/gpgpusim_entrypoint.cc
+++ b/src/gpgpusim_entrypoint.cc
@@ -207,8 +207,6 @@ void exit_simulation()
fflush(stdout);
}
-extern bool g_cuda_launch_blocking;
-
gpgpu_sim *gpgpu_context::gpgpu_ptx_sim_init_perf()
{
srand(1);
@@ -233,7 +231,7 @@ gpgpu_sim *gpgpu_context::gpgpu_ptx_sim_init_perf()
GPGPUsim_ctx_ptr()->g_the_gpu_config->init();
GPGPUsim_ctx_ptr()->g_the_gpu = new gpgpu_sim(*(GPGPUsim_ctx_ptr()->g_the_gpu_config), this);
- GPGPUsim_ctx_ptr()->g_stream_manager = new stream_manager((GPGPUsim_ctx_ptr()->g_the_gpu),g_cuda_launch_blocking);
+ GPGPUsim_ctx_ptr()->g_stream_manager = new stream_manager((GPGPUsim_ctx_ptr()->g_the_gpu), func_sim->g_cuda_launch_blocking);
GPGPUsim_ctx_ptr()->g_simulation_starttime = time((time_t *)NULL);