[llvm] [AMDGPU][NFC] Compute prologue frame size/alignment in 64-bit (PR #224734)

via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 21 07:46:35 PDT 2026


https://github.com/ahradwan2-public updated https://github.com/llvm/llvm-project/pull/224734

>From 2ff19da1c69ce3b4039e497a91a9f0eaf88da99a Mon Sep 17 00:00:00 2001
From: Ahmed Radwan <ahradwan at amd.com>
Date: Fri, 18 Sep 2026 15:50:29 -0400
Subject: [PATCH 1/2] [AMDGPU][NFC] Compute prologue frame size/alignment in
 64-bit

---
 llvm/lib/Target/AMDGPU/SIFrameLowering.cpp    |  6 +-
 .../eliminate-frame-index-v-add-co-u32.mir    | 64 +++++++++----------
 .../eliminate-frame-index-v-add-u32.mir       |  6 +-
 .../AMDGPU/pei-scavenge-sgpr-carry-out.mir    |  8 +--
 .../CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir |  4 +-
 .../test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir |  2 +-
 .../AMDGPU/pei-scavenge-vgpr-spill.mir        |  6 +-
 .../CodeGen/AMDGPU/use_restore_frame_reg.mir  |  4 +-
 8 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
index 92fb77b1e6436..585a8eb8191f7 100644
--- a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
@@ -1443,8 +1443,8 @@ void SIFrameLowering::emitPrologue(MachineFunction &MF,
 
   bool HasFP = false;
   bool HasBP = false;
-  uint32_t NumBytes = MFI.getStackSize();
-  uint32_t RoundedSize = NumBytes;
+  uint64_t NumBytes = MFI.getStackSize();
+  uint64_t RoundedSize = NumBytes;
 
   // Functions that never return don't need to save and restore the FP or BP.
   const Function &F = MF.getFunction();
@@ -1496,7 +1496,7 @@ void SIFrameLowering::emitPrologue(MachineFunction &MF,
   }
 
   if (HasFP) {
-    const unsigned Alignment = MFI.getMaxAlign().value();
+    const uint64_t Alignment = MFI.getMaxAlign().value();
 
     RoundedSize += Alignment;
     if (LiveUnits.empty()) {
diff --git a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir
index 9bb70794fa5f3..7e20bd2d5b19b 100644
--- a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir
+++ b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir
@@ -2506,7 +2506,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2533,7 +2533,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2560,7 +2560,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2586,7 +2586,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2612,7 +2612,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2637,7 +2637,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2662,7 +2662,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2686,7 +2686,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2728,7 +2728,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2755,7 +2755,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2782,7 +2782,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2808,7 +2808,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2834,7 +2834,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2859,7 +2859,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2884,7 +2884,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2908,7 +2908,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2948,7 +2948,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2973,7 +2973,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2998,7 +2998,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3022,7 +3022,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3046,7 +3046,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3069,7 +3069,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3092,7 +3092,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3114,7 +3114,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3154,7 +3154,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3179,7 +3179,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3204,7 +3204,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3228,7 +3228,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3252,7 +3252,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3275,7 +3275,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3298,7 +3298,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3320,7 +3320,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir
index b605e5a0ec4b8..866c3dc5f044b 100644
--- a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir
+++ b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir
@@ -2072,7 +2072,7 @@ body:             |
     ; MUBUF-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; MUBUF-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; MUBUF-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; MUBUF-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2096,7 +2096,7 @@ body:             |
     ; MUBUFW32-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; MUBUFW32-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; MUBUFW32-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 262112, implicit-def $scc
-    ; MUBUFW32-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294705152, implicit-def dead $scc
+    ; MUBUFW32-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -262144, implicit-def dead $scc
     ; MUBUFW32-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; MUBUFW32-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; MUBUFW32-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2119,7 +2119,7 @@ body:             |
     ; FLATSCRW64-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; FLATSCRW64-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; FLATSCRW64-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; FLATSCRW64-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; FLATSCRW64-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; FLATSCRW64-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; FLATSCRW64-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; FLATSCRW64-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir
index c6eaa033d4d02..80c4f9d7ba2c3 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir
@@ -61,7 +61,7 @@ body:             |
     ; CHECK-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -141,7 +141,7 @@ body:             |
     ; CHECK-NEXT: $sgpr29 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr29
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr40 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr40
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -220,7 +220,7 @@ body:             |
     ; CHECK-NEXT: $sgpr28 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr28
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr29 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr29
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -298,7 +298,7 @@ body:             |
     ; CHECK-NEXT: $sgpr28 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr28
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr29 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr29
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir
index 7f55b13c77466..ed0c3097bd566 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir
@@ -57,7 +57,7 @@ body:             |
     ; MUBUF-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; MUBUF-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; MUBUF-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; MUBUF-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -110,7 +110,7 @@ body:             |
     ; FLATSCR-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; FLATSCR-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; FLATSCR-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; FLATSCR-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; FLATSCR-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; FLATSCR-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir
index db8af6feb4f7a..b1a11879987da 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir
@@ -56,7 +56,7 @@ body:             |
     ; CHECK-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 262080, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294705152, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -262144, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir
index 8f0fa541e2076..e2043bdfe445d 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir
@@ -93,7 +93,7 @@ body:             |
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION undefined $sgpr95
     ; GFX8-NEXT: $sgpr4 = COPY $sgpr33
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr6_sgpr7 = S_XOR_SAVEEXEC_B64 -1, implicit-def $exec, implicit-def dead $scc, implicit $exec
     ; GFX8-NEXT: $sgpr5 = S_ADD_I32 $sgpr33, 1048832, implicit-def dead $scc
     ; GFX8-NEXT: BUFFER_STORE_DWORD_OFFSET $vgpr2, $sgpr0_sgpr1_sgpr2_sgpr3, killed $sgpr5, 0, 0, 0, implicit $exec :: ("amdgpu-thread-private" store (s32) into %stack.3, addrspace 5)
@@ -194,7 +194,7 @@ body:             |
     ; GFX9-NEXT: frame-setup CFI_INSTRUCTION undefined $sgpr95
     ; GFX9-NEXT: $sgpr4 = COPY $sgpr33
     ; GFX9-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX9-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+    ; GFX9-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
     ; GFX9-NEXT: $sgpr6_sgpr7 = S_XOR_SAVEEXEC_B64 -1, implicit-def $exec, implicit-def dead $scc, implicit $exec
     ; GFX9-NEXT: $sgpr5 = S_ADD_I32 $sgpr33, 1048832, implicit-def dead $scc
     ; GFX9-NEXT: BUFFER_STORE_DWORD_OFFSET $vgpr2, $sgpr0_sgpr1_sgpr2_sgpr3, killed $sgpr5, 0, 0, 0, implicit $exec :: ("amdgpu-thread-private" store (s32) into %stack.3, addrspace 5)
@@ -293,7 +293,7 @@ body:             |
     ; GFX9-FLATSCR-NEXT: frame-setup CFI_INSTRUCTION undefined $sgpr95
     ; GFX9-FLATSCR-NEXT: $sgpr4 = COPY $sgpr33
     ; GFX9-FLATSCR-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX9-FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+    ; GFX9-FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
     ; GFX9-FLATSCR-NEXT: $sgpr6_sgpr7 = S_XOR_SAVEEXEC_B64 -1, implicit-def $exec, implicit-def dead $scc, implicit $exec
     ; GFX9-FLATSCR-NEXT: $sgpr5 = S_ADD_I32 $sgpr33, 16388, implicit-def dead $scc
     ; GFX9-FLATSCR-NEXT: SCRATCH_STORE_DWORD_SADDR $vgpr2, killed $sgpr5, 0, 0, implicit $exec, implicit $flat_scr :: ("amdgpu-thread-private" store (s32) into %stack.3, addrspace 5)
diff --git a/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir b/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir
index 58b2c491f4e73..b8b17aeaa61cc 100644
--- a/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir
+++ b/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir
@@ -71,7 +71,7 @@ body:             |
   ; MUBUF-NEXT:   $sgpr40 = frame-setup COPY $sgpr33
   ; MUBUF-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
   ; MUBUF-NEXT:   $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-  ; MUBUF-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
+  ; MUBUF-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
   ; MUBUF-NEXT:   $sgpr41 = frame-setup COPY $sgpr34
   ; MUBUF-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
   ; MUBUF-NEXT:   $sgpr34 = frame-setup COPY $sgpr32
@@ -139,7 +139,7 @@ body:             |
   ; FLATSCR-NEXT:   $sgpr40 = frame-setup COPY $sgpr33
   ; FLATSCR-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
   ; FLATSCR-NEXT:   $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-  ; FLATSCR-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
+  ; FLATSCR-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
   ; FLATSCR-NEXT:   $sgpr41 = frame-setup COPY $sgpr34
   ; FLATSCR-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
   ; FLATSCR-NEXT:   $sgpr34 = frame-setup COPY $sgpr32

>From 37e6327a39d77f14d0058225785fff033b6e807e Mon Sep 17 00:00:00 2001
From: Ahmed Radwan <ahradwan at amd.com>
Date: Mon, 21 Sep 2026 10:46:10 -0400
Subject: [PATCH 2/2] [AMDGPU] Address review: revert Alignment to unsigned;
 use int64_t for NumBytes/RoundedSize

---
 llvm/lib/Target/AMDGPU/SIFrameLowering.cpp    |  6 +-
 .../eliminate-frame-index-v-add-co-u32.mir    | 64 +++++++++----------
 .../eliminate-frame-index-v-add-u32.mir       |  6 +-
 .../AMDGPU/pei-scavenge-sgpr-carry-out.mir    |  8 +--
 .../CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir |  4 +-
 .../test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir |  2 +-
 .../AMDGPU/pei-scavenge-vgpr-spill.mir        |  6 +-
 .../CodeGen/AMDGPU/use_restore_frame_reg.mir  |  4 +-
 8 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
index 585a8eb8191f7..364d8f07b6df2 100644
--- a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
@@ -1443,8 +1443,8 @@ void SIFrameLowering::emitPrologue(MachineFunction &MF,
 
   bool HasFP = false;
   bool HasBP = false;
-  uint64_t NumBytes = MFI.getStackSize();
-  uint64_t RoundedSize = NumBytes;
+  int64_t NumBytes = MFI.getStackSize();
+  int64_t RoundedSize = NumBytes;
 
   // Functions that never return don't need to save and restore the FP or BP.
   const Function &F = MF.getFunction();
@@ -1496,7 +1496,7 @@ void SIFrameLowering::emitPrologue(MachineFunction &MF,
   }
 
   if (HasFP) {
-    const uint64_t Alignment = MFI.getMaxAlign().value();
+    const unsigned Alignment = MFI.getMaxAlign().value();
 
     RoundedSize += Alignment;
     if (LiveUnits.empty()) {
diff --git a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir
index 7e20bd2d5b19b..9bb70794fa5f3 100644
--- a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir
+++ b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-co-u32.mir
@@ -2506,7 +2506,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2533,7 +2533,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2560,7 +2560,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2586,7 +2586,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2612,7 +2612,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2637,7 +2637,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2662,7 +2662,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2686,7 +2686,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2728,7 +2728,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2755,7 +2755,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2782,7 +2782,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2808,7 +2808,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2834,7 +2834,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2859,7 +2859,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2884,7 +2884,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2908,7 +2908,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2948,7 +2948,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2973,7 +2973,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2998,7 +2998,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3022,7 +3022,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3046,7 +3046,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3069,7 +3069,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3092,7 +3092,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3114,7 +3114,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3154,7 +3154,7 @@ body:             |
     ; GFX7-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX7-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX7-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX7-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX7-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX7-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3179,7 +3179,7 @@ body:             |
     ; GFX8-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX8-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3204,7 +3204,7 @@ body:             |
     ; GFX900-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX900-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX900-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX900-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX900-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX900-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3228,7 +3228,7 @@ body:             |
     ; GFX90A-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX90A-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX90A-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX90A-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX90A-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX90A-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3252,7 +3252,7 @@ body:             |
     ; GFX10-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX10-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX10-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX10-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX10-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX10-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3275,7 +3275,7 @@ body:             |
     ; GFX942-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX942-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX942-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX942-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX942-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX942-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3298,7 +3298,7 @@ body:             |
     ; GFX11-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX11-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX11-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX11-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX11-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX11-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -3320,7 +3320,7 @@ body:             |
     ; GFX12-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; GFX12-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX12-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX12-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; GFX12-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; GFX12-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir
index 866c3dc5f044b..b605e5a0ec4b8 100644
--- a/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir
+++ b/llvm/test/CodeGen/AMDGPU/eliminate-frame-index-v-add-u32.mir
@@ -2072,7 +2072,7 @@ body:             |
     ; MUBUF-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; MUBUF-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; MUBUF-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; MUBUF-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2096,7 +2096,7 @@ body:             |
     ; MUBUFW32-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; MUBUFW32-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; MUBUFW32-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 262112, implicit-def $scc
-    ; MUBUFW32-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -262144, implicit-def dead $scc
+    ; MUBUFW32-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294705152, implicit-def dead $scc
     ; MUBUFW32-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; MUBUFW32-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; MUBUFW32-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -2119,7 +2119,7 @@ body:             |
     ; FLATSCRW64-NEXT: $sgpr4 = frame-setup COPY $sgpr33
     ; FLATSCRW64-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr4
     ; FLATSCRW64-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; FLATSCRW64-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; FLATSCRW64-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; FLATSCRW64-NEXT: $sgpr5 = frame-setup COPY $sgpr34
     ; FLATSCRW64-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr5
     ; FLATSCRW64-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir
index 80c4f9d7ba2c3..c6eaa033d4d02 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-carry-out.mir
@@ -61,7 +61,7 @@ body:             |
     ; CHECK-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -141,7 +141,7 @@ body:             |
     ; CHECK-NEXT: $sgpr29 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr29
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr40 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr40
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -220,7 +220,7 @@ body:             |
     ; CHECK-NEXT: $sgpr28 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr28
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr29 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr29
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -298,7 +298,7 @@ body:             |
     ; CHECK-NEXT: $sgpr28 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr28
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr29 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr29
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir
index ed0c3097bd566..7f55b13c77466 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr-gfx9.mir
@@ -57,7 +57,7 @@ body:             |
     ; MUBUF-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; MUBUF-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; MUBUF-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; MUBUF-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; MUBUF-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; MUBUF-NEXT: $sgpr34 = frame-setup COPY $sgpr32
@@ -110,7 +110,7 @@ body:             |
     ; FLATSCR-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; FLATSCR-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; FLATSCR-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; FLATSCR-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; FLATSCR-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; FLATSCR-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir
index b1a11879987da..db8af6feb4f7a 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-sgpr.mir
@@ -56,7 +56,7 @@ body:             |
     ; CHECK-NEXT: $sgpr40 = frame-setup COPY $sgpr33
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
     ; CHECK-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 262080, implicit-def $scc
-    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -262144, implicit-def dead $scc
+    ; CHECK-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294705152, implicit-def dead $scc
     ; CHECK-NEXT: $sgpr41 = frame-setup COPY $sgpr34
     ; CHECK-NEXT: frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
     ; CHECK-NEXT: $sgpr34 = frame-setup COPY $sgpr32
diff --git a/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir b/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir
index e2043bdfe445d..8f0fa541e2076 100644
--- a/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir
+++ b/llvm/test/CodeGen/AMDGPU/pei-scavenge-vgpr-spill.mir
@@ -93,7 +93,7 @@ body:             |
     ; GFX8-NEXT: frame-setup CFI_INSTRUCTION undefined $sgpr95
     ; GFX8-NEXT: $sgpr4 = COPY $sgpr33
     ; GFX8-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX8-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX8-NEXT: $sgpr6_sgpr7 = S_XOR_SAVEEXEC_B64 -1, implicit-def $exec, implicit-def dead $scc, implicit $exec
     ; GFX8-NEXT: $sgpr5 = S_ADD_I32 $sgpr33, 1048832, implicit-def dead $scc
     ; GFX8-NEXT: BUFFER_STORE_DWORD_OFFSET $vgpr2, $sgpr0_sgpr1_sgpr2_sgpr3, killed $sgpr5, 0, 0, 0, implicit $exec :: ("amdgpu-thread-private" store (s32) into %stack.3, addrspace 5)
@@ -194,7 +194,7 @@ body:             |
     ; GFX9-NEXT: frame-setup CFI_INSTRUCTION undefined $sgpr95
     ; GFX9-NEXT: $sgpr4 = COPY $sgpr33
     ; GFX9-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-    ; GFX9-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+    ; GFX9-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
     ; GFX9-NEXT: $sgpr6_sgpr7 = S_XOR_SAVEEXEC_B64 -1, implicit-def $exec, implicit-def dead $scc, implicit $exec
     ; GFX9-NEXT: $sgpr5 = S_ADD_I32 $sgpr33, 1048832, implicit-def dead $scc
     ; GFX9-NEXT: BUFFER_STORE_DWORD_OFFSET $vgpr2, $sgpr0_sgpr1_sgpr2_sgpr3, killed $sgpr5, 0, 0, 0, implicit $exec :: ("amdgpu-thread-private" store (s32) into %stack.3, addrspace 5)
@@ -293,7 +293,7 @@ body:             |
     ; GFX9-FLATSCR-NEXT: frame-setup CFI_INSTRUCTION undefined $sgpr95
     ; GFX9-FLATSCR-NEXT: $sgpr4 = COPY $sgpr33
     ; GFX9-FLATSCR-NEXT: $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-    ; GFX9-FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+    ; GFX9-FLATSCR-NEXT: $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
     ; GFX9-FLATSCR-NEXT: $sgpr6_sgpr7 = S_XOR_SAVEEXEC_B64 -1, implicit-def $exec, implicit-def dead $scc, implicit $exec
     ; GFX9-FLATSCR-NEXT: $sgpr5 = S_ADD_I32 $sgpr33, 16388, implicit-def dead $scc
     ; GFX9-FLATSCR-NEXT: SCRATCH_STORE_DWORD_SADDR $vgpr2, killed $sgpr5, 0, 0, implicit $exec, implicit $flat_scr :: ("amdgpu-thread-private" store (s32) into %stack.3, addrspace 5)
diff --git a/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir b/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir
index b8b17aeaa61cc..58b2c491f4e73 100644
--- a/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir
+++ b/llvm/test/CodeGen/AMDGPU/use_restore_frame_reg.mir
@@ -71,7 +71,7 @@ body:             |
   ; MUBUF-NEXT:   $sgpr40 = frame-setup COPY $sgpr33
   ; MUBUF-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
   ; MUBUF-NEXT:   $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 524224, implicit-def $scc
-  ; MUBUF-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -524288, implicit-def dead $scc
+  ; MUBUF-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294443008, implicit-def dead $scc
   ; MUBUF-NEXT:   $sgpr41 = frame-setup COPY $sgpr34
   ; MUBUF-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
   ; MUBUF-NEXT:   $sgpr34 = frame-setup COPY $sgpr32
@@ -139,7 +139,7 @@ body:             |
   ; FLATSCR-NEXT:   $sgpr40 = frame-setup COPY $sgpr33
   ; FLATSCR-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr33, $sgpr40
   ; FLATSCR-NEXT:   $sgpr33 = frame-setup S_ADD_I32 $sgpr32, 8191, implicit-def $scc
-  ; FLATSCR-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, -8192, implicit-def dead $scc
+  ; FLATSCR-NEXT:   $sgpr33 = frame-setup S_AND_B32 killed $sgpr33, 4294959104, implicit-def dead $scc
   ; FLATSCR-NEXT:   $sgpr41 = frame-setup COPY $sgpr34
   ; FLATSCR-NEXT:   frame-setup CFI_INSTRUCTION register $sgpr34, $sgpr41
   ; FLATSCR-NEXT:   $sgpr34 = frame-setup COPY $sgpr32



More information about the llvm-commits mailing list