diff options
| author | Ahmed El-Shafiey <[email protected]> | 2014-08-06 20:08:15 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:51:00 -0700 |
| commit | ad5a3cf3480e3fa302382122af21278c881595d6 (patch) | |
| tree | 52c7edf0639ec380d9fe772db26842c0415fdfae /src/cuda-sim/ptx.y | |
| parent | fd3c208f3c51c5520dcd7150d8a521a61577a9d5 (diff) | |
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]
Diffstat (limited to 'src/cuda-sim/ptx.y')
| -rw-r--r-- | src/cuda-sim/ptx.y | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index 6c614bf..e5942f0 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -157,10 +157,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %token NEG_OPTION %token SYNC_OPTION %token RED_OPTION -%token POPC_REDUCTION -%token AND_REDUCTION -%token OR_REDUCTION %token ARRIVE_OPTION +%token ATOMIC_POPC %token ATOMIC_AND %token ATOMIC_OR %token ATOMIC_XOR @@ -416,10 +414,7 @@ option: type_spec | rounding_mode | SYNC_OPTION { add_option(SYNC_OPTION); } | ARRIVE_OPTION { add_option(ARRIVE_OPTION); } - | RED_OPTION { add_option(RED_OPTION); } - | POPC_REDUCTION { add_option(POPC_REDUCTION); } - | AND_REDUCTION { add_option(AND_REDUCTION); } - | OR_REDUCTION { add_option(OR_REDUCTION); } + | RED_OPTION { add_option(RED_OPTION); } | UNI_OPTION { add_option(UNI_OPTION); } | WIDE_OPTION { add_option(WIDE_OPTION); } | ANY_OPTION { add_option(ANY_OPTION); } |