Internal

Change-Id: I100b28882f962db70fed3902dc3202972f43c571

Author: bcheng0127

visa/G4_Opcode.h

@@ -421,4 +421,5 @@ inline bool isLowPrecisionFloatTy(G4_Type ty)
 }
 
 #define SUB_ALIGNMENT_GRFALIGN (Sixteen_Word)
+#define SUB_ALIGNMENT_HALFGRFALIGN (Eight_Word)
 #endif  // _G4_OPCODE_H_

visa/LocalRA.cpp

@@ -156,7 +156,7 @@ void LocalRA::evenAlign()
 #endif
             gra.updateAlignment(G4_GRF, Even);
         }
-        gra.updateSubRegAlignment(G4_GRF, Sixteen_Word);
+        gra.updateSubRegAlignment(G4_GRF, SUB_ALIGNMENT_GRFALIGN);
         // Since we are piggy backing on mask field of G4_Declare,
         // we need to make sure we reset it before going further.
         resetMasks();
@@ -818,7 +818,7 @@ bool LocalRA::assignUniqueRegisters(bool twoBanksRA, bool twoDirectionsAssign)
             }
 
             // Why?
-            G4_SubReg_Align subAlign = builder.GRFAlign() ? Sixteen_Word : dcl->getSubRegAlign();
+            G4_SubReg_Align subAlign = builder.GRFAlign() ? SUB_ALIGNMENT_GRFALIGN : dcl->getSubRegAlign();
 
             if (assignFromFront)
             {
@@ -1688,9 +1688,9 @@ void LocalRA::countLocalLiveIntervals(std::vector<LocalLiveRange*>& liveInterval
         }
         else
         {
-            if (dcl->getNumElems() > 1 && size > 16 && size <= 32)
+            if (dcl->getNumElems() > 1 && size > (getGRFSize() / 2u) && size <= (unsigned int)getGRFSize())
                 numOneGRF++;
-            else if (dcl->getNumElems() > 1 && size <= 16)
+            else if (dcl->getNumElems() > 1 && size <= (getGRFSize() / 2u))
                 numHalfGRF++;
             else if (dcl->getNumElems() == 1)
                 numScalars++;
@@ -1843,6 +1843,7 @@ void PhyRegsLocalRA::setGRFBusy(int which)
 {
     MUST_BE_TRUE(isGRFAvailable(which), "Invalid register");
     regBusyVector[which] = 0xffff;
+
     if (twoBanksRA)
     {
         if (which < SECOND_HALF_BANK_START_GRF)
@@ -1884,7 +1885,7 @@ void PhyRegsLocalRA::setWordBusy(int whichgrf, int word)
         }
     }
 
-    regBusyVector[whichgrf] |= (0x1 << word);
+    regBusyVector[whichgrf] |= (WORD_BUSY << word);
 }
 
 void PhyRegsLocalRA::setWordBusy(int whichgrf, int word, int howmany)
@@ -1947,7 +1948,7 @@ void PhyRegsLocalRA::setWordNotBusy(int whichgrf, int word, int instID)
             }
         }
     }
-    int mask = ~(1 << word);
+    uint32_t mask = ~(1 << word);
     regBusyVector[whichgrf] &= mask;
     if (instID)
     {
@@ -2259,15 +2260,15 @@ void PhyRegsLocalRA::markPhyRegs(G4_Declare* topdcl)
 bool PhyRegsLocalRA::findFreeSingleReg(int regIdx, G4_SubReg_Align subalign, int &regnum, int &subregnum, int size)
 {
     bool found = false;
-    if (subalign == Sixteen_Word)
+    if (subalign == SUB_ALIGNMENT_GRFALIGN)
     {
         if (isWordBusy(regIdx, 0, size) == false)
         {
             subregnum = 0;
             found = true;
         }
     }
-    else if (subalign == Eight_Word)
+    else if (subalign == SUB_ALIGNMENT_HALFGRFALIGN)
     {
         if (isWordBusy(regIdx, 0, size) == false)
         {
@@ -2280,7 +2281,8 @@ bool PhyRegsLocalRA::findFreeSingleReg(int regIdx, G4_SubReg_Align subalign, int
             found = true;
         }
     }
-    else if (subalign == Four_Word)
+    else if (subalign == Eight_Word || 
+                subalign == Four_Word)
     {
         for (int j = 0; j < (NUM_WORDS_PER_GRF - size + 1) && found == false; j += 4)
         {

visa/LocalRA.h

@@ -248,8 +248,6 @@ enum
 	WORD_BUSY = 1,
 };
 
-#define REG_UNAVAILABLE 0xffff0000
-
 namespace vISA
 {
 class PhyRegsLocalRA
@@ -263,7 +261,7 @@ class PhyRegsLocalRA
 	// entire grf busy/available
     std::vector<uint32_t> regBusyVector;
     std::vector<int32_t> regLastUse;
-
+    std::vector<bool> grfAvialable;
     int lastUseSum1;
     int lastUseSum2;
     int bank1AvailableRegNum;
@@ -275,18 +273,20 @@ class PhyRegsLocalRA
     bool r1Forbidden;
 
 public:
-	PhyRegsLocalRA(uint32_t nregs) : numRegs(nregs)
-	{
-		uint32_t grfFree = 0;
+    PhyRegsLocalRA(uint32_t nregs) : numRegs(nregs)
+    {
+        uint32_t grfFree = 0;
 
         regBusyVector.resize(numRegs);
         regLastUse.resize(numRegs);
+        grfAvialable.resize(numRegs);
 
-		for( int i = 0; i < (int) nregs; i++ )
-		{
-			regBusyVector[i] = grfFree;
+        for( int i = 0; i < (int) nregs; i++ )
+        {
+            regBusyVector[i] = grfFree;
             regLastUse[i] = 0;
-		}
+            grfAvialable[i] = true;
+        }
 
 		lastUseSum1 = 0;
 		lastUseSum2 = 0;
@@ -339,7 +339,7 @@ class PhyRegsLocalRA
 
 	// Available/unavailable is different from busy/free
 	// Unavailable GRFs are not available for allocation
-	void setGRFUnavailable( int which ) { regBusyVector[which] = REG_UNAVAILABLE; }
+	void setGRFUnavailable( int which ) { grfAvialable[which] = false; }
     bool isGRFAvailable(int which) const
     {
 
@@ -366,7 +366,7 @@ class PhyRegsLocalRA
         else
         {
             MUST_BE_TRUE(which < (int) numRegs, "invalid GRF");
-            return (!((regBusyVector[which] & REG_UNAVAILABLE) == REG_UNAVAILABLE));
+            return (grfAvialable[which] == true);
         }
     }