Skip to content

Commit d57892a

Browse files
vitalybukavitalybuka
authored
Revert "[DAGCombiner] Add support for scalarising extracts of a vector setcc" (#118693)
Reverts #117566 Breaks libc++ tests with HWASAN https://lab.llvm.org/buildbot/#/builders/55/builds/3959
1 parent 048fc2b commit d57892a

File tree

8 files changed

+41
-270
lines changed

8 files changed

+41
-270
lines changed

‎llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22751,22 +22751,16 @@ SDValue DAGCombiner::scalarizeExtractedVectorLoad(SDNode *EVE, EVT InVecVT,
2275122751

2275222752
/// Transform a vector binary operation into a scalar binary operation by moving
2275322753
/// the math/logic after an extract element of a vector.
22754-
static SDValue scalarizeExtractedBinOp(SDNode *ExtElt, SelectionDAG &DAG,
22755-
const SDLoc &DL, bool LegalTypes) {
22754+
static SDValue scalarizeExtractedBinop(SDNode *ExtElt, SelectionDAG &DAG,
22755+
const SDLoc &DL, bool LegalOperations) {
2275622756
const TargetLowering &TLI = DAG.getTargetLoweringInfo();
2275722757
SDValue Vec = ExtElt->getOperand(0);
2275822758
SDValue Index = ExtElt->getOperand(1);
2275922759
auto *IndexC = dyn_cast<ConstantSDNode>(Index);
22760-
unsigned Opc = Vec.getOpcode();
22761-
if (!IndexC || !Vec.hasOneUse() || (!TLI.isBinOp(Opc) && Opc != ISD::SETCC) ||
22760+
if (!IndexC || !TLI.isBinOp(Vec.getOpcode()) || !Vec.hasOneUse() ||
2276222761
Vec->getNumValues() != 1)
2276322762
return SDValue();
2276422763

22765-
EVT ResVT = ExtElt->getValueType(0);
22766-
if (Opc == ISD::SETCC &&
22767-
(ResVT != Vec.getValueType().getVectorElementType() || LegalTypes))
22768-
return SDValue();
22769-
2277022764
// Targets may want to avoid this to prevent an expensive register transfer.
2277122765
if (!TLI.shouldScalarizeBinop(Vec))
2277222766
return SDValue();
@@ -22777,24 +22771,19 @@ static SDValue scalarizeExtractedBinOp(SDNode *ExtElt, SelectionDAG &DAG,
2277722771
SDValue Op0 = Vec.getOperand(0);
2277822772
SDValue Op1 = Vec.getOperand(1);
2277922773
APInt SplatVal;
22780-
if (!isAnyConstantBuildVector(Op0, true) &&
22781-
!ISD::isConstantSplatVector(Op0.getNode(), SplatVal) &&
22782-
!isAnyConstantBuildVector(Op1, true) &&
22783-
!ISD::isConstantSplatVector(Op1.getNode(), SplatVal))
22784-
return SDValue();
22785-
22786-
// extractelt (op X, C), IndexC --> op (extractelt X, IndexC), C'
22787-
// extractelt (op C, X), IndexC --> op C', (extractelt X, IndexC)
22788-
if (Opc == ISD::SETCC) {
22789-
EVT OpVT = Op0.getValueType().getVectorElementType();
22790-
Op0 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, OpVT, Op0, Index);
22791-
Op1 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, OpVT, Op1, Index);
22792-
return DAG.getSetCC(DL, ResVT, Op0, Op1,
22793-
cast<CondCodeSDNode>(Vec->getOperand(2))->get());
22774+
if (isAnyConstantBuildVector(Op0, true) ||
22775+
ISD::isConstantSplatVector(Op0.getNode(), SplatVal) ||
22776+
isAnyConstantBuildVector(Op1, true) ||
22777+
ISD::isConstantSplatVector(Op1.getNode(), SplatVal)) {
22778+
// extractelt (binop X, C), IndexC --> binop (extractelt X, IndexC), C'
22779+
// extractelt (binop C, X), IndexC --> binop C', (extractelt X, IndexC)
22780+
EVT VT = ExtElt->getValueType(0);
22781+
SDValue Ext0 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, Op0, Index);
22782+
SDValue Ext1 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, VT, Op1, Index);
22783+
return DAG.getNode(Vec.getOpcode(), DL, VT, Ext0, Ext1);
2279422784
}
22795-
Op0 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ResVT, Op0, Index);
22796-
Op1 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, ResVT, Op1, Index);
22797-
return DAG.getNode(Opc, DL, ResVT, Op0, Op1);
22785+
22786+
return SDValue();
2279822787
}
2279922788

