Skip to content

Commit

Permalink
[RISCV][ISel] Fix types in tryFoldSelectIntoOp (llvm#90659)
Browse files Browse the repository at this point in the history
```
SelectionDAG has 17 nodes:
  t0: ch,glue = EntryToken
    t6: i64,ch = CopyFromReg t0, Register:i64 %2
  t8: i1 = truncate t6
          t4: i64,ch = CopyFromReg t0, Register:i64 %1
        t7: i1 = truncate t4
            t2: i64,ch = CopyFromReg t0, Register:i64 %0
          t10: i64,i1 = saddo t2, Constant:i64<1>
        t11: i1 = or t8, t10:1
      t12: i1 = select t7, t8, t11
    t13: i64 = any_extend t12
  t15: ch,glue = CopyToReg t0, Register:i64 $x10, t13
  t16: ch = RISCVISD::RET_GLUE t15, Register:i64 $x10, t15:1
```

`OtherOpVT` should be i1, but `OtherOp->getValueType(0)` returns `i64`,
which ignores `ResNo` in `SDValue`.

Fix llvm#90652.
  • Loading branch information
dtcxzyw committed Apr 30, 2024
1 parent 805f01f commit 2647bd7
Show file tree
Hide file tree
Showing 2 changed files with 20 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 @@ -15421,7 +15421,7 @@ static SDValue tryFoldSelectIntoOp(SDNode *N, SelectionDAG &DAG,
EVT VT = N->getValueType(0);
SDLoc DL(N);
SDValue OtherOp = TrueVal.getOperand(1 - OpToFold);
EVT OtherOpVT = OtherOp->getValueType(0);
EVT OtherOpVT = OtherOp.getValueType();
SDValue IdentityOperand =
DAG.getNeutralElement(Opc, DL, OtherOpVT, N->getFlags());
if (!Commutative)
Expand Down
19 changes: 19 additions & 0 deletions llvm/test/CodeGen/RISCV/pr90652.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
; RUN: llc < %s -mtriple=riscv64 | FileCheck %s

define i1 @test(i64 %x, i1 %cond1, i1 %cond2) {
; CHECK-LABEL: test:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: addi a3, a0, 1
; CHECK-NEXT: slt a0, a3, a0
; CHECK-NEXT: not a1, a1
; CHECK-NEXT: and a0, a1, a0
; CHECK-NEXT: or a0, a2, a0
; CHECK-NEXT: ret
entry:
%sadd = call { i64, i1 } @llvm.sadd.with.overflow.i64(i64 %x, i64 1)
%ov = extractvalue { i64, i1 } %sadd, 1
%or = or i1 %cond2, %ov
%sel = select i1 %cond1, i1 %cond2, i1 %or
ret i1 %sel
}

0 comments on commit 2647bd7

Please sign in to comment.