Reviewer feedback

Author: dakersnar

llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp

@@ -1051,6 +1051,7 @@ static SDValue selectBaseADDR(SDValue N, SelectionDAG *DAG) {
 }
 
 static SDValue accumulateOffset(SDValue &Addr, SDLoc DL, SelectionDAG *DAG) {
+  Addr = stripAssertAlign(Addr);
   APInt AccumulatedOffset(64u, 0);
   while (isAddLike(Addr)) {
     const auto *CN = dyn_cast<ConstantSDNode>(Addr.getOperand(1));

llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp

@@ -415,11 +415,11 @@ static void adjustByValArgAlignment(Argument *Arg, Value *ArgInParamAS,
 // Create a call to the nvvm_internal_addrspace_wrap intrinsic and set the
 // alignment of the return value based on the alignment of the argument.
 static CallInst *createNVVMInternalAddrspaceWrap(IRBuilder<> &IRB,
-                                                 Argument &Arg,
-                                                 const Twine &Name = "") {
-  CallInst *ArgInParam = IRB.CreateIntrinsic(
-      Intrinsic::nvvm_internal_addrspace_wrap,
-      {IRB.getPtrTy(ADDRESS_SPACE_PARAM), Arg.getType()}, &Arg, {}, Name);
+                                                 Argument &Arg) {
+  CallInst *ArgInParam =
+      IRB.CreateIntrinsic(Intrinsic::nvvm_internal_addrspace_wrap,
+                          {IRB.getPtrTy(ADDRESS_SPACE_PARAM), Arg.getType()},
+                          &Arg, {}, Arg.getName() + ".param");
 
   if (MaybeAlign ParamAlign = Arg.getParamAlign())
     ArgInParam->addRetAttr(
@@ -531,8 +531,7 @@ void copyByValParam(Function &F, Argument &Arg) {
       Arg.getParamAlign().value_or(DL.getPrefTypeAlign(StructType)));
   Arg.replaceAllUsesWith(AllocA);
 
-  CallInst *ArgInParam =
-      createNVVMInternalAddrspaceWrap(IRB, Arg, Arg.getName());
+  CallInst *ArgInParam = createNVVMInternalAddrspaceWrap(IRB, Arg);
 
   // Be sure to propagate alignment to this load; LLVM doesn't know that NVPTX
   // addrspacecast preserves alignment.  Since params are constant, this load
@@ -593,8 +592,7 @@ static void handleByValParam(const NVPTXTargetMachine &TM, Argument *Arg) {
     // argument already in the param address space, we need to use the noop
     // intrinsic, this had the added benefit of preventing other optimizations
     // from folding away this pair of addrspacecasts.
-    auto *ParamSpaceArg =
-        createNVVMInternalAddrspaceWrap(IRB, *Arg, Arg->getName() + ".param");
+    auto *ParamSpaceArg = createNVVMInternalAddrspaceWrap(IRB, *Arg);
 
     // Cast param address to generic address space.
     Value *GenericArg = IRB.CreateAddrSpaceCast(