[IGC vISA] Update barrier workaround

Update barrier workarouond.
From:
(W) cmp (1|M0) (ne)f0.0  null<1>:ud  n0.0<0;1,0>:ud  r36.10<0;1,0>:ud {I@1}
To:
(W) and (1|M0) (eq)f0.0  null<1>:ud  n0.0<0;1,0>:ud  r36.10<0;1,0>:ud {I@1}

Author: fangliu2020

visa/Optimizer.cpp

@@ -13483,15 +13483,15 @@ void Optimizer::applyBarrierWA(INST_LIST_ITER it, G4_BB *bb) {
   auto labelInst = builder.createLabelInst(label, false);
   bb->insertBefore(it, labelInst);
 
-  // (W) cmp(1) (ne)f0.0 null:ud n0.0:ud 0x1:ud
+  // (W) and(1) (eq)f0.0 null:ud n0.0:ud 0x1:ud
   G4_DstRegRegion *nullDst = builder.createNullDst(Type_UD);
-  G4_SrcRegRegion *src0Cmp = builder.createSrc(
+  G4_SrcRegRegion *src0And = builder.createSrc(
       builder.phyregpool.getN0Reg(), 0, 0, builder.getRegionScalar(), Type_UD);
-  G4_CondMod *condMod = builder.createCondMod(Mod_ne, WAFlagVar, 0);
-  auto cmpInst = builder.createInternalInst(
-      nullptr, G4_cmp, condMod, g4::NOSAT, g4::SIMD1, nullDst, src0Cmp,
+  G4_CondMod *condMod = builder.createCondMod(Mod_e, WAFlagVar, 0);
+  auto andInst = builder.createInternalInst(
+      nullptr, G4_and, condMod, g4::NOSAT, g4::SIMD1, nullDst, src0And,
       builder.createImm(0x1, Type_UD), InstOpt_WriteEnable);
-  bb->insertBefore(it, cmpInst);
+  bb->insertBefore(it, andInst);
 
   // (W&f0.0) while(1) loop
   G4_Predicate *pred = builder.createPredicate(PredState_Plus, WAFlagVar, 0);
@@ -13573,16 +13573,16 @@ void Optimizer::applyNamedBarrierWA(INST_LIST_ITER it, G4_BB *bb) {
   auto labelInst = builder.createLabelInst(label, false);
   bb->insertBefore(it, labelInst);
 
-  // (W) cmp(1) (ne)f0.0 null:ud n0.0:ud dst1.1:ud
+  // (W) and(1) (eq)f0.0 null:ud n0.0:ud dst1.1:ud
   G4_DstRegRegion *nullDst = builder.createNullDst(Type_UD);
-  G4_SrcRegRegion *src0Cmp = builder.createSrc(
+  G4_SrcRegRegion *src0And = builder.createSrc(
       builder.phyregpool.getN0Reg(), 0, 0, builder.getRegionScalar(), Type_UD);
-  G4_SrcRegRegion *src1Cmp = builder.duplicateOperand(src0Shl);
-  G4_CondMod *condMod = builder.createCondMod(Mod_ne, WAFlagVar, 0);
-  auto cmpInst = builder.createInternalInst(nullptr, G4_cmp, condMod, g4::NOSAT,
-                                            g4::SIMD1, nullDst, src0Cmp,
-                                            src1Cmp, InstOpt_WriteEnable);
-  bb->insertBefore(it, cmpInst);
+  G4_SrcRegRegion *src1And = builder.duplicateOperand(src0Shl);
+  G4_CondMod *condMod = builder.createCondMod(Mod_e, WAFlagVar, 0);
+  auto andInst = builder.createInternalInst(nullptr, G4_and, condMod, g4::NOSAT,
+                                            g4::SIMD1, nullDst, src0And,
+                                            src1And, InstOpt_WriteEnable);
+  bb->insertBefore(it, andInst);
 
   // (W&f0.0) while(1) loop
   G4_Predicate *pred = builder.createPredicate(PredState_Plus, WAFlagVar, 0);

visa/VisaToG4/TranslateSendSync.cpp

@@ -330,7 +330,7 @@ int IR_Builder::translateVISANamedBarrierWait(G4_Predicate *pred,
   //     mov(1) r10.1:ud 0x1:ud
   //     (W) shl(1) r10.1:ud r10.1:ud r10.0:ud
   //     loop:
-  //     cmp(1)(ne) f0.0 null:ud n0.0:ud r10.1:ud
+  //     and(1)(eq) f0.0 null:ud n0.0:ud r10.1:ud
   //     (f0.0) while (1) loop
   //     (W) sync.bar f1.0:uw
   // Here insert Intrinsic::NamedBarrierWA before wait which will be expanded
@@ -542,7 +542,7 @@ void IR_Builder::generateBarrierWait(G4_Predicate *prd) {
   // instructions sequence must be inserted before a sync.bar instruction.
   // Legacy barrier case:
   //    loop:
-  //    cmp (1) (ne)f0.0 null:ud n0.0:ud 0x1:ud
+  //    and (1) (eq)f0.0 null:ud n0.0:ud 0x1:ud
   //    (f0.0) while(1) loop
   //    (W) sync.bar 0x0:uw
   // Here insert Intrinsic::BarrierWA before wait which will be expanded