From 888dd6c18d927d93856c721a06c7155d5eac2d53 Mon Sep 17 00:00:00 2001 From: Wilson Fung Date: Thu, 16 Aug 2012 20:11:16 -0800 Subject: 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] --- src/cuda-sim/ptx.y | 1 + 1 file changed, 1 insertion(+) (limited to 'src/cuda-sim/ptx.y') 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(); } -- cgit v1.3