Adjusts tests

- Compact reg numbers in vop test
- Remove "undef"
- Readjust types in wave32 test

Author: frederik-h

llvm/test/CodeGen/AMDGPU/sdwa-peephole-cndmask-vop2.mir

@@ -30,12 +30,12 @@ body: |
     ; GFX11-NEXT: [[V_CNDMASK_B32_e32_:%[0-9]+]]:vgpr_32 = V_CNDMASK_B32_e32 killed [[V_LSHRREV_B32_e64_]], killed [[V_LSHRREV_B32_e64_1]], implicit $exec, implicit $vcc_lo
     ; GFX11-NEXT: $vgpr0 = COPY [[V_CNDMASK_B32_e32_]]
     ; GFX11-NEXT: SI_RETURN implicit $vgpr0
-    %1:vgpr_32 = COPY $vgpr1
-    %2:vgpr_32 = COPY $vgpr0
+    %0:vgpr_32 = COPY $vgpr1
+    %1:vgpr_32 = COPY $vgpr0
+    %2:vgpr_32 = V_LSHRREV_B32_e64 16, %0, implicit $exec
     %3:vgpr_32 = V_LSHRREV_B32_e64 16, %1, implicit $exec
-    %4:vgpr_32 = V_LSHRREV_B32_e64 16, %2, implicit $exec
-    %7:vgpr_32 = V_CNDMASK_B32_e32 killed %3, killed %4, implicit $exec, implicit $vcc
-    $vgpr0 = COPY %7
+    %4:vgpr_32 = V_CNDMASK_B32_e32 killed %2, killed %3, implicit $exec, implicit $vcc
+    $vgpr0 = COPY %4
     SI_RETURN implicit $vgpr0
 
 ...

llvm/test/CodeGen/AMDGPU/sdwa-peephole-cndmask-vop3-wave32.mir

@@ -52,7 +52,7 @@ body:             |
     %1:vgpr_32 = IMPLICIT_DEF
     %2:vgpr_32 = V_PK_MAX_F16 8, undef %1, 8, undef %1, 0, 0, 0, 0, 0, implicit $mode, implicit $exec
     %3:vgpr_32 = V_LSHRREV_B32_e64 16, %2, implicit $exec
-    %4:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, undef %3, killed undef %0, implicit $exec
+    %4:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %3, killed undef %0, implicit $exec
     $vgpr0 = COPY %4
     SI_RETURN implicit $vgpr0
 ...
@@ -150,21 +150,23 @@ body:             |
 ---
 name: missing-carry-def
 tracksRegLiveness: true
+registers:
+  - { id: 0, class: sreg_32_xm0_xexec }
 body:             |
   bb.0:
     liveins: $vgpr0
 
     ; CHECK-LABEL: name: missing-carry-def
     ; CHECK: liveins: $vgpr0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:vgpr_32 = IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:sreg_32_xm0_xexec = IMPLICIT_DEF
     ; CHECK-NEXT: [[V_LSHRREV_B32_e64_:%[0-9]+]]:vgpr_32 = V_LSHRREV_B32_e64 16, undef [[DEF]], implicit $exec
     ; CHECK-NEXT: [[V_CNDMASK_B32_e64_:%[0-9]+]]:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, [[V_LSHRREV_B32_e64_]], undef %0:sreg_32_xm0_xexec, implicit $exec
     ; CHECK-NEXT: $vgpr0 = COPY [[V_CNDMASK_B32_e64_]]
     ; CHECK-NEXT: SI_RETURN implicit $vgpr0
-    %1:vgpr_32 = IMPLICIT_DEF
+    %1:sreg_32_xm0_xexec = IMPLICIT_DEF
     %2:vgpr_32 = V_LSHRREV_B32_e64 16, undef %1:sreg_32_xm0_xexec, implicit $exec
-    %3:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %2, undef %0, implicit $exec
+    %3:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %2, undef %0:sreg_32_xm0_xexec, implicit $exec
     $vgpr0 = COPY %3
     SI_RETURN implicit $vgpr0
 ...

llvm/test/CodeGen/AMDGPU/sdwa-peephole-cndmask-vop3-wave64.mir

@@ -1,5 +1,5 @@
-# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
 # RUN: llc %s -mtriple=amdgcn -mcpu=gfx900 -run-pass=si-peephole-sdwa -o - | FileCheck %s
+# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
 
 ---
 name: change-compare-to-vopc # carry-in def is a comparison that can be changed to VOPC
@@ -42,17 +42,17 @@ body:             |
     ; CHECK-NEXT: [[DEF:%[0-9]+]]:sreg_64_xexec = IMPLICIT_DEF
     ; CHECK-NEXT: [[DEF1:%[0-9]+]]:vgpr_32 = IMPLICIT_DEF
     ; CHECK-NEXT: [[V_PK_MAX_F16_:%[0-9]+]]:vgpr_32 = V_PK_MAX_F16 8, undef [[DEF1]], 8, undef [[DEF1]], 0, 0, 0, 0, 0, implicit $mode, implicit $exec
