Revert "[Transforms][IPO] Add func suffix in ArgumentPromotion and De…

…adArgume… (#105742)"

This reverts commit 959448f.
Reverting because multiple test failures e.g.
  https://lab.llvm.org/buildbot/#/builders/187/builds/1290
  https://lab.llvm.org/buildbot/#/builders/153/builds/9389
and maybe a few others.

llvm/lib/Transforms/IPO/ArgumentPromotion.cpp

@@ -215,7 +215,6 @@ doPromotion(Function *F, FunctionAnalysisManager &FAM,
 
   F->getParent()->getFunctionList().insert(F->getIterator(), NF);
   NF->takeName(F);
-  NF->setName(NF->getName() + ".argprom");
 
   // Loop over all the callers of the function, transforming the call sites to
   // pass in the loaded pointers.

llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp

@@ -889,10 +889,6 @@ bool DeadArgumentEliminationPass::removeDeadStuffFromFunction(Function *F) {
   // it again.
   F->getParent()->getFunctionList().insert(F->getIterator(), NF);
   NF->takeName(F);
-  if (NumArgumentsEliminated)
-    NF->setName(NF->getName() + ".argelim");
-  else
-    NF->setName(NF->getName() + ".retelim");
   NF->IsNewDbgInfoFormat = F->IsNewDbgInfoFormat;
 
   // Loop over all the callers of the function, transforming the call sites to

llvm/test/Analysis/LazyCallGraph/remove-dead-function-spurious-ref-edge.ll

@@ -9,15 +9,15 @@ define internal void @a() alwaysinline {
 }
 
 define internal void @b(ptr) noinline {
-; CHECK-LABEL: @b.argprom(
+; CHECK-LABEL: @b(
 ; CHECK-NEXT:    ret void
 ;
   ret void
 }
 
 define internal void @c() noinline {
 ; CHECK-LABEL: @c(
-; CHECK-NEXT:    call void @b.argprom()
+; CHECK-NEXT:    call void @b()
 ; CHECK-NEXT:    ret void
 ;
   call void @b(ptr @a)

llvm/test/BugPoint/remove_arguments_test.ll

@@ -11,7 +11,7 @@
 
 declare i32 @test2()
 
-; CHECK: define void @test.argelim() {
+; CHECK: define void @test() {
 define i32 @test(i32 %A, ptr %B, float %C) {
 	call i32 @test2()
 	ret i32 %1

llvm/test/CodeGen/AArch64/arg_promotion.ll

@@ -38,16 +38,16 @@ define dso_local void @caller_4xi32(ptr noalias %src, ptr noalias %dst) #1 {
 ; CHECK-LABEL: define dso_local void @caller_4xi32(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[SRC_VAL:%.*]] = load <4 x i32>, ptr [[SRC:%.*]], align 16
-; CHECK-NEXT:    call fastcc void @callee_4xi32.argprom.argprom(<4 x i32> [[SRC_VAL]], ptr noalias [[DST:%.*]])
+; CHECK-NEXT:    call fastcc void @callee_4xi32(<4 x i32> [[SRC_VAL]], ptr noalias [[DST:%.*]])
 ; CHECK-NEXT:    ret void
 ;
 entry:
-  call fastcc void @callee_4xi32.argprom(ptr noalias %src, ptr noalias %dst)
+  call fastcc void @callee_4xi32(ptr noalias %src, ptr noalias %dst)
   ret void
 }
 
-define internal fastcc void @callee_4xi32.argprom(ptr noalias %src, ptr noalias %dst) #1 {
-; CHECK-LABEL: define internal fastcc void @callee_4xi32.argprom.argprom(
+define internal fastcc void @callee_4xi32(ptr noalias %src, ptr noalias %dst) #1 {
+; CHECK-LABEL: define internal fastcc void @callee_4xi32(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    store <4 x i32> [[SRC_0_VAL:%.*]], ptr [[DST:%.*]], align 16
 ; CHECK-NEXT:    ret void
@@ -65,7 +65,7 @@ define dso_local void @caller_i256(ptr noalias %src, ptr noalias %dst) #0 {
 ; CHECK-LABEL: define dso_local void @caller_i256(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[SRC_VAL:%.*]] = load i256, ptr [[SRC:%.*]], align 16
-; CHECK-NEXT:    call fastcc void @callee_i256.argprom(i256 [[SRC_VAL]], ptr noalias [[DST:%.*]])
+; CHECK-NEXT:    call fastcc void @callee_i256(i256 [[SRC_VAL]], ptr noalias [[DST:%.*]])
 ; CHECK-NEXT:    ret void
 ;
 entry:
@@ -74,7 +74,7 @@ entry:
 }
 
 define internal fastcc void @callee_i256(ptr noalias %src, ptr noalias %dst) #0 {
-; CHECK-LABEL: define internal fastcc void @callee_i256.argprom(
+; CHECK-LABEL: define internal fastcc void @callee_i256(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    store i256 [[SRC_0_VAL:%.*]], ptr [[DST:%.*]], align 16
 ; CHECK-NEXT:    ret void
@@ -159,7 +159,7 @@ define dso_local void @caller_struct4xi32(ptr noalias %src, ptr noalias %dst) #1
 ; CHECK-NEXT:    [[SRC_VAL:%.*]] = load <4 x i32>, ptr [[SRC:%.*]], align 16
 ; CHECK-NEXT:    [[TMP0:%.*]] = getelementptr i8, ptr [[SRC]], i64 16
 ; CHECK-NEXT:    [[SRC_VAL1:%.*]] = load <4 x i32>, ptr [[TMP0]], align 16
-; CHECK-NEXT:    call fastcc void @callee_struct4xi32.argprom(<4 x i32> [[SRC_VAL]], <4 x i32> [[SRC_VAL1]], ptr noalias [[DST:%.*]])
+; CHECK-NEXT:    call fastcc void @callee_struct4xi32(<4 x i32> [[SRC_VAL]], <4 x i32> [[SRC_VAL1]], ptr noalias [[DST:%.*]])
 ; CHECK-NEXT:    ret void
 ;
 entry:
@@ -168,7 +168,7 @@ entry:
 }
 
 define internal fastcc void @callee_struct4xi32(ptr noalias %src, ptr noalias %dst) #1 {
-; CHECK-LABEL: define internal fastcc void @callee_struct4xi32.argprom(
+; CHECK-LABEL: define internal fastcc void @callee_struct4xi32(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    store <4 x i32> [[SRC_0_VAL:%.*]], ptr [[DST:%.*]], align 16
 ; CHECK-NEXT:    [[DST2:%.*]] = getelementptr inbounds [[STRUCT_4XI32:%.*]], ptr [[DST]], i64 0, i32 1

llvm/test/CodeGen/AMDGPU/internalize.ll

@@ -10,7 +10,7 @@
 ; ALL: gvar_used
 @gvar_used = addrspace(1) global i32 undef, align 4
 
-; OPT: define internal fastcc void @func_used_noinline.argelim(
+; OPT: define internal fastcc void @func_used_noinline(
 ; OPT-NONE: define fastcc void @func_used_noinline(
 define fastcc void @func_used_noinline(ptr addrspace(1) %out, i32 %tid) #1 {
 entry:

llvm/test/ThinLTO/X86/memprof-aliased-location1.ll

@@ -84,22 +84,22 @@ attributes #0 = { noinline optnone }
 ;; The first call to foo does not allocate cold memory. It should call the
 ;; original functions, which ultimately call the original allocation decorated
 ;; with a "notcold" attribute.
-; IR:   call {{.*}} @_Z3foov.retelim()
+; IR:   call {{.*}} @_Z3foov()
 ;; The second call to foo allocates cold memory. It should call cloned functions
 ;; which ultimately call a cloned allocation decorated with a "cold" attribute.
-; IR:   call {{.*}} @_Z3foov.memprof.1.retelim()
-; IR: define internal {{.*}} @_Z3barv.retelim()
+; IR:   call {{.*}} @_Z3foov.memprof.1()
+; IR: define internal {{.*}} @_Z3barv()
 ; IR:   call {{.*}} @_Znam(i64 0) #[[NOTCOLD:[0-9]+]]
-; IR: define internal {{.*}} @_Z3bazv.retelim()
-; IR:   call {{.*}} @_Z3barv.retelim()
-; IR: define internal {{.*}} @_Z3foov.retelim()
-; IR:   call {{.*}} @_Z3bazv.retelim()
-; IR: define internal {{.*}} @_Z3barv.memprof.1.retelim()
+; IR: define internal {{.*}} @_Z3bazv()
+; IR:   call {{.*}} @_Z3barv()
+; IR: define internal {{.*}} @_Z3foov()
+; IR:   call {{.*}} @_Z3bazv()
+; IR: define internal {{.*}} @_Z3barv.memprof.1()
 ; IR:   call {{.*}} @_Znam(i64 0) #[[COLD:[0-9]+]]
-; IR: define internal {{.*}} @_Z3bazv.memprof.1.retelim()
-; IR:   call {{.*}} @_Z3barv.memprof.1.retelim()
-; IR: define internal {{.*}} @_Z3foov.memprof.1.retelim()
-; IR:   call {{.*}} @_Z3bazv.memprof.1.retelim()
+; IR: define internal {{.*}} @_Z3bazv.memprof.1()
+; IR:   call {{.*}} @_Z3barv.memprof.1()
+; IR: define internal {{.*}} @_Z3foov.memprof.1()
+; IR:   call {{.*}} @_Z3bazv.memprof.1()
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 

llvm/test/ThinLTO/X86/memprof-aliased-location2.ll

@@ -84,22 +84,22 @@ attributes #0 = { noinline optnone }
 ;; The first call to foo does not allocate cold memory. It should call the
 ;; original functions, which ultimately call the original allocation decorated
 ;; with a "notcold" attribute.
-; IR:   call {{.*}} @_Z3foov.retelim()
+; IR:   call {{.*}} @_Z3foov()
 ;; The second call to foo allocates cold memory. It should call cloned functions
 ;; which ultimately call a cloned allocation decorated with a "cold" attribute.
-; IR:   call {{.*}} @_Z3foov.memprof.1.retelim()
-; IR: define internal {{.*}} @_Z3barv.retelim()
+; IR:   call {{.*}} @_Z3foov.memprof.1()
+; IR: define internal {{.*}} @_Z3barv()
 ; IR:   call {{.*}} @_Znam(i64 0) #[[NOTCOLD:[0-9]+]]
-; IR: define internal {{.*}} @_Z3bazv.retelim()
-; IR:   call {{.*}} @_Z3barv.retelim()
-; IR: define internal {{.*}} @_Z3foov.retelim()
-; IR:   call {{.*}} @_Z3bazv.retelim()
-; IR: define internal {{.*}} @_Z3barv.memprof.1.retelim()
+; IR: define internal {{.*}} @_Z3bazv()
+; IR:   call {{.*}} @_Z3barv()
+; IR: define internal {{.*}} @_Z3foov()
+; IR:   call {{.*}} @_Z3bazv()
+; IR: define internal {{.*}} @_Z3barv.memprof.1()
 ; IR:   call {{.*}} @_Znam(i64 0) #[[COLD:[0-9]+]]
-; IR: define internal {{.*}} @_Z3bazv.memprof.1.retelim()
-; IR:   call {{.*}} @_Z3barv.memprof.1.retelim()
-; IR: define internal {{.*}} @_Z3foov.memprof.1.retelim()
-; IR:   call {{.*}} @_Z3bazv.memprof.1.retelim()
+; IR: define internal {{.*}} @_Z3bazv.memprof.1()
+; IR:   call {{.*}} @_Z3barv.memprof.1()
+; IR: define internal {{.*}} @_Z3foov.memprof.1()
+; IR:   call {{.*}} @_Z3bazv.memprof.1()
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 

llvm/test/ThinLTO/X86/memprof-basic.ll

@@ -53,7 +53,7 @@
 ;; We should have cloned bar, baz, and foo, for the cold memory allocation.
 ; RUN:	cat %t.ccg.cloned.dot | FileCheck %s --check-prefix=DOTCLONED
 
-; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IRNODIST
+; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IR
 
 
 ;; Try again but with distributed ThinLTO
@@ -303,23 +303,6 @@ attributes #0 = { noinline optnone }
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 
-; IRNODIST: define {{.*}} @main
-; IRNODIST:   call {{.*}} @_Z3foov.retelim()
-; IRNODIST:   call {{.*}} @_Z3foov.memprof.1.retelim()
-; IRNODIST: define internal {{.*}} @_Z3barv.retelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[NOTCOLD:[0-9]+]]
-; IRNODIST: define internal {{.*}} @_Z3bazv.retelim()
-; IRNODIST:   call {{.*}} @_Z3barv.retelim()
-; IRNODIST: define internal {{.*}} @_Z3foov.retelim()
-; IRNODIST:   call {{.*}} @_Z3bazv.retelim()
-; IRNODIST: define internal {{.*}} @_Z3barv.memprof.1.retelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[COLD:[0-9]+]]
-; IRNODIST: define internal {{.*}} @_Z3bazv.memprof.1.retelim()
-; IRNODIST:   call {{.*}} @_Z3barv.memprof.1.retelim()
-; IRNODIST: define internal {{.*}} @_Z3foov.memprof.1.retelim()
-; IRNODIST:   call {{.*}} @_Z3bazv.memprof.1.retelim()
-; IRNODIST: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
-; IRNODIST: attributes #[[COLD]] = { "memprof"="cold" }
 
 ; STATS: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned)
 ; STATS-BE: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned) during ThinLTO backend

llvm/test/ThinLTO/X86/memprof-duplicate-context-ids.ll

@@ -68,7 +68,7 @@
 ; RUN:  -o %t.out 2>&1 | FileCheck %s --check-prefix=DUMP \
 ; RUN:  --check-prefix=STATS --check-prefix=STATS-BE --check-prefix=REMARKS
 
-; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IRNODIST
+; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IR
 
 
 ;; Try again but with distributed ThinLTO
@@ -247,18 +247,6 @@ attributes #0 = { noinline optnone}
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 
-; IRNODIST: define internal {{.*}} @_Z1Dv.retelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[NOTCOLD:[0-9]+]]
-; IRNODIST: define internal {{.*}} @_Z1Fv.retelim()
-; IRNODIST:   call {{.*}} @_Z1Dv.retelim()
-; IRNODIST: define internal {{.*}} @_Z1Bv.retelim()
-; IRNODIST:   call {{.*}} @_Z1Dv.memprof.1.retelim()
-; IRNODIST: define internal {{.*}} @_Z1Ev.retelim()
-; IRNODIST:   call {{.*}} @_Z1Dv.memprof.1.retelim()
-; IRNODIST: define internal {{.*}} @_Z1Dv.memprof.1.retelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[COLD:[0-9]+]]
-; IRNODIST: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
-; IRNODIST: attributes #[[COLD]] = { "memprof"="cold" }
 
 ; STATS: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned)
 ; STATS-BE: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned) during ThinLTO backend

llvm/test/ThinLTO/X86/memprof-funcassigncloning.ll

@@ -61,7 +61,7 @@
 ; RUN:  -o %t.out 2>&1 | FileCheck %s --check-prefix=DUMP \
 ; RUN:  --check-prefix=STATS --check-prefix=STATS-BE --check-prefix=REMARKS
 
-; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IRNODIST
+; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IR
 
 
 ;; Try again but with distributed ThinLTO
@@ -283,23 +283,6 @@ attributes #0 = { noinline optnone }
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 
-; IRNODIST: define internal {{.*}} @_Z1EPPcS0_.argelim(
-; IRNODIST:   call {{.*}} @_Znam(i64 noundef 10) #[[NOTCOLD:[0-9]+]]
-; IRNODIST:   call {{.*}} @_Znam(i64 noundef 10) #[[NOTCOLD]]
-; IRNODIST: define internal {{.*}} @_Z1BPPcS0_(
-; IRNODIST:   call {{.*}} @_Z1EPPcS0_.argelim(
-; IRNODIST: define internal {{.*}} @_Z1CPPcS0_(
-; IRNODIST:   call {{.*}} @_Z1EPPcS0_.memprof.3.argelim(
-; IRNODIST: define internal {{.*}} @_Z1DPPcS0_(
-; IRNODIST:   call {{.*}} @_Z1EPPcS0_.memprof.2.argelim(
-; IRNODIST: define internal {{.*}} @_Z1EPPcS0_.memprof.2.argelim(
-; IRNODIST:   call {{.*}} @_Znam(i64 noundef 10) #[[COLD:[0-9]+]]
-; IRNODIST:   call {{.*}} @_Znam(i64 noundef 10) #[[NOTCOLD]]
-; IRNODIST: define internal {{.*}} @_Z1EPPcS0_.memprof.3.argelim(
-; IRNODIST:   call {{.*}} @_Znam(i64 noundef 10) #[[NOTCOLD]]
-; IRNODIST:   call {{.*}} @_Znam(i64 noundef 10) #[[COLD]]
-; IRNODIST: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
-; IRNODIST: attributes #[[COLD]] = { "memprof"="cold" }
 
 ; STATS: 2 memprof-context-disambiguation - Number of cold static allocations (possibly cloned)
 ; STATS-BE: 2 memprof-context-disambiguation - Number of cold static allocations (possibly cloned) during ThinLTO backend

llvm/test/ThinLTO/X86/memprof-indirectcall.ll

@@ -74,7 +74,7 @@
 ;; from main allocating cold memory.
 ; RUN:  cat %t.ccg.cloned.dot | FileCheck %s --check-prefix=DOTCLONED
 
-; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IRNODIST
+; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IR
 
 
 ;; Try again but with distributed ThinLTO
@@ -419,19 +419,6 @@ attributes #0 = { noinline optnone }
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 
-; IRNODIST: define {{.*}} @main(
-; IRNODIST:   call {{.*}} @_Z3foov.argelim()
-; IRNODIST:   call {{.*}} @_Z3foov.memprof.1.argelim()
-; IRNODIST:   call {{.*}} @_Z3barP1A.argelim(
-; IRNODIST:   call {{.*}} @_Z3barP1A.argelim(
-; IRNODIST:   call {{.*}} @_Z3barP1A.argelim(
-; IRNODIST:   call {{.*}} @_Z3barP1A.argelim(
-; IRNODIST: define internal {{.*}} @_Z3foov.argelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[NOTCOLD:[0-9]+]]
-; IRNODIST: define internal {{.*}} @_Z3foov.memprof.1.argelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[COLD:[0-9]+]]
-; IRNODIST: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
-; IRNODIST: attributes #[[COLD]] = { "memprof"="cold" }
 
 ; STATS: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned)
 ; STATS-BE: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned) during ThinLTO backend

llvm/test/ThinLTO/X86/memprof-inlined.ll

@@ -63,7 +63,7 @@
 ;; cold memory.
 ; RUN:	cat %t.ccg.cloned.dot | FileCheck %s --check-prefix=DOTCLONED
 
-; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IRNODIST
+; RUN: llvm-dis %t.out.1.4.opt.bc -o - | FileCheck %s --check-prefix=IR
 
 
 ;; Try again but with distributed ThinLTO
@@ -323,19 +323,6 @@ attributes #0 = { noinline optnone }
 ; IR: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
 ; IR: attributes #[[COLD]] = { "memprof"="cold" }
 
-; IRNODIST: define internal {{.*}} @_Z3barv.retelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[NOTCOLD:[0-9]+]]
-; IRNODIST: define internal {{.*}} @_Z3foov.retelim()
-; IRNODIST:   call {{.*}} @_Z3barv.retelim()
-; IRNODIST: define {{.*}} @main()
-; IRNODIST:   call {{.*}} @_Z3foov.retelim()
-; IRNODIST:   call {{.*}} @_Z3foov.memprof.1.retelim()
-; IRNODIST: define internal {{.*}} @_Z3barv.memprof.1.retelim()
-; IRNODIST:   call {{.*}} @_Znam(i64 0) #[[COLD:[0-9]+]]
-; IRNODIST: define internal {{.*}} @_Z3foov.memprof.1.retelim()
-; IRNODIST:   call {{.*}} @_Z3barv.memprof.1.retelim()
-; IRNODIST: attributes #[[NOTCOLD]] = { "memprof"="notcold" }
-; IRNODIST: attributes #[[COLD]] = { "memprof"="cold" }
 
 ; STATS: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned)
 ; STATS-BE: 1 memprof-context-disambiguation - Number of cold static allocations (possibly cloned) during ThinLTO backend

llvm/test/Transforms/ArgumentPromotion/2008-02-01-ReturnAttrs.ll

@@ -3,7 +3,7 @@
 ; RUN: cat %t | FileCheck -check-prefix=REMARK %s
 
 define internal i32 @deref(ptr %x) nounwind {
-; CHECK-LABEL: define {{[^@]+}}@deref.argprom
+; CHECK-LABEL: define {{[^@]+}}@deref
 ; CHECK-SAME: (i32 [[X_0_VAL:%.*]]) #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    ret i32 [[X_0_VAL]]
@@ -29,7 +29,7 @@ define i32 @f(i32 %x) {
 ; CHECK-NEXT:    [[X_ADDR:%.*]] = alloca i32, align 4
 ; CHECK-NEXT:    store i32 [[X]], ptr [[X_ADDR]], align 4
 ; CHECK-NEXT:    [[X_ADDR_VAL:%.*]] = load i32, ptr [[X_ADDR]], align 4
-; CHECK-NEXT:    [[TEMP1:%.*]] = call i32 @deref.argprom(i32 [[X_ADDR_VAL]])
+; CHECK-NEXT:    [[TEMP1:%.*]] = call i32 @deref(i32 [[X_ADDR_VAL]])
 ; CHECK-NEXT:    ret i32 [[TEMP1]]
 ;
 entry:

llvm/test/Transforms/ArgumentPromotion/BPF/argpromotion.ll

@@ -85,4 +85,4 @@ entry:
 ; Without number-of-argument constraint, argpromotion will create a function signature with 5 arguments, which equals
 ; the maximum number of argument permitted by bpf backend, so argpromotion result code does work.
 ;
-; CHECK:  i32 @foo2.argprom(i32 %p1.0.val, i32 %p1.4.val, i32 %p2.8.val, i32 %p2.16.val, i32 %p3.20.val)
+; CHECK:  i32 @foo2(i32 %p1.0.val, i32 %p1.4.val, i32 %p2.8.val, i32 %p2.16.val, i32 %p3.20.val)

llvm/test/Transforms/ArgumentPromotion/X86/attributes.ll

@@ -42,7 +42,7 @@ bb:
 }
 
 define internal fastcc void @promote_avx2(ptr %arg, ptr readonly %arg1) #0 {
-; CHECK-LABEL: define {{[^@]+}}@promote_avx2.argprom
+; CHECK-LABEL: define {{[^@]+}}@promote_avx2
 ; CHECK-SAME: (ptr [[ARG:%.*]], <4 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <4 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -62,7 +62,7 @@ define void @promote(ptr %arg) #0 {
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <4 x i64>, align 32
 ; CHECK-NEXT:    call void @llvm.memset.p0.i64(ptr align 32 [[TMP]], i8 0, i64 32, i1 false)
 ; CHECK-NEXT:    [[TMP_VAL:%.*]] = load <4 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @promote_avx2.argprom(ptr [[TMP2]], <4 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @promote_avx2(ptr [[TMP2]], <4 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <4 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <4 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void