diff --git a/llvm/test/CodeGen/AMDGPU/gfx-callable-argument-types.ll b/llvm/test/CodeGen/AMDGPU/gfx-callable-argument-types.ll
diff --git a/llvm/test/CodeGen/AMDGPU/tail-call-amdgpu-gfx.ll b/llvm/test/CodeGen/AMDGPU/tail-call-amdgpu-gfx.ll
@@ -24,6 +24,6 @@ define amdgpu_gfx float @caller(float %arg0) {
 ; GCN-NEXT:    s_addc_u32 s7, s7, callee@rel32@hi+12
 ; GCN-NEXT:    s_setpc_b64 s[6:7]
   %add = fadd float %arg0, 1.0
-  %call = tail call amdgpu_gfx float @callee(float %add, float inreg 2.0)
+  %call = tail call amdgpu_gfx float @callee(float %add, float 2.0)
   ret float %call
 }
diff --git a/llvm/test/CodeGen/ARM/ipra-r0-returned.ll b/llvm/test/CodeGen/ARM/ipra-r0-returned.ll
@@ -13,6 +13,6 @@ entry:
 ; CHECK-NOT: r0
 ; CHECK: bl      returns_r0
 ; CHECK-NOT: r0
-  %b = call i32 @returns_r0(i32 returned %a)
+  %b = call i32 @returns_r0(i32 %a)
   ret i32 %a
 }
diff --git a/llvm/test/CodeGen/ARM/returned-ext.ll b/llvm/test/CodeGen/ARM/returned-ext.ll
@@ -22,9 +22,9 @@ entry:
 ; CHECKT2D: uxth r0, r0
 ; CHECKT2D: bl _identity32
 ; CHECKT2D: mov r0, [[SAVEX]]
-  %call = tail call i16 @identity16(i16 returned %x)
+  %call = tail call i16 @identity16(i16 %x)
   %b = zext i16 %call to i32
-  %call2 = tail call i32 @identity32(i32 returned %b)
+  %call2 = tail call i32 @identity32(i32 %b)
   ret i16 %x
 }
 
@@ -56,9 +56,9 @@ entry:
 ; This shouldn't be required
 ; CHECKT2D: mov r0, [[SAVEX]]
 
-  %call = tail call i16 @retzext16(i16 returned %x)
+  %call = tail call i16 @retzext16(i16 %x)
   %b = zext i16 %call to i32
-  %call2 = tail call i32 @identity32(i32 returned %b)
+  %call2 = tail call i32 @identity32(i32 %b)
   ret i16 %x
 }
 
@@ -76,9 +76,9 @@ entry:
 ; CHECKT2D: sxth r0, {{r[0-9]+}}
 ; CHECKT2D: bl _identity32
 ; CHECKT2D: mov r0, [[SAVEX]]
-  %call = tail call i16 @retzext16(i16 returned %x)
+  %call = tail call i16 @retzext16(i16 %x)
   %b = sext i16 %call to i32
-  %call2 = tail call i32 @identity32(i32 returned %b)
+  %call2 = tail call i32 @identity32(i32 %b)
   ret i16 %x
 }
 
@@ -96,10 +96,10 @@ entry:
 ; CHECKT2D: uxth r0, r0
 ; CHECKT2D: bl _identity32
 ; CHECKT2D: b.w _paramzext16
-  %call = tail call i16 @paramzext16(i16 zeroext returned %x)
+  %call = tail call i16 @paramzext16(i16 %x)
   %b = zext i16 %call to i32
-  %call2 = tail call i32 @identity32(i32 returned %b)
-  %call3 = tail call i16 @paramzext16(i16 zeroext returned %call)
+  %call2 = tail call i32 @identity32(i32 %b)
+  %call3 = tail call i16 @paramzext16(i16 %call)
   ret i16 %call3
 }
 
@@ -121,13 +121,13 @@ entry:
 ; CHECKT2D: bl _paramzext16
 ; CHECKT2D: bl _identity32
 ; CHECKT2D: b.w _paramzext16
