Changes in code.

Author: bcheng0127

inc/common/sku_wa.h

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

visa/HWCaps.inc

@@ -870,10 +870,6 @@ SPDX-License-Identifier: MIT
         return false;
     }
 
-   bool hasEOTWait() const
-   {
-        return true;
-   }
    bool noMulOrMadwExpandingBeforeScheduler()
    {
         return false;

visa/LocalScheduler/SWSB_G4IR.cpp

@@ -5631,7 +5631,7 @@ void G4_BB_SB::SBDDD(G4_BB* bb,
 
         if ((builder.getOption(vISA_EnableSwitch) && node->GetInstruction()->isYieldInst()) ||
             (node->GetInstruction()->isCall() || node->GetInstruction()->isFCall()) ||
-            (builder.hasEOTWait() && node->GetInstruction()->isEOT()))
+            (VISA_WA_CHECK(builder.getPWaTable(), Wa_14013672992) && node->GetInstruction()->isEOT()))
         {
             node->setDistance(1);
             if (builder.hasThreeALUPipes() || builder.hasFourALUPipes())
@@ -6979,7 +6979,7 @@ static G4_INST* setForceDebugSWSB(IR_Builder* builder, G4_BB* bb, INST_LIST_ITER
     if (inst->tokenHonourInstruction())
     {
         inst->setSetToken(0);
-        if (builder->hasEOTWait() && inst->isEOT())
+        if (inst->isEOT())
         {
             inst->setDistance(1);
             if (builder->hasThreeALUPipes() || builder->hasFourALUPipes())