[llvm] becc02c - Revert "[Transforms][IPO] Add func suffix in ArgumentPromotion and DeadArgume… (#105742)"

Yonghong Song via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 19 03:54:52 PDT 2024


Author: Yonghong Song
Date: 2024-09-19T03:54:13-07:00
New Revision: becc02ce93cd14f07f444fff6f7433c1ecf13664

URL: https://github.com/llvm/llvm-project/commit/becc02ce93cd14f07f444fff6f7433c1ecf13664
DIFF: https://github.com/llvm/llvm-project/commit/becc02ce93cd14f07f444fff6f7433c1ecf13664.diff

LOG: Revert "[Transforms][IPO] Add func suffix in ArgumentPromotion and DeadArgume… (#105742)"

This reverts commit 959448fbd6bc6f74fb3f9655b1387d0e8a272ab8.
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.

Added: 
    

Modified: 
    llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
    llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
    llvm/test/Analysis/LazyCallGraph/remove-dead-function-spurious-ref-edge.ll
    llvm/test/BugPoint/remove_arguments_test.ll
    llvm/test/CodeGen/AArch64/arg_promotion.ll
    llvm/test/CodeGen/AMDGPU/internalize.ll
    llvm/test/ThinLTO/X86/memprof-aliased-location1.ll
    llvm/test/ThinLTO/X86/memprof-aliased-location2.ll
    llvm/test/ThinLTO/X86/memprof-basic.ll
    llvm/test/ThinLTO/X86/memprof-duplicate-context-ids.ll
    llvm/test/ThinLTO/X86/memprof-funcassigncloning.ll
    llvm/test/ThinLTO/X86/memprof-indirectcall.ll
    llvm/test/ThinLTO/X86/memprof-inlined.ll
    llvm/test/Transforms/ArgumentPromotion/2008-02-01-ReturnAttrs.ll
    llvm/test/Transforms/ArgumentPromotion/BPF/argpromotion.ll
    llvm/test/Transforms/ArgumentPromotion/X86/attributes.ll
    llvm/test/Transforms/ArgumentPromotion/X86/min-legal-vector-width.ll
    llvm/test/Transforms/ArgumentPromotion/X86/thiscall.ll
    llvm/test/Transforms/ArgumentPromotion/actual-arguments.ll
    llvm/test/Transforms/ArgumentPromotion/aggregate-promote-dead-gep.ll
    llvm/test/Transforms/ArgumentPromotion/aggregate-promote.ll
    llvm/test/Transforms/ArgumentPromotion/align.ll
    llvm/test/Transforms/ArgumentPromotion/allocsize.ll
    llvm/test/Transforms/ArgumentPromotion/attrs.ll
    llvm/test/Transforms/ArgumentPromotion/basictest.ll
    llvm/test/Transforms/ArgumentPromotion/bitcasts.ll
    llvm/test/Transforms/ArgumentPromotion/byval-2.ll
    llvm/test/Transforms/ArgumentPromotion/byval-with-padding.ll
    llvm/test/Transforms/ArgumentPromotion/byval.ll
    llvm/test/Transforms/ArgumentPromotion/chained.ll
    llvm/test/Transforms/ArgumentPromotion/control-flow2.ll
    llvm/test/Transforms/ArgumentPromotion/crash.ll
    llvm/test/Transforms/ArgumentPromotion/dbg.ll
    llvm/test/Transforms/ArgumentPromotion/fp80.ll
    llvm/test/Transforms/ArgumentPromotion/inalloca.ll
    llvm/test/Transforms/ArgumentPromotion/invalidation.ll
    llvm/test/Transforms/ArgumentPromotion/load-alignment-value-overflows-addrspace-size.ll
    llvm/test/Transforms/ArgumentPromotion/max-elements-limit.ll
    llvm/test/Transforms/ArgumentPromotion/metadata.ll
    llvm/test/Transforms/ArgumentPromotion/min-legal-vector-width.ll
    llvm/test/Transforms/ArgumentPromotion/nonzero-address-spaces.ll
    llvm/test/Transforms/ArgumentPromotion/opaque-ptr.ll
    llvm/test/Transforms/ArgumentPromotion/pr27568.ll
    llvm/test/Transforms/ArgumentPromotion/pr32917.ll
    llvm/test/Transforms/ArgumentPromotion/pr33641_remove_arg_dbgvalue.ll
    llvm/test/Transforms/ArgumentPromotion/profile.ll
    llvm/test/Transforms/ArgumentPromotion/propagate-remove-dead-args.ll
    llvm/test/Transforms/ArgumentPromotion/recursion/aggregate-promote-recursive.ll
    llvm/test/Transforms/ArgumentPromotion/recursion/argpromotion-recursion-pr1259.ll
    llvm/test/Transforms/ArgumentPromotion/recursion/recursion-mixed-calls.ll
    llvm/test/Transforms/ArgumentPromotion/recursion/recursion-non-zero-offset.ll
    llvm/test/Transforms/ArgumentPromotion/reserve-tbaa.ll
    llvm/test/Transforms/ArgumentPromotion/sret.ll
    llvm/test/Transforms/ArgumentPromotion/store-into-inself.ll
    llvm/test/Transforms/ArgumentPromotion/unused-argument.ll
    llvm/test/Transforms/Attributor/reduced/clear_cached_analysis_for_deleted_functions.ll
    llvm/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
    llvm/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
    llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll
    llvm/test/Transforms/DeadArgElim/aggregates.ll
    llvm/test/Transforms/DeadArgElim/call_profile.ll
    llvm/test/Transforms/DeadArgElim/comdat.ll
    llvm/test/Transforms/DeadArgElim/dbginfo-update-dbgval-local.ll
    llvm/test/Transforms/DeadArgElim/dbginfo.ll
    llvm/test/Transforms/DeadArgElim/deadretval.ll
    llvm/test/Transforms/DeadArgElim/fct_ptr.ll
    llvm/test/Transforms/DeadArgElim/func_metadata.ll
    llvm/test/Transforms/DeadArgElim/funclet.ll
    llvm/test/Transforms/DeadArgElim/keepalive.ll
    llvm/test/Transforms/DeadArgElim/nonzero-address-spaces.ll
    llvm/test/Transforms/DeadArgElim/returned.ll
    llvm/test/Transforms/DeadArgElim/variadic_safety.ll
    llvm/test/Transforms/FunctionSpecialization/function-specialization2.ll
    llvm/test/Transforms/FunctionSpecialization/global-var-constants.ll
    llvm/test/Transforms/FunctionSpecialization/non-argument-tracked.ll
    llvm/test/Transforms/FunctionSpecialization/specialization-order.ll
    llvm/test/Transforms/PhaseOrdering/dae-dce.ll
    llvm/test/Transforms/PhaseOrdering/dce-after-argument-promotion.ll
    llvm/test/Transforms/SCCP/recursion.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
index c8b75dd475ae44..1f9b546ed29996 100644
--- a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
+++ b/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.

diff  --git a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
index b912cc66d19db5..d1548592b1ce26 100644
--- a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
+++ b/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