-  %call = tail call i16 @paramzext16(i16 zeroext returned %x)
+  %call = tail call i16 @paramzext16(i16 %x)
 
 ; Should make no difference if %x is used below rather than %call, but it does
   %b = zext i16 %x to i32
 
   %call2 = tail call i32 @identity32(i32 %b)
-  %call3 = tail call i16 @paramzext16(i16 zeroext returned %call)
+  %call3 = tail call i16 @paramzext16(i16 %call)
   ret i16 %call3
 }
 
@@ -149,9 +149,9 @@ entry:
 ; FIXME: Tail call should be OK here
 ; CHECKT2D: bl _identity32
 
-  %call = tail call i16 @bothzext16(i16 zeroext returned %x)
+  %call = tail call i16 @bothzext16(i16 %x)
   %b = zext i16 %x to i32
-  %call2 = tail call i32 @identity32(i32 returned %b)
+  %call2 = tail call i32 @identity32(i32 %b)
   ret i16 %call
 }
 
@@ -171,8 +171,8 @@ entry:
 ; CHECKT2D: sxth r0, [[SAVEX]]
 ; CHECKT2D: bl _identity32
 ; CHECKT2D: mov r0, [[SAVEX]]
-  %call = tail call i16 @bothzext16(i16 zeroext returned %x)
+  %call = tail call i16 @bothzext16(i16 %x)
   %b = sext i16 %x to i32
-  %call2 = tail call i32 @identity32(i32 returned %b)
+  %call2 = tail call i32 @identity32(i32 %b)
   ret i16 %x
 }
diff --git a/llvm/test/CodeGen/ARM/this-return.ll b/llvm/test/CodeGen/ARM/this-return.ll
@@ -28,9 +28,9 @@ entry:
 ; CHECKT2D-NOT: mov r0, {{r[0-9]+}}
 ; CHECKT2D: b.w _B_ctor_base
   %0 = bitcast %struct.C* %this to %struct.A*
-  %call = tail call %struct.A* @A_ctor_base(%struct.A* returned %0)
+  %call = tail call %struct.A* @A_ctor_base(%struct.A* %0)
   %1 = getelementptr inbounds %struct.C, %struct.C* %this, i32 0, i32 0
-  %call2 = tail call %struct.B* @B_ctor_base(%struct.B* returned %1, i32 %x)
+  %call2 = tail call %struct.B* @B_ctor_base(%struct.B* %1, i32 %x)
   ret %struct.C* %this
 }
 
@@ -59,7 +59,7 @@ entry:
 ; CHECKELF: b C_ctor_base
 ; CHECKT2D-LABEL: C_ctor_complete:
 ; CHECKT2D: b.w _C_ctor_base
-  %call = tail call %struct.C* @C_ctor_base(%struct.C* returned %this, i32 %x)
+  %call = tail call %struct.C* @C_ctor_base(%struct.C* %this, i32 %x)
   ret %struct.C* %this
 }
 
@@ -86,8 +86,8 @@ entry:
 ; CHECKT2D-NOT: mov r0, {{r[0-9]+}}
 ; CHECKT2D: b.w _B_ctor_complete
   %b = getelementptr inbounds %struct.D, %struct.D* %this, i32 0, i32 0
-  %call = tail call %struct.B* @B_ctor_complete(%struct.B* returned %b, i32 %x)
-  %call2 = tail call %struct.B* @B_ctor_complete(%struct.B* returned %b, i32 %x)
+  %call = tail call %struct.B* @B_ctor_complete(%struct.B* %b, i32 %x)
+  %call2 = tail call %struct.B* @B_ctor_complete(%struct.B* %b, i32 %x)
   ret %struct.D* %this
 }
 
@@ -98,8 +98,8 @@ entry:
 ; CHECKT2D-LABEL: E_ctor_base:
 ; CHECKT2D-NOT: b.w _B_ctor_complete
   %b = getelementptr inbounds %struct.E, %struct.E* %this, i32 0, i32 0
