summaryrefslogtreecommitdiff
path: root/src/cuda-sim/ptx.y
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2010-07-17 08:42:20 -0800
committerTor Aamodt <[email protected]>2010-07-17 08:42:20 -0800
commitca7e2e58e7fd932d67c6d28477a5c15ed3b156b0 (patch)
tree1a66586b291019476ec06715d259560818baf923 /src/cuda-sim/ptx.y
parentb6661da800739b0fca9e01ba6d5afaca4f286d84 (diff)
- add support for cvta and isspacep instructions (currently assuming
a fixed address mapping between shared,local to generic that depends upon hardware thread context used... might be interesting to explore tradeoffs at some point) - remove util.h... we don't need TRUE, FALSE anymore now that everything is C++ - remove some dead code from shader_decode [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 6867]
Diffstat (limited to 'src/cuda-sim/ptx.y')
-rw-r--r--src/cuda-sim/ptx.y5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y
index 4f1502a..7b4c17a 100644
--- a/src/cuda-sim/ptx.y
+++ b/src/cuda-sim/ptx.y
@@ -195,6 +195,7 @@
%token ALL_OPTION
%token GLOBAL_OPTION
%token CTA_OPTION
+%token TO_OPTION
%type <int_value> function_decl_header
%type <ptr_value> function_decl
@@ -384,7 +385,9 @@ option: type_spec
| FTZ_OPTION { add_option(FTZ_OPTION); }
| APPROX_OPTION { add_option(APPROX_OPTION); }
| FULL_OPTION { add_option(FULL_OPTION); }
- | atomic_operation_spec ;
+ | atomic_operation_spec
+ | TO_OPTION { add_option(TO_OPTION); }
+ ;
atomic_operation_spec: ATOMIC_AND { add_option(ATOMIC_AND); }
| ATOMIC_OR { add_option(ATOMIC_OR); }