diff  --git a/llvm/test/Analysis/LazyCallGraph/remove-dead-function-spurious-ref-edge.ll b/llvm/test/Analysis/LazyCallGraph/remove-dead-function-spurious-ref-edge.ll
index 4f16c02b1473ff..2bc486f541c71f 100644
--- a/llvm/test/Analysis/LazyCallGraph/remove-dead-function-spurious-ref-edge.ll
+++ b/llvm/test/Analysis/LazyCallGraph/remove-dead-function-spurious-ref-edge.ll
@@ -9,7 +9,7 @@ define internal void @a() alwaysinline {
 }
 
 define internal void @b(ptr) noinline {
-; CHECK-LABEL: @b.argprom(
+; CHECK-LABEL: @b(
 ; CHECK-NEXT:    ret void
 ;
   ret void
@@ -17,7 +17,7 @@ define internal void @b(ptr) noinline {
 
 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)

diff  --git a/llvm/test/BugPoint/remove_arguments_test.ll b/llvm/test/BugPoint/remove_arguments_test.ll
index bb93e45e4b46ef..9e9c51eaafc383 100644
--- a/llvm/test/BugPoint/remove_arguments_test.ll
+++ b/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

diff  --git a/llvm/test/CodeGen/AArch64/arg_promotion.ll b/llvm/test/CodeGen/AArch64/arg_promotion.ll
index 724a7f109f1e29..cc37d230c6cbe4 100644
--- a/llvm/test/CodeGen/AArch64/arg_promotion.ll
+++ b/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

diff  --git a/llvm/test/CodeGen/AMDGPU/internalize.ll b/llvm/test/CodeGen/AMDGPU/internalize.ll
index 08b42f93bf5f47..6b2a4d5fc328b4 100644
--- a/llvm/test/CodeGen/AMDGPU/internalize.ll
+++ b/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:

diff  --git a/llvm/test/ThinLTO/X86/memprof-aliased-location1.ll b/llvm/test/ThinLTO/X86/memprof-aliased-location1.ll
index 8be9727b316d28..42819d5421ca0f 100644
--- a/llvm/test/ThinLTO/X86/memprof-aliased-location1.ll
+++ b/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" }
 

diff  --git a/llvm/test/ThinLTO/X86/memprof-aliased-location2.ll b/llvm/test/ThinLTO/X86/memprof-aliased-location2.ll
index 4c18cf8226c8bb..663f8525043c2f 100644
--- a/llvm/test/ThinLTO/X86/memprof-aliased-location2.ll
+++ b/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" }
 

diff  --git a/llvm/test/ThinLTO/X86/memprof-basic.ll b/llvm/test/ThinLTO/X86/memprof-basic.ll
index b7aadf8e32a771..6922dbfd368467 100644
--- a/llvm/test/ThinLTO/X86/memprof-basic.ll
+++ b/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

diff  --git a/llvm/test/ThinLTO/X86/memprof-duplicate-context-ids.ll b/llvm/test/ThinLTO/X86/memprof-duplicate-context-ids.ll
index bfc7b02a956c6f..65d794e9cba87c 100644
--- a/llvm/test/ThinLTO/X86/memprof-duplicate-context-ids.ll
+++ b/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

diff  --git a/llvm/test/ThinLTO/X86/memprof-funcassigncloning.ll b/llvm/test/ThinLTO/X86/memprof-funcassigncloning.ll
index 4153524bf44706..f1a494d077fefc 100644
--- a/llvm/test/ThinLTO/X86/memprof-funcassigncloning.ll
+++ b/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

diff  --git a/llvm/test/ThinLTO/X86/memprof-indirectcall.ll b/llvm/test/ThinLTO/X86/memprof-indirectcall.ll
index ba8811b46175e3..07a52f441ca278 100644
--- a/llvm/test/ThinLTO/X86/memprof-indirectcall.ll
+++ b/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

diff  --git a/llvm/test/ThinLTO/X86/memprof-inlined.ll b/llvm/test/ThinLTO/X86/memprof-inlined.ll
index 7111a536a3110a..89df345b220423 100644
--- a/llvm/test/ThinLTO/X86/memprof-inlined.ll
+++ b/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

diff  --git a/llvm/test/Transforms/ArgumentPromotion/2008-02-01-ReturnAttrs.ll b/llvm/test/Transforms/ArgumentPromotion/2008-02-01-ReturnAttrs.ll
index 51839033177034..daa4e1fb757d21 100644
--- a/llvm/test/Transforms/ArgumentPromotion/2008-02-01-ReturnAttrs.ll
+++ b/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:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/BPF/argpromotion.ll b/llvm/test/Transforms/ArgumentPromotion/BPF/argpromotion.ll
index f317a5a4533484..6c39f27115ada4 100644
--- a/llvm/test/Transforms/ArgumentPromotion/BPF/argpromotion.ll
+++ b/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)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/X86/attributes.ll b/llvm/test/Transforms/ArgumentPromotion/X86/attributes.ll
index 6d34fb57c9dcf7..a64b7346d83618 100644
--- a/llvm/test/Transforms/ArgumentPromotion/X86/attributes.ll
+++ b/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

diff  --git a/llvm/test/Transforms/ArgumentPromotion/X86/min-legal-vector-width.ll b/llvm/test/Transforms/ArgumentPromotion/X86/min-legal-vector-width.ll
index 99aa19e72371fb..3373c09d5f91aa 100644
--- a/llvm/test/Transforms/ArgumentPromotion/X86/min-legal-vector-width.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/X86/min-legal-vector-width.ll
@@ -7,7 +7,7 @@ target triple = "x86_64-unknown-linux-gnu"
 
 ; This should promote
 define internal fastcc void @callee_avx512_legal512_prefer512_call_avx512_legal512_prefer512(ptr %arg, ptr readonly %arg1) #0 {
-; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer512_call_avx512_legal512_prefer512.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer512_call_avx512_legal512_prefer512
 ; CHECK-SAME: (ptr [[ARG:%.*]], <8 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <8 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -27,7 +27,7 @@ define void @avx512_legal512_prefer512_call_avx512_legal512_prefer512(ptr %arg)
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <8 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 <8 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer512_call_avx512_legal512_prefer512.argprom(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer512_call_avx512_legal512_prefer512(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <8 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <8 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void
@@ -44,7 +44,7 @@ bb:
 
 ; This should promote
 define internal fastcc void @callee_avx512_legal512_prefer256_call_avx512_legal512_prefer256(ptr %arg, ptr readonly %arg1) #1 {
-; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer256_call_avx512_legal512_prefer256.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer256_call_avx512_legal512_prefer256
 ; CHECK-SAME: (ptr [[ARG:%.*]], <8 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <8 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -64,7 +64,7 @@ define void @avx512_legal512_prefer256_call_avx512_legal512_prefer256(ptr %arg)
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <8 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 <8 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer256_call_avx512_legal512_prefer256.argprom(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer256_call_avx512_legal512_prefer256(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <8 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <8 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void
@@ -81,7 +81,7 @@ bb:
 
 ; This should promote
 define internal fastcc void @callee_avx512_legal512_prefer512_call_avx512_legal512_prefer256(ptr %arg, ptr readonly %arg1) #1 {
-; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer512_call_avx512_legal512_prefer256.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer512_call_avx512_legal512_prefer256
 ; CHECK-SAME: (ptr [[ARG:%.*]], <8 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <8 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -101,7 +101,7 @@ define void @avx512_legal512_prefer512_call_avx512_legal512_prefer256(ptr %arg)
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <8 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 <8 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer512_call_avx512_legal512_prefer256.argprom(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer512_call_avx512_legal512_prefer256(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <8 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <8 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void
@@ -118,7 +118,7 @@ bb:
 
 ; This should promote
 define internal fastcc void @callee_avx512_legal512_prefer256_call_avx512_legal512_prefer512(ptr %arg, ptr readonly %arg1) #0 {
-; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer256_call_avx512_legal512_prefer512.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_avx512_legal512_prefer256_call_avx512_legal512_prefer512
 ; CHECK-SAME: (ptr [[ARG:%.*]], <8 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <8 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -138,7 +138,7 @@ define void @avx512_legal512_prefer256_call_avx512_legal512_prefer512(ptr %arg)
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <8 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 <8 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer256_call_avx512_legal512_prefer512.argprom(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @callee_avx512_legal512_prefer256_call_avx512_legal512_prefer512(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <8 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <8 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void
@@ -229,7 +229,7 @@ bb:
 
 ; This should promote
 define internal fastcc void @callee_avx2_legal256_prefer256_call_avx2_legal512_prefer256(ptr %arg, ptr readonly %arg1) #3 {
-; CHECK-LABEL: define {{[^@]+}}@callee_avx2_legal256_prefer256_call_avx2_legal512_prefer256.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_avx2_legal256_prefer256_call_avx2_legal512_prefer256
 ; CHECK-SAME: (ptr [[ARG:%.*]], <8 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <8 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -249,7 +249,7 @@ define void @avx2_legal256_prefer256_call_avx2_legal512_prefer256(ptr %arg) #4 {
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <8 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 <8 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @callee_avx2_legal256_prefer256_call_avx2_legal512_prefer256.argprom(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @callee_avx2_legal256_prefer256_call_avx2_legal512_prefer256(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <8 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <8 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void
@@ -266,7 +266,7 @@ bb:
 
 ; This should promote
 define internal fastcc void @callee_avx2_legal512_prefer256_call_avx2_legal256_prefer256(ptr %arg, ptr readonly %arg1) #4 {
-; CHECK-LABEL: define {{[^@]+}}@callee_avx2_legal512_prefer256_call_avx2_legal256_prefer256.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_avx2_legal512_prefer256_call_avx2_legal256_prefer256
 ; CHECK-SAME: (ptr [[ARG:%.*]], <8 x i64> [[ARG1_VAL:%.*]])
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    store <8 x i64> [[ARG1_VAL]], ptr [[ARG]]
@@ -286,7 +286,7 @@ define void @avx2_legal512_prefer256_call_avx2_legal256_prefer256(ptr %arg) #3 {
 ; CHECK-NEXT:    [[TMP2:%.*]] = alloca <8 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 <8 x i64>, ptr [[TMP]]
-; CHECK-NEXT:    call fastcc void @callee_avx2_legal512_prefer256_call_avx2_legal256_prefer256.argprom(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
+; CHECK-NEXT:    call fastcc void @callee_avx2_legal512_prefer256_call_avx2_legal256_prefer256(ptr [[TMP2]], <8 x i64> [[TMP_VAL]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = load <8 x i64>, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    store <8 x i64> [[TMP4]], ptr [[ARG]], align 2
 ; CHECK-NEXT:    ret void
@@ -303,7 +303,7 @@ bb:
 
 ; If the arguments are scalar, its ok to promote.
 define internal i32 @scalar_callee_avx512_legal256_prefer256_call_avx512_legal512_prefer256(ptr %X, ptr %Y) #2 {
-; CHECK-LABEL: define {{[^@]+}}@scalar_callee_avx512_legal256_prefer256_call_avx512_legal512_prefer256.argprom
+; CHECK-LABEL: define {{[^@]+}}@scalar_callee_avx512_legal256_prefer256_call_avx512_legal512_prefer256
 ; CHECK-SAME: (i32 [[X_VAL:%.*]], i32 [[Y_VAL:%.*]])
 ; CHECK-NEXT:    [[C:%.*]] = add i32 [[X_VAL]], [[Y_VAL]]
 ; CHECK-NEXT:    ret i32 [[C]]
@@ -321,7 +321,7 @@ define i32 @scalar_avx512_legal256_prefer256_call_avx512_legal512_prefer256(ptr
 ; CHECK-NEXT:    store i32 1, ptr [[A]]
 ; CHECK-NEXT:    [[A_VAL:%.*]] = load i32, ptr [[A]]
 ; CHECK-NEXT:    [[B_VAL:%.*]] = load i32, ptr [[B]]
-; CHECK-NEXT:    [[C:%.*]] = call i32 @scalar_callee_avx512_legal256_prefer256_call_avx512_legal512_prefer256.argprom(i32 [[A_VAL]], i32 [[B_VAL]])
+; CHECK-NEXT:    [[C:%.*]] = call i32 @scalar_callee_avx512_legal256_prefer256_call_avx512_legal512_prefer256(i32 [[A_VAL]], i32 [[B_VAL]])
 ; CHECK-NEXT:    ret i32 [[C]]
 ;
   %A = alloca i32
@@ -332,7 +332,7 @@ define i32 @scalar_avx512_legal256_prefer256_call_avx512_legal512_prefer256(ptr
 
 ; If the arguments are scalar, its ok to promote.
 define internal i32 @scalar_callee_avx512_legal512_prefer256_call_avx512_legal256_prefer256(ptr %X, ptr %Y) #2 {
-; CHECK-LABEL: define {{[^@]+}}@scalar_callee_avx512_legal512_prefer256_call_avx512_legal256_prefer256.argprom
+; CHECK-LABEL: define {{[^@]+}}@scalar_callee_avx512_legal512_prefer256_call_avx512_legal256_prefer256
 ; CHECK-SAME: (i32 [[X_VAL:%.*]], i32 [[Y_VAL:%.*]])
 ; CHECK-NEXT:    [[C:%.*]] = add i32 [[X_VAL]], [[Y_VAL]]
 ; CHECK-NEXT:    ret i32 [[C]]
@@ -350,7 +350,7 @@ define i32 @scalar_avx512_legal512_prefer256_call_avx512_legal256_prefer256(ptr
 ; CHECK-NEXT:    store i32 1, ptr [[A]]
 ; CHECK-NEXT:    [[A_VAL:%.*]] = load i32, ptr [[A]]
 ; CHECK-NEXT:    [[B_VAL:%.*]] = load i32, ptr [[B]]
-; CHECK-NEXT:    [[C:%.*]] = call i32 @scalar_callee_avx512_legal512_prefer256_call_avx512_legal256_prefer256.argprom(i32 [[A_VAL]], i32 [[B_VAL]])
+; CHECK-NEXT:    [[C:%.*]] = call i32 @scalar_callee_avx512_legal512_prefer256_call_avx512_legal256_prefer256(i32 [[A_VAL]], i32 [[B_VAL]])
 ; CHECK-NEXT:    ret i32 [[C]]
 ;
   %A = alloca i32

diff  --git a/llvm/test/Transforms/ArgumentPromotion/X86/thiscall.ll b/llvm/test/Transforms/ArgumentPromotion/X86/thiscall.ll
index 22e2c92617182f..2195e437bc8637 100644
--- a/llvm/test/Transforms/ArgumentPromotion/X86/thiscall.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/X86/thiscall.ll
@@ -23,7 +23,7 @@ define internal x86_thiscallcc void @internalfun(ptr %this, ptr inalloca(<{ %str
 ; ARGPROMOTION-NEXT:    call void @ext(ptr inalloca(<{ [[STRUCT_A]] }>) [[ARGMEM]])
 ; ARGPROMOTION-NEXT:    ret void
 ;
-; GLOBALOPT_ARGPROMOTION-LABEL: define {{[^@]+}}@internalfun.argprom
+; GLOBALOPT_ARGPROMOTION-LABEL: define {{[^@]+}}@internalfun
 ; GLOBALOPT_ARGPROMOTION-SAME: (ptr [[TMP0:%.*]]) unnamed_addr {
 ; GLOBALOPT_ARGPROMOTION-NEXT:  entry:
 ; GLOBALOPT_ARGPROMOTION-NEXT:    [[A:%.*]] = getelementptr inbounds <{ [[STRUCT_A:%.*]] }>, ptr [[TMP0]], i32 0, i32 0
@@ -56,7 +56,7 @@ define void @exportedfun(ptr %a) {
 ; GLOBALOPT_ARGPROMOTION-SAME: (ptr [[A:%.*]]) local_unnamed_addr {
 ; GLOBALOPT_ARGPROMOTION-NEXT:    [[INALLOCA_SAVE:%.*]] = tail call ptr @llvm.stacksave.p0()
 ; GLOBALOPT_ARGPROMOTION-NEXT:    [[ARGMEM:%.*]] = alloca inalloca <{ [[STRUCT_A:%.*]] }>, align 4
-; GLOBALOPT_ARGPROMOTION-NEXT:    call fastcc void @internalfun.argprom(ptr [[ARGMEM]])
+; GLOBALOPT_ARGPROMOTION-NEXT:    call fastcc void @internalfun(ptr [[ARGMEM]])
 ; GLOBALOPT_ARGPROMOTION-NEXT:    call void @llvm.stackrestore.p0(ptr [[INALLOCA_SAVE]])
 ; GLOBALOPT_ARGPROMOTION-NEXT:    ret void
 ;

diff  --git a/llvm/test/Transforms/ArgumentPromotion/actual-arguments.ll b/llvm/test/Transforms/ArgumentPromotion/actual-arguments.ll
index 54e1727b5bca6a..63366ba998c7bb 100644
--- a/llvm/test/Transforms/ArgumentPromotion/actual-arguments.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/actual-arguments.ll
@@ -12,7 +12,7 @@ define internal i32 @test_cannot_promote_1(ptr %p, ptr nocapture readonly %test_
 ; CHECK-LABEL: define {{[^@]+}}@test_cannot_promote_1
 ; CHECK-SAME: (ptr [[P:%.*]], ptr nocapture readonly [[TEST_C:%.*]]) {
 ; CHECK-NEXT:    [[TEST_C_VAL:%.*]] = load i32, ptr [[TEST_C]], align 4
-; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee.argprom(ptr [[P]], i32 [[TEST_C_VAL]])
+; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee(ptr [[P]], i32 [[TEST_C_VAL]])
 ; CHECK-NEXT:    [[LTEST_C:%.*]] = load i32, ptr [[TEST_C]], align 4
 ; CHECK-NEXT:    [[SUM:%.*]] = add i32 [[LTEST_C]], [[RES]]
 ; CHECK-NEXT:    ret i32 [[SUM]]
@@ -33,7 +33,7 @@ define internal i32 @test_cannot_promote_2(ptr %p, ptr nocapture readonly %test_
 ; CHECK-LABEL: define {{[^@]+}}@test_cannot_promote_2
 ; CHECK-SAME: (ptr [[P:%.*]], ptr nocapture readonly [[TEST_C:%.*]]) {
 ; CHECK-NEXT:    [[TEST_C_VAL:%.*]] = load i32, ptr [[TEST_C]], align 4
-; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee.argprom(ptr [[P]], i32 [[TEST_C_VAL]])
+; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee(ptr [[P]], i32 [[TEST_C_VAL]])
 ; CHECK-NEXT:    [[LTEST_C:%.*]] = load i32, ptr [[TEST_C]], align 4
 ; CHECK-NEXT:    [[SUM:%.*]] = add i32 [[LTEST_C]], [[RES]]
 ; CHECK-NEXT:    ret i32 [[SUM]]
@@ -54,7 +54,7 @@ define internal i32 @test_cannot_promote_3(ptr %p, ptr nocapture readonly %test_
 ; CHECK-LABEL: define {{[^@]+}}@test_cannot_promote_3
 ; CHECK-SAME: (ptr [[P:%.*]], ptr nocapture readonly [[TEST_C:%.*]]) {
 ; CHECK-NEXT:    [[TEST_C_VAL:%.*]] = load i32, ptr [[TEST_C]], align 4
-; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee.argprom(ptr [[P]], i32 [[TEST_C_VAL]])
+; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee(ptr [[P]], i32 [[TEST_C_VAL]])
 ; CHECK-NEXT:    [[LTEST_C:%.*]] = load i32, ptr [[TEST_C]], align 4
 ; CHECK-NEXT:    [[SUM:%.*]] = add i32 [[LTEST_C]], [[RES]]
 ; CHECK-NEXT:    ret i32 [[SUM]]
@@ -77,7 +77,7 @@ define internal i32 @test_can_promote_1(ptr %p, ptr nocapture readonly %test_c)
 ; CHECK-LABEL: define {{[^@]+}}@test_can_promote_1
 ; CHECK-SAME: (ptr [[P:%.*]], ptr nocapture readonly [[TEST_C:%.*]]) {
 ; CHECK-NEXT:    [[TEST_C_VAL:%.*]] = load i32, ptr [[TEST_C]], align 4
-; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee.argprom(ptr [[P]], i32 [[TEST_C_VAL]])
+; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee(ptr [[P]], i32 [[TEST_C_VAL]])
 ; CHECK-NEXT:    [[LTEST_C:%.*]] = load i32, ptr [[TEST_C]], align 4
 ; CHECK-NEXT:    [[SUM:%.*]] = add i32 [[LTEST_C]], [[RES]]
 ; CHECK-NEXT:    ret i32 [[SUM]]
@@ -101,7 +101,7 @@ define internal i32 @test_can_promote_2(ptr %p, ptr nocapture readonly %test_c)
 ; CHECK-LABEL: define {{[^@]+}}@test_can_promote_2
 ; CHECK-SAME: (ptr [[P:%.*]], ptr nocapture readonly [[TEST_C:%.*]]) {
 ; CHECK-NEXT:    [[TEST_C_VAL:%.*]] = load i32, ptr [[TEST_C]], align 4
-; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee.argprom(ptr [[P]], i32 [[TEST_C_VAL]])
+; CHECK-NEXT:    [[RES:%.*]] = call i32 @callee(ptr [[P]], i32 [[TEST_C_VAL]])
 ; CHECK-NEXT:    [[LTEST_C:%.*]] = load i32, ptr [[TEST_C]], align 4
 ; CHECK-NEXT:    [[SUM:%.*]] = add i32 [[LTEST_C]], [[RES]]
 ; CHECK-NEXT:    ret i32 [[SUM]]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/aggregate-promote-dead-gep.ll b/llvm/test/Transforms/ArgumentPromotion/aggregate-promote-dead-gep.ll
index 3ff3ac7ac61d75..75e802b1510c56 100644
--- a/llvm/test/Transforms/ArgumentPromotion/aggregate-promote-dead-gep.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/aggregate-promote-dead-gep.ll
@@ -5,7 +5,7 @@
 @G = constant %T { i32 0, i32 0, i32 17, i32 25 }
 
 define internal i32 @test(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@test.argprom
+; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (i32 [[P_12_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[V:%.*]] = add i32 [[P_12_VAL]], 10
@@ -24,7 +24,7 @@ define i32 @caller() {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TMP0:%.*]] = getelementptr i8, ptr @G, i64 12
 ; CHECK-NEXT:    [[G_VAL:%.*]] = load i32, ptr [[TMP0]], align 4
-; CHECK-NEXT:    [[V:%.*]] = call i32 @test.argprom(i32 [[G_VAL]])
+; CHECK-NEXT:    [[V:%.*]] = call i32 @test(i32 [[G_VAL]])
 ; CHECK-NEXT:    ret i32 [[V]]
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/aggregate-promote.ll b/llvm/test/Transforms/ArgumentPromotion/aggregate-promote.ll
index cbc3d07efc5e9b..dc5b376850f08c 100644
--- a/llvm/test/Transforms/ArgumentPromotion/aggregate-promote.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/aggregate-promote.ll
@@ -5,7 +5,7 @@
 @G = constant %T { i32 0, i32 0, i32 17, i32 25 }
 
 define internal i32 @test(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@test.argprom
+; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (i32 [[P_8_VAL:%.*]], i32 [[P_12_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[V:%.*]] = add i32 [[P_12_VAL]], [[P_8_VAL]]
@@ -27,7 +27,7 @@ define i32 @caller() {
 ; CHECK-NEXT:    [[G_VAL:%.*]] = load i32, ptr [[TMP0]], align 4
 ; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr i8, ptr @G, i64 12
 ; CHECK-NEXT:    [[G_VAL1:%.*]] = load i32, ptr [[TMP1]], align 4
-; CHECK-NEXT:    [[V:%.*]] = call i32 @test.argprom(i32 [[G_VAL]], i32 [[G_VAL1]])
+; CHECK-NEXT:    [[V:%.*]] = call i32 @test(i32 [[G_VAL]], i32 [[G_VAL1]])
 ; CHECK-NEXT:    ret i32 [[V]]
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/align.ll b/llvm/test/Transforms/ArgumentPromotion/align.ll
index 251f43b2ae7286..656c7c9da5b4af 100644
--- a/llvm/test/Transforms/ArgumentPromotion/align.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/align.ll
@@ -2,7 +2,7 @@
 ; RUN: opt -S -passes=argpromotion < %s | FileCheck %s
 
 define internal i32 @callee_must_exec(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_must_exec.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_must_exec
 ; CHECK-SAME: (i32 [[P_0_VAL:%.*]]) {
 ; CHECK-NEXT:    ret i32 [[P_0_VAL]]
 ;
@@ -14,7 +14,7 @@ define void @caller_must_exec(ptr %p) {
 ; CHECK-LABEL: define {{[^@]+}}@caller_must_exec
 ; CHECK-SAME: (ptr [[P:%.*]]) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 16
-; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_must_exec.argprom(i32 [[P_VAL]])
+; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_must_exec(i32 [[P_VAL]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_must_exec(ptr %p)
@@ -22,7 +22,7 @@ define void @caller_must_exec(ptr %p) {
 }
 
 define internal i32 @callee_guaranteed_aligned_1(i1 %c, ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_guaranteed_aligned_1.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_guaranteed_aligned_1
 ; CHECK-SAME: (i1 [[C:%.*]], i32 [[P_0_VAL:%.*]]) {
 ; CHECK-NEXT:    br i1 [[C]], label [[IF:%.*]], label [[ELSE:%.*]]
 ; CHECK:       if:
@@ -44,7 +44,7 @@ define void @caller_guaranteed_aligned_1(i1 %c, ptr align 16 dereferenceable(4)
 ; CHECK-LABEL: define {{[^@]+}}@caller_guaranteed_aligned_1
 ; CHECK-SAME: (i1 [[C:%.*]], ptr align 16 dereferenceable(4) [[P:%.*]]) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 16
-; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_guaranteed_aligned_1.argprom(i1 [[C]], i32 [[P_VAL]])
+; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_guaranteed_aligned_1(i1 [[C]], i32 [[P_VAL]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_guaranteed_aligned_1(i1 %c, ptr %p)
@@ -52,7 +52,7 @@ define void @caller_guaranteed_aligned_1(i1 %c, ptr align 16 dereferenceable(4)
 }
 
 define internal i32 @callee_guaranteed_aligned_2(i1 %c, ptr align 16 dereferenceable(4) %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_guaranteed_aligned_2.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_guaranteed_aligned_2
 ; CHECK-SAME: (i1 [[C:%.*]], i32 [[P_0_VAL:%.*]]) {
 ; CHECK-NEXT:    br i1 [[C]], label [[IF:%.*]], label [[ELSE:%.*]]
 ; CHECK:       if:
@@ -74,7 +74,7 @@ define void @caller_guaranteed_aligned_2(i1 %c, ptr %p) {
 ; CHECK-LABEL: define {{[^@]+}}@caller_guaranteed_aligned_2
 ; CHECK-SAME: (i1 [[C:%.*]], ptr [[P:%.*]]) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 16
-; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_guaranteed_aligned_2.argprom(i1 [[C]], i32 [[P_VAL]])
+; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_guaranteed_aligned_2(i1 [[C]], i32 [[P_VAL]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_guaranteed_aligned_2(i1 %c, ptr %p)
@@ -83,7 +83,7 @@ define void @caller_guaranteed_aligned_2(i1 %c, ptr %p) {
 
 ; We have seen the offset before but with a lower alignment
 define internal i32 @callee_guaranteed_aligned_3(i1 %c, ptr align 16 dereferenceable(4) %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_guaranteed_aligned_3.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_guaranteed_aligned_3
 ; CHECK-SAME: (i1 [[C:%.*]], i32 [[P_0_VAL:%.*]]) {
 ; CHECK-NEXT:    br i1 [[C]], label [[IF:%.*]], label [[ELSE:%.*]]
 ; CHECK:       if:
@@ -106,7 +106,7 @@ define void @caller_guaranteed_aligned_3(i1 %c, ptr %p) {
 ; CHECK-LABEL: define {{[^@]+}}@caller_guaranteed_aligned_3
 ; CHECK-SAME: (i1 [[C:%.*]], ptr [[P:%.*]]) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 16
-; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_guaranteed_aligned_3.argprom(i1 [[C]], i32 [[P_VAL]])
+; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @callee_guaranteed_aligned_3(i1 [[C]], i32 [[P_VAL]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_guaranteed_aligned_3(i1 %c, ptr %p)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/allocsize.ll b/llvm/test/Transforms/ArgumentPromotion/allocsize.ll
index ca648f5a012cc4..36271e17c9d76d 100644
--- a/llvm/test/Transforms/ArgumentPromotion/allocsize.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/allocsize.ll
@@ -6,7 +6,7 @@ declare ptr @calloc(i64, i64)
 
 define internal ptr @my_alloc1(i64 %unchanged, ptr %unused, i64 %size, ptr %unused2) allocsize(2) {
 ; CHECK: Function Attrs: allocsize(1)
-; CHECK-LABEL: define internal ptr @my_alloc1.argprom(
+; CHECK-LABEL: define internal ptr @my_alloc1(
 ; CHECK-SAME: i64 [[UNCHANGED:%.*]], i64 [[SIZE:%.*]]) #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:    [[PTR:%.*]] = call ptr @malloc(i64 [[SIZE]])
 ; CHECK-NEXT:    ret ptr [[PTR]]
@@ -17,7 +17,7 @@ define internal ptr @my_alloc1(i64 %unchanged, ptr %unused, i64 %size, ptr %unus
 
 define internal ptr @my_alloc2(i64 %unchanged, ptr %unused, i64 %size, i64 %size2, ptr %unused2) allocsize(2,3) {
 ; CHECK: Function Attrs: allocsize(1,2)
-; CHECK-LABEL: define internal ptr @my_alloc2.argprom(
+; CHECK-LABEL: define internal ptr @my_alloc2(
 ; CHECK-SAME: i64 [[UNCHANGED:%.*]], i64 [[SIZE:%.*]], i64 [[SIZE2:%.*]]) #[[ATTR1:[0-9]+]] {
 ; CHECK-NEXT:    [[PTR:%.*]] = call ptr @calloc(i64 [[SIZE]], i64 [[SIZE2]])
 ; CHECK-NEXT:    ret ptr [[PTR]]
@@ -28,7 +28,7 @@ define internal ptr @my_alloc2(i64 %unchanged, ptr %unused, i64 %size, i64 %size
 
 define internal ptr @my_alloc3(i64 %unchanged, ptr %promoted, ptr %promoted2, i64 %size) allocsize(3) {
 ; CHECK: Function Attrs: allocsize(5)
-; CHECK-LABEL: define internal ptr @my_alloc3.argprom(
+; CHECK-LABEL: define internal ptr @my_alloc3(
 ; CHECK-SAME: i64 [[UNCHANGED:%.*]], i32 [[PROMOTED_0_VAL:%.*]], i32 [[PROMOTED_4_VAL:%.*]], i32 [[PROMOTED2_0_VAL:%.*]], i32 [[PROMOTED2_4_VAL:%.*]], i64 [[SIZE:%.*]]) #[[ATTR2:[0-9]+]] {
 ; CHECK-NEXT:    [[PTR:%.*]] = call ptr @malloc(i64 [[SIZE]])
 ; CHECK-NEXT:    ret ptr [[PTR]]
@@ -47,7 +47,7 @@ define internal ptr @my_alloc3(i64 %unchanged, ptr %promoted, ptr %promoted2, i6
 
 define internal ptr @my_alloc4(i64 %unchanged, ptr %promoted, ptr %promoted2, i64 %size, i64 %size2) allocsize(3,4) {
 ; CHECK: Function Attrs: allocsize(5,6)
-; CHECK-LABEL: define internal ptr @my_alloc4.argprom(
+; CHECK-LABEL: define internal ptr @my_alloc4(
 ; CHECK-SAME: i64 [[UNCHANGED:%.*]], i32 [[PROMOTED_0_VAL:%.*]], i32 [[PROMOTED_4_VAL:%.*]], i32 [[PROMOTED2_0_VAL:%.*]], i32 [[PROMOTED2_4_VAL:%.*]], i64 [[SIZE:%.*]], i64 [[SIZE2:%.*]]) #[[ATTR3:[0-9]+]] {
 ; CHECK-NEXT:    [[PTR:%.*]] = call ptr @calloc(i64 [[SIZE]], i64 [[SIZE2]])
 ; CHECK-NEXT:    ret ptr [[PTR]]
@@ -67,22 +67,22 @@ define internal ptr @my_alloc4(i64 %unchanged, ptr %promoted, ptr %promoted2, i6
 define void @call_my_alloc(ptr %arg, ptr %arg2) {
 ; CHECK-LABEL: define void @call_my_alloc(
 ; CHECK-SAME: ptr [[ARG:%.*]], ptr [[ARG2:%.*]]) {
-; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @my_alloc1.argprom(i64 0, i64 2)
-; CHECK-NEXT:    [[TMP2:%.*]] = call ptr @my_alloc2.argprom(i64 0, i64 2, i64 2)
+; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @my_alloc1(i64 0, i64 2)
+; CHECK-NEXT:    [[TMP2:%.*]] = call ptr @my_alloc2(i64 0, i64 2, i64 2)
 ; CHECK-NEXT:    [[ARG_VAL:%.*]] = load i32, ptr [[ARG]], align 4
 ; CHECK-NEXT:    [[TMP3:%.*]] = getelementptr i8, ptr [[ARG]], i64 4
 ; CHECK-NEXT:    [[ARG_VAL1:%.*]] = load i32, ptr [[TMP3]], align 4
 ; CHECK-NEXT:    [[ARG2_VAL:%.*]] = load i32, ptr [[ARG2]], align 4
 ; CHECK-NEXT:    [[TMP4:%.*]] = getelementptr i8, ptr [[ARG2]], i64 4
 ; CHECK-NEXT:    [[ARG2_VAL2:%.*]] = load i32, ptr [[TMP4]], align 4
-; CHECK-NEXT:    [[TMP5:%.*]] = call ptr @my_alloc3.argprom(i64 0, i32 [[ARG_VAL]], i32 [[ARG_VAL1]], i32 [[ARG2_VAL]], i32 [[ARG2_VAL2]], i64 2)
+; CHECK-NEXT:    [[TMP5:%.*]] = call ptr @my_alloc3(i64 0, i32 [[ARG_VAL]], i32 [[ARG_VAL1]], i32 [[ARG2_VAL]], i32 [[ARG2_VAL2]], i64 2)
 ; CHECK-NEXT:    [[ARG_VAL3:%.*]] = load i32, ptr [[ARG]], align 4
 ; CHECK-NEXT:    [[TMP6:%.*]] = getelementptr i8, ptr [[ARG]], i64 4
 ; CHECK-NEXT:    [[ARG_VAL4:%.*]] = load i32, ptr [[TMP6]], align 4
 ; CHECK-NEXT:    [[ARG2_VAL5:%.*]] = load i32, ptr [[ARG2]], align 4
 ; CHECK-NEXT:    [[TMP7:%.*]] = getelementptr i8, ptr [[ARG2]], i64 4
 ; CHECK-NEXT:    [[ARG2_VAL6:%.*]] = load i32, ptr [[TMP7]], align 4
-; CHECK-NEXT:    [[TMP8:%.*]] = call ptr @my_alloc4.argprom(i64 0, i32 [[ARG_VAL3]], i32 [[ARG_VAL4]], i32 [[ARG2_VAL5]], i32 [[ARG2_VAL6]], i64 2, i64 2)
+; CHECK-NEXT:    [[TMP8:%.*]] = call ptr @my_alloc4(i64 0, i32 [[ARG_VAL3]], i32 [[ARG_VAL4]], i32 [[ARG2_VAL5]], i32 [[ARG2_VAL6]], i64 2, i64 2)
 ; CHECK-NEXT:    ret void
 ;
   %ptr = call ptr @my_alloc1(i64 0, ptr null, i64 2, ptr null)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/attrs.ll b/llvm/test/Transforms/ArgumentPromotion/attrs.ll
index 665065b3c35096..2b68ef2e403ba0 100644
--- a/llvm/test/Transforms/ArgumentPromotion/attrs.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/attrs.ll
@@ -4,7 +4,7 @@
 %struct.ss = type { i32, i64 }
 
 define internal void @f(ptr byval(%struct.ss) align 4 %b, ptr byval(i32) align 4 %X, i32 %i) nounwind {
-; CHECK-LABEL: define {{[^@]+}}@f.argprom
+; CHECK-LABEL: define {{[^@]+}}@f
 ; CHECK-SAME: (i32 [[B_0:%.*]], i32 [[X:%.*]], i32 [[I:%.*]]) #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP:%.*]] = add i32 [[B_0]], 1
@@ -30,7 +30,7 @@ define i32 @test(ptr %X) {
 ; CHECK-NEXT:    store i64 2, ptr [[TEMP4]], align 4
 ; CHECK-NEXT:    [[S_0_VAL:%.*]] = load i32, ptr [[S]], align 4
 ; CHECK-NEXT:    [[X_VAL:%.*]] = load i32, ptr [[X]], align 4
-; CHECK-NEXT:    call void @f.argprom(i32 [[S_0_VAL]], i32 [[X_VAL]], i32 zeroext 0)
+; CHECK-NEXT:    call void @f(i32 [[S_0_VAL]], i32 [[X_VAL]], i32 zeroext 0)
 ; CHECK-NEXT:    ret i32 0
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/basictest.ll b/llvm/test/Transforms/ArgumentPromotion/basictest.ll
index 47518f73ec07a7..ba84ac126fe49b 100644
--- a/llvm/test/Transforms/ArgumentPromotion/basictest.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/basictest.ll
@@ -3,7 +3,7 @@
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 define internal i32 @test(ptr %X, ptr %Y) {
-; CHECK-LABEL: define {{[^@]+}}@test.argprom
+; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (i32 [[X_0_VAL:%.*]], i32 [[Y_0_VAL:%.*]]) {
 ; CHECK-NEXT:    [[C:%.*]] = add i32 [[X_0_VAL]], [[Y_0_VAL]]
 ; CHECK-NEXT:    ret i32 [[C]]
@@ -15,9 +15,9 @@ define internal i32 @test(ptr %X, ptr %Y) {
 }
 
 define internal i32 @caller(ptr %B) {
-; CHECK-LABEL: define {{[^@]+}}@caller.argprom
+; CHECK-LABEL: define {{[^@]+}}@caller
 ; CHECK-SAME: (i32 [[B_0_VAL:%.*]]) {
-; CHECK-NEXT:    [[C:%.*]] = call i32 @test.argprom(i32 1, i32 [[B_0_VAL]])
+; CHECK-NEXT:    [[C:%.*]] = call i32 @test(i32 1, i32 [[B_0_VAL]])
 ; CHECK-NEXT:    ret i32 [[C]]
 ;
   %A = alloca i32
@@ -28,7 +28,7 @@ define internal i32 @caller(ptr %B) {
 
 define i32 @callercaller() {
 ; CHECK-LABEL: define {{[^@]+}}@callercaller() {
-; CHECK-NEXT:    [[X:%.*]] = call i32 @caller.argprom(i32 2)
+; CHECK-NEXT:    [[X:%.*]] = call i32 @caller(i32 2)
 ; CHECK-NEXT:    ret i32 [[X]]
 ;
   %B = alloca i32

diff  --git a/llvm/test/Transforms/ArgumentPromotion/bitcasts.ll b/llvm/test/Transforms/ArgumentPromotion/bitcasts.ll
index bc4e5cc13b160a..6f2c322d7877be 100644
--- a/llvm/test/Transforms/ArgumentPromotion/bitcasts.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/bitcasts.ll
@@ -6,7 +6,7 @@
 %opaque = type opaque
 
 define internal i32 @callee_basic(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_basic.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_basic
 ; CHECK-SAME: (i32 [[P_0_VAL:%.*]], i32 [[P_4_VAL:%.*]]) {
 ; CHECK-NEXT:    [[Z:%.*]] = add i32 [[P_0_VAL]], [[P_4_VAL]]
 ; CHECK-NEXT:    ret i32 [[Z]]
@@ -24,7 +24,7 @@ define void @caller_basic(ptr %p) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 4
 ; CHECK-NEXT:    [[TMP2:%.*]] = getelementptr i8, ptr [[P]], i64 4
 ; CHECK-NEXT:    [[P_VAL1:%.*]] = load i32, ptr [[TMP2]], align 4
-; CHECK-NEXT:    [[TMP4:%.*]] = call i32 @callee_basic.argprom(i32 [[P_VAL]], i32 [[P_VAL1]])
+; CHECK-NEXT:    [[TMP4:%.*]] = call i32 @callee_basic(i32 [[P_VAL]], i32 [[P_VAL1]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_basic(ptr %p)
@@ -32,7 +32,7 @@ define void @caller_basic(ptr %p) {
 }
 
 define internal i32 @callee_opaque(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_opaque.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_opaque
 ; CHECK-SAME: (i32 [[P_0_VAL:%.*]], i32 [[P_4_VAL:%.*]]) {
 ; CHECK-NEXT:    [[Z:%.*]] = add i32 [[P_0_VAL]], [[P_4_VAL]]
 ; CHECK-NEXT:    ret i32 [[Z]]
@@ -50,7 +50,7 @@ define void @caller_opaque(ptr %p) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 4
 ; CHECK-NEXT:    [[TMP3:%.*]] = getelementptr i8, ptr [[P]], i64 4
 ; CHECK-NEXT:    [[P_VAL1:%.*]] = load i32, ptr [[TMP3]], align 4
-; CHECK-NEXT:    [[TMP5:%.*]] = call i32 @callee_opaque.argprom(i32 [[P_VAL]], i32 [[P_VAL1]])
+; CHECK-NEXT:    [[TMP5:%.*]] = call i32 @callee_opaque(i32 [[P_VAL]], i32 [[P_VAL1]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_opaque(ptr %p)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/byval-2.ll b/llvm/test/Transforms/ArgumentPromotion/byval-2.ll
index 9147a42fc7fc6b..3d0e9f2958444f 100644
--- a/llvm/test/Transforms/ArgumentPromotion/byval-2.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/byval-2.ll
@@ -6,7 +6,7 @@
 %struct.ss = type { i32, i64 }
 
 define internal void @f(ptr byval(%struct.ss) align 8 %b, ptr byval(i32) align 4 %X) nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@f.argprom
+; CHECK-LABEL: define {{[^@]+}}@f
 ; CHECK-SAME: (i32 [[B_0:%.*]], i32 [[X:%.*]]) #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP:%.*]] = add i32 [[B_0]], 1
@@ -31,7 +31,7 @@ define i32 @test(ptr %X) {
 ; CHECK-NEXT:    store i64 2, ptr [[TEMP4]], align 4
 ; CHECK-NEXT:    [[S_0_VAL:%.*]] = load i32, ptr [[S]], align 4
 ; CHECK-NEXT:    [[X_VAL:%.*]] = load i32, ptr [[X]], align 4
-; CHECK-NEXT:    call void @f.argprom(i32 [[S_0_VAL]], i32 [[X_VAL]])
+; CHECK-NEXT:    call void @f(i32 [[S_0_VAL]], i32 [[X_VAL]])
 ; CHECK-NEXT:    ret i32 0
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/byval-with-padding.ll b/llvm/test/Transforms/ArgumentPromotion/byval-with-padding.ll
index fe3820617e2d77..9089470b7d3853 100644
--- a/llvm/test/Transforms/ArgumentPromotion/byval-with-padding.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/byval-with-padding.ll
@@ -4,7 +4,7 @@
 %struct.A = type { float, [12 x i8], i64, [8 x i8] }
 
 define internal float @callee(ptr byval(%struct.A) align 32 %0) {
-; CHECK-LABEL: define {{[^@]+}}@callee.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee
 ; CHECK-SAME: (float [[DOT0_VAL:%.*]], i64 [[DOT16_VAL:%.*]]) {
 ; CHECK-NEXT:    [[TMP1:%.*]] = fadd float 0.000000e+00, [[DOT0_VAL]]
 ; CHECK-NEXT:    [[TMP2:%.*]] = uitofp i64 [[DOT16_VAL]] to float
@@ -30,7 +30,7 @@ define float @caller(float %0) {
 ; CHECK-NEXT:    [[DOTVAL:%.*]] = load float, ptr [[TMP2]], align 32
 ; CHECK-NEXT:    [[TMP4:%.*]] = getelementptr i8, ptr [[TMP2]], i64 16
 ; CHECK-NEXT:    [[DOTVAL1:%.*]] = load i64, ptr [[TMP4]], align 16
-; CHECK-NEXT:    [[TMP5:%.*]] = call noundef float @callee.argprom(float [[DOTVAL]], i64 [[DOTVAL1]])
+; CHECK-NEXT:    [[TMP5:%.*]] = call noundef float @callee(float [[DOTVAL]], i64 [[DOTVAL1]])
 ; CHECK-NEXT:    ret float [[TMP5]]
 ;
   %2 = alloca %struct.A, align 32

diff  --git a/llvm/test/Transforms/ArgumentPromotion/byval.ll b/llvm/test/Transforms/ArgumentPromotion/byval.ll
index 424425b30767ed..13a60a96359212 100644
--- a/llvm/test/Transforms/ArgumentPromotion/byval.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/byval.ll
@@ -6,7 +6,7 @@ target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:1
 %struct.ss = type { i32, i64 }
 
 define internal void @f(ptr byval(%struct.ss) align 4 %b) nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@f.argprom
+; CHECK-LABEL: define {{[^@]+}}@f
 ; CHECK-SAME: (i32 [[B_0_VAL:%.*]]) #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP2:%.*]] = add i32 [[B_0_VAL]], 1
@@ -20,7 +20,7 @@ entry:
 }
 
 define internal void @g(ptr byval(%struct.ss) align 32 %b) nounwind {
-; CHECK-LABEL: define {{[^@]+}}@g.argprom
+; CHECK-LABEL: define {{[^@]+}}@g
 ; CHECK-SAME: (i32 [[B_0_VAL:%.*]]) #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP2:%.*]] = add i32 [[B_0_VAL]], 1
@@ -56,7 +56,7 @@ entry:
 
 ; Transform even if an argument is written to and then is loaded from.
 define internal void @k(ptr byval(%struct.ss) align 4 %b) nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@k.argprom
+; CHECK-LABEL: define {{[^@]+}}@k
 ; CHECK-SAME: (i32 [[B_0_VAL:%.*]]) #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP2:%.*]] = add i32 [[B_0_VAL]], 1
@@ -72,7 +72,7 @@ entry:
 
 ; Transform even if a store instruction is the single user.
 define internal void @l(ptr byval(%struct.ss) align 4 %b) nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@l.argprom
+; CHECK-LABEL: define {{[^@]+}}@l
 ; CHECK-SAME: (i32 [[B_0_VAL:%.*]]) #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    ret void
@@ -85,7 +85,7 @@ entry:
 ; Transform all the arguments creating the required number of 'alloca's and
 ; then optimize them out.
 define internal void @m(ptr byval(%struct.ss) align 4 %b, ptr byval(%struct.ss) align 4 %c) nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@m.argprom
+; CHECK-LABEL: define {{[^@]+}}@m
 ; CHECK-SAME: (i32 [[B_0_VAL:%.*]], i32 [[C_0_VAL:%.*]], i64 [[C_4_VAL:%.*]]) #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP2:%.*]] = add i32 [[B_0_VAL]], 1
@@ -116,19 +116,19 @@ define i32 @main() nounwind  {
 ; CHECK-NEXT:    [[TEMP4:%.*]] = getelementptr [[STRUCT_SS]], ptr [[S]], i32 0, i32 1
 ; CHECK-NEXT:    store i64 2, ptr [[TEMP4]], align 4
 ; CHECK-NEXT:    [[S_VAL:%.*]] = load i32, ptr [[S]], align 4
-; CHECK-NEXT:    call void @f.argprom(i32 [[S_VAL]])
+; CHECK-NEXT:    call void @f(i32 [[S_VAL]])
 ; CHECK-NEXT:    [[S_VAL1:%.*]] = load i32, ptr [[S]], align 4
-; CHECK-NEXT:    call void @g.argprom(i32 [[S_VAL1]])
+; CHECK-NEXT:    call void @g(i32 [[S_VAL1]])
 ; CHECK-NEXT:    call void @h(ptr byval([[STRUCT_SS]]) [[S]])
 ; CHECK-NEXT:    [[S_VAL2:%.*]] = load i32, ptr [[S]], align 4
-; CHECK-NEXT:    call void @k.argprom(i32 [[S_VAL2]])
+; CHECK-NEXT:    call void @k(i32 [[S_VAL2]])
 ; CHECK-NEXT:    [[S_VAL3:%.*]] = load i32, ptr [[S]], align 4
-; CHECK-NEXT:    call void @l.argprom(i32 [[S_VAL3]])
+; CHECK-NEXT:    call void @l(i32 [[S_VAL3]])
 ; CHECK-NEXT:    [[S_VAL4:%.*]] = load i32, ptr [[S]], align 4
 ; CHECK-NEXT:    [[S_VAL5:%.*]] = load i32, ptr [[S]], align 4
 ; CHECK-NEXT:    [[TMP0:%.*]] = getelementptr i8, ptr [[S]], i64 4
 ; CHECK-NEXT:    [[S_VAL6:%.*]] = load i64, ptr [[TMP0]], align 8
-; CHECK-NEXT:    call void @m.argprom(i32 [[S_VAL4]], i32 [[S_VAL5]], i64 [[S_VAL6]])
+; CHECK-NEXT:    call void @m(i32 [[S_VAL4]], i32 [[S_VAL5]], i64 [[S_VAL6]])
 ; CHECK-NEXT:    ret i32 0
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/chained.ll b/llvm/test/Transforms/ArgumentPromotion/chained.ll
index dba6726ea9b1f7..2fb80a39875688 100644
--- a/llvm/test/Transforms/ArgumentPromotion/chained.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/chained.ll
@@ -5,7 +5,7 @@
 @G2 = constant ptr @G1
 
 define internal i32 @test(ptr %x) {
-; CHECK-LABEL: define {{[^@]+}}@test.argprom.argprom
+; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (i32 [[X_0_VAL_0_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    ret i32 [[X_0_VAL_0_VAL]]
@@ -21,7 +21,7 @@ define i32 @caller() {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[G2_VAL:%.*]] = load ptr, ptr @G2, align 8
 ; CHECK-NEXT:    [[G2_VAL_VAL:%.*]] = load i32, ptr [[G2_VAL]], align 4
-; CHECK-NEXT:    [[X:%.*]] = call i32 @test.argprom.argprom(i32 [[G2_VAL_VAL]])
+; CHECK-NEXT:    [[X:%.*]] = call i32 @test(i32 [[G2_VAL_VAL]])
 ; CHECK-NEXT:    ret i32 [[X]]
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/control-flow2.ll b/llvm/test/Transforms/ArgumentPromotion/control-flow2.ll
index 7fb572551b0cfa..8df89033c0d8da 100644
--- a/llvm/test/Transforms/ArgumentPromotion/control-flow2.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/control-flow2.ll
@@ -4,7 +4,7 @@
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 define internal i32 @callee(i1 %C, ptr %P) {
-; CHECK-LABEL: define {{[^@]+}}@callee.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee
 ; CHECK-SAME: (i1 [[C:%.*]], i32 [[P_0_VAL:%.*]]) {
 ; CHECK-NEXT:    br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
 ; CHECK:       T:
@@ -27,7 +27,7 @@ define i32 @foo() {
 ; CHECK-NEXT:    [[A:%.*]] = alloca i32, align 4
 ; CHECK-NEXT:    store i32 17, ptr [[A]], align 4
 ; CHECK-NEXT:    [[A_VAL:%.*]] = load i32, ptr [[A]], align 4
-; CHECK-NEXT:    [[X:%.*]] = call i32 @callee.argprom(i1 false, i32 [[A_VAL]])
+; CHECK-NEXT:    [[X:%.*]] = call i32 @callee(i1 false, i32 [[A_VAL]])
 ; CHECK-NEXT:    ret i32 [[X]]
 ;
   %A = alloca i32         ; <ptr> [#uses=2]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/crash.ll b/llvm/test/Transforms/ArgumentPromotion/crash.ll
index 0d15d7876dae61..12caae4dbef8df 100644
--- a/llvm/test/Transforms/ArgumentPromotion/crash.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/crash.ll
@@ -44,7 +44,7 @@ bb:
 }
 
 define internal i1 @eggs(ptr %arg) {
-; ARGPROMOTION-LABEL: define {{[^@]+}}@eggs.argprom() {
+; ARGPROMOTION-LABEL: define {{[^@]+}}@eggs() {
 ; ARGPROMOTION-NEXT:  bb:
 ; ARGPROMOTION-NEXT:    unreachable
 ;

diff  --git a/llvm/test/Transforms/ArgumentPromotion/dbg.ll b/llvm/test/Transforms/ArgumentPromotion/dbg.ll
index 15ed2cc2d20a6a..6a14facfb36a22 100644
--- a/llvm/test/Transforms/ArgumentPromotion/dbg.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/dbg.ll
@@ -4,7 +4,7 @@
 declare void @sink(i32)
 
 define internal void @test(ptr %X) !dbg !2 {
-; CHECK-LABEL: define {{[^@]+}}@test.argprom.argprom
+; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (i32 [[X_0_VAL_0_VAL:%.*]]) !dbg [[DBG3:![0-9]+]] {
 ; CHECK-NEXT:    call void @sink(i32 [[X_0_VAL_0_VAL]])
 ; CHECK-NEXT:    ret void
@@ -37,7 +37,7 @@ define void @caller(ptr %Y, ptr %P) {
 ; CHECK-SAME: (ptr [[Y:%.*]], ptr [[P:%.*]]) {
 ; CHECK-NEXT:    [[Y_VAL:%.*]] = load ptr, ptr [[Y]], align 8, !dbg [[DBG4:![0-9]+]]
 ; CHECK-NEXT:    [[Y_VAL_VAL:%.*]] = load i32, ptr [[Y_VAL]], align 8, !dbg [[DBG4]]
-; CHECK-NEXT:    call void @test.argprom.argprom(i32 [[Y_VAL_VAL]]), !dbg [[DBG4]]
+; CHECK-NEXT:    call void @test(i32 [[Y_VAL_VAL]]), !dbg [[DBG4]]
 ; CHECK-NEXT:    call void @test_byval(ptr byval([[STRUCT_PAIR:%.*]]) align 4 [[P]]), !dbg [[DBG5:![0-9]+]]
 ; CHECK-NEXT:    ret void
 ;

diff  --git a/llvm/test/Transforms/ArgumentPromotion/fp80.ll b/llvm/test/Transforms/ArgumentPromotion/fp80.ll
index 7e2a595b8f95f8..1e3d01a2361b92 100644
--- a/llvm/test/Transforms/ArgumentPromotion/fp80.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/fp80.ll
@@ -16,12 +16,12 @@ define void @run() {
 ; CHECK-LABEL: define {{[^@]+}}@run() {
 ; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr i8, ptr @b, i64 10
 ; CHECK-NEXT:    [[B_VAL:%.*]] = load i8, ptr [[TMP1]], align 1
-; CHECK-NEXT:    [[TMP2:%.*]] = tail call i8 @UseLongDoubleUnsafely.argprom(i8 [[B_VAL]])
+; CHECK-NEXT:    [[TMP2:%.*]] = tail call i8 @UseLongDoubleUnsafely(i8 [[B_VAL]])
 ; CHECK-NEXT:    [[B_VAL1:%.*]] = load x86_fp80, ptr @b, align 16
-; CHECK-NEXT:    [[TMP3:%.*]] = tail call x86_fp80 @UseLongDoubleSafely.argprom(x86_fp80 [[B_VAL1]])
+; CHECK-NEXT:    [[TMP3:%.*]] = tail call x86_fp80 @UseLongDoubleSafely(x86_fp80 [[B_VAL1]])
 ; CHECK-NEXT:    [[TMP4:%.*]] = tail call x86_fp80 @UseLongDoubleSafelyNoPromotion(ptr byval([[UNION_U:%.*]]) align 16 @b)
 ; CHECK-NEXT:    [[A_VAL:%.*]] = load i64, ptr @a, align 8
-; CHECK-NEXT:    [[TMP5:%.*]] = call i64 @AccessPaddingOfStruct.argprom(i64 [[A_VAL]])
+; CHECK-NEXT:    [[TMP5:%.*]] = call i64 @AccessPaddingOfStruct(i64 [[A_VAL]])
 ; CHECK-NEXT:    [[TMP6:%.*]] = call i64 @CaptureAStruct(ptr byval([[STRUCT_FOO:%.*]]) @a)
 ; CHECK-NEXT:    ret void
 ;
@@ -34,7 +34,7 @@ define void @run() {
 }
 
 define internal i8 @UseLongDoubleUnsafely(ptr byval(%union.u) align 16 %arg) {
-; CHECK-LABEL: define {{[^@]+}}@UseLongDoubleUnsafely.argprom
+; CHECK-LABEL: define {{[^@]+}}@UseLongDoubleUnsafely
 ; CHECK-SAME: (i8 [[ARG_10_VAL:%.*]]) {
 ; CHECK-NEXT:    ret i8 [[ARG_10_VAL]]
 ;
@@ -44,7 +44,7 @@ define internal i8 @UseLongDoubleUnsafely(ptr byval(%union.u) align 16 %arg) {
 }
 
 define internal x86_fp80 @UseLongDoubleSafely(ptr byval(%union.u) align 16 %arg) {
-; CHECK-LABEL: define {{[^@]+}}@UseLongDoubleSafely.argprom
+; CHECK-LABEL: define {{[^@]+}}@UseLongDoubleSafely
 ; CHECK-SAME: (x86_fp80 [[ARG_0_VAL:%.*]]) {
 ; CHECK-NEXT:    ret x86_fp80 [[ARG_0_VAL]]
 ;
@@ -71,7 +71,7 @@ define internal x86_fp80 @UseLongDoubleSafelyNoPromotion(ptr byval(%union.u) ali
 }
 
 define internal i64 @AccessPaddingOfStruct(ptr byval(%struct.Foo) %a) {
-; CHECK-LABEL: define {{[^@]+}}@AccessPaddingOfStruct.argprom
+; CHECK-LABEL: define {{[^@]+}}@AccessPaddingOfStruct
 ; CHECK-SAME: (i64 [[A_0_VAL:%.*]]) {
 ; CHECK-NEXT:    ret i64 [[A_0_VAL]]
 ;

diff  --git a/llvm/test/Transforms/ArgumentPromotion/inalloca.ll b/llvm/test/Transforms/ArgumentPromotion/inalloca.ll
index 6a5cf841f99440..f6a101cf38a47a 100644
--- a/llvm/test/Transforms/ArgumentPromotion/inalloca.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/inalloca.ll
@@ -7,7 +7,7 @@ target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:1
 
 ; Argpromote + sroa should change this to passing the two integers by value.
 define internal i32 @f(ptr inalloca(%struct.ss)  %s) {
-; CHECK-LABEL: define {{[^@]+}}@f.argprom
+; CHECK-LABEL: define {{[^@]+}}@f
 ; CHECK-SAME: (i32 [[S_0_VAL:%.*]], i32 [[S_4_VAL:%.*]]) unnamed_addr {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[R:%.*]] = add i32 [[S_0_VAL]], [[S_4_VAL]]
@@ -24,7 +24,7 @@ entry:
 define i32 @main() {
 ; CHECK-LABEL: define {{[^@]+}}@main() local_unnamed_addr {
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[R:%.*]] = call fastcc i32 @f.argprom(i32 1, i32 2)
+; CHECK-NEXT:    [[R:%.*]] = call fastcc i32 @f(i32 1, i32 2)
 ; CHECK-NEXT:    ret i32 [[R]]
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/invalidation.ll b/llvm/test/Transforms/ArgumentPromotion/invalidation.ll
index 66de6bdfec503d..fe8f3b52f8dc5f 100644
--- a/llvm/test/Transforms/ArgumentPromotion/invalidation.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/invalidation.ll
@@ -12,7 +12,7 @@
 @G = constant i32 0
 
 define internal i32 @a(ptr %x) {
-; CHECK-LABEL: define {{[^@]+}}@a.argprom
+; CHECK-LABEL: define {{[^@]+}}@a
 ; CHECK-SAME: (i32 [[X_0_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    ret i32 [[X_0_VAL]]
@@ -26,7 +26,7 @@ define i32 @b() {
 ; CHECK-LABEL: define {{[^@]+}}@b() {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[G_VAL:%.*]] = load i32, ptr @G, align 4
-; CHECK-NEXT:    [[V:%.*]] = call i32 @a.argprom(i32 [[G_VAL]])
+; CHECK-NEXT:    [[V:%.*]] = call i32 @a(i32 [[G_VAL]])
 ; CHECK-NEXT:    ret i32 [[V]]
 ;
 entry:
@@ -38,7 +38,7 @@ define i32 @c() {
 ; CHECK-LABEL: define {{[^@]+}}@c() {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[G_VAL:%.*]] = load i32, ptr @G, align 4
-; CHECK-NEXT:    [[V1:%.*]] = call i32 @a.argprom(i32 [[G_VAL]])
+; CHECK-NEXT:    [[V1:%.*]] = call i32 @a(i32 [[G_VAL]])
 ; CHECK-NEXT:    [[V2:%.*]] = call i32 @b()
 ; CHECK-NEXT:    [[RESULT:%.*]] = add i32 [[V1]], [[V2]]
 ; CHECK-NEXT:    ret i32 [[RESULT]]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/load-alignment-value-overflows-addrspace-size.ll b/llvm/test/Transforms/ArgumentPromotion/load-alignment-value-overflows-addrspace-size.ll
index e263330caaf06f..659d1331700a0f 100644
--- a/llvm/test/Transforms/ArgumentPromotion/load-alignment-value-overflows-addrspace-size.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/load-alignment-value-overflows-addrspace-size.ll
@@ -66,7 +66,7 @@ define internal void @call_load_maxalign_alloca_maxalign() {
 ; CHECK-NEXT:    [[ALLOCA:%.*]] = alloca [13 x i16], align 4294967296, addrspace(5)
 ; CHECK-NEXT:    [[ADDRSPACECAST:%.*]] = addrspacecast ptr addrspace(5) [[ALLOCA]] to ptr
 ; CHECK-NEXT:    [[ADDRSPACECAST_VAL:%.*]] = load i32, ptr [[ADDRSPACECAST]], align 4294967296
-; CHECK-NEXT:    call void @load_maxalign1.argprom(i32 [[ADDRSPACECAST_VAL]])
+; CHECK-NEXT:    call void @load_maxalign1(i32 [[ADDRSPACECAST_VAL]])
 ; CHECK-NEXT:    ret void
 ;
 bb:
@@ -77,7 +77,7 @@ bb:
 }
 
 define internal void @load_maxalign1(ptr %arg) {
-; CHECK-LABEL: define internal void @load_maxalign1.argprom
+; CHECK-LABEL: define internal void @load_maxalign1
 ; CHECK-SAME: (i32 [[ARG_0_VAL:%.*]]) {
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    br label [[BB1:%.*]]
@@ -110,7 +110,7 @@ define internal void @call_load_maxalign_alloca_ptr128() {
 ; CHECK-NEXT:    [[ALLOCA:%.*]] = alloca [13 x i16], align 4294967296, addrspace(6)
 ; CHECK-NEXT:    [[ADDRSPACECAST:%.*]] = addrspacecast ptr addrspace(6) [[ALLOCA]] to ptr
 ; CHECK-NEXT:    [[ADDRSPACECAST_VAL:%.*]] = load i32, ptr [[ADDRSPACECAST]], align 4294967296
-; CHECK-NEXT:    call void @load_maxalign2.argprom(i32 [[ADDRSPACECAST_VAL]])
+; CHECK-NEXT:    call void @load_maxalign2(i32 [[ADDRSPACECAST_VAL]])
 ; CHECK-NEXT:    ret void
 ;
 bb:
@@ -121,7 +121,7 @@ bb:
 }
 
 define internal void @load_maxalign2(ptr %arg) {
-; CHECK-LABEL: define internal void @load_maxalign2.argprom
+; CHECK-LABEL: define internal void @load_maxalign2
 ; CHECK-SAME: (i32 [[ARG_0_VAL:%.*]]) {
 ; CHECK-NEXT:  bb:
 ; CHECK-NEXT:    br label [[BB1:%.*]]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/max-elements-limit.ll b/llvm/test/Transforms/ArgumentPromotion/max-elements-limit.ll
index 424238280f7fce..06293e8bbe7580 100644
--- a/llvm/test/Transforms/ArgumentPromotion/max-elements-limit.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/max-elements-limit.ll
@@ -2,7 +2,7 @@
 ; RUN: opt -passes=argpromotion -S %s | FileCheck %s
 
 define internal i32 @callee2(ptr noundef %0) {
-; CHECK-LABEL: define {{[^@]+}}@callee2.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee2
 ; CHECK-SAME: (i32 [[DOT0_VAL:%.*]], i32 [[DOT4_VAL:%.*]]) {
 ; CHECK-NEXT:    [[TMP1:%.*]] = add nsw i32 [[DOT0_VAL]], [[DOT4_VAL]]
 ; CHECK-NEXT:    ret i32 [[TMP1]]
@@ -24,7 +24,7 @@ define i32 @caller2(i32 %0, i32 %1) {
 ; CHECK-NEXT:    [[DOTVAL:%.*]] = load i32, ptr [[TMP3]], align 4
 ; CHECK-NEXT:    [[TMP5:%.*]] = getelementptr i8, ptr [[TMP3]], i64 4
 ; CHECK-NEXT:    [[DOTVAL1:%.*]] = load i32, ptr [[TMP5]], align 4
-; CHECK-NEXT:    [[TMP6:%.*]] = call i32 @callee2.argprom(i32 [[DOTVAL]], i32 [[DOTVAL1]])
+; CHECK-NEXT:    [[TMP6:%.*]] = call i32 @callee2(i32 [[DOTVAL]], i32 [[DOTVAL1]])
 ; CHECK-NEXT:    ret i32 [[TMP6]]
 ;
   %3 = alloca [2 x i32], align 4

diff  --git a/llvm/test/Transforms/ArgumentPromotion/metadata.ll b/llvm/test/Transforms/ArgumentPromotion/metadata.ll
index caac625cea30f2..b3f9fb0c5510e1 100644
--- a/llvm/test/Transforms/ArgumentPromotion/metadata.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/metadata.ll
@@ -5,7 +5,7 @@ declare void @use.i32(i32)
 declare void @use.p32(ptr)
 
 define internal void @callee(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7, ptr %p8, ptr %p9, ptr %p10) {
-; CHECK-LABEL: define {{[^@]+}}@callee.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee
 ; CHECK-SAME: (i32 [[P1_0_VAL:%.*]], i32 [[P2_0_VAL:%.*]], ptr [[P3_0_VAL:%.*]], ptr [[P4_0_VAL:%.*]], ptr [[P5_0_VAL:%.*]], ptr [[P6_0_VAL:%.*]], ptr [[P7_0_VAL:%.*]], ptr [[P8_0_VAL:%.*]], ptr [[P9_0_VAL:%.*]], ptr [[P10_0_VAL:%.*]]) {
 ; CHECK-NEXT:    [[TMP1:%.*]] = icmp ne ptr [[P4_0_VAL]], null
 ; CHECK-NEXT:    call void @llvm.assume(i1 [[TMP1]])
@@ -57,7 +57,7 @@ define void @caller(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p
 ; CHECK-NEXT:    [[P8_VAL:%.*]] = load ptr, ptr [[P8]], align 8, !align !3, !noundef !1
 ; CHECK-NEXT:    [[P9_VAL:%.*]] = load ptr, ptr [[P9]], align 8, !noundef !1
 ; CHECK-NEXT:    [[P10_VAL:%.*]] = load ptr, ptr [[P10]], align 8, !nontemporal !4
-; CHECK-NEXT:    call void @callee.argprom(i32 [[P1_VAL]], i32 [[P2_VAL]], ptr [[P3_VAL]], ptr [[P4_VAL]], ptr [[P5_VAL]], ptr [[P6_VAL]], ptr [[P7_VAL]], ptr [[P8_VAL]], ptr [[P9_VAL]], ptr [[P10_VAL]])
+; CHECK-NEXT:    call void @callee(i32 [[P1_VAL]], i32 [[P2_VAL]], ptr [[P3_VAL]], ptr [[P4_VAL]], ptr [[P5_VAL]], ptr [[P6_VAL]], ptr [[P7_VAL]], ptr [[P8_VAL]], ptr [[P9_VAL]], ptr [[P10_VAL]])
 ; CHECK-NEXT:    ret void
 ;
   call void @callee(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7, ptr %p8, ptr %p9, ptr %p10)
@@ -65,7 +65,7 @@ define void @caller(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p
 }
 
 define internal ptr @callee_conditional(i1 %c, ptr dereferenceable(8) align 8 %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_conditional.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_conditional
 ; CHECK-SAME: (i1 [[C:%.*]], ptr [[P_0_VAL:%.*]]) {
 ; CHECK-NEXT:    br i1 [[C]], label [[IF:%.*]], label [[ELSE:%.*]]
 ; CHECK:       if:
@@ -89,7 +89,7 @@ define void @caller_conditional(i1 %c, ptr %p) {
 ; CHECK-LABEL: define {{[^@]+}}@caller_conditional
 ; CHECK-SAME: (i1 [[C:%.*]], ptr [[P:%.*]]) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load ptr, ptr [[P]], align 8
-; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @callee_conditional.argprom(i1 [[C]], ptr [[P_VAL]])
+; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @callee_conditional(i1 [[C]], ptr [[P_VAL]])
 ; CHECK-NEXT:    ret void
 ;
   call ptr @callee_conditional(i1 %c, ptr %p)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/min-legal-vector-width.ll b/llvm/test/Transforms/ArgumentPromotion/min-legal-vector-width.ll
index 8812dc2104feb2..a5a0fc0cf186b7 100644
--- a/llvm/test/Transforms/ArgumentPromotion/min-legal-vector-width.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/min-legal-vector-width.ll
@@ -2,11 +2,11 @@
 
 ; CHECK-LABEL: define i32 @foo() #0 {
 ; CHECK-NEXT:      %.val = load <32 x half>, ptr undef, align 4
-; CHECK-NEXT:      call void @bar.argprom(<32 x half> %.val)
+; CHECK-NEXT:      call void @bar(<32 x half> %.val)
 ; CHECK-NEXT:      ret i32 0
 ; CHECK-NEXT:    }
 
-; CHECK-LABEL: define internal void @bar.argprom(<32 x half> %.0.val) #0 {
+; CHECK-LABEL: define internal void @bar(<32 x half> %.0.val) #0 {
 ; CHECK-NEXT:      ret void
 ; CHECK-NEXT:    }
 

diff  --git a/llvm/test/Transforms/ArgumentPromotion/nonzero-address-spaces.ll b/llvm/test/Transforms/ArgumentPromotion/nonzero-address-spaces.ll
index 335275380c11b0..6cabc5bb8f3a90 100644
--- a/llvm/test/Transforms/ArgumentPromotion/nonzero-address-spaces.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/nonzero-address-spaces.ll
@@ -11,7 +11,7 @@ target datalayout = "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8"
 define i32 @bar() {
 ; CHECK-LABEL: define {{[^@]+}}@bar() addrspace(1) {
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[CALL:%.*]] = call addrspace(1) i32 @foo.argprom()
+; CHECK-NEXT:    [[CALL:%.*]] = call addrspace(1) i32 @foo()
 ; CHECK-NEXT:    ret i32 [[CALL]]
 ;
 
@@ -21,7 +21,7 @@ entry:
 }
 
 define internal i32 @foo(ptr) {
-; CHECK-LABEL: define {{[^@]+}}@foo.argprom() addrspace(1) {
+; CHECK-LABEL: define {{[^@]+}}@foo() addrspace(1) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[RETVAL:%.*]] = alloca i32, align 4
 ; CHECK-NEXT:    call addrspace(0) void asm sideeffect "ldr r0, [r0] \0Abx lr \0A", ""()

diff  --git a/llvm/test/Transforms/ArgumentPromotion/opaque-ptr.ll b/llvm/test/Transforms/ArgumentPromotion/opaque-ptr.ll
index 5ca798b3a9d918..59699675577cfe 100644
--- a/llvm/test/Transforms/ArgumentPromotion/opaque-ptr.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/opaque-ptr.ll
@@ -2,7 +2,7 @@
 ; RUN: opt -S -passes=argpromotion < %s | FileCheck %s
 
 define internal i32 @callee_basic(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@callee_basic.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_basic
 ; CHECK-SAME: (i32 [[P_0_VAL:%.*]], i32 [[P_4_VAL:%.*]]) {
 ; CHECK-NEXT:    [[Z:%.*]] = add i32 [[P_0_VAL]], [[P_4_VAL]]
 ; CHECK-NEXT:    ret i32 [[Z]]
@@ -20,7 +20,7 @@ define void @caller_basic(ptr %p) {
 ; CHECK-NEXT:    [[P_VAL:%.*]] = load i32, ptr [[P]], align 4
 ; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr i8, ptr [[P]], i64 4
 ; CHECK-NEXT:    [[P_VAL1:%.*]] = load i32, ptr [[TMP1]], align 4
-; CHECK-NEXT:    [[TMP2:%.*]] = call i32 @callee_basic.argprom(i32 [[P_VAL]], i32 [[P_VAL1]])
+; CHECK-NEXT:    [[TMP2:%.*]] = call i32 @callee_basic(i32 [[P_VAL]], i32 [[P_VAL1]])
 ; CHECK-NEXT:    ret void
 ;
   call i32 @callee_basic(ptr %p)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/pr27568.ll b/llvm/test/Transforms/ArgumentPromotion/pr27568.ll
index 1164bcf4141ed9..cc25088edf52f9 100644
--- a/llvm/test/Transforms/ArgumentPromotion/pr27568.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/pr27568.ll
@@ -5,7 +5,7 @@
 target triple = "x86_64-pc-windows-msvc"
 
 define internal void @callee(ptr) {
-; CHECK-LABEL: define {{[^@]+}}@callee.argprom() {
+; CHECK-LABEL: define {{[^@]+}}@callee() {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    call void @thunk()
 ; CHECK-NEXT:    ret void
@@ -24,7 +24,7 @@ define void @test1() personality ptr @__CxxFrameHandler3 {
 ; CHECK-NEXT:    ret void
 ; CHECK:       cpad:
 ; CHECK-NEXT:    [[PAD:%.*]] = cleanuppad within none []
-; CHECK-NEXT:    call void @callee.argprom() [ "funclet"(token [[PAD]]) ]
+; CHECK-NEXT:    call void @callee() [ "funclet"(token [[PAD]]) ]
 ; CHECK-NEXT:    cleanupret from [[PAD]] unwind to caller
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/pr32917.ll b/llvm/test/Transforms/ArgumentPromotion/pr32917.ll
index ac0d30999ce0e9..dd089a910f5a31 100644
--- a/llvm/test/Transforms/ArgumentPromotion/pr32917.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/pr32917.ll
@@ -12,7 +12,7 @@ define i32 @fn2() local_unnamed_addr {
 ; CHECK-NEXT:    [[TMP3:%.*]] = inttoptr i64 [[TMP2]] to ptr
 ; CHECK-NEXT:    [[TMP4:%.*]] = getelementptr i8, ptr [[TMP3]], i64 -4
 ; CHECK-NEXT:    [[DOTVAL:%.*]] = load i32, ptr [[TMP4]], align 4
-; CHECK-NEXT:    call fastcc void @fn1.argprom(i32 [[DOTVAL]])
+; CHECK-NEXT:    call fastcc void @fn1(i32 [[DOTVAL]])
 ; CHECK-NEXT:    ret i32 undef
 ;
   %1 = load i32, ptr @b, align 4
@@ -23,7 +23,7 @@ define i32 @fn2() local_unnamed_addr {
 }
 
 define internal fastcc void @fn1(ptr nocapture readonly) unnamed_addr {
-; CHECK-LABEL: define {{[^@]+}}@fn1.argprom
+; CHECK-LABEL: define {{[^@]+}}@fn1
 ; CHECK-SAME: (i32 [[DOT_4_VAL:%.*]]) unnamed_addr {
 ; CHECK-NEXT:    store i32 [[DOT_4_VAL]], ptr @a, align 4
 ; CHECK-NEXT:    ret void

diff  --git a/llvm/test/Transforms/ArgumentPromotion/pr33641_remove_arg_dbgvalue.ll b/llvm/test/Transforms/ArgumentPromotion/pr33641_remove_arg_dbgvalue.ll
index 42728abb81e722..8db0a28e680587 100644
--- a/llvm/test/Transforms/ArgumentPromotion/pr33641_remove_arg_dbgvalue.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/pr33641_remove_arg_dbgvalue.ll
@@ -14,7 +14,7 @@ define void @foo() {
 }
 
 define internal void @bar(ptr %p) {
-; CHECK-LABEL: define {{.*}}void @bar.argprom()
+; CHECK-LABEL: define {{.*}}void @bar()
 ; CHECK-NEXT:    #dbg_value(ptr undef, !3, !DIExpression(), !5
   call void @llvm.dbg.value(metadata ptr %p, metadata !3, metadata !DIExpression()), !dbg !5
   ret void

diff  --git a/llvm/test/Transforms/ArgumentPromotion/profile.ll b/llvm/test/Transforms/ArgumentPromotion/profile.ll
index b932f7c762431e..58d7376b8b7da0 100644
--- a/llvm/test/Transforms/ArgumentPromotion/profile.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/profile.ll
@@ -6,7 +6,7 @@ target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:1
 
 define void @caller() #0 {
 ; CHECK-LABEL: define {{[^@]+}}@caller() {
-; CHECK-NEXT:    call void @promote_i32_ptr.argprom(i32 42), !prof [[PROF0:![0-9]+]]
+; CHECK-NEXT:    call void @promote_i32_ptr(i32 42), !prof [[PROF0:![0-9]+]]
 ; CHECK-NEXT:    ret void
 ;
   %x = alloca i32
@@ -16,7 +16,7 @@ define void @caller() #0 {
 }
 
 define internal void @promote_i32_ptr(ptr %xp) !prof !1 {
-; CHECK-LABEL: define {{[^@]+}}@promote_i32_ptr.argprom
+; CHECK-LABEL: define {{[^@]+}}@promote_i32_ptr
 ; CHECK-SAME: (i32 [[XP_0_VAL:%.*]]) !prof [[PROF1:![0-9]+]] {
 ; CHECK-NEXT:    call void @use_i32(i32 [[XP_0_VAL]])
 ; CHECK-NEXT:    ret void

diff  --git a/llvm/test/Transforms/ArgumentPromotion/propagate-remove-dead-args.ll b/llvm/test/Transforms/ArgumentPromotion/propagate-remove-dead-args.ll
index 584ec42ae995c5..87a14533cfda26 100644
--- a/llvm/test/Transforms/ArgumentPromotion/propagate-remove-dead-args.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/propagate-remove-dead-args.ll
@@ -4,7 +4,7 @@
 %ptr.struct = type { ptr, ptr, ptr }
 
 define internal void @child(ptr %this, ptr %y, ptr %x) {
-; CHECK-LABEL: define internal void @child.argprom
+; CHECK-LABEL: define internal void @child
 ; CHECK-SAME: (ptr [[Y:%.*]], half [[X_0_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    store half [[X_0_VAL]], ptr [[Y]], align 2
@@ -17,15 +17,15 @@ entry:
 }
 
 define internal void @parent(ptr %this, ptr %p1, ptr %p2) {
-; CHECK-LABEL: define internal void @parent.argprom
+; CHECK-LABEL: define internal void @parent
 ; CHECK-SAME: (ptr [[P1:%.*]], ptr [[P2:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[P2_VAL2:%.*]] = load half, ptr [[P2]], align 2
-; CHECK-NEXT:    call void @child.argprom(ptr [[P1]], half [[P2_VAL2]])
+; CHECK-NEXT:    call void @child(ptr [[P1]], half [[P2_VAL2]])
 ; CHECK-NEXT:    [[P2_VAL1:%.*]] = load half, ptr [[P2]], align 2
-; CHECK-NEXT:    call void @child.argprom(ptr [[P1]], half [[P2_VAL1]])
+; CHECK-NEXT:    call void @child(ptr [[P1]], half [[P2_VAL1]])
 ; CHECK-NEXT:    [[P2_VAL:%.*]] = load half, ptr [[P2]], align 2
-; CHECK-NEXT:    call void @child.argprom(ptr [[P1]], half [[P2_VAL]])
+; CHECK-NEXT:    call void @child(ptr [[P1]], half [[P2_VAL]])
 ; CHECK-NEXT:    ret void
 ;
 entry:
@@ -46,7 +46,7 @@ define  void @grandparent() {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[XPTR:%.*]] = alloca i32, align 4
 ; CHECK-NEXT:    [[YPTR:%.*]] = alloca i32, align 4
-; CHECK-NEXT:    call void @parent.argprom(ptr [[XPTR]], ptr [[YPTR]])
+; CHECK-NEXT:    call void @parent(ptr [[XPTR]], ptr [[YPTR]])
 ; CHECK-NEXT:    ret void
 ;
 entry:
@@ -58,7 +58,7 @@ entry:
 }
 
 define internal ptr @callee(ptr %dead) {
-; CHECK-LABEL: define internal ptr @callee.argprom() {
+; CHECK-LABEL: define internal ptr @callee() {
 ; CHECK-NEXT:    ret ptr null
 ;
   ret ptr null
@@ -66,8 +66,8 @@ define internal ptr @callee(ptr %dead) {
 
 define void @caller() {
 ; CHECK-LABEL: define void @caller() {
-; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @callee.argprom()
-; CHECK-NEXT:    [[TMP2:%.*]] = call ptr @callee.argprom()
+; CHECK-NEXT:    [[TMP1:%.*]] = call ptr @callee()
+; CHECK-NEXT:    [[TMP2:%.*]] = call ptr @callee()
 ; CHECK-NEXT:    ret void
 ;
   %ret = call ptr @callee(ptr null)

diff  --git a/llvm/test/Transforms/ArgumentPromotion/recursion/aggregate-promote-recursive.ll b/llvm/test/Transforms/ArgumentPromotion/recursion/aggregate-promote-recursive.ll
index b1d5898a9a1c7b..011ebe4eee76e7 100644
--- a/llvm/test/Transforms/ArgumentPromotion/recursion/aggregate-promote-recursive.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/recursion/aggregate-promote-recursive.ll
@@ -5,11 +5,11 @@
 @G = constant %T { i32 0, i32 0, i32 17, i32 25 }
 
 define internal i32 @test(ptr %p) {
-; CHECK-LABEL: define {{[^@]+}}@test.argprom
+; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (i32 [[P_8_VAL:%.*]], i32 [[P_12_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[V:%.*]] = add i32 [[P_12_VAL]], [[P_8_VAL]]
-; CHECK-NEXT:    [[RET:%.*]] = call i32 @test.argprom(i32 [[P_8_VAL]], i32 [[P_12_VAL]])
+; CHECK-NEXT:    [[RET:%.*]] = call i32 @test(i32 [[P_8_VAL]], i32 [[P_12_VAL]])
 ; CHECK-NEXT:    [[ARET:%.*]] = add i32 [[V]], [[RET]]
 ; CHECK-NEXT:    ret i32 [[ARET]]
 ;
@@ -31,7 +31,7 @@ define i32 @caller() {
 ; CHECK-NEXT:    [[G_VAL:%.*]] = load i32, ptr [[TMP0]], align 4
 ; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr i8, ptr @G, i64 12
 ; CHECK-NEXT:    [[G_VAL1:%.*]] = load i32, ptr [[TMP1]], align 4
-; CHECK-NEXT:    [[V:%.*]] = call i32 @test.argprom(i32 [[G_VAL]], i32 [[G_VAL1]])
+; CHECK-NEXT:    [[V:%.*]] = call i32 @test(i32 [[G_VAL]], i32 [[G_VAL1]])
 ; CHECK-NEXT:    ret i32 [[V]]
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/recursion/argpromotion-recursion-pr1259.ll b/llvm/test/Transforms/ArgumentPromotion/recursion/argpromotion-recursion-pr1259.ll
index 28bdc8fc45050f..e160dbad92e7b1 100644
--- a/llvm/test/Transforms/ArgumentPromotion/recursion/argpromotion-recursion-pr1259.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/recursion/argpromotion-recursion-pr1259.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
 ; RUN: opt -S -passes=argpromotion < %s | FileCheck %s
 define internal i32 @foo(ptr %x, i32 %n, i32 %m) {
-; CHECK-LABEL: define internal i32 @foo.argprom(
+; CHECK-LABEL: define internal i32 @foo(
 ; CHECK-SAME: i32 [[X_0_VAL:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[N]], 0
@@ -10,9 +10,9 @@ define internal i32 @foo(ptr %x, i32 %n, i32 %m) {
 ; CHECK-NEXT:    br label %[[RETURN:.*]]
 ; CHECK:       [[COND_FALSE]]:
 ; CHECK-NEXT:    [[SUBVAL:%.*]] = sub i32 [[N]], 1
-; CHECK-NEXT:    [[CALLRET:%.*]] = call i32 @foo.argprom(i32 [[X_0_VAL]], i32 [[SUBVAL]], i32 [[X_0_VAL]])
+; CHECK-NEXT:    [[CALLRET:%.*]] = call i32 @foo(i32 [[X_0_VAL]], i32 [[SUBVAL]], i32 [[X_0_VAL]])
 ; CHECK-NEXT:    [[SUBVAL2:%.*]] = sub i32 [[N]], 2
-; CHECK-NEXT:    [[CALLRET2:%.*]] = call i32 @foo.argprom(i32 [[X_0_VAL]], i32 [[SUBVAL2]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRET2:%.*]] = call i32 @foo(i32 [[X_0_VAL]], i32 [[SUBVAL2]], i32 [[M]])
 ; CHECK-NEXT:    [[CMP2:%.*]] = add i32 [[CALLRET]], [[CALLRET2]]
 ; CHECK-NEXT:    br label %[[RETURN]]
 ; CHECK:       [[COND_NEXT:.*]]:
@@ -51,7 +51,7 @@ define i32 @bar(ptr align(4) dereferenceable(4) %x, i32 %n, i32 %m) {
 ; CHECK-SAME: ptr align 4 dereferenceable(4) [[X:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[X_VAL:%.*]] = load i32, ptr [[X]], align 4
-; CHECK-NEXT:    [[CALLRET3:%.*]] = call i32 @foo.argprom(i32 [[X_VAL]], i32 [[N]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRET3:%.*]] = call i32 @foo(i32 [[X_VAL]], i32 [[N]], i32 [[M]])
 ; CHECK-NEXT:    br label %[[RETURN:.*]]
 ; CHECK:       [[RETURN]]:
 ; CHECK-NEXT:    ret i32 [[CALLRET3]]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-mixed-calls.ll b/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-mixed-calls.ll
index 0e048c2726a312..0ec4137aadeb4c 100644
--- a/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-mixed-calls.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-mixed-calls.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
 ; RUN: opt -S -passes=argpromotion < %s | FileCheck %s
 define internal i32 @zoo(ptr %x, i32 %m) {
-; CHECK-LABEL: define internal i32 @zoo.argprom(
+; CHECK-LABEL: define internal i32 @zoo(
 ; CHECK-SAME: i32 [[X_0_VAL:%.*]], i32 [[M:%.*]]) {
 ; CHECK-NEXT:    [[RESZOO:%.*]] = add i32 [[X_0_VAL]], [[M]]
 ; CHECK-NEXT:    ret i32 [[X_0_VAL]]
@@ -12,7 +12,7 @@ define internal i32 @zoo(ptr %x, i32 %m) {
 }
 
 define internal i32 @foo(ptr %x, ptr %y, i32 %n, i32 %m) {
-; CHECK-LABEL: define internal i32 @foo.argprom(
+; CHECK-LABEL: define internal i32 @foo(
 ; CHECK-SAME: ptr [[X:%.*]], i32 [[Y_0_VAL:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[N]], 0
@@ -23,12 +23,12 @@ define internal i32 @foo(ptr %x, ptr %y, i32 %n, i32 %m) {
 ; CHECK:       [[COND_FALSE]]:
 ; CHECK-NEXT:    [[VAL2:%.*]] = load i32, ptr [[X]], align 4
 ; CHECK-NEXT:    [[SUBVAL:%.*]] = sub i32 [[N]], [[Y_0_VAL]]
-; CHECK-NEXT:    [[CALLRET:%.*]] = call i32 @foo.argprom(ptr [[X]], i32 [[Y_0_VAL]], i32 [[SUBVAL]], i32 [[VAL2]])
+; CHECK-NEXT:    [[CALLRET:%.*]] = call i32 @foo(ptr [[X]], i32 [[Y_0_VAL]], i32 [[SUBVAL]], i32 [[VAL2]])
 ; CHECK-NEXT:    [[SUBVAL2:%.*]] = sub i32 [[N]], 2
-; CHECK-NEXT:    [[CALLRET2:%.*]] = call i32 @foo.argprom(ptr [[X]], i32 [[Y_0_VAL]], i32 [[SUBVAL2]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRET2:%.*]] = call i32 @foo(ptr [[X]], i32 [[Y_0_VAL]], i32 [[SUBVAL2]], i32 [[M]])
 ; CHECK-NEXT:    [[CMP1:%.*]] = add i32 [[CALLRET]], [[CALLRET2]]
 ; CHECK-NEXT:    [[X_VAL:%.*]] = load i32, ptr [[X]], align 4
-; CHECK-NEXT:    [[CALLRETFINAL:%.*]] = call i32 @zoo.argprom(i32 [[X_VAL]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRETFINAL:%.*]] = call i32 @zoo(i32 [[X_VAL]], i32 [[M]])
 ; CHECK-NEXT:    [[CMP2:%.*]] = add i32 [[CMP1]], [[CALLRETFINAL]]
 ; CHECK-NEXT:    br label %[[RETURN]]
 ; CHECK:       [[COND_NEXT:.*]]:
@@ -70,7 +70,7 @@ define i32 @bar(ptr align(4) dereferenceable(4) %x, ptr align(4) dereferenceable
 ; CHECK-SAME: ptr align 4 dereferenceable(4) [[X:%.*]], ptr align 4 dereferenceable(4) [[Y:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[Y_VAL:%.*]] = load i32, ptr [[Y]], align 4
-; CHECK-NEXT:    [[CALLRET3:%.*]] = call i32 @foo.argprom(ptr [[X]], i32 [[Y_VAL]], i32 [[N]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRET3:%.*]] = call i32 @foo(ptr [[X]], i32 [[Y_VAL]], i32 [[N]], i32 [[M]])
 ; CHECK-NEXT:    br label %[[RETURN:.*]]
 ; CHECK:       [[RETURN]]:
 ; CHECK-NEXT:    ret i32 [[CALLRET3]]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-non-zero-offset.ll b/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-non-zero-offset.ll
index 1ec8ab1edca669..805414de17f133 100644
--- a/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-non-zero-offset.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/recursion/recursion-non-zero-offset.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
 ; RUN: opt -S -passes=argpromotion < %s | FileCheck %s
 define internal i32 @foo(ptr %x, i32 %n, i32 %m) {
-; CHECK-LABEL: define internal i32 @foo.argprom(
+; CHECK-LABEL: define internal i32 @foo(
 ; CHECK-SAME: i32 [[X_0_VAL:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[N]], 0
@@ -10,9 +10,9 @@ define internal i32 @foo(ptr %x, i32 %n, i32 %m) {
 ; CHECK-NEXT:    br label %[[RETURN:.*]]
 ; CHECK:       [[COND_FALSE]]:
 ; CHECK-NEXT:    [[SUBVAL:%.*]] = sub i32 [[N]], 1
-; CHECK-NEXT:    [[CALLRET:%.*]] = call i32 @foo.argprom(i32 [[X_0_VAL]], i32 [[SUBVAL]], i32 [[X_0_VAL]])
+; CHECK-NEXT:    [[CALLRET:%.*]] = call i32 @foo(i32 [[X_0_VAL]], i32 [[SUBVAL]], i32 [[X_0_VAL]])
 ; CHECK-NEXT:    [[SUBVAL2:%.*]] = sub i32 [[N]], 2
-; CHECK-NEXT:    [[CALLRET2:%.*]] = call i32 @foo.argprom(i32 [[X_0_VAL]], i32 [[SUBVAL2]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRET2:%.*]] = call i32 @foo(i32 [[X_0_VAL]], i32 [[SUBVAL2]], i32 [[M]])
 ; CHECK-NEXT:    [[CMP2:%.*]] = add i32 [[CALLRET]], [[CALLRET2]]
 ; CHECK-NEXT:    br label %[[RETURN]]
 ; CHECK:       [[COND_NEXT:.*]]:
@@ -52,7 +52,7 @@ define i32 @bar(ptr align(4) dereferenceable(4) %x, i32 %n, i32 %m) {
 ; CHECK-NEXT:  [[ENTRY:.*:]]
 ; CHECK-NEXT:    [[GEPVAL:%.*]] = getelementptr ptr, ptr [[X]], i32 0
 ; CHECK-NEXT:    [[GEPVAL_VAL:%.*]] = load i32, ptr [[GEPVAL]], align 4
-; CHECK-NEXT:    [[CALLRET3:%.*]] = call i32 @foo.argprom(i32 [[GEPVAL_VAL]], i32 [[N]], i32 [[M]])
+; CHECK-NEXT:    [[CALLRET3:%.*]] = call i32 @foo(i32 [[GEPVAL_VAL]], i32 [[N]], i32 [[M]])
 ; CHECK-NEXT:    br label %[[RETURN:.*]]
 ; CHECK:       [[RETURN]]:
 ; CHECK-NEXT:    ret i32 [[CALLRET3]]

diff  --git a/llvm/test/Transforms/ArgumentPromotion/reserve-tbaa.ll b/llvm/test/Transforms/ArgumentPromotion/reserve-tbaa.ll
index 2f13767c643184..f60dd48a464d22 100644
--- a/llvm/test/Transforms/ArgumentPromotion/reserve-tbaa.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/reserve-tbaa.ll
@@ -14,7 +14,7 @@
 @d = global i8 0, align 1
 
 define internal fastcc void @fn(ptr nocapture readonly %p1, ptr nocapture readonly %p2) {
-; CHECK-LABEL: define {{[^@]+}}@fn.argprom
+; CHECK-LABEL: define {{[^@]+}}@fn
 ; CHECK-SAME: (i32 [[P1_0_VAL:%.*]], i64 [[P2_0_VAL:%.*]]) {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[CONV:%.*]] = trunc i64 [[P2_0_VAL]] to i32
@@ -40,7 +40,7 @@ define i32 @main() {
 ; CHECK-NEXT:    store i32 1, ptr [[TMP1]], align 4, !tbaa [[TBAA5:![0-9]+]]
 ; CHECK-NEXT:    [[G_VAL:%.*]] = load i32, ptr @g, align 4, !tbaa [[TBAA5]]
 ; CHECK-NEXT:    [[C_VAL:%.*]] = load i64, ptr @c, align 8, !tbaa [[TBAA7:![0-9]+]]
-; CHECK-NEXT:    call fastcc void @fn.argprom(i32 [[G_VAL]], i64 [[C_VAL]])
+; CHECK-NEXT:    call fastcc void @fn(i32 [[G_VAL]], i64 [[C_VAL]])
 ; CHECK-NEXT:    ret i32 0
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/sret.ll b/llvm/test/Transforms/ArgumentPromotion/sret.ll
index 80403e1d92d527..fcc868954bc951 100644
--- a/llvm/test/Transforms/ArgumentPromotion/sret.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/sret.ll
@@ -5,7 +5,7 @@ target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
 
 define internal void @add(ptr %this, ptr sret(i32) %r) {
-; CHECK-LABEL: define {{[^@]+}}@add.argprom
+; CHECK-LABEL: define {{[^@]+}}@add
 ; CHECK-SAME: (i32 [[THIS_0_VAL:%.*]], i32 [[THIS_4_VAL:%.*]], ptr noalias [[R:%.*]]) {
 ; CHECK-NEXT:    [[AB:%.*]] = add i32 [[THIS_0_VAL]], [[THIS_4_VAL]]
 ; CHECK-NEXT:    store i32 [[AB]], ptr [[R]], align 4
@@ -27,7 +27,7 @@ define void @f() {
 ; CHECK-NEXT:    [[PAIR_VAL:%.*]] = load i32, ptr [[PAIR]], align 4
 ; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr i8, ptr [[PAIR]], i64 4
 ; CHECK-NEXT:    [[PAIR_VAL1:%.*]] = load i32, ptr [[TMP1]], align 4
-; CHECK-NEXT:    call void @add.argprom(i32 [[PAIR_VAL]], i32 [[PAIR_VAL1]], ptr noalias [[R]])
+; CHECK-NEXT:    call void @add(i32 [[PAIR_VAL]], i32 [[PAIR_VAL1]], ptr noalias [[R]])
 ; CHECK-NEXT:    ret void
 ;
   %r = alloca i32

diff  --git a/llvm/test/Transforms/ArgumentPromotion/store-into-inself.ll b/llvm/test/Transforms/ArgumentPromotion/store-into-inself.ll
index ecf8eb557786dc..0db42a97841f48 100644
--- a/llvm/test/Transforms/ArgumentPromotion/store-into-inself.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/store-into-inself.ll
@@ -59,7 +59,7 @@ entry:
 }
 
 define internal void @l(ptr byval(ptr) align 4 %p) nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@l.argprom.argprom
+; CHECK-LABEL: define {{[^@]+}}@l
 ; CHECK-SAME: () #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    ret void
@@ -83,7 +83,7 @@ define i32 @main() nounwind  {
 ; CHECK-NEXT:    call void @g(ptr byval(ptr) align 4 [[S]]) #[[ATTR0]]
 ; CHECK-NEXT:    call void @h(ptr byval(ptr) align 4 [[S]]) #[[ATTR0]]
 ; CHECK-NEXT:    call void @k(ptr byval(ptr) align 4 [[S]]) #[[ATTR0]]
-; CHECK-NEXT:    call void @l.argprom.argprom() #[[ATTR0]]
+; CHECK-NEXT:    call void @l() #[[ATTR0]]
 ; CHECK-NEXT:    ret i32 0
 ;
 entry:

diff  --git a/llvm/test/Transforms/ArgumentPromotion/unused-argument.ll b/llvm/test/Transforms/ArgumentPromotion/unused-argument.ll
index ec1503d3022154..f648d20f47311e 100644
--- a/llvm/test/Transforms/ArgumentPromotion/unused-argument.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/unused-argument.ll
@@ -4,7 +4,7 @@
 ; while the used arguments should be promoted if they are pointers.
 ; The pass should not touch any unused non-pointer arguments.
 define internal i32 @callee(i1 %c, i1 %d, ptr %used, ptr %unused) nounwind {
-; CHECK-LABEL: define {{[^@]+}}@callee.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee
 ; CHECK-SAME: (i1 [[C:%.*]], i1 [[D:%.*]], i32 [[USED_VAL:%.*]]) #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    br i1 [[C]], label %if, label %else
@@ -28,7 +28,7 @@ else:
 ; while the used arguments should be promoted if they are pointers.
 ; The pass should not touch any unused non-pointer arguments.
 define internal i32 @callee_byval(i1 %c, i1 %d, ptr byval(i32) align 4 %used, ptr byval(i32) align 4 %unused) nounwind {
-; CHECK-LABEL: define {{[^@]+}}@callee_byval.argprom
+; CHECK-LABEL: define {{[^@]+}}@callee_byval
 ; CHECK-SAME: (i1 [[C:%.*]], i1 [[D:%.*]], i32 [[USED_VAL:%.*]]) #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    br i1 [[C]], label %if, label %else
@@ -53,9 +53,9 @@ define i32 @caller(i1 %c, i1 %d, ptr %arg) nounwind {
 ; CHECK-SAME: (i1 [[C:%.*]], i1 [[D:%.*]], ptr [[ARG:%.*]]) #[[ATTR0]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[ARG_VAL_0:%.*]] = load i32, ptr [[ARG]], align 4
-; CHECK-NEXT:    [[RES_0:%.*]] = call i32 @callee_byval.argprom(i1 [[C]], i1 [[D]], i32 [[ARG_VAL_0]]) #[[ATTR0]]
+; CHECK-NEXT:    [[RES_0:%.*]] = call i32 @callee_byval(i1 [[C]], i1 [[D]], i32 [[ARG_VAL_0]]) #[[ATTR0]]
 ; CHECK-NEXT:    [[ARG_VAL_1:%.*]] = load i32, ptr [[ARG]], align 4
-; CHECK-NEXT:    [[RES_1:%.*]] = call i32 @callee.argprom(i1 [[C]], i1 [[D]], i32 [[ARG_VAL_1]]) #[[ATTR0]]
+; CHECK-NEXT:    [[RES_1:%.*]] = call i32 @callee(i1 [[C]], i1 [[D]], i32 [[ARG_VAL_1]]) #[[ATTR0]]
 ; CHECK-NEXT:  ret i32 1
 ;
 entry:

diff  --git a/llvm/test/Transforms/Attributor/reduced/clear_cached_analysis_for_deleted_functions.ll b/llvm/test/Transforms/Attributor/reduced/clear_cached_analysis_for_deleted_functions.ll
index db8f86ea1b06cc..b3e3b2497194cb 100644
--- a/llvm/test/Transforms/Attributor/reduced/clear_cached_analysis_for_deleted_functions.ll
+++ b/llvm/test/Transforms/Attributor/reduced/clear_cached_analysis_for_deleted_functions.ll
@@ -19,7 +19,7 @@ define i32 @clause_LiteralComputeWeight(ptr %call23) {
 ; CGSCC-NEXT:    [[TERM_0:%.*]] = phi ptr [ null, [[ENTRY:%.*]] ], [ [[CALL24:%.*]], [[DO_BODY]] ]
 ; CGSCC-NEXT:    [[CALL2:%.*]] = load volatile i32, ptr [[TERM_0]], align 4
 ; CGSCC-NEXT:    [[CALL23_VAL:%.*]] = load ptr, ptr [[CALL23]], align 8
-; CGSCC-NEXT:    [[CALL24]] = call ptr @list_Car.argprom(ptr nofree readonly [[CALL23_VAL]]) #[[ATTR3:[0-9]+]]
+; CGSCC-NEXT:    [[CALL24]] = call ptr @list_Car(ptr nofree readonly [[CALL23_VAL]]) #[[ATTR3:[0-9]+]]
 ; CGSCC-NEXT:    br label [[DO_BODY]]
 ;
 entry:
@@ -46,7 +46,7 @@ entry:
 
 define internal ptr @list_Car(ptr %L) #0 {
 ; CGSCC: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: read)
-; CGSCC-LABEL: define {{[^@]+}}@list_Car.argprom
+; CGSCC-LABEL: define {{[^@]+}}@list_Car
 ; CGSCC-SAME: (ptr nofree [[L_0_VAL:%.*]]) #[[ATTR2:[0-9]+]] {
 ; CGSCC-NEXT:  entry:
 ; CGSCC-NEXT:    ret ptr [[L_0_VAL]]

diff  --git a/llvm/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll b/llvm/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
index ee6a16e834718a..5096aff3eb0298 100644
--- a/llvm/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
+++ b/llvm/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -passes=deadargelim -S | grep "@test.argelim("
+; RUN: opt < %s -passes=deadargelim -S | grep "@test("
 ; RUN: opt < %s -passes=deadargelim -S | not grep dead
 
 define internal i32 @test(i32 %X, i32 %dead) {

diff  --git a/llvm/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll b/llvm/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
index 79fe6eb81bd077..c3f7d7df90bc4f 100644
--- a/llvm/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
+++ b/llvm/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
@@ -5,7 +5,7 @@
 
 @g = global i8 0
 
-; CHECK: define internal void @foo.argelim(i8 signext %y) [[NUW:#[0-9]+]]
+; CHECK: define internal void @foo(i8 signext %y) [[NUW:#[0-9]+]]
 ;
 ; REMARK-LABEL: Function: foo
 ; REMARK:       Args:
@@ -21,7 +21,7 @@ define internal zeroext i8 @foo(ptr inreg %p, i8 signext %y, ... )  nounwind {
 }
 
 define i32 @bar() {
-; CHECK: call void @foo.argelim(i8 signext 1) [[NUW]]
+; CHECK: call void @foo(i8 signext 1) [[NUW]]
   %A = call zeroext i8(ptr, i8, ...) @foo(ptr inreg null, i8 signext 1, ptr byval(%struct) null ) nounwind
   ret i32 0
 }

diff  --git a/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll b/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll
index 8d6b1d13c52a34..485275b11160ff 100644
--- a/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll
+++ b/llvm/test/Transforms/DeadArgElim/2010-04-30-DbgInfo.ll
@@ -15,7 +15,7 @@ define ptr @vfs_addname(ptr %name, i32 %len, i32 %hash, i32 %flags) nounwind ssp
 ; CHECK-NEXT:      #dbg_value(i32 [[LEN]], [[META13:![0-9]+]], !DIExpression(), [[META12]])
 ; CHECK-NEXT:      #dbg_value(i32 [[HASH]], [[META14:![0-9]+]], !DIExpression(), [[META12]])
 ; CHECK-NEXT:      #dbg_value(i32 [[FLAGS]], [[META15:![0-9]+]], !DIExpression(), [[META12]])
-; CHECK-NEXT:    [[TMP0:%.*]] = call fastcc ptr @add_name_internal.argelim(ptr [[NAME]], i32 [[HASH]]) #[[ATTR2:[0-9]+]], !dbg [[DBG16:![0-9]+]]
+; CHECK-NEXT:    [[TMP0:%.*]] = call fastcc ptr @add_name_internal(ptr [[NAME]], i32 [[HASH]]) #[[ATTR2:[0-9]+]], !dbg [[DBG16:![0-9]+]]
 ; CHECK-NEXT:    ret ptr [[TMP0]], !dbg [[DBG16]]
 ;
 entry:
@@ -31,7 +31,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
 
 define internal fastcc ptr @add_name_internal(ptr %name, i32 %len, i32 %hash, i8 zeroext %extra, i32 %flags) noinline nounwind ssp !dbg !16 {
 ;
-; CHECK-LABEL: define {{[^@]+}}@add_name_internal.argelim
+; CHECK-LABEL: define {{[^@]+}}@add_name_internal
 ; CHECK-SAME: (ptr [[NAME:%.*]], i32 [[HASH:%.*]]) #[[ATTR1:[0-9]+]] !dbg [[DBG18:![0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:      #dbg_value(ptr [[NAME]], [[META22:![0-9]+]], !DIExpression(), [[META23:![0-9]+]])

diff  --git a/llvm/test/Transforms/DeadArgElim/aggregates.ll b/llvm/test/Transforms/DeadArgElim/aggregates.ll
index 4671fa63c5c918..784ac3af64c754 100644
--- a/llvm/test/Transforms/DeadArgElim/aggregates.ll
+++ b/llvm/test/Transforms/DeadArgElim/aggregates.ll
@@ -4,7 +4,7 @@
 ; actually only used in ways we can eliminate. We gain benefit from analysing
 ; the "use" and applying its results to all sub-values.
 
-; CHECK-LABEL: define internal void @agguse_dead.retelim()
+; CHECK-LABEL: define internal void @agguse_dead()
 
 define internal { i32, i32 } @agguse_dead() {
   ret { i32, i32 } { i32 0, i32 1 }
@@ -20,7 +20,7 @@ define internal { i32, i32 } @test_agguse_dead() {
 ; Case 1: an opaque use of the aggregate exists (in this case dead). Otherwise
 ; only one value is used, so function can be simplified.
 
-; CHECK-LABEL: define internal i32 @rets_independent_if_agguse_dead.retelim()
+; CHECK-LABEL: define internal i32 @rets_independent_if_agguse_dead()
 ; CHECK: [[RET:%.*]] = extractvalue { i32, i32 } { i32 0, i32 1 }, 1
 ; CHECK: ret i32 [[RET]]
 
@@ -89,7 +89,7 @@ define [2 x i32] @test_array_rets_have_multiple_slots() {
 ; Case 4: we can remove some retvals from the array. It's nice to produce an
 ; array again having done so (rather than converting it to a struct).
 
-; CHECK-LABEL: define internal [2 x i32] @can_shrink_arrays.retelim()
+; CHECK-LABEL: define internal [2 x i32] @can_shrink_arrays()
 ; CHECK: [[VAL0:%.*]] = extractvalue [3 x i32] [i32 42, i32 43, i32 44], 0
 ; CHECK: [[RESTMP:%.*]] = insertvalue [2 x i32] poison, i32 [[VAL0]], 0
 ; CHECK: [[VAL2:%.*]] = extractvalue [3 x i32] [i32 42, i32 43, i32 44], 2
@@ -117,7 +117,7 @@ define void @test_can_shrink_arrays() {
 ; Case 5: %in gets passed directly to the return. It should mark be marked as
 ; used if *any* of the return values are, not just if value 0 is.
 
-; CHECK-LABEL: define internal i32 @ret_applies_to_all.retelim({ i32, i32 } %in)
+; CHECK-LABEL: define internal i32 @ret_applies_to_all({ i32, i32 } %in)
 ; CHECK: [[RET:%.*]] = extractvalue { i32, i32 } %in, 1
 ; CHECK: ret i32 [[RET]]
 
@@ -167,7 +167,7 @@ entry:
 }
 
 ; CHECK-LABEL: define void @PR24906
-; CHECK: %[[invoke:.*]] = invoke i32 @agg_ret.retelim()
+; CHECK: %[[invoke:.*]] = invoke i32 @agg_ret()
 ; CHECK: %[[oldret:.*]] = insertvalue { i32 } poison, i32 %[[invoke]], 0
 ; CHECK: phi { i32 } [ %[[oldret]],
 define void @PR24906() personality ptr poison {

diff  --git a/llvm/test/Transforms/DeadArgElim/call_profile.ll b/llvm/test/Transforms/DeadArgElim/call_profile.ll
index 93572a3c540b89..94dbbef6a6e983 100644
--- a/llvm/test/Transforms/DeadArgElim/call_profile.ll
+++ b/llvm/test/Transforms/DeadArgElim/call_profile.ll
@@ -3,8 +3,8 @@
 ; Checks if !prof metadata is corret in deadargelim.
 
 define void @caller() #0 {
-; CHECK: call void @test_vararg.argelim(), !prof ![[PROF:[0-9]]]
-; CHECK: call void @test.argelim(), !prof ![[PROF]]
+; CHECK: call void @test_vararg(), !prof ![[PROF:[0-9]]]
+; CHECK: call void @test(), !prof ![[PROF]]
   call void (i32, ...) @test_vararg(i32 1), !prof !0
   call void @test(i32 1), !prof !0
   ret void

diff  --git a/llvm/test/Transforms/DeadArgElim/comdat.ll b/llvm/test/Transforms/DeadArgElim/comdat.ll
index 0175ffe436e2d2..ea80d0dec0d1e9 100644
--- a/llvm/test/Transforms/DeadArgElim/comdat.ll
+++ b/llvm/test/Transforms/DeadArgElim/comdat.ll
@@ -11,4 +11,4 @@ define internal void @g(i32 %dead) comdat($f) {
   ret void
 }
 
-; CHECK: define internal void @g.argelim() comdat($f) {
+; CHECK: define internal void @g() comdat($f) {

diff  --git a/llvm/test/Transforms/DeadArgElim/dbginfo-update-dbgval-local.ll b/llvm/test/Transforms/DeadArgElim/dbginfo-update-dbgval-local.ll
index 514bfd72d48b3f..0e834013fe40b4 100644
--- a/llvm/test/Transforms/DeadArgElim/dbginfo-update-dbgval-local.ll
+++ b/llvm/test/Transforms/DeadArgElim/dbginfo-update-dbgval-local.ll
@@ -5,7 +5,7 @@
 
 ; Reproducer for PR23260.
 
-; CHECK-LABEL: define internal void @bar.argelim()
+; CHECK-LABEL: define internal void @bar()
 ; CHECK: #dbg_value(i32 poison, ![[LOCAL1:[0-9]+]]
 ; CHECK: call void @sink()
 
@@ -18,9 +18,9 @@ entry:
 }
 
 ; CHECK-LABEL: define void @foo()
-; CHECK: call void @bar.argelim()
+; CHECK: call void @bar()
 ; CHECK: #dbg_value(i32 poison, ![[LOCAL2:[0-9]+]]
-; CHECK: call void @bar.argelim()
+; CHECK: call void @bar()
 
 ; Function Attrs: nounwind uwtable
 define void @foo() #0 !dbg !6 {

diff  --git a/llvm/test/Transforms/DeadArgElim/dbginfo.ll b/llvm/test/Transforms/DeadArgElim/dbginfo.ll
index c86fc457860519..a27ca9dd70c245 100644
--- a/llvm/test/Transforms/DeadArgElim/dbginfo.ll
+++ b/llvm/test/Transforms/DeadArgElim/dbginfo.ll
@@ -14,7 +14,7 @@
 ; the function->debug info mapping on update to ensure it's accurate when used
 ; again for the next removal.
 
-; CHECK: define internal void @_ZL2f1iz.argelim({{.*}} !dbg [[SP:![0-9]+]]
+; CHECK: define internal void @_ZL2f1iz({{.*}} !dbg [[SP:![0-9]+]]
 ; CHECK: [[SP]] = distinct !DISubprogram(name: "f1"
 
 ; Check that debug info metadata for subprograms stores pointers to

diff  --git a/llvm/test/Transforms/DeadArgElim/deadretval.ll b/llvm/test/Transforms/DeadArgElim/deadretval.ll
index 74359f29ccbd2b..910aa7b9bd2238 100644
--- a/llvm/test/Transforms/DeadArgElim/deadretval.ll
+++ b/llvm/test/Transforms/DeadArgElim/deadretval.ll
@@ -23,7 +23,7 @@ define i32 @test3() {
 ; The callee function's return type shouldn't be changed if the call result is
 ; used.
 
-; CHECK-LABEL: define internal ptr @callee4.argelim()
+; CHECK-LABEL: define internal ptr @callee4()
 
 define internal ptr @callee4(ptr %a0) {
   ret ptr @g0;
@@ -32,7 +32,7 @@ define internal ptr @callee4(ptr %a0) {
 declare void @llvm.objc.clang.arc.noop.use(...)
 
 ; CHECK-LABEL: define ptr @test4(
-; CHECK: tail call ptr @callee4.argelim() [ "clang.arc.attachedcall"(ptr @llvm.objc.retainAutoreleasedReturnValue) ]
+; CHECK: tail call ptr @callee4() [ "clang.arc.attachedcall"(ptr @llvm.objc.retainAutoreleasedReturnValue) ]
 
 define ptr @test4() {
   %call = tail call ptr @callee4(ptr @g0) [ "clang.arc.attachedcall"(ptr @llvm.objc.retainAutoreleasedReturnValue) ]

diff  --git a/llvm/test/Transforms/DeadArgElim/fct_ptr.ll b/llvm/test/Transforms/DeadArgElim/fct_ptr.ll
index 6c02bd5ee9c3c3..bf54fb2e8b7286 100644
--- a/llvm/test/Transforms/DeadArgElim/fct_ptr.ll
+++ b/llvm/test/Transforms/DeadArgElim/fct_ptr.ll
@@ -22,7 +22,7 @@ define i32 @call_indirect(ptr readnone %fct_ptr, i32 %arg1, i32 %arg2, i32 %arg3
 ; CHECK-NEXT:    [[RES2:%.*]] = tail call i32 @internal_fct(i32 poison, i32 [[ARG2]], i32 poison)
 ; CHECK-NEXT:    br label [[END]]
 ; CHECK:       call_other:
-; CHECK-NEXT:    [[RES3:%.*]] = tail call i32 @other_fct.argelim(i32 [[ARG2]])
+; CHECK-NEXT:    [[RES3:%.*]] = tail call i32 @other_fct(i32 [[ARG2]])
 ; CHECK-NEXT:    br label [[END]]
 ; CHECK:       end:
 ; CHECK-NEXT:    [[FINAL_RES:%.*]] = phi i32 [ [[RES1]], [[CALL_EXT]] ], [ [[RES2]], [[CALL_INT]] ], [ [[RES3]], [[CALL_OTHER]] ]

diff  --git a/llvm/test/Transforms/DeadArgElim/func_metadata.ll b/llvm/test/Transforms/DeadArgElim/func_metadata.ll
index 2d25d916b24426..4922798b3aaa35 100644
--- a/llvm/test/Transforms/DeadArgElim/func_metadata.ll
+++ b/llvm/test/Transforms/DeadArgElim/func_metadata.ll
@@ -8,7 +8,7 @@ target triple = "x86_64-unknown-linux-gnu"
 @s = common dso_local local_unnamed_addr global i32 0, align 4
 
 define internal i32 @va_func(i32 %num, ...) !prof !28 !PGOFuncName !29{
-; CHECK: define internal void @va_func.retelim(i32 %num) !prof ![[ENTRYCOUNT:[0-9]+]] !PGOFuncName ![[PGOFUNCNAME1:[0-9]+]] {
+; CHECK: define internal void @va_func(i32 %num) !prof ![[ENTRYCOUNT:[0-9]+]] !PGOFuncName ![[PGOFUNCNAME1:[0-9]+]] {
 entry:
   %0 = load i32, ptr @s, align 4, !tbaa !31
   %add = add nsw i32 %0, %num
@@ -17,7 +17,7 @@ entry:
 }
 
 define internal fastcc i32 @foo() unnamed_addr !prof !28 !PGOFuncName !30 {
-; CHECK: define internal fastcc void @foo.retelim() unnamed_addr !prof ![[ENTRYCOUNT:[0-9]+]] !PGOFuncName ![[PGOFUNCNAME2:[0-9]+]] {
+; CHECK: define internal fastcc void @foo() unnamed_addr !prof ![[ENTRYCOUNT:[0-9]+]] !PGOFuncName ![[PGOFUNCNAME2:[0-9]+]] {
 entry:
   %0 = load i32, ptr @s, align 4, !tbaa !31
   %add = add nsw i32 %0, 8

diff  --git a/llvm/test/Transforms/DeadArgElim/funclet.ll b/llvm/test/Transforms/DeadArgElim/funclet.ll
index d56720f96379da..3115c8b341415f 100644
--- a/llvm/test/Transforms/DeadArgElim/funclet.ll
+++ b/llvm/test/Transforms/DeadArgElim/funclet.ll
@@ -22,7 +22,7 @@ bad1:                                             ; preds = %entry-block
 }
 ; CHECK-LABEL: define void @test1(
 ; CHECK:      %[[pad:.*]] = cleanuppad within none []
-; CHECK-NEXT: call void @callee.argelim() [ "funclet"(token %[[pad]]) ]
+; CHECK-NEXT: call void @callee() [ "funclet"(token %[[pad]]) ]
 
 declare void @thunk()
 

diff  --git a/llvm/test/Transforms/DeadArgElim/keepalive.ll b/llvm/test/Transforms/DeadArgElim/keepalive.ll
index 43dd8791ff4565..bcb9f1d5f302cf 100644
--- a/llvm/test/Transforms/DeadArgElim/keepalive.ll
+++ b/llvm/test/Transforms/DeadArgElim/keepalive.ll
@@ -10,7 +10,7 @@ declare ptr @llvm.call.preallocated.arg(token, i32)
 ; the function and then changing too much.
 
 ; This checks if the return value attributes are not removed
-; CHECK: define internal zeroext i32 @test1.argelim() #1
+; CHECK: define internal zeroext i32 @test1() #1
 define internal zeroext i32 @test1(i32 %DEADARG1) nounwind {
 ;
 ;
@@ -18,7 +18,7 @@ define internal zeroext i32 @test1(i32 %DEADARG1) nounwind {
 }
 
 ; This checks if the struct doesn't get non-packed
-; CHECK-LABEL: define internal <{ i32, i32 }> @test2.argelim(
+; CHECK-LABEL: define internal <{ i32, i32 }> @test2(
 define internal <{ i32, i32 }> @test2(i32 %DEADARG1) {
 ;
 ;

diff  --git a/llvm/test/Transforms/DeadArgElim/nonzero-address-spaces.ll b/llvm/test/Transforms/DeadArgElim/nonzero-address-spaces.ll
index fd9d4e0c411072..ddd9aaac628d54 100644
--- a/llvm/test/Transforms/DeadArgElim/nonzero-address-spaces.ll
+++ b/llvm/test/Transforms/DeadArgElim/nonzero-address-spaces.ll
@@ -5,14 +5,14 @@
 
 target datalayout = "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8"
 
-; CHECK: define internal i32 @foo.argelim() addrspace(1)
+; CHECK: define internal i32 @foo() addrspace(1)
 define internal i32 @foo(i32 %x) #0 {
   tail call void asm sideeffect inteldialect "mov eax, [esp + $$4]\0A\09ret", "~{eax},~{dirflag},~{fpsr},~{flags}"()
   unreachable
 }
 
 define i32 @f(i32 %x, i32 %y) {
-  ; CHECK: %r = call addrspace(1) i32 @foo.argelim()
+  ; CHECK: %r = call addrspace(1) i32 @foo()
   %r = call i32 @foo(i32 %x)
 
   ret i32 %r

diff  --git a/llvm/test/Transforms/DeadArgElim/returned.ll b/llvm/test/Transforms/DeadArgElim/returned.ll
index 94b1c9654d4d64..73f23ffa725eff 100644
--- a/llvm/test/Transforms/DeadArgElim/returned.ll
+++ b/llvm/test/Transforms/DeadArgElim/returned.ll
@@ -3,14 +3,14 @@
 %Ty = type { i32, i32 }
 
 ; Validate that the argument and return value are both dead
-; CHECK-LABEL: define internal void @test1.argelim()
+; CHECK-LABEL: define internal void @test1()
 
 define internal ptr @test1(ptr %this) {
   ret ptr %this
 }
 
 ; do not keep alive the return value of a function with a dead 'returned' argument
-; CHECK-LABEL: define internal void @test2.argelim()
+; CHECK-LABEL: define internal void @test2()
 
 define internal ptr @test2(ptr returned %this) {
   ret ptr %this
@@ -20,7 +20,7 @@ define internal ptr @test2(ptr returned %this) {
 @dummy = global ptr null 
 
 ; Validate that return value is dead
-; CHECK-LABEL: define internal void @test3.argelim(ptr %this)
+; CHECK-LABEL: define internal void @test3(ptr %this)
 
 define internal ptr @test3(ptr %this) {
   store volatile ptr %this, ptr @dummy
@@ -36,7 +36,7 @@ define internal ptr @test4(ptr returned %this) {
 }
 
 ; don't do this if 'returned' is on the call site...
-; CHECK-LABEL: define internal void @test5.argelim(ptr %this)
+; CHECK-LABEL: define internal void @test5(ptr %this)
 
 define internal ptr @test5(ptr %this) {
   store volatile ptr %this, ptr @dummy
@@ -55,7 +55,7 @@ define ptr @caller(ptr %this) {
   %3 = call ptr @test3(ptr %this)
   %4 = call ptr @test4(ptr %this)
 ; ...instead, drop 'returned' form the call site
-; CHECK: call void @test5.argelim(ptr %this)
+; CHECK: call void @test5(ptr %this)
   %5 = call ptr @test5(ptr returned %this)
   %6 = call ptr @test6()
   ret ptr %this

diff  --git a/llvm/test/Transforms/DeadArgElim/variadic_safety.ll b/llvm/test/Transforms/DeadArgElim/variadic_safety.ll
index d9fc4a1c822056..2147e4d0b8372d 100644
--- a/llvm/test/Transforms/DeadArgElim/variadic_safety.ll
+++ b/llvm/test/Transforms/DeadArgElim/variadic_safety.ll
@@ -34,5 +34,5 @@ define void @call_deadret(i32 %in) {
   store i32 42, ptr %stacked
   call i32 (i32, i32, ...) @va_deadret_func(i32 poison, i32 %in, [6 x i32] poison, ptr byval(i32) %stacked)
   ret void
-; CHECK: call void (i32, i32, ...) @va_deadret_func.retelim(i32 poison, i32 poison, [6 x i32] poison, ptr byval(i32) %stacked)
+; CHECK: call void (i32, i32, ...) @va_deadret_func(i32 poison, i32 poison, [6 x i32] poison, ptr byval(i32) %stacked)
 }

diff  --git a/llvm/test/Transforms/FunctionSpecialization/function-specialization2.ll b/llvm/test/Transforms/FunctionSpecialization/function-specialization2.ll
index 6e92084625294d..b6cdcf18eea429 100644
--- a/llvm/test/Transforms/FunctionSpecialization/function-specialization2.ll
+++ b/llvm/test/Transforms/FunctionSpecialization/function-specialization2.ll
@@ -42,15 +42,15 @@ define internal void @decrement(ptr nocapture %0) {
 }
 
 define i32 @main(ptr %0, i32 %1) {
-; CHECK:    call void @func.specialized.2.argelim(ptr [[TMP0:%.*]], i32 [[TMP1:%.*]])
+; CHECK:    call void @func.specialized.2(ptr [[TMP0:%.*]], i32 [[TMP1:%.*]])
   %3 = call i32 @func(ptr %0, i32 %1, ptr nonnull @increment)
-; CHECK:    call void @func.specialized.1.argelim(ptr [[TMP0]], i32 0)
+; CHECK:    call void @func.specialized.1(ptr [[TMP0]], i32 0)
   %4 = call i32 @func(ptr %0, i32 %3, ptr nonnull @decrement)
 ; CHECK:    ret i32 0
   ret i32 %4
 }
 
-; CHECK: @func.specialized.1.argelim(
+; CHECK: @func.specialized.1(
 ; CHECK:    [[TMP3:%.*]] = alloca i32, align 4
 ; CHECK:    store i32 [[TMP1:%.*]], ptr [[TMP3]], align 4
 ; CHECK:    [[TMP4:%.*]] = load i32, ptr [[TMP3]], align 4
@@ -63,13 +63,13 @@ define i32 @main(ptr %0, i32 %1) {
 ; CHECK:    call void @decrement(ptr [[TMP9]])
 ; CHECK:    [[TMP10:%.*]] = load i32, ptr [[TMP3]], align 4
 ; CHECK:    [[TMP11:%.*]] = add nsw i32 [[TMP10]], -1
-; CHECK:    call void @func.specialized.1.argelim(ptr [[TMP0]], i32 [[TMP11]])
+; CHECK:    call void @func.specialized.1(ptr [[TMP0]], i32 [[TMP11]])
 ; CHECK:    br label [[TMP12:%.*]]
 ; CHECK:       12:
 ; CHECK:    ret void
 ;
 ;
-; CHECK: @func.specialized.2.argelim(
+; CHECK: @func.specialized.2(
 ; CHECK:    [[TMP3:%.*]] = alloca i32, align 4
 ; CHECK:    store i32 [[TMP1:%.*]], ptr [[TMP3]], align 4
 ; CHECK:    [[TMP4:%.*]] = load i32, ptr [[TMP3]], align 4
@@ -82,7 +82,7 @@ define i32 @main(ptr %0, i32 %1) {
 ; CHECK:    call void @increment(ptr [[TMP9]])
 ; CHECK:    [[TMP10:%.*]] = load i32, ptr [[TMP3]], align 4
 ; CHECK:    [[TMP11:%.*]] = add nsw i32 [[TMP10]], -1
-; CHECK:    call void @func.specialized.2.argelim(ptr [[TMP0]], i32 [[TMP11]])
+; CHECK:    call void @func.specialized.2(ptr [[TMP0]], i32 [[TMP11]])
 ; CHECK:    br label [[TMP12:%.*]]
 ; CHECK:       12:
 ; CHECK:    ret void

diff  --git a/llvm/test/Transforms/FunctionSpecialization/global-var-constants.ll b/llvm/test/Transforms/FunctionSpecialization/global-var-constants.ll
index 65b859b3a44801..a576d9aa32e140 100644
--- a/llvm/test/Transforms/FunctionSpecialization/global-var-constants.ll
+++ b/llvm/test/Transforms/FunctionSpecialization/global-var-constants.ll
@@ -49,11 +49,11 @@ entry:
 ; Check if specialisation on the address of a non-const global variable
 ; is not allowed, then it is not performed.
 
-; NO-GLOBALS-LABEL: define internal range(i32 -2147483646, -2147483648) i32 @g.argelim()
+; NO-GLOBALS-LABEL: define internal range(i32 -2147483646, -2147483648) i32 @g()
 ; NO-GLOBALS: call i32 @f(ptr @G)
 
 ; NO-GLOBALS-LABEL: define range(i32 -2147483646, -2147483648) i32 @h0(ptr %p)
-; NO-GLOBALS:call i32 @g.argelim()
+; NO-GLOBALS:call i32 @g()
 
 ; NO-GLOBALS-LABEL: define i32 @h1()
 ; NO-GLOBALS: call i32 @f(ptr @G)
@@ -64,15 +64,15 @@ entry:
 ; Check if specialisation on the address of a non-const global variable
 ; is allowed, then it is performed where possible.
 
-; GLOBALS-LABEL: define internal range(i32 -2147483646, -2147483648) i32 @g.argelim()
-; GLOBALS: call i32 @f.specialized.2.argelim()
+; GLOBALS-LABEL: define internal range(i32 -2147483646, -2147483648) i32 @g()
+; GLOBALS: call i32 @f.specialized.2()
 
 ; GLOBALS-LABEL: define range(i32 -2147483646, -2147483648) i32 @h0(ptr %p)
-; GLOBALS: call i32 @g.argelim()
+; GLOBALS: call i32 @g()
 
 ; GLOBALS-LABEL: define i32 @h1()
-; GLOBALS: call i32 @f.specialized.2.argelim()
+; GLOBALS: call i32 @f.specialized.2()
 
 ; GLOBALS-LABEL: define i32 @h2()
-; GLOBALS: call i32 @f.specialized.1.argelim()
+; GLOBALS: call i32 @f.specialized.1()
 

diff  --git a/llvm/test/Transforms/FunctionSpecialization/non-argument-tracked.ll b/llvm/test/Transforms/FunctionSpecialization/non-argument-tracked.ll
index 85ff084e90b198..9446e557da7581 100644
--- a/llvm/test/Transforms/FunctionSpecialization/non-argument-tracked.ll
+++ b/llvm/test/Transforms/FunctionSpecialization/non-argument-tracked.ll
@@ -29,9 +29,9 @@ define internal i32 @f2(i32 %i) {
 ;; All calls are to specilisation instances.
 
 ; CHECK-LABEL: define i32 @g0
-; CHECK:         call void @f0.specialized.[[#A:]].argelim()
-; CHECK-NEXT:    call void @f1.specialized.[[#B:]].argelim()
-; CHECK-NEXT:    call void @f2.specialized.[[#C:]].argelim()
+; CHECK:         call void @f0.specialized.[[#A:]]()
+; CHECK-NEXT:    call void @f1.specialized.[[#B:]]()
+; CHECK-NEXT:    call void @f2.specialized.[[#C:]]()
 ; CHECK-NEXT:    ret i32 9
 define i32 @g0(i32 %i) {
   %u0 = call i32 @f0(i32 1)
@@ -43,9 +43,9 @@ define i32 @g0(i32 %i) {
 }
 
 ; CHECK-LABEL: define i32 @g1
-; CHECK:         call void @f0.specialized.[[#D:]].argelim()
-; CHECK-NEXT:    call void @f1.specialized.[[#E:]].argelim()
-; CHECK-NEXT:    call void @f2.specialized.[[#F:]].argelim()
+; CHECK:         call void @f0.specialized.[[#D:]]()
+; CHECK-NEXT:    call void @f1.specialized.[[#E:]]()
+; CHECK-NEXT:    call void @f2.specialized.[[#F:]]()
 ; CHECK-NEXT:    ret i32 12
 define i32 @g1(i32 %i) {
   %u0 = call i32 @f0(i32 2)
@@ -58,9 +58,9 @@ define i32 @g1(i32 %i) {
 
 ; All of the function are specialized and all clones are with internal linkage.
 
-; CHECK-DAG: define internal void @f0.specialized.[[#A]].argelim() {
-; CHECK-DAG: define internal void @f1.specialized.[[#B]].argelim() {
-; CHECK-DAG: define internal void @f2.specialized.[[#C]].argelim() {
-; CHECK-DAG: define internal void @f0.specialized.[[#D]].argelim() {
-; CHECK-DAG: define internal void @f1.specialized.[[#E]].argelim() {
-; CHECK-DAG: define internal void @f2.specialized.[[#F]].argelim() {
+; CHECK-DAG: define internal void @f0.specialized.[[#A]]() {
+; CHECK-DAG: define internal void @f1.specialized.[[#B]]() {
+; CHECK-DAG: define internal void @f2.specialized.[[#C]]() {
+; CHECK-DAG: define internal void @f0.specialized.[[#D]]() {
+; CHECK-DAG: define internal void @f1.specialized.[[#E]]() {
+; CHECK-DAG: define internal void @f2.specialized.[[#F]]() {

diff  --git a/llvm/test/Transforms/FunctionSpecialization/specialization-order.ll b/llvm/test/Transforms/FunctionSpecialization/specialization-order.ll
index 1e81f2ebc409a0..da4cb40fb6dc50 100644
--- a/llvm/test/Transforms/FunctionSpecialization/specialization-order.ll
+++ b/llvm/test/Transforms/FunctionSpecialization/specialization-order.ll
@@ -21,7 +21,7 @@ entry:
 
 define dso_local i32 @g0(i32 %x, i32 %y) {
 ; CHECK-LABEL: @g0
-; CHECK:       call i32 @f.specialized.3.argelim(i32 [[X:%.*]], i32 [[Y:%.*]])
+; CHECK:       call i32 @f.specialized.3(i32 [[X:%.*]], i32 [[Y:%.*]])
 entry:
   %call = tail call i32 @f(i32 %x, i32 %y, ptr @add, ptr @add)
   ret i32 %call
@@ -30,7 +30,7 @@ entry:
 
 define dso_local i32 @g1(i32 %x, i32 %y) {
 ; CHECK-LABEL: @g1(
-; CHECK:       call i32 @f.specialized.2.argelim(i32 [[X:%.*]], i32 [[Y:%.*]])
+; CHECK:       call i32 @f.specialized.2(i32 [[X:%.*]], i32 [[Y:%.*]])
 entry:
   %call = tail call i32 @f(i32 %x, i32 %y, ptr @sub, ptr @add)
   ret i32 %call
@@ -38,21 +38,21 @@ entry:
 
 define dso_local i32 @g2(i32 %x, i32 %y, ptr %v) {
 ; CHECK-LABEL: @g2
-; CHECK:       call i32 @f.specialized.1.argelim(i32 [[X:%.*]], i32 [[Y:%.*]], ptr [[V:%.*]])
+; CHECK:       call i32 @f.specialized.1(i32 [[X:%.*]], i32 [[Y:%.*]], ptr [[V:%.*]])
 entry:
   %call = tail call i32 @f(i32 %x, i32 %y, ptr @sub, ptr %v)
   ret i32 %call
 }
 
-; CHECK-LABEL: define {{.*}} i32 @f.specialized.1.argelim
+; CHECK-LABEL: define {{.*}} i32 @f.specialized.1
 ; CHECK:       call i32 @sub(i32 %x, i32 %y)
 ; CHECK-NEXT:  call i32 %v(i32 %x, i32 %y)
 
-; CHECK-LABEL: define {{.*}} i32 @f.specialized.2.argelim
+; CHECK-LABEL: define {{.*}} i32 @f.specialized.2
 ; CHECK:       call i32 @sub(i32 %x, i32 %y)
 ; CHECK-NEXT:  call i32 @add(i32 %x, i32 %y)
 
-; CHECK-LABEL: define {{.*}} i32 @f.specialized.3.argelim
+; CHECK-LABEL: define {{.*}} i32 @f.specialized.3
 ; CHECK:       call i32 @add(i32 %x, i32 %y)
 ; CHECK-NEXT:   call i32 @add(i32 %x, i32 %y)
 

diff  --git a/llvm/test/Transforms/PhaseOrdering/dae-dce.ll b/llvm/test/Transforms/PhaseOrdering/dae-dce.ll
index 389c2f5612488d..7ff3c5dc5536f7 100644
--- a/llvm/test/Transforms/PhaseOrdering/dae-dce.ll
+++ b/llvm/test/Transforms/PhaseOrdering/dae-dce.ll
@@ -14,8 +14,7 @@ define void @do_trap(ptr %ptr) {
 }
 
 define internal void @capture_and_trap(ptr %ptr) noinline {
-; DEFAULT-LABEL: @capture_and_trap.argelim(
-; LTO-LABEL: @capture_and_trap.argprom(
+; CHECK-LABEL: @capture_and_trap(
 ; CHECK-NEXT:    tail call void @llvm.trap()
 ; CHECK-NEXT:    unreachable
 ;
@@ -35,8 +34,7 @@ define internal void @dead_fn2() {
 
 define void @test(i1 %c) {
 ; CHECK-LABEL: @test(
-; DEFAULT-NEXT:    tail call fastcc void @capture_and_trap.argelim()
-; LTO-NEXT:    tail call fastcc void @capture_and_trap.argprom()
+; CHECK-NEXT:    tail call fastcc void @capture_and_trap()
 ; CHECK-NEXT:    unreachable
 ;
   br i1 %c, label %if, label %else

diff  --git a/llvm/test/Transforms/PhaseOrdering/dce-after-argument-promotion.ll b/llvm/test/Transforms/PhaseOrdering/dce-after-argument-promotion.ll
index 9361ec16d23d55..c33fcfbe6ed973 100644
--- a/llvm/test/Transforms/PhaseOrdering/dce-after-argument-promotion.ll
+++ b/llvm/test/Transforms/PhaseOrdering/dce-after-argument-promotion.ll
@@ -8,7 +8,7 @@
 ; CHECK: [[DUMMY:@.*]] = local_unnamed_addr global i32 0
 
 define internal void @f(ptr byval(%struct.ss) align 8 %b, ptr byval(i32) align 4 %X) noinline nounwind  {
-; CHECK-LABEL: define {{[^@]+}}@f.argprom.argelim
+; CHECK-LABEL: define {{[^@]+}}@f
 ; CHECK-SAME: (i32 [[B_0:%.*]]){{[^#]*}} #[[ATTR0:[0-9]+]] {
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[TEMP:%.*]] = add i32 [[B_0]], 1
@@ -27,7 +27,7 @@ define i32 @test(ptr %X) {
 ; CHECK-LABEL: define {{[^@]+}}@test
 ; CHECK-SAME: (ptr {{[^%]*}} [[X:%.*]]){{[^#]*}} #[[ATTR1:[0-9]+]] {
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    tail call {{.*}}void @f.argprom.argelim(i32 1)
+; CHECK-NEXT:    tail call {{.*}}void @f(i32 1)
 ; CHECK-NEXT:    ret i32 0
 ;
 entry:

diff  --git a/llvm/test/Transforms/SCCP/recursion.ll b/llvm/test/Transforms/SCCP/recursion.ll
index bc036f71d0c7e2..f6556bee3eaba1 100644
--- a/llvm/test/Transforms/SCCP/recursion.ll
+++ b/llvm/test/Transforms/SCCP/recursion.ll
@@ -4,8 +4,8 @@
 ; CHECK-NOT: %X
 
 define internal i32 @foo(i32 %X) {
-; CHECK-LABEL: @foo.argelim(
-; CHECK-NEXT:    [[Y:%.*]] = call i32 @foo.argelim()
+; CHECK-LABEL: @foo(
+; CHECK-NEXT:    [[Y:%.*]] = call i32 @foo()
 ; CHECK-NEXT:    [[Z:%.*]] = add i32 [[Y]], 1
 ; CHECK-NEXT:    ret i32 [[Z]]
 ;
@@ -16,7 +16,7 @@ define internal i32 @foo(i32 %X) {
 
 define void @bar() {
 ; CHECK-LABEL: @bar(
-; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @foo.argelim()
+; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @foo()
 ; CHECK-NEXT:    ret void
 ;
   call i32 @foo( i32 17 )         ; <i32>:1 [#uses=0]


        


More information about the llvm-commits mailing list