Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions llvm/lib/Target/AMDGPU/SIISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6487,6 +6487,17 @@ SITargetLowering::EmitInstrWithCustomInserter(MachineInstr &MI,
MI.getOperand(0).setReg(OriginalExec);
return BB;
}
case AMDGPU::S_CBRANCH_SCC0:
case AMDGPU::S_CBRANCH_SCC1: {
MachineBasicBlock *TBB = nullptr;
MachineBasicBlock *FBB = nullptr;
SmallVector<MachineOperand, 1> Cond;
TII->analyzeBranch(*BB, TBB, FBB, Cond);
if (TBB && !TBB->isLiveIn(AMDGPU::SCC) && FBB &&
!FBB->isLiveIn(AMDGPU::SCC))
MI.addRegisterKilled(AMDGPU::SCC, TRI);
return BB;
}
default:
if (TII->isImage(MI) || TII->isMUBUF(MI)) {
if (!MI.mayStore())
Expand Down
70 changes: 61 additions & 9 deletions llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10737,12 +10737,62 @@ bool SIInstrInfo::analyzeCompare(const MachineInstr &MI, Register &SrcReg,
return false;
}

// Invert all uses of SCC following SCCDef because SCCDef may be deleted and
// (incoming SCC) = !(SCC defined by SCCDef).
// Return true if all uses can be re-written, false otherwise.
bool SIInstrInfo::invertSCCUse(MachineInstr *SCCDef) const {
MachineBasicBlock *MBB = SCCDef->getParent();
SmallVector<MachineInstr *> InvertInstr;
bool SCCIsDead = false;

// Scan instructions for SCC uses that need to be inverted until SCC is dead.
for (MachineInstr &MI :
make_range(std::next(MachineBasicBlock::iterator(SCCDef)), MBB->end())) {
if (MI.readsRegister(AMDGPU::SCC, &RI)) {
if (MI.getOpcode() == AMDGPU::S_CSELECT_B32 ||
MI.getOpcode() == AMDGPU::S_CSELECT_B64 ||
MI.getOpcode() == AMDGPU::S_CBRANCH_SCC0 ||
MI.getOpcode() == AMDGPU::S_CBRANCH_SCC1)
InvertInstr.push_back(&MI);
else
return false;
}
if (MI.definesRegister(AMDGPU::SCC, &RI) ||
MI.killsRegister(AMDGPU::SCC, &RI)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant check the dead flag on the operand, not kill flags

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant check the dead flag on the operand, not kill flags

Isn't a dead SCC operand already covered by definesRegister(AMDGPU::SCC)? A dead operand is an unused definition.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, dead register is a subset of defined register if it's known there is no use of the value.

I want to avoid introducing new uses of kill flags, which are soft deprecated. Dead is the opposite of kill

Copy link
Contributor Author

@LU-JOHN LU-JOHN Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, dead register is a subset of defined register if it's known there is no use of the value.

So does the dead flag mean that a register is not live after an instruction? It can be set for operands that are only used and not defined by the instruction?

Looking at https://llvm.org/docs/MIRLangRef.html#register-flags, dead is an "Unused definition", which is different from not live after an instruction.

SCCIsDead = true;
break;
}
}
if (MBB->succ_empty())
SCCIsDead = true;

// SCC may have more uses. Can't invert all of them.
if (!SCCIsDead)
return false;

// Invert uses
for (MachineInstr *MI : InvertInstr) {
if (MI->getOpcode() == AMDGPU::S_CSELECT_B32 ||
MI->getOpcode() == AMDGPU::S_CSELECT_B64) {
swapOperands(*MI);
} else if (MI->getOpcode() == AMDGPU::S_CBRANCH_SCC0 ||
MI->getOpcode() == AMDGPU::S_CBRANCH_SCC1) {
MI->setDesc(get(MI->getOpcode() == AMDGPU::S_CBRANCH_SCC0
? AMDGPU::S_CBRANCH_SCC1
: AMDGPU::S_CBRANCH_SCC0));
} else {
llvm_unreachable("SCC used but no inversion handling");
}
}
return true;
}

// SCC is already valid after SCCValid.
// SCCRedefine will redefine SCC to the same value already available after
// SCCValid. If there are no intervening SCC conflicts delete SCCRedefine and
// update kill/dead flags if necessary.
static bool optimizeSCC(MachineInstr *SCCValid, MachineInstr *SCCRedefine,
const SIRegisterInfo &RI) {
bool SIInstrInfo::optimizeSCC(MachineInstr *SCCValid, MachineInstr *SCCRedefine,
bool NeedInversion) const {
MachineInstr *KillsSCC = nullptr;
if (SCCValid->getParent() != SCCRedefine->getParent())
return false;
Expand All @@ -10753,6 +10803,8 @@ static bool optimizeSCC(MachineInstr *SCCValid, MachineInstr *SCCRedefine,
if (MI.killsRegister(AMDGPU::SCC, &RI))
KillsSCC = &MI;
}
if (NeedInversion && !invertSCCUse(SCCRedefine))
return false;
if (MachineOperand *SccDef =
SCCValid->findRegisterDefOperand(AMDGPU::SCC, /*TRI=*/nullptr))
SccDef->setIsDead(false);
Expand Down Expand Up @@ -10786,7 +10838,7 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg,
return false;

const auto optimizeCmpSelect = [&CmpInstr, SrcReg, CmpValue, MRI,
this]() -> bool {
this](bool NeedInversion) -> bool {
if (CmpValue != 0)
return false;

Expand All @@ -10807,7 +10859,7 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg,
if (!setsSCCifResultIsNonZero(*Def) && !foldableSelect(*Def))
return false;

if (!optimizeSCC(Def, &CmpInstr, RI))
if (!optimizeSCC(Def, &CmpInstr, NeedInversion))
return false;

// If s_or_b32 result, sY, is unused (i.e. it is effectively a 64-bit
Expand All @@ -10832,7 +10884,7 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg,
Def1->getOperand(1).getReg() == Def2->getOperand(1).getReg()) {
MachineInstr *Select = MRI->getVRegDef(Def1->getOperand(1).getReg());
if (Select && foldableSelect(*Select))
optimizeSCC(Select, Def, RI);
optimizeSCC(Select, Def, false);
}
}
}
Expand Down Expand Up @@ -10913,7 +10965,7 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg,
if (IsReversedCC && !MRI->hasOneNonDBGUse(DefReg))
return false;

if (!optimizeSCC(Def, &CmpInstr, RI))
if (!optimizeSCC(Def, &CmpInstr, false))
return false;

if (!MRI->use_nodbg_empty(DefReg)) {
Expand Down Expand Up @@ -10944,7 +10996,7 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg,
case AMDGPU::S_CMP_EQ_I32:
case AMDGPU::S_CMPK_EQ_U32:
case AMDGPU::S_CMPK_EQ_I32:
return optimizeCmpAnd(1, 32, true, false);
return optimizeCmpAnd(1, 32, true, false) || optimizeCmpSelect(true);
case AMDGPU::S_CMP_GE_U32:
case AMDGPU::S_CMPK_GE_U32:
return optimizeCmpAnd(1, 32, false, false);
Expand All @@ -10957,15 +11009,15 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg,
case AMDGPU::S_CMP_LG_I32:
case AMDGPU::S_CMPK_LG_U32:
case AMDGPU::S_CMPK_LG_I32:
return optimizeCmpAnd(0, 32, true, false) || optimizeCmpSelect();
return optimizeCmpAnd(0, 32, true, false) || optimizeCmpSelect(false);
case AMDGPU::S_CMP_GT_U32:
case AMDGPU::S_CMPK_GT_U32:
return optimizeCmpAnd(0, 32, false, false);
case AMDGPU::S_CMP_GT_I32:
case AMDGPU::S_CMPK_GT_I32:
return optimizeCmpAnd(0, 32, false, true);
case AMDGPU::S_CMP_LG_U64:
return optimizeCmpAnd(0, 64, true, false) || optimizeCmpSelect();
return optimizeCmpAnd(0, 64, true, false) || optimizeCmpSelect(false);
}

return false;
Expand Down
5 changes: 5 additions & 0 deletions llvm/lib/Target/AMDGPU/SIInstrInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ class SIInstrInfo final : public AMDGPUGenInstrInfo {
unsigned SubIdx, const TargetRegisterClass *SubRC) const;

private:
bool optimizeSCC(MachineInstr *SCCValid, MachineInstr *SCCRedefine,
bool NeedInversion) const;

bool invertSCCUse(MachineInstr *SCCDef) const;

void swapOperands(MachineInstr &Inst) const;

std::pair<bool, MachineBasicBlock *>
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/AMDGPU/SOPInstructions.td
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,7 @@ defm S_BRANCH : SOPP_With_Relaxation<
[(br bb:$simm16)]>;
}

