diff options
| author | Ahmed El-Shafiey <[email protected]> | 2012-11-30 23:29:36 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:49:22 -0700 |
| commit | 7fa13cb69acd1c74e5753fa216a425c45797a69b (patch) | |
| tree | 7bf7b83a301755579cde36014032eca5feca12d8 /src | |
| parent | a4e786e7ba32deb2877722650a907ccdb1bef096 (diff) | |
fixing a bug that cause the thread_fence benchmark fails (excluding an opcode that does not have operands "mem_bar" from checking its operands types)
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14738]
Diffstat (limited to 'src')
| -rw-r--r-- | src/cuda-sim/cuda-sim.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc index 368ac4a..0e6ba7e 100644 --- a/src/cuda-sim/cuda-sim.cc +++ b/src/cuda-sim/cuda-sim.cc @@ -453,7 +453,7 @@ void ptx_print_insn( address_type pc, FILE *fp ) } void ptx_instruction::set_fp_or_int_archop(){ op2=UN_OP; - if((m_opcode == SSY_OP )||(m_opcode == BRA_OP) || (m_opcode == BAR_OP) || (m_opcode == RET_OP) || (m_opcode == RETP_OP) || (m_opcode == NOP_OP) || (m_opcode == EXIT_OP) || (m_opcode == CALLP_OP) || (m_opcode == CALL_OP)){ + if((m_opcode == MEMBAR_OP)||(m_opcode == SSY_OP )||(m_opcode == BRA_OP) || (m_opcode == BAR_OP) || (m_opcode == RET_OP) || (m_opcode == RETP_OP) || (m_opcode == NOP_OP) || (m_opcode == EXIT_OP) || (m_opcode == CALLP_OP) || (m_opcode == CALL_OP)){ // do nothing }else if((m_opcode == CVT_OP || m_opcode == SET_OP || m_opcode == SLCT_OP)){ if(get_type2()==F16_TYPE || get_type2()==F32_TYPE || get_type2() == F64_TYPE || get_type2() == FF64_TYPE){ @@ -468,7 +468,7 @@ void ptx_instruction::set_fp_or_int_archop(){ } void ptx_instruction::set_mul_div_or_other_archop(){ op3=OTHER_OP; - if((m_opcode != SSY_OP) && (m_opcode != BRA_OP) && (m_opcode != BAR_OP) && (m_opcode != EXIT_OP) && (m_opcode != NOP_OP) && (m_opcode != RETP_OP) && (m_opcode != RET_OP) && (m_opcode != CALLP_OP) && (m_opcode != CALL_OP)){ + if((m_opcode != MEMBAR_OP) && (m_opcode != SSY_OP) && (m_opcode != BRA_OP) && (m_opcode != BAR_OP) && (m_opcode != EXIT_OP) && (m_opcode != NOP_OP) && (m_opcode != RETP_OP) && (m_opcode != RET_OP) && (m_opcode != CALLP_OP) && (m_opcode != CALL_OP)){ if(get_type()==F32_TYPE || get_type() == F64_TYPE || get_type() == FF64_TYPE){ switch(get_opcode()){ case MUL_OP: |