Skip to content

Commit

Permalink
[RISCV][ISel] Allow opaque constants in hasAndNotCompare (#92926)
Browse files Browse the repository at this point in the history
See the following code:

https://github.com/llvm/llvm-project/blob/4ae896fe979b7db501cabde4b6b3504478958682/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#L9334-L9357

> Combining: t47: i64 = xor t43, OpaqueConstant:i64<31808>
X: i64 = Constant<0>
Y: i64 = OpaqueConstant<31808>

The assertion failed because both `X` and `Y` are constants.
This patch allows opaque constants in `hasAndNotCompare` to fix the
issue.

Fixes #90730.
  • Loading branch information
dtcxzyw committed May 21, 2024
1 parent 0c8bc08 commit 557bf38
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion llvm/lib/Target/RISCV/RISCVISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1919,7 +1919,7 @@ bool RISCVTargetLowering::hasAndNotCompare(SDValue Y) const {
return false;

return (Subtarget.hasStdExtZbb() || Subtarget.hasStdExtZbkb()) &&
!isa<ConstantSDNode>(Y);
(!isa<ConstantSDNode>(Y) || cast<ConstantSDNode>(Y)->isOpaque());
}

bool RISCVTargetLowering::hasBitTest(SDValue X, SDValue Y) const {
Expand Down
22 changes: 22 additions & 0 deletions llvm/test/CodeGen/RISCV/pr90730.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
; RUN: llc < %s -mtriple=riscv64 -mattr=+zbb | FileCheck %s

define i32 @pr90730(i32 %x, i1 %y, ptr %p) {
; CHECK-LABEL: pr90730:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: lui a1, 8
; CHECK-NEXT: addiw a1, a1, -960
; CHECK-NEXT: andn a0, a1, a0
; CHECK-NEXT: sw zero, 0(a2)
; CHECK-NEXT: ret
entry:
%ext = zext i1 %y to i32
%xor1 = xor i32 %ext, 31817
%and1 = and i32 %xor1, %x
store i32 %and1, ptr %p, align 4
%v = load i32, ptr %p, align 4
%and2 = and i32 %v, 31808
%xor2 = xor i32 %and2, 31808
store i32 0, ptr %p, align 4
ret i32 %xor2
}

0 comments on commit 557bf38

Please sign in to comment.