Fix for for send WAR dependence tracking

Fix for for send WAR dependence tracking

Author: bcheng0127

visa/HWCaps.inc

@@ -853,17 +853,13 @@ bool noSrc0Src1OverlapSend() const {
 
 
 bool WARLocalization() const {
-  if (getOption(vISA_SWSBMakeLocalWAR) && (getPlatform() >= Xe2)) {
+  if (getOption(vISA_SWSBMakeLocalWAR)) {
     return true;
   }
 
   return false;
 }
 
-bool hasPVCSendWARWA() const {
-  return hasDFInst() && (getPlatform() == Xe_PVC || getPlatform() == Xe_PVCXT);
-}
-
 bool PVCSendWARWA() const {
   if (getOption(vISA_PVCSendWARWA) && (getPlatform() == Xe_PVC || getPlatform() == Xe_PVCXT)) {
     return true;

visa/LocalScheduler/SWSB_G4IR.cpp

@@ -4902,19 +4902,13 @@ void SWSB::insertPVCWA() {
 
     auto cleanLSCGRFs = [&](uint32_t &WATokens) {
       for (uint32_t i = 0; i < totalTokenNum; i++) {
-        if (LSCLastTwoGRFsOfToken[i].first != INVALID_GRF) {
-          WATokens |= 1 << i;
-        }
         LSCLastTwoGRFsOfToken[i].first = INVALID_GRF;
         LSCLastTwoGRFsOfToken[i].second = INVALID_GRF;
       }
     };
 
     auto cleanNonLSCGRFs = [&](uint32_t &WATokens) {
       for (uint32_t i = 0; i < totalTokenNum; i++) {
-        if (nonLSClastTwoGRFsOfToken[i].first != INVALID_GRF) {
-          WATokens |= 1 << i;
-        }
         nonLSClastTwoGRFsOfToken[i].first = INVALID_GRF;
         nonLSClastTwoGRFsOfToken[i].second = INVALID_GRF;
       }
@@ -4999,6 +4993,7 @@ void SWSB::insertPVCWA() {
         if (LSCLastToken != UNKNOWN_TOKEN) {
           if (insertDummyMovs(bb, inst_it, LSCLastToken, LSCLastTwoGRFsOfToken,
                               nonLSClastTwoGRFsOfToken)) {
+            WAtokens |= 1 << LSCLastToken;
             cleanLSCGRFs(WAtokens);
           }
         }
@@ -5008,6 +5003,7 @@ void SWSB::insertPVCWA() {
           if (insertDummyMovs(bb, inst_it, nonLSCLastToken,
                               LSCLastTwoGRFsOfToken,
                               nonLSClastTwoGRFsOfToken)) {
+            WAtokens |= 1 << nonLSCLastToken;
             cleanNonLSCGRFs(WAtokens);
           }
         }