Bump up GRF mode for forceBCR

When forceBCR is applied, there are a lot of bank conflict. Bump up GRF
mode to reduce conflict

Author: bcheng0127

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -4259,6 +4259,9 @@ void CEncoder::InitVISABuilderOptions(TARGET_PLATFORM VISAPlatform, bool canAbor
   if (IGC_IS_FLAG_ENABLED(ForceBCR)) {
     SaveOption(vISA_forceBCR, true);
   }
+  if (IGC_IS_FLAG_ENABLED(BumpGRFForForceBCR)) {
+    SaveOption(vISA_bumpGRFForForceBCR, true);
+  }
   if (IGC_IS_FLAG_ENABLED(forceSamplerHeader)) {
     SaveOption(vISA_forceSamplerHeader, true);
   }

IGC/common/igc_flags.h

@@ -101,6 +101,7 @@ DECLARE_IGC_REGKEY(bool, DisableGatherRSFusionSyncWA, false,
                    "Disable WA for gather instruction when read suppression and EU fusion are enabled.", true)
 DECLARE_IGC_REGKEY(bool, EnableBCR, false, "Enable bank conflict reduction.", true)
 DECLARE_IGC_REGKEY(bool, ForceBCR, false, "Force bank conflict reduction, no matter spill or not.", true)
+DECLARE_IGC_REGKEY(bool, BumpGRFForForceBCR, false, "Bump up GRF mode for force BCR.", true)
 DECLARE_IGC_REGKEY(bool, EnableForceDebugSWSB, false,
                    "Enable force debugging functionality for software scoreboard generation", true)
 DECLARE_IGC_REGKEY(DWORD, EnableSWSBInstStall, 0,

visa/G4_Kernel.cpp

@@ -2246,6 +2246,13 @@ GRFMode::GRFMode(const TARGET_PLATFORM plat, unsigned regSize, Options *op)
 
   // Select higher GRF
   GRFModeUpValue = op->getuInt32Option(vISA_ForceGRFModeUp);
+
+  if (GRFModeUpValue == 0)
+    GRFModeUpValue =
+        (op->getOption(vISA_forceBCR) && op->getOption(vISA_bumpGRFForForceBCR))
+            ? 1
+            : 0;
+
   vISA_ASSERT(GRFModeUpValue >= 0 && GRFModeUpValue <= configs.size(),
               "Invalid value for selecting a higher GRF mode");
 }

visa/include/VISAOptionsDefs.h

@@ -421,6 +421,7 @@ DEF_VISA_OPTION(vISA_AbortOnSpillThreshold, ET_INT32, "-abortOnSpill", 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_bumpGRFForForceBCR, ET_BOOL, "-bumpGRFForForceBCR", UNUSED, false)
 DEF_VISA_OPTION(vISA_twoSrcBundleBCR, ET_BOOL, "-twoSrcBundleBCR", UNUSED, false)
 DEF_VISA_OPTION(vISA_NewAugmentation, ET_BOOL_TRUE, "-newaugmentation",
                 "USAGE: -newaugmentation "