2280022789
// Given a ISD::EXTRACT_VECTOR_ELT, which is a glorified bit sequence extract,
@@ -23027,7 +23016,7 @@ SDValue DAGCombiner::visitEXTRACT_VECTOR_ELT(SDNode *N) {
2302723016
}
2302823017
}
2302923018

23030-
if (SDValue BO = scalarizeExtractedBinOp(N, DAG, DL, LegalTypes))
23019+
if (SDValue BO = scalarizeExtractedBinop(N, DAG, DL, LegalOperations))
2303123020
return BO;
2303223021

2303323022
if (VecVT.isScalableVector())

‎llvm/lib/Target/AArch64/AArch64ISelLowering.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,10 +1348,6 @@ class AArch64TargetLowering : public TargetLowering {
13481348
unsigned getMinimumJumpTableEntries() const override;
13491349

13501350
bool softPromoteHalfType() const override { return true; }
1351-
1352-
bool shouldScalarizeBinop(SDValue VecOp) const override {
1353-
return VecOp.getOpcode() == ISD::SETCC;
1354-
}
13551351
};
13561352

13571353
namespace AArch64 {

‎llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2093,7 +2093,7 @@ bool RISCVTargetLowering::shouldScalarizeBinop(SDValue VecOp) const {
20932093

20942094
// Assume target opcodes can't be scalarized.
20952095
// TODO - do we have any exceptions?
2096-
if (Opc >= ISD::BUILTIN_OP_END || !isBinOp(Opc))
2096+
if (Opc >= ISD::BUILTIN_OP_END)
20972097
return false;
20982098

20992099
// If the vector op is not supported, try to convert to scalar.

‎llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ bool WebAssemblyTargetLowering::shouldScalarizeBinop(SDValue VecOp) const {
429429

430430
// Assume target opcodes can't be scalarized.
431431
// TODO - do we have any exceptions?
432-
if (Opc >= ISD::BUILTIN_OP_END || !isBinOp(Opc))
432+
if (Opc >= ISD::BUILTIN_OP_END)
433433
return false;
434434

435435
// If the vector op is not supported, try to convert to scalar.

‎llvm/lib/Target/X86/X86ISelLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3306,7 +3306,7 @@ bool X86TargetLowering::shouldScalarizeBinop(SDValue VecOp) const {
33063306

33073307
// Assume target opcodes can't be scalarized.
33083308
// TODO - do we have any exceptions?
3309-
if (Opc >= ISD::BUILTIN_OP_END || !isBinOp(Opc))
3309+
if (Opc >= ISD::BUILTIN_OP_END)
33103310
return false;
33113311

33123312
// If the vector op is not supported, try to convert to scalar.

‎llvm/test/CodeGen/AArch64/dag-combine-concat-vectors.ll

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
declare void @llvm.masked.scatter.nxv16i8.nxv16p0(<vscale x 16 x i8>, <vscale x 16 x ptr>, i32 immarg, <vscale x 16 x i1>)
77

8-
define fastcc i8 @allocno_reload_assign(ptr %p) {
8+
define fastcc i8 @allocno_reload_assign() {
99
; CHECK-LABEL: allocno_reload_assign:
1010
; CHECK: // %bb.0:
1111
; CHECK-NEXT: fmov d0, xzr
@@ -14,8 +14,8 @@ define fastcc i8 @allocno_reload_assign(ptr %p) {
1414
; CHECK-NEXT: cmpeq p0.d, p0/z, z0.d, #0
1515
; CHECK-NEXT: uzp1 p0.s, p0.s, p0.s
1616
; CHECK-NEXT: uzp1 p0.h, p0.h, p0.h
17-
; CHECK-NEXT: uzp1 p8.b, p0.b, p0.b
18-
; CHECK-NEXT: mov z0.b, p8/z, #1 // =0x1
17+
; CHECK-NEXT: uzp1 p0.b, p0.b, p0.b
18+
; CHECK-NEXT: mov z0.b, p0/z, #1 // =0x1
1919
; CHECK-NEXT: fmov w8, s0
2020
; CHECK-NEXT: mov z0.b, #0 // =0x0
2121
; CHECK-NEXT: uunpklo z1.h, z0.b
@@ -30,35 +30,34 @@ define fastcc i8 @allocno_reload_assign(ptr %p) {
3030
; CHECK-NEXT: punpklo p1.h, p0.b
3131
; CHECK-NEXT: punpkhi p0.h, p0.b
3232
; CHECK-NEXT: punpklo p2.h, p1.b
33-
; CHECK-NEXT: punpkhi p4.h, p1.b
33+
; CHECK-NEXT: punpkhi p3.h, p1.b
3434
; CHECK-NEXT: uunpklo z0.d, z2.s
3535
; CHECK-NEXT: uunpkhi z1.d, z2.s
36-
; CHECK-NEXT: punpklo p6.h, p0.b
36+
; CHECK-NEXT: punpklo p5.h, p0.b
3737
; CHECK-NEXT: uunpklo z2.d, z3.s
3838
; CHECK-NEXT: uunpkhi z3.d, z3.s
39-
; CHECK-NEXT: punpkhi p0.h, p0.b
39+
; CHECK-NEXT: punpkhi p7.h, p0.b
4040
; CHECK-NEXT: uunpklo z4.d, z5.s
4141
; CHECK-NEXT: uunpkhi z5.d, z5.s
4242
; CHECK-NEXT: uunpklo z6.d, z7.s
4343
; CHECK-NEXT: uunpkhi z7.d, z7.s
44-
; CHECK-NEXT: punpklo p1.h, p2.b
45-
; CHECK-NEXT: punpkhi p2.h, p2.b
46-
; CHECK-NEXT: punpklo p3.h, p4.b
47-
; CHECK-NEXT: punpkhi p4.h, p4.b
48-
; CHECK-NEXT: punpklo p5.h, p6.b
49-
; CHECK-NEXT: punpkhi p6.h, p6.b
50-
; CHECK-NEXT: punpklo p7.h, p0.b
51-
; CHECK-NEXT: punpkhi p0.h, p0.b
44+
; CHECK-NEXT: punpklo p0.h, p2.b
45+
; CHECK-NEXT: punpkhi p1.h, p2.b
46+
; CHECK-NEXT: punpklo p2.h, p3.b
47+
; CHECK-NEXT: punpkhi p3.h, p3.b
48+
; CHECK-NEXT: punpklo p4.h, p5.b
49+
; CHECK-NEXT: punpkhi p5.h, p5.b
50+
; CHECK-NEXT: punpklo p6.h, p7.b
51+
; CHECK-NEXT: punpkhi p7.h, p7.b
5252
; CHECK-NEXT: .LBB0_1: // =>This Inner Loop Header: Depth=1
53-
; CHECK-NEXT: st1b { z0.d }, p1, [z16.d]
54-
; CHECK-NEXT: st1b { z1.d }, p2, [z16.d]
55-
; CHECK-NEXT: st1b { z2.d }, p3, [z16.d]
56-
; CHECK-NEXT: st1b { z3.d }, p4, [z16.d]
57-
; CHECK-NEXT: st1b { z4.d }, p5, [z16.d]
58-
; CHECK-NEXT: st1b { z5.d }, p6, [z16.d]
59-
; CHECK-NEXT: st1b { z6.d }, p7, [z16.d]
60-
; CHECK-NEXT: st1b { z7.d }, p0, [z16.d]
61-
; CHECK-NEXT: str p8, [x0]
53+
; CHECK-NEXT: st1b { z0.d }, p0, [z16.d]
54+
; CHECK-NEXT: st1b { z1.d }, p1, [z16.d]
55+
; CHECK-NEXT: st1b { z2.d }, p2, [z16.d]
56+
; CHECK-NEXT: st1b { z3.d }, p3, [z16.d]
57+
; CHECK-NEXT: st1b { z4.d }, p4, [z16.d]
58+
; CHECK-NEXT: st1b { z5.d }, p5, [z16.d]
59+
; CHECK-NEXT: st1b { z6.d }, p6, [z16.d]
60+
; CHECK-NEXT: st1b { z7.d }, p7, [z16.d]
6261
; CHECK-NEXT: b .LBB0_1
6362
br label %1
6463

@@ -67,7 +66,6 @@ define fastcc i8 @allocno_reload_assign(ptr %p) {
6766
%constexpr1 = shufflevector <vscale x 16 x i1> %constexpr, <vscale x 16 x i1> poison, <vscale x 16 x i32> zeroinitializer
6867
%constexpr2 = xor <vscale x 16 x i1> %constexpr1, shufflevector (<vscale x 16 x i1> insertelement (<vscale x 16 x i1> poison, i1 true, i64 0), <vscale x 16 x i1> poison, <vscale x 16 x i32> zeroinitializer)
6968
call void @llvm.masked.scatter.nxv16i8.nxv16p0(<vscale x 16 x i8> zeroinitializer, <vscale x 16 x ptr> zeroinitializer, i32 0, <vscale x 16 x i1> %constexpr2)
70-
store <vscale x 16 x i1> %constexpr, ptr %p, align 16
7169
br label %1
7270
}
7371

‎llvm/test/CodeGen/AArch64/extract-vector-cmp.ll

Lines changed: 0 additions & 186 deletions
This file was deleted.

0 commit comments

Comments
 (0)