IsWriteAfterRead -> IsReadAfterWrite and avoid using ops vector

Author: SamTebbs33

llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp

@@ -1780,13 +1780,13 @@ SDValue VectorLegalizer::ExpandLOOP_DEPENDENCE_MASK(SDNode *N) {
   SDValue SinkValue = N->getOperand(1);
   SDValue EltSize = N->getOperand(2);
 
-  bool IsWriteAfterRead =
-      N->getOpcode() == ISD::EXPERIMENTAL_LOOP_DEPENDENCE_WAR_MASK;
+  bool IsReadAfterWrite =
+      N->getOpcode() == ISD::EXPERIMENTAL_LOOP_DEPENDENCE_RAW_MASK;
   auto VT = N->getValueType(0);
   auto PtrVT = SourceValue->getValueType(0);
 
   SDValue Diff = DAG.getNode(ISD::SUB, DL, PtrVT, SinkValue, SourceValue);
-  if (!IsWriteAfterRead)
+  if (IsReadAfterWrite)
     Diff = DAG.getNode(ISD::ABS, DL, PtrVT, Diff);
 
   Diff = DAG.getNode(ISD::SDIV, DL, PtrVT, Diff, EltSize);
@@ -1796,7 +1796,7 @@ SDValue VectorLegalizer::ExpandLOOP_DEPENDENCE_MASK(SDNode *N) {
                                       Diff.getValueType());
   SDValue Zero = DAG.getTargetConstant(0, DL, PtrVT);
   SDValue Cmp = DAG.getSetCC(DL, CmpVT, Diff, Zero,
-                             IsWriteAfterRead ? ISD::SETLE : ISD::SETEQ);
+                             IsReadAfterWrite ? ISD::SETEQ : ISD::SETLE);
 
   // Create the lane mask
   EVT SplatTY =
@@ -1807,7 +1807,7 @@ SDValue VectorLegalizer::ExpandLOOP_DEPENDENCE_MASK(SDNode *N) {
       DAG.getSetCC(DL, VT, VectorStep, DiffSplat, ISD::CondCode::SETULT);
 
   // Splat the compare result then OR it with the lane mask
-  auto VTElementTy = VT.getVectorElementType();
+  EVT VTElementTy = VT.getVectorElementType();
   if (CmpVT.getScalarSizeInBits() < VTElementTy.getScalarSizeInBits())
     Cmp = DAG.getNode(ISD::ZERO_EXTEND, DL, VTElementTy, Cmp);
   SDValue Splat = DAG.getSplat(VT, DL, Cmp);

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

@@ -8248,13 +8248,12 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
   case Intrinsic::experimental_loop_dependence_raw_mask: {
     auto IntrinsicVT = EVT::getEVT(I.getType());
     SmallVector<SDValue, 4> Ops;
-    for (auto &Op : I.operands())
-      Ops.push_back(getValue(Op));
     unsigned ID = Intrinsic == Intrinsic::experimental_loop_dependence_war_mask
                       ? ISD::EXPERIMENTAL_LOOP_DEPENDENCE_WAR_MASK
                       : ISD::EXPERIMENTAL_LOOP_DEPENDENCE_RAW_MASK;
-    SDValue Mask = DAG.getNode(ID, sdl, IntrinsicVT, Ops);
-    setValue(&I, Mask);
+    setValue(&I,
+             DAG.getNode(ID, sdl, IntrinsicVT, getValue(I.getOperand(0)),
+                         getValue(I.getOperand(1)), getValue(I.getOperand(2))));
   }
   }
 }