Honoring GRF alignment computed by augmentation is required for correctness. Bank conflict alignment is honored only if special alignment isnt needed by augmentation.

Change-Id: I09ddae465e8f8ff619f0f05a78ba5c29d58edaad

Author: pratikashar

visa/GraphColor.cpp

@@ -5413,11 +5413,13 @@ bool GraphColor::assignColors(ColorHeuristic colorHeuristicGRF, bool doBankConfl
 
             if (!failed_alloc)
             {
-                BankAlign align = gra.isEvenAligned(lrVar->getDeclare()) ? BankAlign::Even : BankAlign::Either;
+                // When evenAlignNeeded is true, it is binding for correctness
+                bool evenAlignNeeded = gra.isEvenAligned(lrVar->getDeclare());
+                BankAlign align = evenAlignNeeded ? BankAlign::Even : BankAlign::Either;
                 if (allocFromBanks)
                 {
 
-                    if (!isHybrid && oneGRFBankDivision)
+                    if (!isHybrid && oneGRFBankDivision && !evenAlignNeeded)
                     {
                         gra.getBankAlignment(lr, align);
                     }

visa/PhyRegUsage.cpp

@@ -1051,7 +1051,7 @@ bool PhyRegUsage::assignRegs(bool  highInternalConflict,
             }
 
             PhyRegUsage::PhyReg phyReg = findGRFSubReg(forbidden, varBasis->getCalleeSaveBias(),
-                varBasis->getCallerSaveBias(), bankAlign != BankAlign::Either ? bankAlign : align, subAlign,
+                varBasis->getCallerSaveBias(), align != BankAlign::Either ? align : bankAlign, subAlign,
                 numAllocUnit(decl->getNumElems(), decl->getElemType()));
             if (phyReg.reg != -1)
             {
@@ -1115,7 +1115,7 @@ bool PhyRegUsage::assignRegs(bool  highInternalConflict,
 
             unsigned short occupiedBundles = gra.getOccupiedBundle(decl);
             bool success = findContiguousGRF(availableGregs, forbidden, occupiedBundles, 
-                bankAlign != BankAlign::Either ? bankAlign : align, decl->getNumRows(), endGRFReg,
+                align != BankAlign::Either ? align : bankAlign, decl->getNumRows(), endGRFReg,
                 startGRFReg, i, varBasis->getCalleeSaveBias(), varBasis->getEOTSrc());
             if (success) {
                 varBasis->setPhyReg(regPool.getGreg(i), 0);