diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
index 417b7b285..ffb184de0 100644
--- a/IGC/Compiler/CISACodeGen/CISABuilder.cpp
+++ b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -4369,7 +4369,11 @@ namespace IGC
 
         if (m_program->m_Platform->hasFusedEU() && IGC_IS_FLAG_ENABLED(EnableCallWA))
         {
-            if (m_program->HasStackCalls() || m_program->IsIntelSymbolTableVoidProgram())
+            if (m_program->m_Platform->getWATable().Wa_14016243945)
+            {
+                SaveOption(vISA_fusedCallWA, (uint32_t)2);
+            }
+            else if (m_program->HasStackCalls() || m_program->IsIntelSymbolTableVoidProgram())
             {
                 SaveOption(vISA_fusedCallWA, (uint32_t)1);
             }
diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp
index 39daf5bb3..52b521988 100644
--- a/IGC/Compiler/CodeGenContext.cpp
+++ b/IGC/Compiler/CodeGenContext.cpp
@@ -850,7 +850,16 @@ namespace IGC
                 Pos = valEnd;
                 continue;
             }
-
+            // -cl-intel-force-emu-int32divrem
+            else if (suffix.equals("-force-emu-int32divrem"))
+            {
+                IntelForceInt32DivRemEmu = true;
+            }
+            // -cl-intel-force-emu-sp-int32divrem
+            else if (suffix.equals("-force-emu-sp-int32divrem"))
+            {
+                IntelForceInt32DivRemEmuSP = true;
+            }
             // -cl-intel-force-disable-4GB-buffer
             else if (suffix.equals("-force-disable-4GB-buffer"))
             {
diff --git a/inc/common/sku_wa_defs.h b/inc/common/sku_wa_defs.h
index 7f130a8e6..829c5307e 100644
--- a/inc/common/sku_wa_defs.h
+++ b/inc/common/sku_wa_defs.h
@@ -10,49 +10,37 @@ SPDX-License-Identifier: MIT
 // If changes are needed here please reach out to the codeowners, thanks.
 
         WA_DECLARE(
-        Wa_1409909237,
+        Wa_18012660806,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_D3D | WA_COMPONENT_OGL | WA_COMPONENT_KMD)
+
+        WA_DECLARE(
+        WaDispatchGRFHWIssueInGSAndHSUnit,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaDisableDSPushConstantsInFusedDownModeWithOnlyTwoSubslices,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1406950495,
+        WaSendsSrc1SizeLimitWhenEOT,
         "Workaround",
         WA_BUG_TYPE_HANG,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_16012383669,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_22010725011,
+        Wa_14010017096,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_D3D | WA_COMPONENT_OGL)
 
         WA_DECLARE(
-        Wa_22014559856,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaSPTMmioAccessSbi,
+        WADisableWriteCommitForPageFault,
         "Workaround",
         WA_BUG_TYPE_FUNCTIONAL,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaPruneModeWithIncorrectHsyncOffset,
+        Wa_1807084924,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
@@ -64,67 +52,13 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14012562260,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaFloatMixedModeSelNotAllowedWithPackedDestination,
+        Wa_14016243945,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_1406306137,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_22012532006,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_OGL | WA_COMPONENT_D3D)
-
-        WA_DECLARE(
-        WaDisableIndirectDataForIndirectDispatch,
-        "Workaround",
-        WA_BUG_TYPE_HANG | WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14012504847,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDoNotPushConstantsForAllPulledGSTopologies,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDstSubRegNumNotAllowedWithLowPrecPacked,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaMixModeSelInstDstNotPacked,
-        "Workaround",
-        WA_BUG_TYPE_FAIL,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaSendsSrc1SizeLimitWhenEOT,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14012688715,
+        WaDisableVSPushConstantsInFusedDownModeWithOnlyTwoSubslices,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
@@ -135,12 +69,6 @@ SPDX-License-Identifier: MIT
         WA_BUG_TYPE_CORRUPTION,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
-        WA_DECLARE(
-        WaForceCB0ToBeZeroWhenSendingPC,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_OGL)
-
         WA_DECLARE(
         WaConservativeRasterization,
         "Workaround",
@@ -148,175 +76,7 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN )
 
         WA_DECLARE(
-        WaDisableDSDualPatchMode,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_18012201914,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDisableMixedModePow,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaClearTDRRegBeforeEOTForNonPS,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1409460247,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaClearArfDependenciesBeforeEot,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14013672992,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDisallow64BitImmMov,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1507979211,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_18013852970,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_16012292205,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1607871015,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaSPTMmioReadFailure,
-        "Workaround",
-        WA_BUG_TYPE_FUNCTIONAL,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14013297064,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaOCLEnableFMaxFMinPlusZero,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1807084924,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaForceMinMaxGSThreadCount,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_2201674230,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14012688258,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_22012856258,
-        "Workaround",
-        WA_BUG_TYPE_PERF,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_18015444900,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaResetN0BeforeGatewayMessage,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDispatchGRFHWIssueInGSAndHSUnit,
-        "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_DECLARE(
-        Wa_1609337769,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14012420496,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDisableSIMD16On3SrcInstr,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_16011859583,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaLimitSizeOfSDEPolyFifo,
+        Wa_22010493955,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
@@ -328,35 +88,41 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaNoSimd16TernarySrc0Imm,
+        WaDisableIndirectDataForIndirectDispatch,
         "Workaround",
-        WA_BUG_TYPE_FAIL,
+        WA_BUG_TYPE_HANG | WA_BUG_TYPE_CORRUPTION,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14010017096,
+        Wa_1607871015,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_D3D | WA_COMPONENT_OGL)
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14012437816,
+        Wa_14012420496,
         "Workaround",
         WA_BUG_TYPE_CORRUPTION,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_220856683,
+        Wa_14012688715,
         "Workaround",
-        WA_BUG_TYPE_FUNCTIONAL,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_D3D)
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_16011983264,
+        Wa_1609337769,
         "Workaround",
-        WA_BUG_TYPE_HANG,
+        WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
+        WA_DECLARE(
+        Wa_22012532006,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_OGL | WA_COMPONENT_D3D)
+
         WA_DECLARE(
         Wa_16012061344,
         "Workaround",
@@ -364,27 +130,33 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_18012660806,
+        WaForceCB0ToBeZeroWhenSendingPC,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_OGL)
+
+        WA_DECLARE(
+        WaSrc1ImmHfNotAllowed,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaForceMinMaxGSThreadCount,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaHeaderRequiredOnSimd16Sample16bit,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_16011859583,
         "Workaround",
         WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_D3D | WA_COMPONENT_OGL | WA_COMPONENT_KMD)
-
-        WA_DECLARE(
-        Wa_22011157800,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1805992985,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_22013689345,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION | WA_BUG_TYPE_HANG,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
@@ -394,31 +166,13 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaSrc1ImmHfNotAllowed,
+        Wa_1406306137,
         "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_TYPE_HANG,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14010198302,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaDisableEuBypassOnSimd16Float32,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_1609337546,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaHeaderRequiredOnSimd16Sample16bit,
+        WaDisableDSPushConstantsInFusedDownModeWithOnlyTwoSubslices,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
@@ -430,57 +184,33 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaDisableSendsSrc0DstOverlap,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaSamplerResponseLengthMustBeGreaterThan1,
-        "Workaround",
-        WA_BUG_TYPE_HANG,
-        WA_BUG_PERF_IMPACT, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_22010811838,
-        "Workaround",
-        WA_BUG_TYPE_UNKNOWN,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        WaNoA32ByteScatteredStatelessMessages,
+        Wa_14013672992,
         "Workaround",
         WA_BUG_TYPE_CORRUPTION,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14014414195,
+        Wa_14013297064,
         "Workaround",
         WA_BUG_TYPE_CORRUPTION,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_OGL)
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaDisableVSPushConstantsInFusedDownModeWithOnlyTwoSubslices,
+        WaPruneModeWithIncorrectHsyncOffset,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaThreadSwitchAfterCall,
+        WaDisableDSDualPatchMode,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WADisableWriteCommitForPageFault,
+        Wa_22010725011,
         "Workaround",
-        WA_BUG_TYPE_FUNCTIONAL,
-        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
-
-        WA_DECLARE(
-        Wa_14012760189,
-        "Workaround",
-        WA_BUG_TYPE_CORRUPTION | WA_BUG_TYPE_HANG,
+        WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
@@ -490,29 +220,89 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaDisableMixedModeLog,
+        Wa_22012856258,
+        "Workaround",
+        WA_BUG_TYPE_PERF,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaClearArfDependenciesBeforeEot,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_22010493955,
+        Wa_1609337546,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_16013338947,
+        WaSamplerResponseLengthMustBeGreaterThan1,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_220856683,
+        "Workaround",
+        WA_BUG_TYPE_FUNCTIONAL,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_D3D)
+
+        WA_DECLARE(
+        Wa_14012437816,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_2201674230,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
+        WA_DECLARE(
+        Wa_18012201914,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaResetN0BeforeGatewayMessage,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDoNotPushConstantsForAllPulledGSTopologies,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaFloatMixedModeSelNotAllowedWithPackedDestination,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_22013689345,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION | WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
         WA_DECLARE(
         WaReturnZeroforRTReadOutsidePrimitive,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
+        WA_DECLARE(
+        WaLimitSizeOfSDEPolyFifo,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
         WA_DECLARE(
         Wa_14013341720,
         "Workaround",
@@ -520,21 +310,129 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14010595310,
+        Wa_18015444900,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaOCLEnableFMaxFMinPlusZero,
         "Workaround",
         WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        WaEnablePooledEuFor2x6,
+        Wa_16012292205,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDisableMixedModeLog,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaThreadSwitchAfterCall,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDisableSendsSrc0DstOverlap,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDstSubRegNumNotAllowedWithLowPrecPacked,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDisableMixedModePow,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDisableEuBypassOnSimd16Float32,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_16013338947,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_1406950495,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_18013852970,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14012760189,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION | WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14017322320,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDisableSIMD16On3SrcInstr,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_16011983264,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_16012383669,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_1409460247,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaSPTMmioAccessSbi,
         "Workaround",
         WA_BUG_TYPE_FUNCTIONAL,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_22013880840,
+        Wa_1808850743,
         "Workaround",
-        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_22010811838,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
@@ -544,7 +442,115 @@ SPDX-License-Identifier: MIT
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
 
         WA_DECLARE(
-        Wa_14017322320,
+        Wa_1805992985,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_1409909237,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14010595310,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_22013880840,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14010198302,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14014414195,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_OGL)
+
+        WA_DECLARE(
+        WaMixModeSelInstDstNotPacked,
+        "Workaround",
+        WA_BUG_TYPE_FAIL,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaEnablePooledEuFor2x6,
+        "Workaround",
+        WA_BUG_TYPE_FUNCTIONAL,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14012688258,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaNoA32ByteScatteredStatelessMessages,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaSPTMmioReadFailure,
+        "Workaround",
+        WA_BUG_TYPE_FUNCTIONAL,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_1507979211,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_22014559856,
+        "Workaround",
+        WA_BUG_TYPE_CORRUPTION,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14012562260,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaClearTDRRegBeforeEOTForNonPS,
+        "Workaround",
+        WA_BUG_TYPE_HANG,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaNoSimd16TernarySrc0Imm,
+        "Workaround",
+        WA_BUG_TYPE_FAIL,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_22011157800,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        WaDisallow64BitImmMov,
+        "Workaround",
+        WA_BUG_TYPE_UNKNOWN,
+        WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
+
+        WA_DECLARE(
+        Wa_14012504847,
         "Workaround",
         WA_BUG_TYPE_HANG,
         WA_BUG_PERF_IMPACT_UNKNOWN, WA_COMPONENT_UNKNOWN)
diff --git a/skuwa/igt_12_70_hw_wa.c b/skuwa/igt_12_70_hw_wa.c
index 5ade15331..02b1009e0 100644
--- a/skuwa/igt_12_70_hw_wa.c
+++ b/skuwa/igt_12_70_hw_wa.c
@@ -91,4 +91,12 @@ void InitGt_12_70HwWaTable(PWA_TABLE pWaTable, PSKU_FEATURE_TABLE pSkuTable, PWA
         SI_WA_BETWEEN(iStepId_GT_12_70, GT_12_70_REV_ID_A0, GT_12_70_REV_ID_B0));
 
 
+    SI_WA_ENABLE(
+        Wa_14016243945,
+        "No Link Provided",
+        "No HWSightingLink provided",
+        PLATFORM_ALL,
+        SI_WA_BETWEEN(iStepId_GT_12_70, GT_12_70_REV_ID_B0, FUTURE_PROJECT));
+
+
 }
diff --git a/skuwa/igt_12_71_hw_wa.c b/skuwa/igt_12_71_hw_wa.c
index ad2be4971..05e94bbd9 100644
--- a/skuwa/igt_12_71_hw_wa.c
+++ b/skuwa/igt_12_71_hw_wa.c
@@ -67,4 +67,12 @@ void InitGt_12_71HwWaTable(PWA_TABLE pWaTable, PSKU_FEATURE_TABLE pSkuTable, PWA
         SI_WA_BETWEEN(iStepId_GT_12_71, GT_12_71_REV_ID_A0, GT_12_71_REV_ID_B0));
 
 
+    SI_WA_ENABLE(
+        Wa_14016243945,
+        "No Link Provided",
+        "No HWSightingLink provided",
+        PLATFORM_ALL,
+        SI_WA_BETWEEN(iStepId_GT_12_71, GT_12_71_REV_ID_B0, FUTURE_PROJECT));
+
+
 }