diff options
| author | Wilson Fung <[email protected]> | 2012-08-16 20:11:16 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:48:54 -0700 |
| commit | 888dd6c18d927d93856c721a06c7155d5eac2d53 (patch) | |
| tree | 91627090401871d6093b51ee6afa8656c616ea4c /src/cuda-sim/ptx.y | |
| parent | 630ea0793949ef5845318e677d80c7b60a89d801 (diff) | |
Integration from TM-311 branch.
- Updated PTX parser to support CUDA 4.1 and 4.2.
- Revised fatbin workaround to a more robust version (with comments explaining it).
- Added print_simulation_time() in gpgpu_sim_thread_concurrent().
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13789]
Diffstat (limited to 'src/cuda-sim/ptx.y')
| -rw-r--r-- | src/cuda-sim/ptx.y | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index 2c01a70..5b69975 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -259,6 +259,7 @@ directive_statement: variable_declaration SEMI_COLON | FILE_DIRECTIVE INT_OPERAND STRING { add_file($2,$3); } | LOC_DIRECTIVE INT_OPERAND INT_OPERAND INT_OPERAND | PRAGMA_DIRECTIVE STRING SEMI_COLON { add_pragma($2); } + | function_decl SEMI_COLON {/*Do nothing*/} ; variable_declaration: variable_spec identifier_list { add_variables(); } |