-  %call = tail call %struct.B* @B_ctor_complete(%struct.B* returned %b, i32 %x)
+  %call = tail call %struct.B* @B_ctor_complete(%struct.B* %b, i32 %x)
   %b2 = getelementptr inbounds %struct.E, %struct.E* %this, i32 0, i32 1
-  %call2 = tail call %struct.B* @B_ctor_complete(%struct.B* returned %b2, i32 %x)
+  %call2 = tail call %struct.B* @B_ctor_complete(%struct.B* %b2, i32 %x)
   ret %struct.E* %this
 }
diff --git a/llvm/test/CodeGen/SPARC/64abi.ll b/llvm/test/CodeGen/SPARC/64abi.ll
@@ -50,7 +50,7 @@ define void @intarg(i8  %a0,   ; %i0
 ; CHECK-NOT: add %sp
 ; CHECK: restore
 define void @call_intarg(i32 %i0, i8* %i1) {
-  call void @intarg(i8 0, i8 1, i16 2, i32 3, i8* undef, i32 5, i32 signext %i0, i8* %i1)
+  call void @intarg(i8 0, i8 1, i16 2, i32 3, i8* undef, i32 5, i32 %i0, i8* %i1)
   ret void
 }
 
@@ -222,7 +222,7 @@ define i32 @inreg_fi(i32 inreg %a0,     ; high bits of %i0
 ; SOFT:  or %i1, %i0, %o0
 ; CHECK: call inreg_fi
 define void @call_inreg_fi(i32* %p, i32 %i1, float %f5) {
-  %x = call i32 @inreg_fi(i32 inreg %i1, float inreg %f5)
+  %x = call i32 @inreg_fi(i32 %i1, float %f5)
   ret void
 }
 
@@ -245,7 +245,7 @@ define float @inreg_ff(float inreg %a0,   ; %f0
 ; SOFT: or %i1, %i0, %o0
 ; CHECK: call inreg_ff
 define void @call_inreg_ff(i32* %p, float %f3, float %f5) {
-  %x = call float @inreg_ff(float inreg %f3, float inreg %f5)
+  %x = call float @inreg_ff(float %f3, float %f5)
   ret void
 }
 
@@ -269,7 +269,7 @@ define i32 @inreg_if(float inreg %a0, ; %f0
 ; SOFT: or %i1, %i0, %o0
 ; CHECK: call inreg_if
 define void @call_inreg_if(i32* %p, float %f3, i32 %i2) {
-  %x = call i32 @inreg_if(float inreg %f3, i32 inreg %i2)
+  %x = call i32 @inreg_if(float %f3, i32 %i2)
   ret void
 }
 
@@ -289,7 +289,7 @@ define i32 @inreg_ii(i32 inreg %a0,   ; high bits of %i0
 ; CHECK: or [[R1]], [[R2]], %o0
 ; CHECK: call inreg_ii
 define void @call_inreg_ii(i32* %p, i32 %i1, i32 %i2) {
-  %x = call i32 @inreg_ii(i32 inreg %i1, i32 inreg %i2)
+  %x = call i32 @inreg_ii(i32 %i1, i32 %i2)
   ret void
 }
 

diff --git a/llvm/test/CodeGen/SystemZ/args-02.ll b/llvm/test/CodeGen/SystemZ/args-02.ll
@@ -66,9 +66,9 @@ define void @foo() {
 ; CHECK-STACK: mvghi 160(%r15), -5
 ; CHECK-STACK: brasl %r14, bar@PLT
 
-  call void @bar (i8 signext -1, i16 signext -2, i32 signext -3, i64 -4, float 0.0, double 0.0,
+  call void @bar (i8 -1, i16 -2, i32 -3, i64 -4, float 0.0, double 0.0,
                   fp128 0xL00000000000000000000000000000000, i64 -5,
-                  float -0.0, double -0.0, i8 signext -6, i16 signext -7, i32 signext -8, i64 -9,
+                  float -0.0, double -0.0, i8 -6, i16 -7, i32 -8, i64 -9,
                   float 0.0, double 0.0,
                   fp128 0xL00000000000000000000000000000000)
   ret void

diff --git a/llvm/test/CodeGen/SystemZ/args-03.ll b/llvm/test/CodeGen/SystemZ/args-03.ll
@@ -68,9 +68,9 @@ define void @foo() {
 ; CHECK-STACK: mvghi 160(%r15), -5
 ; CHECK-STACK: brasl %r14, bar@PLT
 
-  call void @bar (i8 zeroext -1, i16 zeroext -2, i32 zeroext -3, i64 -4, float 0.0, double 0.0,
+  call void @bar (i8 -1, i16 -2, i32 -3, i64 -4, float 0.0, double 0.0,
                   fp128 0xL00000000000000000000000000000000, i64 -5,
-                  float -0.0, double -0.0, i8 zeroext -6, i16 zeroext -7, i32 zeroext -8, i64 -9,
+                  float -0.0, double -0.0, i8 -6, i16 -7, i32 -8, i64 -9,
                   float 0.0, double 0.0,
                   fp128 0xL00000000000000000000000000000000)
   ret void

diff --git a/llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll b/llvm/test/CodeGen/X86/fast-cc-merge-stack-adj.ll
@@ -7,7 +7,7 @@ declare x86_fastcallcc void @func(i32*, i64 inreg)
 
 define x86_fastcallcc void @caller(i32, i64) {
         %X = alloca i32         ; <i32*> [#uses=1]
-        call x86_fastcallcc void @func( i32* %X, i64 inreg 0 )
+        call x86_fastcallcc void @func( i32* %X, i64 0 )
         ret void
 }
 
diff --git a/llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll b/llvm/test/CodeGen/X86/fast-cc-pass-in-regs.ll
@@ -4,7 +4,7 @@
 declare x86_fastcallcc i64 @callee(i64 inreg)
 
 define i64 @caller() {
-        %X = call x86_fastcallcc  i64 @callee( i64 inreg 4294967299 )          ; <i64> [#uses=1]
+        %X = call x86_fastcallcc  i64 @callee( i64 4294967299 )          ; <i64> [#uses=1]
 ; CHECK: mov{{.*}}edx, 1
         ret i64 %X
 }

diff --git a/llvm/test/CodeGen/X86/mismatched-byval.ll b/llvm/test/CodeGen/X86/mismatched-byval.ll
diff --git a/llvm/test/CodeGen/X86/movtopush.ll b/llvm/test/CodeGen/X86/movtopush.ll
@@ -107,7 +107,7 @@ entry:
 ; NORMAL-NEXT: addl $12, %esp
 define void @test4() optsize {
 entry:
-  call void @inreg(i32 1, i32 inreg 2, i32 3, i32 4)
+  call void @inreg(i32 1, i32 2, i32 3, i32 4)
   ret void
 }
 
@@ -307,9 +307,9 @@ define void @test11() optsize {
 define void @test12() optsize {
 entry:
   %s = alloca %struct.s, align 4
-  call void @struct(%struct.s* byval(%struct.s) %s, i32 2, i32 3, i32 4)
+  call void @struct(%struct.s* %s, i32 2, i32 3, i32 4)
   call void @good(i32 5, i32 6, i32 7, i32 8)
-  call void @struct(%struct.s* byval(%struct.s) %s, i32 10, i32 11, i32 12)
+  call void @struct(%struct.s* %s, i32 10, i32 11, i32 12)
   ret void
 }
 
@@ -340,7 +340,7 @@ define void @test12b() optsize {
 entry:
   %s = alloca %struct.s, align 4
   call void @good(i32 1, i32 2, i32 3, i32 4)
-  call void @struct(%struct.s* byval(%struct.s) %s, i32 6, i32 7, i32 8)
+  call void @struct(%struct.s* %s, i32 6, i32 7, i32 8)
   call void @good(i32 9, i32 10, i32 11, i32 12)
   ret void
 }
@@ -413,7 +413,7 @@ entry:
   %0 = bitcast %struct.A* %a to i64*
   %1 = load i64, i64* %0, align 4
   store i64 %1, i64* %agg.tmp, align 4
-  %call = call x86_thiscallcc %struct.B* @B_ctor(%struct.B* returned %ref.tmp, %struct.A* byval(%struct.A) %tmpcast)
+  %call = call x86_thiscallcc %struct.B* @B_ctor(%struct.B* %ref.tmp, %struct.A* byval(%struct.A) %tmpcast)
   %2 = getelementptr inbounds %struct.B, %struct.B* %tmp, i32 0, i32 0
   call void @B_func(%struct.B* sret(%struct.B) %tmp, %struct.B* %ref.tmp, i32 1)
   ret void

diff --git a/llvm/test/CodeGen/X86/pop-stack-cleanup.ll b/llvm/test/CodeGen/X86/pop-stack-cleanup.ll
@@ -60,7 +60,7 @@ define void @spill(i32 inreg %a, i32 inreg %b, i32 inreg %c) minsize nounwind {
 ; CHECK-DAG: movl {{.*}}, %edx
 ; CHECK: calll _spill
   %i = call i32 @param2_ret(i32 1, i32 2)
-  call void @spill(i32 inreg %a, i32 inreg %b, i32 inreg %c)
+  call void @spill(i32 %a, i32 %b, i32 %c)
   ret void
 }
 

diff --git a/llvm/test/CodeGen/X86/preallocated.ll b/llvm/test/CodeGen/X86/preallocated.ll
@@ -129,11 +129,11 @@ define void @nested_with_init() {
 ; CHECK: pushl [[REGISTER2]]
 ; CHECK: calll _init
 
-  call void @foo_ret_p(%Foo* sret(%Foo) %b1, %Foo* preallocated(%Foo) %b2) ["preallocated"(token %t2)]
+  call void @foo_ret_p(%Foo* %b1, %Foo* preallocated(%Foo) %b2) ["preallocated"(token %t2)]
 ; CHECK-NOT: subl {{\$[0-9]+}}, %esp
 ; CHECK-NOT: pushl
 ; CHECK: calll _foo_ret_p
-  call void @foo_ret_p(%Foo* sret(%Foo) %tmp, %Foo* preallocated(%Foo) %b1) ["preallocated"(token %t1)]
+  call void @foo_ret_p(%Foo* %tmp, %Foo* preallocated(%Foo) %b1) ["preallocated"(token %t1)]
 ; CHECK-NOT: subl {{\$[0-9]+}}, %esp
 ; CHECK-NOT: pushl
 ; CHECK: calll _foo_ret_p
@@ -150,7 +150,7 @@ define void @inreg() {
 ; CHECK: subl $8, %esp
 ; CHECK: movl $9, %eax
 ; CHECK: calll _foo_inreg_p
-  call void @foo_inreg_p(i32 inreg 9, %Foo* preallocated(%Foo) %b) ["preallocated"(token %t)]
+  call void @foo_inreg_p(i32 9, %Foo* preallocated(%Foo) %b) ["preallocated"(token %t)]
   ret void
 }
 

diff --git a/llvm/test/CodeGen/X86/tailcall-msvc-conventions.ll b/llvm/test/CodeGen/X86/tailcall-msvc-conventions.ll
@@ -181,7 +181,7 @@ define x86_stdcallcc void @stdcall_thiscall_tail(i32 %a, i32 %b) {
 
 declare x86_fastcallcc void @fastcall2(i32 inreg %a, i32 inreg %b)
 define void @cdecl_fastcall_tail(i32 %a, i32 %b) {
-  tail call x86_fastcallcc void @fastcall2(i32 inreg %a, i32 inreg %b)
+  tail call x86_fastcallcc void @fastcall2(i32 %a, i32 %b)
   ret void
 }
 ; fastcall2 won't pop anything.