Spill memory displace bug fix

bcheng0127 · sys_zuul · commit b9600d39ed47 · 2020-02-13T23:37:14.000-08:00
Change-Id: I425dfc5df6d49f7a8da95ec99beac818278c35d1
diff --git a/visa/SpillManagerGMRF.cpp b/visa/SpillManagerGMRF.cpp
@@ -565,7 +565,7 @@ SpillManagerGRF::calculateSpillDisp (
             if (useScratchMsg_)
             {
                 if(curLocEnd % G4_GRF_REG_NBYTES != 0)
-                    curLocEnd = (curLocEnd&(owordMask()<<1)) + G4_GRF_REG_NBYTES;
+                    curLocEnd = ROUND(curLocEnd, G4_GRF_REG_NBYTES);
             }
             else
             {
@@ -685,7 +685,7 @@ G4_RegVar * regVar
 
             if ((spillAreaOffset_) % G4_GRF_REG_NBYTES != 0)
             {
-                (spillAreaOffset_) = ((spillAreaOffset_)&(owordMask() << 1)) + G4_GRF_REG_NBYTES;
+                (spillAreaOffset_) = ROUND(spillAreaOffset_, G4_GRF_REG_NBYTES);
             }
 
             regVar->setDisp(spillAreaOffset_);

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ SpillManagerGRF::calculateSpillDisp (`
`565`	`565`	`if (useScratchMsg_)`
`566`	`566`	`{`
`567`	`567`	`if(curLocEnd % G4_GRF_REG_NBYTES != 0)`
`568`		`- curLocEnd = (curLocEnd&(owordMask()<<1)) + G4_GRF_REG_NBYTES;`
	`568`	`+ curLocEnd = ROUND(curLocEnd, G4_GRF_REG_NBYTES);`
`569`	`569`	`}`
`570`	`570`	`else`
`571`	`571`	`{`
`@@ -685,7 +685,7 @@ G4_RegVar * regVar`
`685`	`685`
`686`	`686`	`if ((spillAreaOffset_) % G4_GRF_REG_NBYTES != 0)`
`687`	`687`	`{`
`688`		`- (spillAreaOffset_) = ((spillAreaOffset_)&(owordMask() << 1)) + G4_GRF_REG_NBYTES;`
	`688`	`+ (spillAreaOffset_) = ROUND(spillAreaOffset_, G4_GRF_REG_NBYTES);`
`689`	`689`	`}`
`690`	`690`
`691`	`691`	`regVar->setDisp(spillAreaOffset_);`