[llvm] Combine (X ^ Y) and (X == Y) where appropriate (PR #130922)
Ryan Buchner via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 12 14:32:24 PDT 2025
https://github.com/bababuck updated https://github.com/llvm/llvm-project/pull/130922
>From 96a1b82d18c926630f3c2b8dac404095c2f423a1 Mon Sep 17 00:00:00 2001
From: bababuck <buchner.ryan at gmail.com>
Date: Wed, 12 Mar 2025 09:23:06 -0700
Subject: [PATCH 1/2] Add new test that re-produces issue #130510
---
.../test/CodeGen/RISCV/select-constant-xor.ll | 84 +++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/llvm/test/CodeGen/RISCV/select-constant-xor.ll b/llvm/test/CodeGen/RISCV/select-constant-xor.ll
index 2e26ae78e2dd8..5f50cc7d49851 100644
--- a/llvm/test/CodeGen/RISCV/select-constant-xor.ll
+++ b/llvm/test/CodeGen/RISCV/select-constant-xor.ll
@@ -239,3 +239,87 @@ define i32 @oneusecmp(i32 %a, i32 %b, i32 %d) {
%x = add i32 %s, %s2
ret i32 %x
}
+
+define i32 @xor_branch_imm_ret(i32 %x) {
+; RV32-LABEL: xor_branch_imm_ret:
+; RV32: # %bb.0: # %entry
+; RV32-NEXT: li a1, -1365
+; RV32-NEXT: beq a0, a1, .LBB11_2
+; RV32-NEXT: # %bb.1: # %if.then
+; RV32-NEXT: xori a0, a0, -1365
+; RV32-NEXT: ret
+; RV32-NEXT: .LBB11_2: # %if.end
+; RV32-NEXT: addi sp, sp, -16
+; RV32-NEXT: .cfi_def_cfa_offset 16
+; RV32-NEXT: sw ra, 12(sp) # 4-byte Folded Spill
+; RV32-NEXT: .cfi_offset ra, -4
+; RV32-NEXT: call abort
+;
+; RV64-LABEL: xor_branch_imm_ret:
+; RV64: # %bb.0: # %entry
+; RV64-NEXT: sext.w a1, a0
+; RV64-NEXT: li a2, -1365
+; RV64-NEXT: beq a1, a2, .LBB11_2
+; RV64-NEXT: # %bb.1: # %if.then
+; RV64-NEXT: xori a0, a0, -1365
+; RV64-NEXT: ret
+; RV64-NEXT: .LBB11_2: # %if.end
+; RV64-NEXT: addi sp, sp, -16
+; RV64-NEXT: .cfi_def_cfa_offset 16
+; RV64-NEXT: sd ra, 8(sp) # 8-byte Folded Spill
+; RV64-NEXT: .cfi_offset ra, -8
+; RV64-NEXT: call abort
+entry:
+ %cmp.not = icmp eq i32 %x, -1365
+ br i1 %cmp.not, label %if.end, label %if.then
+if.then:
+ %xor = xor i32 %x, -1365
+ ret i32 %xor
+if.end:
+ tail call void @abort() #2
+ unreachable
+}
+
+define i32 @xor_branch_ret(i32 %x) {
+; RV32-LABEL: xor_branch_ret:
+; RV32: # %bb.0: # %entry
+; RV32-NEXT: li a1, 1
+; RV32-NEXT: slli a1, a1, 11
+; RV32-NEXT: beq a0, a1, .LBB12_2
+; RV32-NEXT: # %bb.1: # %if.then
+; RV32-NEXT: xor a0, a0, a1
+; RV32-NEXT: ret
+; RV32-NEXT: .LBB12_2: # %if.end
+; RV32-NEXT: addi sp, sp, -16
+; RV32-NEXT: .cfi_def_cfa_offset 16
+; RV32-NEXT: sw ra, 12(sp) # 4-byte Folded Spill
+; RV32-NEXT: .cfi_offset ra, -4
+; RV32-NEXT: call abort
+;
+; RV64-LABEL: xor_branch_ret:
+; RV64: # %bb.0: # %entry
+; RV64-NEXT: sext.w a2, a0
+; RV64-NEXT: li a1, 1
+; RV64-NEXT: slli a1, a1, 11
+; RV64-NEXT: beq a2, a1, .LBB12_2
+; RV64-NEXT: # %bb.1: # %if.then
+; RV64-NEXT: xor a0, a0, a1
+; RV64-NEXT: ret
+; RV64-NEXT: .LBB12_2: # %if.end
+; RV64-NEXT: addi sp, sp, -16
+; RV64-NEXT: .cfi_def_cfa_offset 16
+; RV64-NEXT: sd ra, 8(sp) # 8-byte Folded Spill
+; RV64-NEXT: .cfi_offset ra, -8
+; RV64-NEXT: call abort
+entry:
+ %cmp.not = icmp eq i32 %x, 2048
+ br i1 %cmp.not, label %if.end, label %if.then
+if.then:
+ %xor = xor i32 %x, 2048
+ ret i32 %xor
+if.end:
+ tail call void @abort() #2
+ unreachable
+}
+
+declare void @abort()
>From 9b6b6faf8d9b03191deda539a4cf3ba4b14a4d89 Mon Sep 17 00:00:00 2001
From: bababuck <buchner.ryan at gmail.com>
Date: Tue, 11 Mar 2025 09:47:21 -0700
Subject: [PATCH 2/2] Combine (X ^ Y) and (X == Y) where appropriate
In RISCV, modify the folding of (X ^ Y == 0) -> (X == Y) to account for
cases where the (X ^ Y) will be re-used.
Fixes #130510.
---
llvm/lib/CodeGen/CodeGenPrepare.cpp | 3 +-
llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 35 ++++++++++++++++++-
.../test/CodeGen/RISCV/select-constant-xor.ll | 16 ++++-----
3 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index d5fbd4c380746..2acb7cb321d07 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -8578,7 +8578,8 @@ static bool optimizeBranch(BranchInst *Branch, const TargetLowering &TLI,
}
if (Cmp->isEquality() &&
(match(UI, m_Add(m_Specific(X), m_SpecificInt(-CmpC))) ||
- match(UI, m_Sub(m_Specific(X), m_SpecificInt(CmpC))))) {
+ match(UI, m_Sub(m_Specific(X), m_SpecificInt(CmpC))) ||
+ match(UI, m_Xor(m_Specific(X), m_SpecificInt(CmpC))))) {
IRBuilder<> Builder(Branch);
if (UI->getParent() != Branch->getParent())
UI->moveBefore(Branch->getIterator());
diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
index 27a4bbce1f5fc..f501a9de46fea 100644
--- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -17194,8 +17194,41 @@ static bool combine_CC(SDValue &LHS, SDValue &RHS, SDValue &CC, const SDLoc &DL,
return true;
}
+ // If XOR is reused and has an immediate that will fit in XORI,
+ // do not fold
+ auto IsXorImmediate = [](const SDValue &Op) -> bool {
+ if (const auto XorCnst = dyn_cast<ConstantSDNode>(Op)) {
+ auto isLegalXorImmediate = [](int64_t Imm) -> bool {
+ return isInt<12>(Imm);
+ };
+ return isLegalXorImmediate(XorCnst->getSExtValue());
+ }
+ return false;
+ };
+ // Fold (X(i1) ^ 1) == 0 -> X != 0
+ auto SingleBitOp = [&DAG](const SDValue &VarOp,
+ const SDValue &ConstOp) -> bool {
+ if (const auto XorCnst = dyn_cast<ConstantSDNode>(ConstOp)) {
+ const APInt Mask = APInt::getBitsSetFrom(VarOp.getValueSizeInBits(), 1);
+ return (XorCnst->getSExtValue() == 1) && DAG.MaskedValueIsZero(VarOp, Mask);
+ }
+ return false;
+ };
+ auto OnlyUsedBySelectOrBR = [](const SDValue &Op) -> bool {
+ for (const SDNode *UserNode : Op->users()) {
+ const unsigned Opcode = UserNode->getOpcode();
+ if (Opcode != RISCVISD::SELECT_CC && Opcode != RISCVISD::BR_CC) {
+ return false;
+ }
+ }
+ return true;
+ };
+
// Fold ((xor X, Y), 0, eq/ne) -> (X, Y, eq/ne)
- if (LHS.getOpcode() == ISD::XOR && isNullConstant(RHS)) {
+ if (LHS.getOpcode() == ISD::XOR && isNullConstant(RHS) &&
+ (!IsXorImmediate(LHS.getOperand(1)) ||
+ SingleBitOp(LHS.getOperand(0), LHS.getOperand(1)) ||
+ OnlyUsedBySelectOrBR(LHS))) {
RHS = LHS.getOperand(1);
LHS = LHS.getOperand(0);
return true;
diff --git a/llvm/test/CodeGen/RISCV/select-constant-xor.ll b/llvm/test/CodeGen/RISCV/select-constant-xor.ll
index 5f50cc7d49851..71c3bf9fec790 100644
--- a/llvm/test/CodeGen/RISCV/select-constant-xor.ll
+++ b/llvm/test/CodeGen/RISCV/select-constant-xor.ll
@@ -243,10 +243,9 @@ define i32 @oneusecmp(i32 %a, i32 %b, i32 %d) {
define i32 @xor_branch_imm_ret(i32 %x) {
; RV32-LABEL: xor_branch_imm_ret:
; RV32: # %bb.0: # %entry
-; RV32-NEXT: li a1, -1365
-; RV32-NEXT: beq a0, a1, .LBB11_2
-; RV32-NEXT: # %bb.1: # %if.then
; RV32-NEXT: xori a0, a0, -1365
+; RV32-NEXT: beqz a0, .LBB11_2
+; RV32-NEXT: # %bb.1: # %if.then
; RV32-NEXT: ret
; RV32-NEXT: .LBB11_2: # %if.end
; RV32-NEXT: addi sp, sp, -16
@@ -257,11 +256,10 @@ define i32 @xor_branch_imm_ret(i32 %x) {
;
; RV64-LABEL: xor_branch_imm_ret:
; RV64: # %bb.0: # %entry
+; RV64-NEXT: xori a0, a0, -1365
; RV64-NEXT: sext.w a1, a0
-; RV64-NEXT: li a2, -1365
-; RV64-NEXT: beq a1, a2, .LBB11_2
+; RV64-NEXT: beqz a1, .LBB11_2
; RV64-NEXT: # %bb.1: # %if.then
-; RV64-NEXT: xori a0, a0, -1365
; RV64-NEXT: ret
; RV64-NEXT: .LBB11_2: # %if.end
; RV64-NEXT: addi sp, sp, -16
@@ -298,12 +296,12 @@ define i32 @xor_branch_ret(i32 %x) {
;
; RV64-LABEL: xor_branch_ret:
; RV64: # %bb.0: # %entry
-; RV64-NEXT: sext.w a2, a0
; RV64-NEXT: li a1, 1
; RV64-NEXT: slli a1, a1, 11
-; RV64-NEXT: beq a2, a1, .LBB12_2
-; RV64-NEXT: # %bb.1: # %if.then
; RV64-NEXT: xor a0, a0, a1
+; RV64-NEXT: sext.w a1, a0
+; RV64-NEXT: beqz a1, .LBB12_2
+; RV64-NEXT: # %bb.1: # %if.then
; RV64-NEXT: ret
; RV64-NEXT: .LBB12_2: # %if.end
; RV64-NEXT: addi sp, sp, -16
More information about the llvm-commits
mailing list