Fix spilled variable offset alignment when scratch space compression is enabled.

Change-Id: I755de9eebd7d9ade87a06100071a77b5b0ac5db4

Author: weiyu-chen

visa/Gen4_IR.cpp

@@ -3685,7 +3685,7 @@ void G4_INST::emit_inst(std::ostream& output, bool symbol_dst, bool *symbol_srcs
         }
         if (isSpillIntrinsic())
         {
-            output << "Scratch[" << asSpillIntrinsic()->getOffset() << "] ";
+            output << "Scratch[" << asSpillIntrinsic()->getOffset() << "x32] ";
         }
         else if (dst)
         {
@@ -3711,7 +3711,7 @@ void G4_INST::emit_inst(std::ostream& output, bool symbol_dst, bool *symbol_srcs
         }
         if (isFillIntrinsic())
         {
-            output << "Scratch[" << asFillIntrinsic()->getOffset() << "] ";
+            output << "Scratch[" << asFillIntrinsic()->getOffset() << "x32] ";
         }
 
         if (isFlowControl() && asCFInst()->getJip())

visa/SpillManagerGMRF.cpp

@@ -560,18 +560,8 @@ SpillManagerGRF::calculateSpillDisp (
             break;
         unsigned curLocEnd = curLocDisp + getByteSize (*curLoc);
         {
-            if (useScratchMsg_)
-            {
-                if(curLocEnd % G4_GRF_REG_NBYTES != 0)
-                    curLocEnd = ROUND(curLocEnd, G4_GRF_REG_NBYTES);
-            }
-            else
-            {
-                if (owordAligned (curLocEnd) == false) {
-                    curLocEnd =
-                        (curLocEnd & owordMask ()) + OWORD_BYTE_SIZE;
-                }
-            }
+            if (curLocEnd % G4_GRF_REG_NBYTES != 0)
+                curLocEnd = ROUND(curLocEnd, G4_GRF_REG_NBYTES);
         }
 
         regVarLocDisp = (regVarLocDisp > curLocEnd)? regVarLocDisp: curLocEnd;
@@ -607,8 +597,9 @@ G4_RegVar * regVar
 {
     // Already calculated spill memory disp
 
-    if (regVar->getDisp() != UINT_MAX) {
-        // Do nothing.
+    if (regVar->getDisp() != UINT_MAX)
+    {
+        return regVar->getDisp();
     }
 
     // If it is an aliased regvar then calculate the disp for the
@@ -691,6 +682,10 @@ G4_RegVar * regVar
         }
     }
 
+    // ToDo: log this in some dump to help debug
+    //regVar->getDeclare()->dump();
+    //std::cerr << "spill offset = " << regVar->getDisp() << "\n";
+
     return regVar->getDisp();
 }