Modify spill/fill intrinsics' offset units

Change-Id: I1fc1aa5c43ac21cf6f623ea0fd339e836c2c34ca

Author: pratikashar

visa/BuildIR.h

@@ -1113,6 +1113,8 @@ class IR_Builder {
         return inst;
     }
 
+    static const unsigned int HWORD_BYTE_SIZE = 32;
+
     // numRows is in hword units
     // offset is in hword units
     G4_INST* createSpill(
@@ -1126,7 +1128,8 @@ class IR_Builder {
         spill->asSpillIntrinsic()->setSrcFilename(srcFilename);
         spill->asSpillIntrinsic()->setCISAOff(CISAoff);
         spill->asSpillIntrinsic()->setFP(fp);
-        spill->asSpillIntrinsic()->setOffset(offset);
+        spill->asSpillIntrinsic()->setOffset((uint32_t)
+            (((uint64_t)offset * HWORD_BYTE_SIZE) / G4_GRF_REG_NBYTES));
         spill->asSpillIntrinsic()->setNumRows(numRows);
         return spill;
     }
@@ -1146,7 +1149,8 @@ class IR_Builder {
         spill->asSpillIntrinsic()->setSrcFilename(srcFilename);
         spill->asSpillIntrinsic()->setCISAOff(CISAoff);
         spill->asSpillIntrinsic()->setFP(fp);
-        spill->asSpillIntrinsic()->setOffset(offset);
+        spill->asSpillIntrinsic()->setOffset((uint32_t)
+            (((uint64_t)offset * HWORD_BYTE_SIZE) / G4_GRF_REG_NBYTES));
         spill->asSpillIntrinsic()->setNumRows(numRows);
         return spill;
     }
@@ -1159,7 +1163,8 @@ class IR_Builder {
         fill->asFillIntrinsic()->setSrcFilename(srcFilename);
         fill->asFillIntrinsic()->setCISAOff(CISAoff);
         fill->asFillIntrinsic()->setFP(fp);
-        fill->asFillIntrinsic()->setOffset(offset);
+        fill->asFillIntrinsic()->setOffset((uint32_t)
+            (((uint64_t)offset * HWORD_BYTE_SIZE) / G4_GRF_REG_NBYTES));
         fill->asFillIntrinsic()->setNumRows(numRows);
         return fill;
     }
@@ -1175,7 +1180,8 @@ class IR_Builder {
         fill->asFillIntrinsic()->setSrcFilename(srcFilename);
         fill->asFillIntrinsic()->setCISAOff(CISAoff);
         fill->asFillIntrinsic()->setFP(fp);
-        fill->asFillIntrinsic()->setOffset(offset);
+        fill->asFillIntrinsic()->setOffset((uint32_t)
+            (((uint64_t)offset * HWORD_BYTE_SIZE) / G4_GRF_REG_NBYTES));
         fill->asFillIntrinsic()->setNumRows(numRows);
         return fill;
     }

visa/GraphColor.cpp

@@ -9390,6 +9390,7 @@ int GlobalRA::coloringRegAlloc()
                 bool disableSpillCoalecse = builder.getOption(vISA_DisableSpillCoalescing) ||
                     builder.getOption(vISA_FastSpill) || builder.getOption(vISA_Debug) ||
                     !useScratchMsgForSpill;
+
                 if (!reserveSpillReg && !disableSpillCoalecse && builder.useSends())
                 {
                     CoalesceSpillFills c(kernel, liveAnalysis, coloring, spillGRF, iterationNo, rpe, *this);

visa/SpillCleanup.cpp

@@ -445,20 +445,7 @@ void CoalesceSpillFills::sendsInRange(std::list<INST_LIST_ITER>& instList,
     {
         unsigned scratchOffset, sizeInGrfUnit, lastScratchOffset;
         auto inst = *(*iter);
-        if (inst->isSpillIntrinsic())
-        {
-            scratchOffset = inst->asSpillIntrinsic()->getOffset();
-            sizeInGrfUnit = inst->asSpillIntrinsic()->getNumRows();
-        }
-        else if (inst->isFillIntrinsic())
-        {
-            scratchOffset = inst->asFillIntrinsic()->getOffset();
-            sizeInGrfUnit = inst->asFillIntrinsic()->getNumRows();
-        }
-        else
-        {
-            MUST_BE_TRUE(false, "unknown inst type");
-        }
+        getScratchMsgInfo(inst, scratchOffset, sizeInGrfUnit);
         lastScratchOffset = scratchOffset + sizeInGrfUnit - 1;
 
         if (min == 0xffffffff && max == 0)

visa/SpillManagerGMRF.cpp

@@ -4560,7 +4560,8 @@ void GlobalRA::expandSpillIntrinsic(G4_BB* bb)
         {
             bool isOffBP = inst->asSpillIntrinsic()->isOffBP();
             uint32_t numRows = inst->asSpillIntrinsic()->getNumRows();
-            uint32_t offset = inst->asSpillIntrinsic()->getOffset();
+            uint32_t offset = inst->asSpillIntrinsic()->getOffset() *
+                (G4_GRF_REG_NBYTES / HWORD_BYTE_SIZE);
             auto header = inst->getSrc(0)->asSrcRegRegion();
             auto payload = inst->getSrc(1)->asSrcRegRegion();
             auto spillIt = instIt;
@@ -4728,7 +4729,8 @@ void GlobalRA::expandFillIntrinsic(G4_BB* bb)
         {
             bool isOffBP = inst->asFillIntrinsic()->isOffBP();
             uint32_t numRows = inst->asFillIntrinsic()->getNumRows();
-            uint32_t offset = inst->asFillIntrinsic()->getOffset();
+            uint32_t offset = inst->asFillIntrinsic()->getOffset() *
+                (G4_GRF_REG_NBYTES / HWORD_BYTE_SIZE);
             auto header = inst->getSrc(0)->asSrcRegRegion();
             auto resultRgn = inst->getDst()->asDstRegRegion();
             auto fillIt = instIt;