-    ; CHECK-NEXT: [[V_LSHRREV_B32_e64_:%[0-9]+]]:vgpr_32 = V_LSHRREV_B32_e64 16, undef [[V_PK_MAX_F16_]], implicit $exec
+    ; CHECK-NEXT: [[V_LSHRREV_B32_e64_:%[0-9]+]]:vgpr_32 = V_LSHRREV_B32_e64 16, [[V_PK_MAX_F16_]], implicit $exec
     ; CHECK-NEXT: $vcc = COPY killed undef [[DEF]]
     ; CHECK-NEXT: [[V_MOV_B32_e32_:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
-    ; CHECK-NEXT: [[V_CNDMASK_B32_sdwa:%[0-9]+]]:vgpr_32 = V_CNDMASK_B32_sdwa 0, [[V_MOV_B32_e32_]], 0, undef [[V_PK_MAX_F16_]], 0, 6, 0, 6, 5, implicit $vcc, implicit $exec
+    ; CHECK-NEXT: [[V_CNDMASK_B32_sdwa:%[0-9]+]]:vgpr_32 = V_CNDMASK_B32_sdwa 0, [[V_MOV_B32_e32_]], 0, [[V_PK_MAX_F16_]], 0, 6, 0, 6, 5, implicit $vcc, implicit $exec
     ; CHECK-NEXT: $vgpr0 = COPY [[V_CNDMASK_B32_sdwa]]
     ; CHECK-NEXT: SI_RETURN implicit $vgpr0
     %0:sreg_64_xexec = IMPLICIT_DEF
     %1:vgpr_32 = IMPLICIT_DEF
-    %2:vgpr_32 = V_PK_MAX_F16 8, %1, 8, %1, 0, 0, 0, 0, 0, implicit $mode, implicit $exec
-    %3:vgpr_32 = V_LSHRREV_B32_e64 16, undef %2, implicit $exec
-    %4:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %3, killed %0, implicit $exec
+    %2:vgpr_32 = V_PK_MAX_F16 8, undef %1, 8, undef %1, 0, 0, 0, 0, 0, implicit $mode, implicit $exec
+    %3:vgpr_32 = V_LSHRREV_B32_e64 16, %2, implicit $exec
+    %4:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %3, killed undef %0, implicit $exec
     $vgpr0 = COPY %4
     SI_RETURN implicit $vgpr0
 ...
@@ -82,7 +82,7 @@ body:             |
     %1:vgpr_32 = IMPLICIT_DEF
     %2:vgpr_32 = V_PK_MAX_F16 8, undef %1, 8, undef %1, 0, 0, 0, 0, 0, implicit $mode, implicit $exec
     %3:vgpr_32 = V_LSHRREV_B32_e64 16, %2, implicit $exec
-    %4:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %3, killed %0, implicit $exec
+    %4:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %3, killed undef %0, implicit $exec
     $vgpr0 = COPY %4
     $vgpr1 = COPY %0
     SI_RETURN implicit $vgpr0
@@ -110,9 +110,9 @@ body:             |
     ; CHECK-NEXT: SI_RETURN implicit $vgpr0
     %0:vgpr_32 = IMPLICIT_DEF
     %2:vgpr_32 = IMPLICIT_DEF
-    %3:sreg_64_xexec = V_CMP_EQ_U32_e64 %0, 1, implicit $exec
-    %5:vgpr_32 = V_LSHRREV_B32_e64 16, %2, implicit $exec
-    V_CMP_EQ_U32_e32 1, %2, implicit-def $vcc, implicit $exec
+    %3:sreg_64_xexec = V_CMP_EQ_U32_e64 undef %0, 1, implicit $exec
+    %5:vgpr_32 = V_LSHRREV_B32_e64 16, undef %2, implicit $exec
+    V_CMP_EQ_U32_e32 1, undef %2, implicit-def $vcc, implicit $exec
     %6:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %5, %3, implicit $exec
     %7:vgpr_32 = V_CNDMASK_B32_e32 killed %5, killed %5, implicit $vcc, implicit $exec
     $vgpr0 = COPY %6
@@ -165,8 +165,8 @@ body:             |
     ; CHECK-NEXT: $vgpr0 = COPY [[V_CNDMASK_B32_e64_]]
     ; CHECK-NEXT: SI_RETURN implicit $vgpr0
     %1:vgpr_32 = IMPLICIT_DEF
-    %2:vgpr_32 = V_LSHRREV_B32_e64 16, %1, implicit $exec
-    %3:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %2, undef %0, implicit $exec
+    %2:vgpr_32 = V_LSHRREV_B32_e64 16, undef %1, implicit $exec
+    %3:vgpr_32 = V_CNDMASK_B32_e64 0, 0, 0, %2, undef %0:sreg_64_xexec, implicit $exec
     $vgpr0 = COPY %3
     SI_RETURN implicit $vgpr0
 ...