From 710a0b7c3ac97324f0306f4df410c20967319508 Mon Sep 17 00:00:00 2001
From: "Andrew M. B. Boktor" <andrew.boktor@gmail.com>
Date: Wed, 2 May 2012 18:47:44 -0800
Subject: Adding support in the simulator for addition with carry specified in
 a given predicate register (calling it addp) Adding support in
 cuobjdump_to_ptxplus for IADD.CARRY* which translates to the above Now power
 benchmarks should work

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12266]
---
 cuobjdump_to_ptxplus/sass.y | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'cuobjdump_to_ptxplus/sass.y')

diff --git a/cuobjdump_to_ptxplus/sass.y b/cuobjdump_to_ptxplus/sass.y
index 634757b..33785a0 100644
--- a/cuobjdump_to_ptxplus/sass.y
+++ b/cuobjdump_to_ptxplus/sass.y
@@ -22,7 +22,7 @@ cuobjdumpInst *instEntry;
 %token <string_value> BAR
 %token <string_value> ADA AND ANDS BRA CAL COS DADD DFMA DMUL EX2 F2F F2I FADD
 %token <string_value> FADD32 FADD32I FMAD FMAD32I FMUL FMUL32 FMUL32I FSET G2R
-%token <string_value> GLD GST I2F I2I IADD IADD32 IADD32I IMAD IMAD24 IMAD32I IMAD32
+%token <string_value> GLD GST I2F I2I IADD IADD32 IADD32I IMAD IMAD24 IMAD32I IMAD32 IADDCARRY
 %token <string_value> IMUL IMUL24 IMULS24 IMUL32 IMUL32S24 IMUL32U24 IMUL32I IMUL32I24 IMUL32IS24
 %token <string_value> ISET LG2 LLD LST MOV MOV32 MVC MVI NOP NOT NOTS OR ORS
 %token <string_value> R2A R2G R2GU16U8 RCP RCP32 RET RRO RSQ SIN SHL SHR SSY XOR XORS
@@ -31,7 +31,7 @@ cuobjdumpInst *instEntry;
 
 %token <string_value> EQ EQU GE GEU GT GTU LE LEU LT LTU NE NEU
 %token <string_value> DOTBEXT DOTS DOTSFU
-%token <string_value> DOTTRUNC DOTIR DOTUN DOTNODEP DOTCARRY0 DOTSAT
+%token <string_value> DOTTRUNC DOTIR DOTUN DOTNODEP DOTSAT
 %token <string_value> DOTF16 DOTF32 DOTF64 DOTS8 DOTS16 DOTS32 DOTS64 DOTS128 DOTU8 DOTU16 DOTU32 DOTU24 DOTU64
 %token <string_value> DOTHI DOTNOINC
 %token <string_value> DOTEQ DOTEQU DOTGE DOTGEU DOTGT DOTGTU DOTLE DOTLEU DOTLT DOTLTU DOTNE DOTNEU DOTNSF DOTSF DOTCARRY
@@ -147,7 +147,7 @@ simpleInstructions	: ADA | AND | ANDS | COS | DADD | DFMA | DMUL | EX2 | F2F
 					| NOT | NOTS | OR | ORS | R2A | R2G | R2GU16U8 | RCP | RCP32 | RET | RRO 
 					| RSQ | SHL | SHR | SIN | SSY | XOR | XORS | S2R | SASS_LD | STS 
 					| LDS | SASS_ST | EXIT | BAR | IMIN | IMAX | A2R | FMAX | FMIN 
-					| TEX | TEX32 | C2R | BRK | R2C
+					| TEX | TEX32 | C2R | BRK | R2C | IADDCARRY
 					;
 
 pbkInstruction	:	PBK {
@@ -264,8 +264,7 @@ modifier	: opTypes	{ printf($1); g_instList->getListEnd().addTypeModifier($1);}
 		| DOTPOPC		{ g_instList->getListEnd().addBaseModifier(".popc"); }
 		| DOTIR			{ g_instList->getListEnd().addBaseModifier(".ir"); }
 		| DOTUN			{ /*g_instList->getListEnd().addBaseModifier(".un"); */}
-		| DOTNODEP			{ /*g_instList->getListEnd().addBaseModifier(".nodep"); */}
-		| DOTCARRY0			{ /*g_instList->getListEnd().addBaseModifier(".carry0"); */}
+		| DOTNODEP		{ /*g_instList->getListEnd().addBaseModifier(".nodep"); */}
 		;
 
 opTypes		: DOTF16	//{ printf($1); g_instList->getListEnd().addTypeModifier($1);}
-- 
cgit v1.3