[llvm] 6ce8481 - [AMDGPU] Always update SETREG MSBs if offset is 0 (#191362)

via llvm-commits llvm-commits at lists.llvm.org
Fri Apr 10 10:50:37 PDT 2026


Author: Stanislav Mekhanoshin
Date: 2026-04-10T10:50:33-07:00
New Revision: 6ce84819d2de76b4c747b433e9bc7ec43cefb186

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

LOG: [AMDGPU] Always update SETREG MSBs if offset is 0 (#191362)

We can always update immediate if Offset is zero. The bits
HW will write are always at the same position if offset is 0.

In particular it removes redundant mode changes created as seen
in the hazard-setreg-vgpr-msb-gfx1250.mir.

This still relies on the wrong behavior that SETREG updates
MSBs, so it will have to be changed later. Test immediates may be
off from desired for that reason in this patch.

Added: 
    

Modified: 
    llvm/lib/Target/AMDGPU/AMDGPULowerVGPREncoding.cpp
    llvm/test/CodeGen/AMDGPU/hazard-setreg-vgpr-msb-gfx1250.mir
    llvm/test/CodeGen/AMDGPU/vgpr-setreg-mode-swar.mir

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/AMDGPULowerVGPREncoding.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerVGPREncoding.cpp
index bcac1dc35ae53..d8754babce1c3 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerVGPREncoding.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerVGPREncoding.cpp
@@ -480,6 +480,7 @@ bool AMDGPULowerVGPREncoding::updateSetregModeImm(MachineInstr &MI,
 
   MachineOperand *ImmOp = TII->getNamedOperand(MI, AMDGPU::OpName::imm);
   int64_t OldImm = ImmOp->getImm();
+  // Note that Offset is ignored for mode bits here.
   int64_t NewImm =
       (OldImm & ~AMDGPU::Hwreg::VGPR_MSB_MASK) | (SetregMode << VGPRMSBShift);
   ImmOp->setImm(NewImm);
@@ -498,7 +499,6 @@ bool AMDGPULowerVGPREncoding::handleSetregMode(MachineInstr &MI) {
   assert(SIMM16Op && "SIMM16Op must be present");
 
   auto [HwRegId, Offset, Size] = HwregEncoding::decode(SIMM16Op->getImm());
-  (void)Offset;
   LLVM_DEBUG(dbgs() << "    HwRegId=" << HwRegId << " Offset=" << Offset
                     << " Size=" << Size << '\n');
   if (HwRegId != ID_MODE) {
@@ -515,9 +515,10 @@ bool AMDGPULowerVGPREncoding::handleSetregMode(MachineInstr &MI) {
   });
 
   // Case 1: Size <= 12 - the original instruction uses imm32[0:Size-1], so
-  // imm32[12:19] is unused. Safe to set imm32[12:19] to the correct VGPR
-  // MSBs.
-  if (Size <= VGPRMSBShift) {
+  // imm32[12:19] is unused, or Offset is zero and it is safe to set
+  // imm32[12:19] to the correct VGPR MSBs.
+  if (!Offset || Size <= VGPRMSBShift) {
+    // Set imm32[12:19] to the correct VGPR MSBs.
     LLVM_DEBUG(dbgs() << "    Case 1: Size(" << Size << ") <= VGPRMSBShift("
                       << VGPRMSBShift
                       << "), treating as mode scope boundary\n");

diff  --git a/llvm/test/CodeGen/AMDGPU/hazard-setreg-vgpr-msb-gfx1250.mir b/llvm/test/CodeGen/AMDGPU/hazard-setreg-vgpr-msb-gfx1250.mir
index 95c8c67566f51..317a7fce56f43 100644
--- a/llvm/test/CodeGen/AMDGPU/hazard-setreg-vgpr-msb-gfx1250.mir
+++ b/llvm/test/CodeGen/AMDGPU/hazard-setreg-vgpr-msb-gfx1250.mir
@@ -19,22 +19,19 @@ body: |
     ; CHECK-LABEL: name: setreg_mode_size_gt_12_mismatch
     ; CHECK: S_SET_VGPR_MSB 64, implicit-def $mode
     ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 undef $sgpr0, implicit $exec
-    ; CHECK-NEXT: S_SETREG_IMM32_B32 146108, 30721, implicit-def $mode, implicit $mode
-    ; CHECK-NEXT: S_NOP 0
-    ; CHECK-NEXT: S_SET_VGPR_MSB 64, implicit-def $mode
-    ; CHECK-NEXT: S_ENDPGM 0
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 2748, 30721, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: SI_RETURN
     $vgpr256 = V_MOV_B32_e32 undef $sgpr0, implicit $exec
     ; hwreg(MODE, 0, 16): simm16 = 0x7801 = 30721
     ; imm32 = 0x23ABC = 146108 (bits 12:19 = 0x23, doesn't match VGPR MSB mode)
     S_SETREG_IMM32_B32 146108, 30721, implicit-def $mode, implicit $mode
-    S_ENDPGM 0
+    SI_RETURN
 ...
 
 ---
 # Case 2 with 
diff erent next MSB: setreg (size=16) with imm32[12:19] that
-# doesn't match current VGPR MSB. S_NOP + S_SET_VGPR_MSB is inserted to
-# restore current mode, then another S_SET_VGPR_MSB for the next VALU
-# (v512/v513).
+# doesn't match current VGPR MSB. S_NOP + S_SET_VGPR_MSB are inserted for the
+# next VALU (v512/v513).
 name: setreg_mode_size_gt_12_matches_next
 tracksRegLiveness: true
 body: |
@@ -43,9 +40,6 @@ body: |
     ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
     ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 undef $vgpr257, implicit $exec
     ; CHECK-NEXT: S_SETREG_IMM32_B32 43708, 30721, implicit-def $mode, implicit $mode
-    ; CHECK-NEXT: S_NOP 0
-    ; CHECK-NEXT: S_SET_VGPR_MSB 65, implicit-def $mode
-    ; CHECK-NEXT: S_SET_VGPR_MSB 16770, implicit-def $mode
     ; CHECK-NEXT: $vgpr512 = V_MOV_B32_e32 undef $vgpr513, implicit $exec
     ; CHECK-NEXT: S_ENDPGM 0
     $vgpr256 = V_MOV_B32_e32 undef $vgpr257, implicit $exec
@@ -77,22 +71,19 @@ body: |
 ...
 
 ---
-# Case 2 but no high VGPRs before setreg. The lowering pass still inserts
-# S_NOP + S_SET_VGPR_MSB 0 (redundant but safe).
+# Case 2 but no high VGPRs before setreg.
 name: setreg_mode_size_gt_12_no_high_vgpr
 tracksRegLiveness: true
 body: |
   bb.0:
     ; CHECK-LABEL: name: setreg_mode_size_gt_12_no_high_vgpr
     ; CHECK: $vgpr0 = V_MOV_B32_e32 undef $sgpr0, implicit $exec
-    ; CHECK-NEXT: S_SETREG_IMM32_B32 146108, 30721, implicit-def $mode, implicit $mode
-    ; CHECK-NEXT: S_NOP 0
-    ; CHECK-NEXT: S_SET_VGPR_MSB 0, implicit-def $mode
-    ; CHECK-NEXT: S_ENDPGM 0
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 2748, 30721, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: SI_RETURN
     $vgpr0 = V_MOV_B32_e32 undef $sgpr0, implicit $exec
     ; hwreg(MODE, 0, 16): simm16 = 0x7801 = 30721
     S_SETREG_IMM32_B32 146108, 30721, implicit-def $mode, implicit $mode
-    S_ENDPGM 0
+    SI_RETURN
 ...
 
 ---
@@ -105,10 +96,7 @@ body: |
   bb.0:
     ; CHECK-LABEL: name: setreg_mode_size_gt_12_high_vgpr_after
     ; CHECK: $vgpr0 = V_MOV_B32_e32 undef $sgpr0, implicit $exec
-    ; CHECK-NEXT: S_SETREG_IMM32_B32 146108, 30721, implicit-def $mode, implicit $mode
-    ; CHECK-NEXT: S_NOP 0
-    ; CHECK-NEXT: S_SET_VGPR_MSB 0, implicit-def $mode
-    ; CHECK-NEXT: S_SET_VGPR_MSB 64, implicit-def $mode
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 6844, 30721, implicit-def $mode, implicit $mode
     ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 undef $sgpr0, implicit $exec
     ; CHECK-NEXT: S_ENDPGM 0
     $vgpr0 = V_MOV_B32_e32 undef $sgpr0, implicit $exec

diff  --git a/llvm/test/CodeGen/AMDGPU/vgpr-setreg-mode-swar.mir b/llvm/test/CodeGen/AMDGPU/vgpr-setreg-mode-swar.mir
index 6f08fa8df94fb..ba3c247b07da4 100644
--- a/llvm/test/CodeGen/AMDGPU/vgpr-setreg-mode-swar.mir
+++ b/llvm/test/CodeGen/AMDGPU/vgpr-setreg-mode-swar.mir
@@ -83,12 +83,12 @@ body:             |
 ...
 
 ---
-# Case 2: Size > 12 (size=16), imm32[12:19] already matches VGPR MSBs
+# Case 2a: Size > 12 (size=16), imm32[12:19] already matches VGPR MSBs
 # vgpr256/257: S_SET_VGPR_MSB mode = 65, MODE register mode = 5
 # imm32 = 0x5ABC = 23228 (bits 12:19 = 5), no modification needed
 
 # ASM-LABEL: {{^}}setreg_size_gt_12_match:
-# ASM: _setreg_imm32_b32 hwreg(HW_REG_WAVE_MODE, 0, 16), 0x5abc ;  msbs: dst=1 src0=1 src1=0 src2=0
+# ASM: s_setreg_imm32_b32 hwreg(HW_REG_WAVE_MODE, 0, 16), 0xabc ;  msbs: dst=0 src0=0 src1=0 src2=0
 
 # DIS-LABEL: <setreg_size_gt_12_match>:
 
@@ -99,7 +99,7 @@ body:             |
     ; CHECK-LABEL: name: setreg_size_gt_12_match
     ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
     ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
-    ; CHECK-NEXT: S_SETREG_IMM32_B32 23228, 30721, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 2748, 30721, implicit-def $mode, implicit $mode
     ; CHECK-NEXT: S_ENDPGM 0
     $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
     ; size=16, offset=0, hwreg=MODE: simm16 = 0x7801 = 30721
@@ -108,13 +108,35 @@ body:             |
     S_ENDPGM 0
 ...
 
+---
+# Case 2b: Size > 12 (size=16), imm32[12:19] already matches VGPR MSBs, offset is non-zero
+# vgpr256/257: S_SET_VGPR_MSB mode = 65, MODE register mode = 5
+# imm32 = 0x5ABC = 23228 (bits 12:19 = 5), no modification needed
+
+
+# DIS-LABEL: <setreg_size_gt_12_offset_1_match>:
+
+name:            setreg_size_gt_12_offset_1_match
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    ; CHECK-LABEL: name: setreg_size_gt_12_offset_1_match
+    ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
+    ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 23228, 30785, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: S_ENDPGM 0
+    $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; size=16, offset=1, hwreg=MODE: simm16 = 0x7841 = 30785
+    ; imm32 = 0x5ABC = 23228 (bits 12:19 = 5 = MODE register mode for vgpr256/257)
+    S_SETREG_IMM32_B32 23228, 30785, implicit-def $mode, implicit $mode
+    S_ENDPGM 0
+...
+
 ---
 # Case 3: Size > 12 (size=16), imm32[12:19] doesn't match VGPR MSBs
 # vgpr256/257: S_SET_VGPR_MSB mode = 65, MODE register mode = 5
-# imm32 = 0x23ABC = 146108 (bits 12:19 = 0x23 != 5), must insert s_set_vgpr_msb after
+# imm32 = 0x23ABC = 146108 (bits 12:19 = 0x23 != 5), update mode bits
 
-# ASM-LABEL: {{^}}setreg_size_gt_12_mismatch:
-# ASM: s_setreg_imm32_b32 hwreg(HW_REG_WAVE_MODE, 0, 16), 0x23abc ;  msbs: dst=3 src0=0 src1=2 src2=0
 
 # DIS-LABEL: <setreg_size_gt_12_mismatch>:
 
@@ -125,9 +147,7 @@ body:             |
     ; CHECK-LABEL: name: setreg_size_gt_12_mismatch
     ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
     ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
-    ; CHECK-NEXT: S_SETREG_IMM32_B32 146108, 30721, implicit-def $mode, implicit $mode
-    ; CHECK-NEXT: S_NOP 0
-    ; CHECK-NEXT: S_SET_VGPR_MSB 65, implicit-def $mode
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 2748, 30721, implicit-def $mode, implicit $mode
     ; CHECK-NEXT: S_ENDPGM 0
     $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
     ; size=16, offset=0, hwreg=MODE: simm16 = 0x7801 = 30721
@@ -136,6 +156,32 @@ body:             |
     S_ENDPGM 0
 ...
 
+---
+# Case 3: Size > 12 (size=16), imm32[12:19] doesn't match VGPR MSBs, offset is non-zero
+# vgpr256/257: S_SET_VGPR_MSB mode = 65, MODE register mode = 5
+# imm32 = 0x23ABC = 146108 (bits 12:19 = 0x23 != 5), must insert s_set_vgpr_msb after
+
+
+# DIS-LABEL: <setreg_size_gt_12_mismatch_offset_1>:
+
+name:            setreg_size_gt_12_mismatch_offset_1
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    ; CHECK-LABEL: name: setreg_size_gt_12_mismatch_offset_1
+    ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
+    ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 146108, 30785, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: S_NOP 0
+    ; CHECK-NEXT: S_SET_VGPR_MSB 65, implicit-def $mode
+    ; CHECK-NEXT: S_ENDPGM 0
+    $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; size=16, offset=1, hwreg=MODE: simm16 = 0x7841 = 30785
+    ; imm32 = 0x23ABC = 146108 (bits 12:19 = 0x23 != 5)
+    S_SETREG_IMM32_B32 146108, 30785, implicit-def $mode, implicit $mode
+    S_ENDPGM 0
+...
+
 ---
 # Case 4: Non-MODE hwreg should not be modified
 # This uses ID_STATUS=2 instead of ID_MODE=1
@@ -292,7 +338,7 @@ body:             |
 # New s_set_vgpr_msb imm = NewMode | (OldMode << 8) = 130 | (65 << 8) = 16770
 
 # ASM-LABEL: {{^}}setreg_size_gt_12_match_then_
diff erent_vgpr:
-# ASM: s_setreg_imm32_b32 hwreg(HW_REG_WAVE_MODE, 0, 16), 0x5abc ;  msbs: dst=1 src0=1 src1=0 src2=0
+# ASM: s_setreg_imm32_b32 hwreg(HW_REG_WAVE_MODE, 0, 16), 0xaabc ;  msbs: dst=2 src0=2 src1=0 src2=0
 
 # DIS-LABEL: <setreg_size_gt_12_match_then_
diff erent_vgpr>:
 
@@ -303,9 +349,7 @@ body:             |
     ; CHECK-LABEL: name: setreg_size_gt_12_match_then_
diff erent_vgpr
     ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
     ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
-    ; CHECK-NEXT: S_SETREG_IMM32_B32 23228, 30721, implicit-def $mode, implicit $mode
-    ; CHECK-NEXT: S_NOP 0
-    ; CHECK-NEXT: S_SET_VGPR_MSB 16770, implicit-def $mode
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 43708, 30721, implicit-def $mode, implicit $mode
     ; CHECK-NEXT: $vgpr512 = V_MOV_B32_e32 $vgpr513, implicit $exec
     ; CHECK-NEXT: S_ENDPGM 0
     $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
@@ -316,6 +360,55 @@ body:             |
     S_ENDPGM 0
 ...
 
+---
+# S_SET_VGPR_MSB format: (src0_msb[0-1], src1_msb[2-3], src2_msb[4-5], dst_msb[6-7])
+# MODE register format:  (dst_msb[0-1], src0_msb[2-3], src1_msb[4-5], src2_msb[6-7])
+# vgpr256/257 (both MSB=1): S_SET_VGPR_MSB mode = (1 << 0) | (1 << 6) = 65
+#                           MODE register mode = (1 << 0) | (1 << 2) = 5
+# New setreg imm = 0x5 | (5 << 12) = 0x5005 = 20485
+
+
+# DIS-LABEL: <setreg_offset_8>:
+
+name:            setreg_offset_8
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    ; CHECK-LABEL: name: setreg_offset_8
+    ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
+    ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 5, 6657, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: S_ENDPGM 0
+    $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; size=4, offset=8, hwreg=MODE: simm16 = 0x1801 = 6145
+    S_SETREG_IMM32_B32 5, 6657, implicit-def $mode, implicit $mode
+    S_ENDPGM 0
+...
+
+---
+
+# New imm = 1 | (5 << 12) = 0x5001 = 20481
+
+
+# DIS-LABEL: <setreg_offset_25>:
+
+name:            setreg_offset_25
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    ; CHECK-LABEL: name: setreg_offset_25
+    ; CHECK: S_SET_VGPR_MSB 65, implicit-def $mode
+    ; CHECK-NEXT: $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; CHECK-NEXT: S_SETREG_IMM32_B32 1, 1601, implicit-def $mode, implicit $mode
+    ; CHECK-NEXT: S_ENDPGM 0
+    $vgpr256 = V_MOV_B32_e32 $vgpr257, implicit $exec
+    ; size=1, offset=25, hwreg=MODE: simm16 = 0x641 = 1601
+    S_SETREG_IMM32_B32 1, 1601, implicit-def $mode, implicit $mode
+    S_ENDPGM 0
+...
+
+# Update multiple SETREG instructions back to the first S_SET_VGPR_MSB
+
 # ASM-LABEL: {{^}}multiple_setreg:
 # ASM: s_set_vgpr_msb 0x41                     ;  msbs: dst=1 src0=1 src1=0 src2=0
 # ASM: v_mov_b32_e32 v0 /*v256*/, v1 /*v257*/


        


More information about the llvm-commits mailing list