Review feedback

Author: dakersnar

llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp

@@ -105,7 +105,7 @@ void NVPTXDAGToDAGISel::Select(SDNode *N) {
   switch (N->getOpcode()) {
   case ISD::LOAD:
   case ISD::ATOMIC_LOAD:
-  case NVPTXISD::MLoadV1:
+  case NVPTXISD::MLoad:
     if (tryLoad(N))
       return;
     break;
@@ -1139,8 +1139,8 @@ bool NVPTXDAGToDAGISel::tryLoad(SDNode *N) {
   case ISD::ATOMIC_LOAD:
     UsedBytesMask = UINT32_MAX;
     break;
-  case NVPTXISD::MLoadV1:
-    UsedBytesMask = N->getConstantOperandVal(N->getNumOperands() - 2);
+  case NVPTXISD::MLoad:
+    UsedBytesMask = N->getConstantOperandVal(3);
     break;
   default:
     llvm_unreachable("Unexpected opcode");
@@ -1302,7 +1302,7 @@ bool NVPTXDAGToDAGISel::tryLDG(MemSDNode *LD) {
     Opcode = pickOpcodeForVT(TargetVT, NVPTX::LD_GLOBAL_NC_i16,
                              NVPTX::LD_GLOBAL_NC_i32, NVPTX::LD_GLOBAL_NC_i64);
     break;
-  case NVPTXISD::MLoadV1:
+  case NVPTXISD::MLoad:
     Opcode = pickOpcodeForVT(TargetVT, std::nullopt, NVPTX::LD_GLOBAL_NC_i32,
                              NVPTX::LD_GLOBAL_NC_i64);
     break;

llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp

@@ -1131,7 +1131,7 @@ const char *NVPTXTargetLowering::getTargetNodeName(unsigned Opcode) const {
     MAKE_CASE(NVPTXISD::LoadV2)
     MAKE_CASE(NVPTXISD::LoadV4)
     MAKE_CASE(NVPTXISD::LoadV8)
-    MAKE_CASE(NVPTXISD::MLoadV1)
+    MAKE_CASE(NVPTXISD::MLoad)
     MAKE_CASE(NVPTXISD::LDUV2)
     MAKE_CASE(NVPTXISD::LDUV4)
     MAKE_CASE(NVPTXISD::StoreV2)
@@ -3727,13 +3727,13 @@ SDValue NVPTXTargetLowering::LowerMLOAD(SDValue Op, SelectionDAG &DAG) const {
 
     OtherOps.push_back(DAG.getConstant(UsedBytesMask, DL, MVT::i32));
 
-    // The select routine does not have access to the LoadSDNode instance, so
-    // pass along the extension information
+    // We currently are not lowering extending loads, but pass the extension
+    // type anyway as later handling expects it.
     OtherOps.push_back(
         DAG.getIntPtrConstant(cast<LoadSDNode>(LD)->getExtensionType(), DL));
-    SDValue NewLD = DAG.getMemIntrinsicNode(
-        NVPTXISD::MLoadV1, DL, LD->getVTList(), OtherOps, LD->getMemoryVT(),
-        LD->getMemOperand());
+    SDValue NewLD =
+        DAG.getMemIntrinsicNode(NVPTXISD::MLoad, DL, LD->getVTList(), OtherOps,
+                                LD->getMemoryVT(), LD->getMemOperand());
     return NewLD;
   }
   return SDValue();

llvm/lib/Target/NVPTX/NVPTXISelLowering.h

@@ -99,7 +99,7 @@ enum NodeType : unsigned {
   LoadV2,
   LoadV4,
   LoadV8,
-  MLoadV1,
+  MLoad,
   LDUV2, // LDU.v2
   LDUV4, // LDU.v4
   StoreV2,

llvm/lib/Target/NVPTX/NVPTXTagInvariantLoads.cpp

@@ -69,14 +69,12 @@ static bool tagInvariantLoads(Function &F) {
         markLoadsAsInvariant(LI);
         Changed = true;
       }
-      if (auto *II = dyn_cast<IntrinsicInst>(&I)) {
-        if (II->getIntrinsicID() == Intrinsic::masked_load) {
-          if (isInvariantLoad(II, II->getOperand(0), IsKernelFn)) {
-            markLoadsAsInvariant(II);
-            Changed = true;
-          }
+      if (auto *II = dyn_cast<IntrinsicInst>(&I))
+        if (II->getIntrinsicID() == Intrinsic::masked_load &&
+            isInvariantLoad(II, II->getOperand(0), IsKernelFn)) {
+          markLoadsAsInvariant(II);
+          Changed = true;
         }
-      }
     }
   }
   return Changed;