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/ptxinfo.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/cuda-sim/ptxinfo.y') diff --git a/src/cuda-sim/ptxinfo.y b/src/cuda-sim/ptxinfo.y index 8bc1306..e4ba6b2 100644 --- a/src/cuda-sim/ptxinfo.y +++ b/src/cuda-sim/ptxinfo.y @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %token SEMICOLON %token QUOTE %token LINE -%token WARNING +%token WARNING %token FOR %{ @@ -78,6 +78,7 @@ input: /* empty */ line: HEADER INFO COLON line_info | HEADER IDENTIFIER COMMA LINE INT_OPERAND SEMICOLON WARNING + | HEADER WARNING { printf("GPGPU-Sim: ptxas %s\n", $2); } ; line_info: function_name -- cgit v1.3