From ad5a3cf3480e3fa302382122af21278c881595d6 Mon Sep 17 00:00:00 2001 From: Ahmed El-Shafiey Date: Wed, 6 Aug 2014 20:08:15 -0800 Subject: This should fix 2.3 regression and may fix others as well. Remove redudant definition for some tokens which confuses the parser [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 18462] --- src/cuda-sim/ptx.l | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/cuda-sim/ptx.l') diff --git a/src/cuda-sim/ptx.l b/src/cuda-sim/ptx.l index ebe07c7..dfed936 100644 --- a/src/cuda-sim/ptx.l +++ b/src/cuda-sim/ptx.l @@ -298,9 +298,6 @@ breakaddr TC; ptx_lval.int_value = BREAKADDR_OP; return OPCODE; \.arrive TC; return ARRIVE_OPTION; \.red TC; return RED_OPTION; -\.popc TC; return POPC_REDUCTION; -\.and TC; return AND_REDUCTION; -\.or TC; return OR_REDUCTION; \.approx TC; return APPROX_OPTION; \.full TC; return FULL_OPTION; @@ -327,6 +324,7 @@ breakaddr TC; ptx_lval.int_value = BREAKADDR_OP; return OPCODE; \.wb TC; return WB_OPTION; \.wt TC; return WT_OPTION; +\.popc TC; return ATOMIC_POPC; \.and TC; return ATOMIC_AND; \.or TC; return ATOMIC_OR; \.xor TC; return ATOMIC_XOR; -- cgit v1.3