Add bundle conflict for none-dpas three source instructions

Add bundle conflict for none-dpas three source instructions

Author: bcheng0127

visa/GraphColor.cpp

@@ -960,6 +960,17 @@ void BankConflictPass::setupBankConflictsforMad(G4_INST* inst)
         }
     }
 
+    if (dcls[0] && dcls[1])
+    {
+        gra.addBundleConflictDcl(dcls[0], dcls[1], offset[0] - offset[1]);
+        gra.addBundleConflictDcl(dcls[1], dcls[0], offset[1] - offset[0]);
+    }
+    if (dcls[1] && dcls[2])
+    {
+        gra.addBundleConflictDcl(dcls[2], dcls[1], offset[2] - offset[1]);
+        gra.addBundleConflictDcl(dcls[1], dcls[2], offset[1] - offset[2]);
+    }
+
     for (int k = 0; k < 2; k++)
     {
         for (int i = 2; i != -1; i--)
@@ -7057,9 +7068,14 @@ bool GraphColor::regAlloc(
                     if (!success && doBankConflictReduction)
                     {
                         resetTemporaryRegisterAssignments();
-                        kernel.getOptions()->setOption(vISA_enableBundleCR, false);
-                        assignColors(FIRST_FIT, false, false);
-                        kernel.getOptions()->setOption(vISA_enableBundleCR, true);
+                        success = assignColors(FIRST_FIT, false, false);
+                        if (!success)
+                        {
+                            resetTemporaryRegisterAssignments();
+                            kernel.getOptions()->setOption(vISA_enableBundleCR, false);
+                            assignColors(FIRST_FIT, false, false);
+                            kernel.getOptions()->setOption(vISA_enableBundleCR, true);
+                        }
                     }
                 }
             }

visa/LocalRA.cpp

@@ -514,7 +514,9 @@ bool LocalRA::localRA()
                 globalLRSize = 0;
             }
             evenAlign();
+            kernel.getOptions()->setOption(vISA_enableBundleCR, false);
             needGlobalRA = localRAPass(false, doSplitLLR);
+            kernel.getOptions()->setOption(vISA_enableBundleCR, true);
         }
     }
 
@@ -700,6 +702,11 @@ inline static unsigned short getOccupiedBundle(IR_Builder& builder, GlobalRA& gr
     unsigned int evenBankNum = 0;
     unsigned int oddBankNum = 0;
 
+    if (!(builder.getOption(vISA_enableBundleCR) && builder.getOption(vISA_forceBCR)))
+    {
+        return occupiedBundles;
+    }
+
     if (!builder.hasDPAS() || !builder.getOption(vISA_EnableDPASBundleConflictReduction))
     {
         return 0;