From 97beb988d6e1dd520d0eca8c42b639796a0aa3ac Mon Sep 17 00:00:00 2001 From: Wilson Fung Date: Thu, 23 Aug 2012 19:05:43 -0800 Subject: Extending ptx.y to ignore the .minnctapersm directive (at least it will not crash the simulator for now). [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13841] --- src/cuda-sim/ptx.y | 7 ++++++- version | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index 751d398..d9c9267 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -209,12 +209,17 @@ input: /* empty */ ; function_defn: function_decl { set_symtab($1); func_header(".skip"); } statement_block { end_function(); } - | function_decl { set_symtab($1); } block_spec { func_header(".skip"); } statement_block { end_function(); } + | function_decl { set_symtab($1); } block_spec_list { func_header(".skip"); } statement_block { end_function(); } ; block_spec: MAXNTID_DIRECTIVE INT_OPERAND COMMA INT_OPERAND COMMA INT_OPERAND {func_header_info_int(".maxntid", $2); func_header_info_int(",", $4); func_header_info_int(",", $6); } + | MINNCTAPERSM_DIRECTIVE INT_OPERAND { func_header_info_int(".minnctapersm", $2); printf("GPGPU-Sim: Warning: .minnctapersm ignored. \n"); } + ; + +block_spec_list: block_spec + | block_spec_list block_spec ; function_decl: function_decl_header LEFT_PAREN { start_function($1); func_header_info("(");} param_entry RIGHT_PAREN {func_header_info(")");} function_ident_param { $$ = reset_symtab(); } diff --git a/version b/version index 995a9a5..7c80d8e 100644 --- a/version +++ b/version @@ -1,2 +1,2 @@ const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.1.1+edits (development branch) "; -const char *g_gpgpusim_build_string = "$Change$"; +const char *g_gpgpusim_build_string = "$Change$"; -- cgit v1.3