[llvm-branch-commits] [llvm] [RISCV] Make enableCSRFirstTimeMinCost default true in RISC-V (PR #239532)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sun Nov 8 20:58:39 PST 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-backend-risc-v
Author: Piyou Chen (BeMg)
<details>
<summary>Changes</summary>
This is patch 3 of 4. Together, they adjust `tryAssignCSRFirstTime` and the `getCSRCost` value to improve prologue/epilogue codegen in benchmarks.
- https://github.com/llvm/llvm-project/pull/239526
- https://github.com/llvm/llvm-project/pull/239530
- https://github.com/llvm/llvm-project/pull/239532
- https://github.com/llvm/llvm-project/pull/239534
------
This patch makes enableCSRFirstTimeMinCost default true in RISC-V.
---
Full diff: https://github.com/llvm/llvm-project/pull/239532.diff
4 Files Affected:
- (modified) llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp (+5)
- (modified) llvm/lib/Target/RISCV/RISCVRegisterInfo.h (+2)
- (modified) llvm/test/CodeGen/RISCV/csr-first-use-cost.ll (+9-9)
- (modified) llvm/test/CodeGen/RISCV/exception-pointer-register.ll (+14-22)
``````````diff
diff --git a/llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp b/llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp
index 00c89367fc3ecb..eb3e597f15f5df 100644
--- a/llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp
+++ b/llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp
@@ -66,6 +66,11 @@ RISCVRegisterInfo::getIPRACSRegs(const MachineFunction *MF) const {
return CSR_IPRA_SaveList;
}
+bool RISCVRegisterInfo::enableCSRFirstTimeMinCost(
+ const MachineFunction &MF) const {
+ return true;
+}
+
const MCPhysReg *
RISCVRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
auto &Subtarget = MF->getSubtarget<RISCVSubtarget>();
diff --git a/llvm/lib/Target/RISCV/RISCVRegisterInfo.h b/llvm/lib/Target/RISCV/RISCVRegisterInfo.h
index 5d5441c75f5a41..e022a2ec8328fc 100644
--- a/llvm/lib/Target/RISCV/RISCVRegisterInfo.h
+++ b/llvm/lib/Target/RISCV/RISCVRegisterInfo.h
@@ -78,6 +78,8 @@ struct RISCVRegisterInfo : public RISCVGenRegisterInfo {
return 5;
}
+ bool enableCSRFirstTimeMinCost(const MachineFunction &MF) const override;
+
const MCPhysReg *getCalleeSavedRegs(const MachineFunction *MF) const override;
const TargetRegisterClass *
diff --git a/llvm/test/CodeGen/RISCV/csr-first-use-cost.ll b/llvm/test/CodeGen/RISCV/csr-first-use-cost.ll
index d50a149bb04077..86cd7f2d0f1a49 100644
--- a/llvm/test/CodeGen/RISCV/csr-first-use-cost.ll
+++ b/llvm/test/CodeGen/RISCV/csr-first-use-cost.ll
@@ -48,7 +48,6 @@ define fastcc void @Perl_sv_setnv(i8 %c, ptr %.str.54.3682) nounwind {
; DEFAULT-COST: # %bb.0: # %entry
; DEFAULT-COST-NEXT: addi sp, sp, -32
; DEFAULT-COST-NEXT: sd ra, 24(sp) # 8-byte Folded Spill
-; DEFAULT-COST-NEXT: sd s0, 16(sp) # 8-byte Folded Spill
; DEFAULT-COST-NEXT: li a2, 2
; DEFAULT-COST-NEXT: zext.b a0, a0
; DEFAULT-COST-NEXT: blt a2, a0, .LBB0_3
@@ -64,7 +63,6 @@ define fastcc void @Perl_sv_setnv(i8 %c, ptr %.str.54.3682) nounwind {
; DEFAULT-COST-NEXT: bne a0, a2, .LBB0_5
; DEFAULT-COST-NEXT: .LBB0_4: # %sw.bb3
; DEFAULT-COST-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
-; DEFAULT-COST-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
; DEFAULT-COST-NEXT: addi sp, sp, 32
; DEFAULT-COST-NEXT: ret
; DEFAULT-COST-NEXT: .LBB0_5: # %entry
@@ -74,14 +72,16 @@ define fastcc void @Perl_sv_setnv(i8 %c, ptr %.str.54.3682) nounwind {
; DEFAULT-COST-NEXT: .LBB0_6: # %sw.bb34.i
; DEFAULT-COST-NEXT: sd zero, 8(sp) # 8-byte Folded Spill
; DEFAULT-COST-NEXT: .LBB0_7: # %Perl_sv_reftype.exit
-; DEFAULT-COST-NEXT: li s0, 0
-; DEFAULT-COST-NEXT: li a0, 0
-; DEFAULT-COST-NEXT: li a1, 0
-; DEFAULT-COST-NEXT: jalr s0
-; DEFAULT-COST-NEXT: li a0, 0
+; DEFAULT-COST-NEXT: sd zero, 16(sp) # 8-byte Folded Spill
+; DEFAULT-COST-NEXT: ld a0, 16(sp) # 8-byte Folded Reload
+; DEFAULT-COST-NEXT: ld a1, 16(sp) # 8-byte Folded Reload
+; DEFAULT-COST-NEXT: ld a2, 16(sp) # 8-byte Folded Reload
+; DEFAULT-COST-NEXT: jalr a2
+; DEFAULT-COST-NEXT: ld a0, 16(sp) # 8-byte Folded Reload
; DEFAULT-COST-NEXT: ld a1, 8(sp) # 8-byte Folded Reload
-; DEFAULT-COST-NEXT: li a2, 0
-; DEFAULT-COST-NEXT: jalr s0
+; DEFAULT-COST-NEXT: ld a2, 16(sp) # 8-byte Folded Reload
+; DEFAULT-COST-NEXT: ld a3, 16(sp) # 8-byte Folded Reload
+; DEFAULT-COST-NEXT: jalr a3
entry:
switch i8 %c, label %Perl_sv_reftype.exit [
i8 1, label %sw.bb4
diff --git a/llvm/test/CodeGen/RISCV/exception-pointer-register.ll b/llvm/test/CodeGen/RISCV/exception-pointer-register.ll
index c46ce8801702be..6eb2227cebab9d 100644
--- a/llvm/test/CodeGen/RISCV/exception-pointer-register.ll
+++ b/llvm/test/CodeGen/RISCV/exception-pointer-register.ll
@@ -19,41 +19,37 @@ define void @caller(ptr %p) personality ptr @__gxx_personality_v0 {
; RV32I-NEXT: .cfi_def_cfa_offset 16
; RV32I-NEXT: sw ra, 12(sp) # 4-byte Folded Spill
; RV32I-NEXT: sw s0, 8(sp) # 4-byte Folded Spill
-; RV32I-NEXT: sw s1, 4(sp) # 4-byte Folded Spill
; RV32I-NEXT: .cfi_offset ra, -4
; RV32I-NEXT: .cfi_offset s0, -8
-; RV32I-NEXT: .cfi_offset s1, -12
; RV32I-NEXT: .cfi_remember_state
; RV32I-NEXT: mv s0, a0
; RV32I-NEXT: beqz a0, .LBB0_2
; RV32I-NEXT: # %bb.1: # %bb2
-; RV32I-NEXT: .Ltmp0:
+; RV32I-NEXT: .Ltmp0: # EH_LABEL
; RV32I-NEXT: mv a0, s0
; RV32I-NEXT: call bar
-; RV32I-NEXT: .Ltmp1:
+; RV32I-NEXT: .Ltmp1: # EH_LABEL
; RV32I-NEXT: j .LBB0_3
; RV32I-NEXT: .LBB0_2: # %bb1
-; RV32I-NEXT: .Ltmp2:
+; RV32I-NEXT: .Ltmp2: # EH_LABEL
; RV32I-NEXT: mv a0, s0
; RV32I-NEXT: call foo
-; RV32I-NEXT: .Ltmp3:
+; RV32I-NEXT: .Ltmp3: # EH_LABEL
; RV32I-NEXT: .LBB0_3: # %end2
; RV32I-NEXT: lw ra, 12(sp) # 4-byte Folded Reload
; RV32I-NEXT: lw s0, 8(sp) # 4-byte Folded Reload
-; RV32I-NEXT: lw s1, 4(sp) # 4-byte Folded Reload
; RV32I-NEXT: .cfi_restore ra
; RV32I-NEXT: .cfi_restore s0
-; RV32I-NEXT: .cfi_restore s1
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: .cfi_def_cfa_offset 0
; RV32I-NEXT: ret
; RV32I-NEXT: .LBB0_4: # %lpad
; RV32I-NEXT: .cfi_restore_state
-; RV32I-NEXT: .Ltmp4:
-; RV32I-NEXT: mv s1, a0
+; RV32I-NEXT: .Ltmp4: # EH_LABEL
+; RV32I-NEXT: sw a0, 4(sp) # 4-byte Folded Spill
; RV32I-NEXT: mv a0, s0
; RV32I-NEXT: call callee
-; RV32I-NEXT: mv a0, s1
+; RV32I-NEXT: lw a0, 4(sp) # 4-byte Folded Reload
; RV32I-NEXT: call _Unwind_Resume
;
; RV64I-LABEL: caller:
@@ -62,41 +58,37 @@ define void @caller(ptr %p) personality ptr @__gxx_personality_v0 {
; RV64I-NEXT: .cfi_def_cfa_offset 32
; RV64I-NEXT: sd ra, 24(sp) # 8-byte Folded Spill
; RV64I-NEXT: sd s0, 16(sp) # 8-byte Folded Spill
-; RV64I-NEXT: sd s1, 8(sp) # 8-byte Folded Spill
; RV64I-NEXT: .cfi_offset ra, -8
; RV64I-NEXT: .cfi_offset s0, -16
-; RV64I-NEXT: .cfi_offset s1, -24
; RV64I-NEXT: .cfi_remember_state
; RV64I-NEXT: mv s0, a0
; RV64I-NEXT: beqz a0, .LBB0_2
; RV64I-NEXT: # %bb.1: # %bb2
-; RV64I-NEXT: .Ltmp0:
+; RV64I-NEXT: .Ltmp0: # EH_LABEL
; RV64I-NEXT: mv a0, s0
; RV64I-NEXT: call bar
-; RV64I-NEXT: .Ltmp1:
+; RV64I-NEXT: .Ltmp1: # EH_LABEL
; RV64I-NEXT: j .LBB0_3
; RV64I-NEXT: .LBB0_2: # %bb1
-; RV64I-NEXT: .Ltmp2:
+; RV64I-NEXT: .Ltmp2: # EH_LABEL
; RV64I-NEXT: mv a0, s0
; RV64I-NEXT: call foo
-; RV64I-NEXT: .Ltmp3:
+; RV64I-NEXT: .Ltmp3: # EH_LABEL
; RV64I-NEXT: .LBB0_3: # %end2
; RV64I-NEXT: ld ra, 24(sp) # 8-byte Folded Reload
; RV64I-NEXT: ld s0, 16(sp) # 8-byte Folded Reload
-; RV64I-NEXT: ld s1, 8(sp) # 8-byte Folded Reload
; RV64I-NEXT: .cfi_restore ra
; RV64I-NEXT: .cfi_restore s0
-; RV64I-NEXT: .cfi_restore s1
; RV64I-NEXT: addi sp, sp, 32
; RV64I-NEXT: .cfi_def_cfa_offset 0
; RV64I-NEXT: ret
; RV64I-NEXT: .LBB0_4: # %lpad
; RV64I-NEXT: .cfi_restore_state
-; RV64I-NEXT: .Ltmp4:
-; RV64I-NEXT: mv s1, a0
+; RV64I-NEXT: .Ltmp4: # EH_LABEL
+; RV64I-NEXT: sd a0, 8(sp) # 8-byte Folded Spill
; RV64I-NEXT: mv a0, s0
; RV64I-NEXT: call callee
-; RV64I-NEXT: mv a0, s1
+; RV64I-NEXT: ld a0, 8(sp) # 8-byte Folded Reload
; RV64I-NEXT: call _Unwind_Resume
entry:
%0 = icmp eq ptr %p, null
``````````
</details>
https://github.com/llvm/llvm-project/pull/239532
More information about the llvm-branch-commits
mailing list