ngen: update PVC WAR bug workaround

Author: petercad

third_party/ngen/ngen_auto_swsb.hpp

@@ -1670,12 +1670,16 @@ PVCWARWA analyzePVCWARWA(HW hw, Program &program, BasicBlock &bb, int phase,
     }
 
     // Case 2: walk forward, looking for a new target send instruction.
+    auto eligibleSend = [=, &program](int inum) {
+        auto &insn = program[inum];
+        return (sendClass == getPipe(hw, insn).sendClassXeHPC()) && !insn.predicated();
+    };
+
     if (adjust > 0) {
         for (pww.inumSrc = dep.inum + 1; pww.inumSrc < inum; pww.inumSrc++) {
-            if (sendClass != getPipe(hw, program[pww.inumSrc]).sendClassXeHPC())
-                continue;
+            if (!eligibleSend(pww.inumSrc)) continue;
             for (int srcN = 0; srcN <= 1; srcN++) {
-                auto &sr = bb.opRegions[dep.inum - bb.istart][srcN + 1];
+                auto &sr = bb.opRegions[pww.inumSrc - bb.istart][srcN + 1];
                 if (!sr.unspecified)
                     adjust -= sr.size;
             }
@@ -1691,8 +1695,7 @@ PVCWARWA analyzePVCWARWA(HW hw, Program &program, BasicBlock &bb, int phase,
     // Case 3: collect 2 GRFs worth of payload from this send class, walking backward.
     int ngrf = 0;
     for (int32_t iother = dep.inum; iother >= int32_t(bb.istart) && ngrf < 2; iother--) {
-        if (sendClass != getPipe(hw, program[iother]).sendClassXeHPC())
-            continue;
+        if (!eligibleSend(iother)) continue;
         for (int srcN = 0; srcN <= 1; srcN++) {
             auto &sr = bb.opRegions[iother - bb.istart][srcN + 1];
             if (sr.unspecified) continue;