Move function_info::sm_next_id

Signed-off-by: Mengchi Zhang <[email protected]>

2 files changed, 1 insertions, 4 deletions

diff --git a/src/cuda-sim/ptx_ir.cc b/src/cuda-sim/ptx_ir.cc
index 3719fb2..5fa9379 100644
--- a/src/cuda-sim/ptx_ir.cc
+++ b/src/cuda-sim/ptx_ir.cc
@@ -1374,12 +1374,11 @@ operand_info ptx_instruction::get_pred() const
     return operand_info( m_pred, gpgpu_ctx);
 }
 
-unsigned function_info::sm_next_uid = 1;
 
 function_info::function_info(int entry_point, gpgpu_context* ctx )
 {
    gpgpu_ctx = ctx;
-   m_uid = sm_next_uid++;
+   m_uid = (gpgpu_ctx->function_info_sm_next_uid)++;
    m_entry_point = (entry_point==1)?true:false;
    m_extern = (entry_point==2)?true:false;
    num_reconvergence_pairs = 0;
diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h
index 2fbda1c..8fc0a06 100644
--- a/src/cuda-sim/ptx_ir.h
+++ b/src/cuda-sim/ptx_ir.h
@@ -873,7 +873,6 @@ private:
    bool m_is_return_var;
    bool m_is_non_arch_reg;
 
-   static unsigned sm_next_uid;
    unsigned get_uid();
 };
 
@@ -1438,7 +1437,6 @@ private:
    symbol_table *m_symtab;
 
    static std::vector<ptx_instruction*> s_g_pc_to_insn; // a direct mapping from PC to instruction
-   static unsigned sm_next_uid;
 
    //parameter size for device kernels
    int m_args_aligned_size;