diff --git a/llvm/test/CodeGen/AMDGPU/agpr-copy-propagation.mir b/llvm/test/CodeGen/AMDGPU/agpr-copy-propagation.mir
index 165ad003c3e0b..2603c616ec0a8 100644
--- a/llvm/test/CodeGen/AMDGPU/agpr-copy-propagation.mir
+++ b/llvm/test/CodeGen/AMDGPU/agpr-copy-propagation.mir
@@ -11,14 +11,14 @@ body: |
 
     ; GFX908-LABEL: name: do_not_propagate_agpr_to_agpr
     ; GFX908: renamable $vgpr0 = COPY renamable $agpr0, implicit $exec
-    ; GFX908: renamable $agpr1 = COPY renamable $vgpr0, implicit $exec
-    ; GFX908: renamable $agpr2 = COPY renamable $vgpr0, implicit $exec
-    ; GFX908: S_ENDPGM 0, implicit $vgpr0, implicit $agpr1, implicit $agpr2
+    ; GFX908-NEXT: renamable $agpr1 = COPY renamable $vgpr0, implicit $exec
+    ; GFX908-NEXT: renamable $agpr2 = COPY renamable $vgpr0, implicit $exec
+    ; GFX908-NEXT: S_ENDPGM 0, implicit $vgpr0, implicit $agpr1, implicit $agpr2
     ; GFX90A-LABEL: name: do_not_propagate_agpr_to_agpr
     ; GFX90A: renamable $vgpr0 = COPY renamable $agpr0, implicit $exec
-    ; GFX90A: renamable $agpr1 = COPY $agpr0, implicit $exec
-    ; GFX90A: renamable $agpr2 = COPY $agpr0, implicit $exec
-    ; GFX90A: S_ENDPGM 0, implicit $vgpr0, implicit $agpr1, implicit $agpr2
+    ; GFX90A-NEXT: renamable $agpr1 = COPY $agpr0, implicit $exec
+    ; GFX90A-NEXT: renamable $agpr2 = COPY $agpr0, implicit $exec
+    ; GFX90A-NEXT: S_ENDPGM 0, implicit $vgpr0, implicit $agpr1, implicit $agpr2
     renamable $vgpr0 = COPY renamable $agpr0, implicit $exec
     renamable $agpr1 = COPY renamable $vgpr0, implicit $exec
     renamable $agpr2 = COPY renamable $vgpr0, implicit $exec
@@ -33,14 +33,14 @@ body: |
 
     ; GFX908-LABEL: name: propagate_vgpr_to_agpr
     ; GFX908: renamable $agpr0 = COPY renamable $vgpr0, implicit $exec
-    ; GFX908: renamable $agpr1 = COPY $vgpr0, implicit $exec
-    ; GFX908: renamable $agpr2 = COPY $vgpr0, implicit $exec
-    ; GFX908: S_ENDPGM 0, implicit $agpr0, implicit $agpr1, implicit $agpr2
+    ; GFX908-NEXT: renamable $agpr1 = COPY $vgpr0, implicit $exec
+    ; GFX908-NEXT: renamable $agpr2 = COPY $vgpr0, implicit $exec
+    ; GFX908-NEXT: S_ENDPGM 0, implicit $agpr0, implicit $agpr1, implicit $agpr2
     ; GFX90A-LABEL: name: propagate_vgpr_to_agpr
     ; GFX90A: renamable $agpr0 = COPY renamable $vgpr0, implicit $exec
-    ; GFX90A: renamable $agpr1 = COPY $vgpr0, implicit $exec
-    ; GFX90A: renamable $agpr2 = COPY $vgpr0, implicit $exec
-    ; GFX90A: S_ENDPGM 0, implicit $agpr0, implicit $agpr1, implicit $agpr2
+    ; GFX90A-NEXT: renamable $agpr1 = COPY $vgpr0, implicit $exec
+    ; GFX90A-NEXT: renamable $agpr2 = COPY $vgpr0, implicit $exec
+    ; GFX90A-NEXT: S_ENDPGM 0, implicit $agpr0, implicit $agpr1, implicit $agpr2
     renamable $agpr0 = COPY renamable $vgpr0, implicit $exec
     renamable $agpr1 = COPY renamable $agpr0, implicit $exec
     renamable $agpr2 = COPY renamable $agpr0, implicit $exec
@@ -55,14 +55,14 @@ body: |
 
     ; GFX908-LABEL: name: propagate_agpr_to_vgpr
     ; GFX908: renamable $vgpr0 = COPY renamable $agpr0, implicit $exec
-    ; GFX908: renamable $vgpr1 = COPY $agpr0, implicit $exec
-    ; GFX908: renamable $vgpr2 = COPY $agpr0, implicit $exec
-    ; GFX908: S_ENDPGM 0, implicit $vgpr0, implicit $vgpr1, implicit $vgpr2
+    ; GFX908-NEXT: renamable $vgpr1 = COPY $agpr0, implicit $exec
+    ; GFX908-NEXT: renamable $vgpr2 = COPY $agpr0, implicit $exec
+    ; GFX908-NEXT: S_ENDPGM 0, implicit $vgpr0, implicit $vgpr1, implicit $vgpr2
     ; GFX90A-LABEL: name: propagate_agpr_to_vgpr
     ; GFX90A: renamable $vgpr0 = COPY renamable $agpr0, implicit $exec
-    ; GFX90A: renamable $vgpr1 = COPY $agpr0, implicit $exec
-    ; GFX90A: renamable $vgpr2 = COPY $agpr0, implicit $exec
-    ; GFX90A: S_ENDPGM 0, implicit $vgpr0, implicit $vgpr1, implicit $vgpr2
+    ; GFX90A-NEXT: renamable $vgpr1 = COPY $agpr0, implicit $exec
+    ; GFX90A-NEXT: renamable $vgpr2 = COPY $agpr0, implicit $exec
+    ; GFX90A-NEXT: S_ENDPGM 0, implicit $vgpr0, implicit $vgpr1, implicit $vgpr2
     renamable $vgpr0 = COPY renamable $agpr0, implicit $exec
     renamable $vgpr1 = COPY renamable $vgpr0, implicit $exec
     renamable $vgpr2 = COPY renamable $vgpr0, implicit $exec