let Uses = [SCC] in {
let usesCustomInserter = 1, Uses = [SCC] in {
defm S_CBRANCH_SCC0 : SOPP_With_Relaxation<
"s_cbranch_scc0" , (ins SOPPBrTarget:$simm16),
"$simm16"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -701,11 +701,10 @@ define amdgpu_kernel void @f1(ptr addrspace(1) %arg, ptr addrspace(1) %arg1, i64
; GFX90A-NEXT: successors: %bb.59(0x40000000), %bb.53(0x40000000)
; GFX90A-NEXT: liveins: $sgpr14, $sgpr15, $sgpr16, $vgpr31, $sgpr4_sgpr5, $sgpr6_sgpr7, $sgpr8_sgpr9:0x000000000000000F, $sgpr10_sgpr11, $sgpr12_sgpr13, $sgpr24_sgpr25, $sgpr28_sgpr29, $sgpr30_sgpr31, $sgpr34_sgpr35, $sgpr36_sgpr37, $sgpr38_sgpr39, $sgpr40_sgpr41, $sgpr42_sgpr43, $sgpr44_sgpr45, $sgpr46_sgpr47, $sgpr48_sgpr49, $sgpr50_sgpr51, $sgpr56_sgpr57:0x000000000000000F, $sgpr62_sgpr63, $sgpr64_sgpr65, $sgpr20_sgpr21_sgpr22_sgpr23:0x000000000000003F, $sgpr24_sgpr25_sgpr26_sgpr27:0x00000000000000F0, $vgpr0_vgpr1:0x000000000000000F, $vgpr2_vgpr3:0x0000000000000003, $vgpr4_vgpr5:0x000000000000000F, $vgpr6_vgpr7:0x0000000000000003, $vgpr8_vgpr9:0x000000000000000F, $vgpr40_vgpr41:0x000000000000000F, $vgpr42_vgpr43:0x000000000000000F, $vgpr44_vgpr45:0x000000000000000F, $vgpr46_vgpr47:0x000000000000000F, $vgpr56_vgpr57:0x000000000000000F, $vgpr58_vgpr59:0x000000000000000F, $vgpr60_vgpr61:0x000000000000000F, $vgpr62_vgpr63:0x000000000000000F, $sgpr0_sgpr1_sgpr2_sgpr3
; GFX90A-NEXT: {{ $}}
; GFX90A-NEXT: renamable $sgpr17 = S_BFE_U32 renamable $sgpr20, 65560, implicit-def dead $scc
; GFX90A-NEXT: S_CMP_EQ_U32 killed renamable $sgpr17, 0, implicit-def $scc
; GFX90A-NEXT: dead renamable $sgpr17 = S_BFE_U32 renamable $sgpr20, 65560, implicit-def $scc
; GFX90A-NEXT: renamable $vgpr10 = V_ADD_CO_U32_e32 4096, $vgpr0, implicit-def $vcc, implicit $exec
; GFX90A-NEXT: renamable $vgpr11, dead renamable $sgpr18_sgpr19 = V_ADDC_U32_e64 0, 0, killed $vcc, 0, implicit $exec
; GFX90A-NEXT: S_CBRANCH_SCC1 %bb.59, implicit killed $scc
; GFX90A-NEXT: S_CBRANCH_SCC0 %bb.59, implicit killed $scc
; GFX90A-NEXT: {{ $}}
; GFX90A-NEXT: bb.53:
; GFX90A-NEXT: successors: %bb.61(0x80000000)
Expand Down
18 changes: 6 additions & 12 deletions llvm/test/CodeGen/AMDGPU/fshl.ll
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,7 @@ define amdgpu_kernel void @orxor2or1(ptr addrspace(1) %in, i32 %a, i32 %b) {
; SI-NEXT: s_mov_b64 s[4:5], s[2:3]
; SI-NEXT: s_lshl_b32 s6, s4, 7
; SI-NEXT: s_or_b32 s6, s5, s6
; SI-NEXT: s_cmp_eq_u32 s6, 0
; SI-NEXT: s_cselect_b32 s4, s4, s5
; SI-NEXT: s_cselect_b32 s4, s5, s4
; SI-NEXT: s_mov_b32 s3, 0xf000
; SI-NEXT: s_mov_b32 s2, -1
; SI-NEXT: v_mov_b32_e32 v0, s4
Expand All @@ -893,8 +892,7 @@ define amdgpu_kernel void @orxor2or1(ptr addrspace(1) %in, i32 %a, i32 %b) {
; VI-NEXT: s_waitcnt lgkmcnt(0)
; VI-NEXT: s_lshl_b32 s4, s2, 7
; VI-NEXT: s_or_b32 s4, s3, s4
; VI-NEXT: s_cmp_eq_u32 s4, 0
; VI-NEXT: s_cselect_b32 s2, s2, s3
; VI-NEXT: s_cselect_b32 s2, s3, s2
; VI-NEXT: v_mov_b32_e32 v0, s0
; VI-NEXT: v_mov_b32_e32 v1, s1
; VI-NEXT: v_mov_b32_e32 v2, s2
Expand All @@ -908,8 +906,7 @@ define amdgpu_kernel void @orxor2or1(ptr addrspace(1) %in, i32 %a, i32 %b) {
; GFX9-NEXT: s_waitcnt lgkmcnt(0)
; GFX9-NEXT: s_lshl_b32 s4, s2, 7
; GFX9-NEXT: s_or_b32 s4, s3, s4
; GFX9-NEXT: s_cmp_eq_u32 s4, 0
; GFX9-NEXT: s_cselect_b32 s2, s2, s3
; GFX9-NEXT: s_cselect_b32 s2, s3, s2
; GFX9-NEXT: v_mov_b32_e32 v1, s2
; GFX9-NEXT: global_store_dword v0, v1, s[0:1]
; GFX9-NEXT: s_endpgm
Expand All @@ -935,8 +932,7 @@ define amdgpu_kernel void @orxor2or1(ptr addrspace(1) %in, i32 %a, i32 %b) {
; GFX10-NEXT: s_waitcnt lgkmcnt(0)
; GFX10-NEXT: s_lshl_b32 s4, s2, 7
; GFX10-NEXT: s_or_b32 s4, s3, s4
; GFX10-NEXT: s_cmp_eq_u32 s4, 0
; GFX10-NEXT: s_cselect_b32 s2, s2, s3
; GFX10-NEXT: s_cselect_b32 s2, s3, s2
; GFX10-NEXT: v_mov_b32_e32 v1, s2
; GFX10-NEXT: global_store_dword v0, v1, s[0:1]
; GFX10-NEXT: s_endpgm
Expand All @@ -946,11 +942,9 @@ define amdgpu_kernel void @orxor2or1(ptr addrspace(1) %in, i32 %a, i32 %b) {
; GFX11-NEXT: s_load_b128 s[0:3], s[4:5], 0x24
; GFX11-NEXT: s_waitcnt lgkmcnt(0)
; GFX11-NEXT: s_lshl_b32 s4, s2, 7
; GFX11-NEXT: s_delay_alu instid0(SALU_CYCLE_1) | instskip(NEXT) | instid1(SALU_CYCLE_1)
; GFX11-NEXT: s_delay_alu instid0(SALU_CYCLE_1) | instskip(SKIP_1) | instid1(SALU_CYCLE_1)
; GFX11-NEXT: s_or_b32 s4, s3, s4
; GFX11-NEXT: s_cmp_eq_u32 s4, 0
; GFX11-NEXT: s_cselect_b32 s2, s2, s3
; GFX11-NEXT: s_delay_alu instid0(SALU_CYCLE_1)
; GFX11-NEXT: s_cselect_b32 s2, s3, s2
; GFX11-NEXT: v_dual_mov_b32 v0, 0 :: v_dual_mov_b32 v1, s2
; GFX11-NEXT: global_store_b32 v0, v1, s[0:1]
; GFX11-NEXT: s_endpgm
Expand Down
41 changes: 36 additions & 5 deletions llvm/test/CodeGen/AMDGPU/s_cmp_0.ll
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6
; RUN: llc -mtriple=amdgcn -mcpu=gfx900 < %s | FileCheck %s
; Test deletion of redundant s_cmp* sX, 0 instructions.

declare i32 @llvm.ctpop.i32(i32)
declare i64 @llvm.ctpop.i64(i64)
Expand All @@ -20,6 +21,36 @@ define amdgpu_ps i32 @shl32(i32 inreg %val0, i32 inreg %val1) {
ret i32 %zext
}

; s_lshl_b32 sets SCC if result is non-zero.
; Deletion of equal to zero comparison will require inversion of use.
define amdgpu_ps i32 @shl32_eq(i32 inreg %val0, i32 inreg %val1) {
; CHECK-LABEL: shl32_eq:
; CHECK: ; %bb.0:
; CHECK-NEXT: s_lshl_b32 s0, s0, 1
; CHECK-NEXT: s_cselect_b32 s0, 0, s1
; CHECK-NEXT: ; return to shader part epilog
%result = shl i32 %val0, 1
%cmp = icmp eq i32 %result, 0
%select = select i1 %cmp, i32 %val1, i32 0
ret i32 %select
}

; 64-bit selection will generate two 32-bit selects. Inversion of multiple
; uses is required.
define amdgpu_ps i64 @shl32_eq_multi_use(i32 inreg %val0, i64 inreg %val1) {
; CHECK-LABEL: shl32_eq_multi_use:
; CHECK: ; %bb.0:
; CHECK-NEXT: s_lshl_b32 s0, s0, 1
; CHECK-NEXT: s_cselect_b32 s2, 0, s2
; CHECK-NEXT: s_cselect_b32 s0, 0, s1
; CHECK-NEXT: s_mov_b32 s1, s2
; CHECK-NEXT: ; return to shader part epilog
%result = shl i32 %val0, 1
%cmp = icmp eq i32 %result, 0
%select = select i1 %cmp, i64 %val1, i64 0
ret i64 %select
}

define amdgpu_ps i32 @shl64(i64 inreg %val0, i64 inreg %val1) {
; CHECK-LABEL: shl64:
; CHECK: ; %bb.0:
Expand Down Expand Up @@ -660,14 +691,14 @@ define amdgpu_ps i32 @si_pc_add_rel_offset_must_not_optimize() {
; CHECK-NEXT: s_add_u32 s0, s0, __unnamed_1@rel32@lo+4
; CHECK-NEXT: s_addc_u32 s1, s1, __unnamed_1@rel32@hi+12
; CHECK-NEXT: s_cmp_lg_u64 s[0:1], 0
; CHECK-NEXT: s_cbranch_scc0 .LBB38_2
; CHECK-NEXT: s_cbranch_scc0 .LBB40_2
; CHECK-NEXT: ; %bb.1: ; %endif
; CHECK-NEXT: s_mov_b32 s0, 1
; CHECK-NEXT: s_branch .LBB38_3
; CHECK-NEXT: .LBB38_2: ; %if
; CHECK-NEXT: s_branch .LBB40_3
; CHECK-NEXT: .LBB40_2: ; %if
; CHECK-NEXT: s_mov_b32 s0, 0
; CHECK-NEXT: s_branch .LBB38_3
; CHECK-NEXT: .LBB38_3:
; CHECK-NEXT: s_branch .LBB40_3
; CHECK-NEXT: .LBB40_3:
%cmp = icmp ne ptr addrspace(4) @1, null
br i1 %cmp, label %endif, label %if

Expand Down
10 changes: 3 additions & 7 deletions llvm/test/CodeGen/AMDGPU/workitem-intrinsic-opts.ll
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ define i1 @workgroup_zero() {
; DAGISEL-GFX8-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
; DAGISEL-GFX8-NEXT: s_or_b32 s4, s12, s13
; DAGISEL-GFX8-NEXT: s_or_b32 s4, s4, s14
; DAGISEL-GFX8-NEXT: s_cmp_eq_u32 s4, 0
; DAGISEL-GFX8-NEXT: s_cselect_b64 s[4:5], -1, 0
; DAGISEL-GFX8-NEXT: s_cselect_b64 s[4:5], 0, -1
; DAGISEL-GFX8-NEXT: v_cndmask_b32_e64 v0, 0, 1, s[4:5]
; DAGISEL-GFX8-NEXT: s_setpc_b64 s[30:31]
;
Expand All @@ -190,8 +189,7 @@ define i1 @workgroup_zero() {
; DAGISEL-GFX942-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
; DAGISEL-GFX942-NEXT: s_or_b32 s0, s12, s13
; DAGISEL-GFX942-NEXT: s_or_b32 s0, s0, s14
; DAGISEL-GFX942-NEXT: s_cmp_eq_u32 s0, 0
; DAGISEL-GFX942-NEXT: s_cselect_b64 s[0:1], -1, 0
; DAGISEL-GFX942-NEXT: s_cselect_b64 s[0:1], 0, -1
; DAGISEL-GFX942-NEXT: v_cndmask_b32_e64 v0, 0, 1, s[0:1]
; DAGISEL-GFX942-NEXT: s_setpc_b64 s[30:31]
;
Expand All @@ -208,9 +206,7 @@ define i1 @workgroup_zero() {
; DAGISEL-GFX12-NEXT: s_or_b32 s0, ttmp9, s0
; DAGISEL-GFX12-NEXT: s_wait_alu 0xfffe
; DAGISEL-GFX12-NEXT: s_or_b32 s0, s0, s1
; DAGISEL-GFX12-NEXT: s_wait_alu 0xfffe
; DAGISEL-GFX12-NEXT: s_cmp_eq_u32 s0, 0
; DAGISEL-GFX12-NEXT: s_cselect_b32 s0, -1, 0
; DAGISEL-GFX12-NEXT: s_cselect_b32 s0, 0, -1
; DAGISEL-GFX12-NEXT: s_wait_alu 0xfffe
; DAGISEL-GFX12-NEXT: v_cndmask_b32_e64 v0, 0, 1, s0
; DAGISEL-GFX12-NEXT: s_setpc_b64 s[30:31]
Expand Down