WA table has been populated with the new WA, use this new WA to

control nomask WA.

Change-Id: I5268473844dde387fc3dd4b27a538c5fbb2569bc

Author: jgu222

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -3993,7 +3993,7 @@ namespace IGC
             SaveOption(vISA_forceNoMaskWA, true);
             SaveOption(vISA_EnableScalarJmp, false);
         }
-        if (m_program->m_Platform->getWATable().Wa_1407528679 != 0 &&
+        if (m_program->m_Platform->getWATable().Wa_1808850743 != 0 &&
             IGC_GET_FLAG_VALUE(NoMaskWA) > 0)
         {
             SaveOption(vISA_noMaskWA, IGC_GET_FLAG_VALUE(NoMaskWA));

inc/common/sku_wa.h

@@ -8455,6 +8455,12 @@ typedef struct _WA_TABLE
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_1808850743,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 } WA_TABLE, *PWA_TABLE;
 
 #ifdef _USC_

visa/Optimizer.cpp

@@ -6695,8 +6695,8 @@ bool Optimizer::foldPseudoAndOr(G4_BB* bb, INST_LIST_ITER& ii)
         //              1 - "emask flag" is created using cmp instructions.
         //
         if (builder.kernel.getOptions()->getTarget() != VISA_CM &&
-            (builder.getuint32Option(vISA_noMaskWA) & 0x3) > 0 &&
-            (getGenxPlatform() == GENX_TGLLP || builder.getOption(vISA_forceNoMaskWA)))
+            ((builder.getuint32Option(vISA_noMaskWA) & 0x3) > 0 ||
+             builder.getOption(vISA_forceNoMaskWA)))
         {
             replaceNoMaskWithAnyhWA();
         }