Skip to content

Commit

Permalink
[DAGCombiner] Mark vectors as not AllAddOne/AllSubOne on type mismatch (
Browse files Browse the repository at this point in the history
#92195)

Fixes #92193.
  • Loading branch information
patrick-rivos authored May 15, 2024
1 parent 64b3cdc commit 4ab2ac2
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
7 changes: 5 additions & 2 deletions llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12142,8 +12142,11 @@ SDValue DAGCombiner::foldVSelectOfConstants(SDNode *N) {
SDValue N2Elt = N2.getOperand(i);
if (N1Elt.isUndef() || N2Elt.isUndef())
continue;
if (N1Elt.getValueType() != N2Elt.getValueType())
continue;
if (N1Elt.getValueType() != N2Elt.getValueType()) {
AllAddOne = false;
AllSubOne = false;
break;
}

const APInt &C1 = N1Elt->getAsAPIntVal();
const APInt &C2 = N2Elt->getAsAPIntVal();
Expand Down
21 changes: 21 additions & 0 deletions llvm/test/CodeGen/RISCV/pr92193.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
; RUN: llc -mtriple=riscv64-unknown-linux-gnu < %s | FileCheck %s
; RUN: llc -mtriple=riscv32-unknown-linux-gnu < %s | FileCheck %s

; Dag-combine used to improperly combine a vector vselect of 0 and 2 into
; 2 + condition(0/1) because one of the two args was transformed from an i32->i64.

define i16 @foo() {
; CHECK-LABEL: foo:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: li a0, 0
; CHECK-NEXT: ret
entry:
%insert.0 = insertelement <4 x i16> zeroinitializer, i16 2, i64 0
%all.two = shufflevector <4 x i16> %insert.0, <4 x i16> zeroinitializer, <4 x i32> zeroinitializer
%sel.0 = select <4 x i1> <i1 true, i1 false, i1 false, i1 false>, <4 x i16> zeroinitializer, <4 x i16> %all.two
%mul.0 = call i16 @llvm.vector.reduce.mul.v4i16(<4 x i16> %sel.0)
ret i16 %mul.0
}

declare i16 @llvm.vector.reduce.mul.v4i32(<4 x i16>)

0 comments on commit 4ab2ac2

Please sign in to comment.