Disable bundle conflict reduction if there is spill

Author: bcheng0127

visa/GraphColor.cpp

@@ -850,7 +850,8 @@ void BankConflictPass::setupBankConflictsforMad(G4_INST* inst)
             }
 
             LocalLiveRange* lr = gra.getLocalLR(dcls[i]);
-            if (k == 0  && !lr->isLiveRangeLocal())
+            if (!lr ||
+                (k == 0  && !lr->isLiveRangeLocal()))
             {
                 continue;
             }
@@ -6728,7 +6729,9 @@ bool GraphColor::regAlloc(
                     if (!success && doBankConflictReduction)
                     {
                         resetTemporaryRegisterAssignments();
+                        kernel.getOptions()->setOption(vISA_enableBundleCR, false);
                         assignColors(FIRST_FIT, false, false);
+                        kernel.getOptions()->setOption(vISA_enableBundleCR, true);
                     }
                 }
             }

visa/PhyRegUsage.cpp

@@ -218,7 +218,10 @@ unsigned short PhyRegUsage::getOccupiedBundle(const G4_Declare* dcl) const
 {
     unsigned short occupiedBundles = 0;
     unsigned bundleNum = 0;
-
+    if (!builder.getOption(vISA_enableBundleCR))
+    {
+        return occupiedBundles;
+    }
 
     for (const BundleConflict& conflict : gra.getBundleConflicts(dcl))
     {

visa/include/VISAOptions.def

@@ -135,6 +135,7 @@ DEF_VISA_OPTION(vISA_FastSpill,             ET_BOOL, "-fasterRA", UNUSED, false)
 DEF_VISA_OPTION(vISA_AbortOnSpillThreshold, ET_INT32, NULLSTR, UNUSED, 0)
 DEF_VISA_OPTION(vISA_enableBCR, ET_BOOL, "-enableBCR",   UNUSED, false)
 DEF_VISA_OPTION(vISA_forceBCR, ET_BOOL, "-forceBCR",   UNUSED, false)
+DEF_VISA_OPTION(vISA_enableBundleCR, ET_BOOL, "-enableBundleCR",   UNUSED, true)
 DEF_VISA_OPTION(vISA_IntrinsicSplit,       ET_BOOL, "-doSplit", UNUSED, false)
 DEF_VISA_OPTION(vISA_LraFFWindowSize,       ET_INT32, "-lraFFWindowSize", UNUSED, 12)
 DEF_VISA_OPTION(vISA_SplitGRFAlignedScalar, ET_BOOL, "-splitGRFalignedscalar", UNUSED, false)