summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcuda/gpgpu_context.h2
-rw-r--r--src/cuda-sim/instructions.cc1
-rw-r--r--src/cuda-sim/ptx_ir.cc2
-rw-r--r--src/cuda-sim/ptx_ir.h2
4 files changed, 3 insertions, 4 deletions
diff --git a/libcuda/gpgpu_context.h b/libcuda/gpgpu_context.h
index 337ebb2..909f267 100644
--- a/libcuda/gpgpu_context.h
+++ b/libcuda/gpgpu_context.h
@@ -16,6 +16,7 @@ class gpgpu_context {
warp_inst_sm_next_uid=0;
operand_info_sm_next_uid = 1;
kernel_info_m_next_uid = 1;
+ g_num_ptx_inst_uid = 0;
api = new cuda_runtime_api(this);
ptxinfo = new ptxinfo_data(this);
ptx_parser = new ptx_recognizer(this);
@@ -31,6 +32,7 @@ class gpgpu_context {
unsigned warp_inst_sm_next_uid;
unsigned operand_info_sm_next_uid;//uid for operand_info
unsigned kernel_info_m_next_uid;//uid for kernel_info_t
+ unsigned g_num_ptx_inst_uid; //uid for ptx inst inside ptx_instruction
// objects pointers for each file
cuda_runtime_api* api;
ptxinfo_data* ptxinfo;
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc
index 565340c..4d4a80d 100644
--- a/src/cuda-sim/instructions.cc
+++ b/src/cuda-sim/instructions.cc
@@ -60,7 +60,6 @@ class ptx_recognizer;
using half_float::half;
-unsigned ptx_instruction::g_num_ptx_inst_uid=0;
bool debug_tensorcore = 0;
diff --git a/src/cuda-sim/ptx_ir.cc b/src/cuda-sim/ptx_ir.cc
index 0fa29eb..849cc5d 100644
--- a/src/cuda-sim/ptx_ir.cc
+++ b/src/cuda-sim/ptx_ir.cc
@@ -1100,7 +1100,7 @@ ptx_instruction::ptx_instruction( int opcode,
gpgpu_context* ctx ) : warp_inst_t(config), m_return_var(ctx)
{
gpgpu_ctx = ctx;
- m_uid = ++g_num_ptx_inst_uid;
+ m_uid = ++(ctx->g_num_ptx_inst_uid);
m_PC = 0;
m_opcode = opcode;
m_pred = pred;
diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h
index 8ed94d9..1ffbebc 100644
--- a/src/cuda-sim/ptx_ir.h
+++ b/src/cuda-sim/ptx_ir.h
@@ -878,7 +878,6 @@ private:
};
extern const char *g_opcode_string[];
-extern unsigned g_num_ptx_inst_uid;
struct basic_block_t {
basic_block_t( unsigned ID, ptx_instruction *begin, ptx_instruction *end, bool entry, bool ex)
{
@@ -1194,7 +1193,6 @@ private:
virtual void pre_decode();
friend class function_info;
- static unsigned g_num_ptx_inst_uid;
// backward pointer
class gpgpu_context* gpgpu_ctx;
};