Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit b3d173b

Browse files
committed
[SelectionDAG] Add SRA/SHL demanded elts support to ComputeNumSignBits
Introduce a isConstOrDemandedConstSplat helper function that can recognise a constant splat build vector for at least the demanded elts we care about. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@316866 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent efd461e commit b3d173b

File tree

2 files changed

+43
-27
lines changed

2 files changed

+43
-27
lines changed

lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,6 +2056,30 @@ bool SelectionDAG::MaskedValueIsZero(SDValue Op, const APInt &Mask,
20562056
return Mask.isSubsetOf(Known.Zero);
20572057
}
20582058

2059+
/// Helper function that checks to see if a node is a constant or a
2060+
/// build vector of splat constants at least within the demanded elts.
2061+
static ConstantSDNode *isConstOrDemandedConstSplat(SDValue N,
2062+
const APInt &DemandedElts) {
2063+
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(N))
2064+
return CN;
2065+
if (N.getOpcode() != ISD::BUILD_VECTOR)
2066+
return nullptr;
2067+
EVT VT = N.getValueType();
2068+
ConstantSDNode *Cst = nullptr;
2069+
unsigned NumElts = VT.getVectorNumElements();
2070+
assert(DemandedElts.getBitWidth() == NumElts && "Unexpected vector size");
2071+
for (unsigned i = 0; i != NumElts; ++i) {
2072+
if (!DemandedElts[i])
2073+
continue;
2074+
ConstantSDNode *C = dyn_cast<ConstantSDNode>(N.getOperand(i));
2075+
if (!C || (Cst && Cst->getAPIntValue() != C->getAPIntValue()) ||
2076+
C->getValueType(0) != VT.getScalarType())
2077+
return nullptr;
2078+
Cst = C;
2079+
}
2080+
return Cst;
2081+
}
2082+
20592083
/// If a SHL/SRA/SRL node has a constant or splat constant shift amount that
20602084
/// is less than the element bit-width of the shift node, return it.
20612085
static const APInt *getValidShiftAmountConstant(SDValue V) {
@@ -3121,16 +3145,18 @@ unsigned SelectionDAG::ComputeNumSignBits(SDValue Op, const APInt &DemandedElts,
31213145
case ISD::SRA:
31223146
Tmp = ComputeNumSignBits(Op.getOperand(0), DemandedElts, Depth+1);
31233147
// SRA X, C -> adds C sign bits.
3124-
if (ConstantSDNode *C = isConstOrConstSplat(Op.getOperand(1))) {
3148+
if (ConstantSDNode *C =
3149+
isConstOrDemandedConstSplat(Op.getOperand(1), DemandedElts)) {
31253150
APInt ShiftVal = C->getAPIntValue();
31263151
ShiftVal += Tmp;
31273152
Tmp = ShiftVal.uge(VTBits) ? VTBits : ShiftVal.getZExtValue();
31283153
}
31293154
return Tmp;
31303155
case ISD::SHL:
3131-
if (ConstantSDNode *C = isConstOrConstSplat(Op.getOperand(1))) {
3156+
if (ConstantSDNode *C =
3157+
isConstOrDemandedConstSplat(Op.getOperand(1), DemandedElts)) {
31323158
// shl destroys sign bits.
3133-
Tmp = ComputeNumSignBits(Op.getOperand(0), Depth+1);
3159+
Tmp = ComputeNumSignBits(Op.getOperand(0), DemandedElts, Depth+1);
31343160
if (C->getAPIntValue().uge(VTBits) || // Bad shift.
31353161
C->getAPIntValue().uge(Tmp)) break; // Shifted all sign bits out.
31363162
return Tmp - C->getZExtValue();

test/CodeGen/X86/known-signbits-vector.ll

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ define float @signbits_ashr_extract_sitofp_0(<2 x i64> %a0) nounwind {
100100
define float @signbits_ashr_extract_sitofp_1(<2 x i64> %a0) nounwind {
101101
; X32-LABEL: signbits_ashr_extract_sitofp_1:
102102
; X32: # BB#0:
103-
; X32-NEXT: pushl %ebp
104-
; X32-NEXT: movl %esp, %ebp
105-
; X32-NEXT: andl $-8, %esp
106-
; X32-NEXT: subl $16, %esp
103+
; X32-NEXT: pushl %eax
107104
; X32-NEXT: vmovdqa {{.*#+}} xmm1 = [0,2147483648,0,2147483648]
108105
; X32-NEXT: vpsrlq $63, %xmm1, %xmm2
109106
; X32-NEXT: vpsrlq $32, %xmm1, %xmm1
@@ -113,12 +110,11 @@ define float @signbits_ashr_extract_sitofp_1(<2 x i64> %a0) nounwind {
113110
; X32-NEXT: vpblendw {{.*#+}} xmm0 = xmm0[0,1,2,3],xmm2[4,5,6,7]
114111
; X32-NEXT: vpxor %xmm1, %xmm0, %xmm0
115112
; X32-NEXT: vpsubq %xmm1, %xmm0, %xmm0
116-
; X32-NEXT: vmovq %xmm0, {{[0-9]+}}(%esp)
117-
; X32-NEXT: fildll {{[0-9]+}}(%esp)
118-
; X32-NEXT: fstps {{[0-9]+}}(%esp)
119-
; X32-NEXT: flds {{[0-9]+}}(%esp)
120-
; X32-NEXT: movl %ebp, %esp
121-
; X32-NEXT: popl %ebp
113+
; X32-NEXT: vmovd %xmm0, %eax
114+
; X32-NEXT: vcvtsi2ssl %eax, %xmm3, %xmm0
115+
; X32-NEXT: vmovss %xmm0, (%esp)
116+
; X32-NEXT: flds (%esp)
117+
; X32-NEXT: popl %eax
122118
; X32-NEXT: retl
123119
;
124120
; X64-LABEL: signbits_ashr_extract_sitofp_1:
@@ -130,7 +126,7 @@ define float @signbits_ashr_extract_sitofp_1(<2 x i64> %a0) nounwind {
130126
; X64-NEXT: vpxor %xmm1, %xmm0, %xmm0
131127
; X64-NEXT: vpsubq %xmm1, %xmm0, %xmm0
132128
; X64-NEXT: vmovq %xmm0, %rax
133-
; X64-NEXT: vcvtsi2ssq %rax, %xmm2, %xmm0
129+
; X64-NEXT: vcvtsi2ssl %eax, %xmm2, %xmm0
134130
; X64-NEXT: retq
135131
%1 = ashr <2 x i64> %a0, <i64 32, i64 63>
136132
%2 = extractelement <2 x i64> %1, i32 0
@@ -141,10 +137,7 @@ define float @signbits_ashr_extract_sitofp_1(<2 x i64> %a0) nounwind {
141137
define float @signbits_ashr_shl_extract_sitofp(<2 x i64> %a0) nounwind {
142138
; X32-LABEL: signbits_ashr_shl_extract_sitofp:
143139
; X32: # BB#0:
144-
; X32-NEXT: pushl %ebp
145-
; X32-NEXT: movl %esp, %ebp
146-
; X32-NEXT: andl $-8, %esp
147-
; X32-NEXT: subl $16, %esp
140+
; X32-NEXT: pushl %eax
148141
; X32-NEXT: vmovdqa {{.*#+}} xmm1 = [0,2147483648,0,2147483648]
149142
; X32-NEXT: vpsrlq $60, %xmm1, %xmm2
150143
; X32-NEXT: vpsrlq $61, %xmm1, %xmm1
@@ -154,15 +147,12 @@ define float @signbits_ashr_shl_extract_sitofp(<2 x i64> %a0) nounwind {
154147
; X32-NEXT: vpblendw {{.*#+}} xmm0 = xmm0[0,1,2,3],xmm2[4,5,6,7]
155148
; X32-NEXT: vpxor %xmm1, %xmm0, %xmm0
156149
; X32-NEXT: vpsubq %xmm1, %xmm0, %xmm0
157-
; X32-NEXT: vpsllq $16, %xmm0, %xmm1
158150
; X32-NEXT: vpsllq $20, %xmm0, %xmm0
159-
; X32-NEXT: vpblendw {{.*#+}} xmm0 = xmm0[0,1,2,3],xmm1[4,5,6,7]
160-
; X32-NEXT: vmovq %xmm0, {{[0-9]+}}(%esp)
161-
; X32-NEXT: fildll {{[0-9]+}}(%esp)
162-
; X32-NEXT: fstps {{[0-9]+}}(%esp)
163-
; X32-NEXT: flds {{[0-9]+}}(%esp)
164-
; X32-NEXT: movl %ebp, %esp
165-
; X32-NEXT: popl %ebp
151+
; X32-NEXT: vmovd %xmm0, %eax
152+
; X32-NEXT: vcvtsi2ssl %eax, %xmm3, %xmm0
153+
; X32-NEXT: vmovss %xmm0, (%esp)
154+
; X32-NEXT: flds (%esp)
155+
; X32-NEXT: popl %eax
166156
; X32-NEXT: retl
167157
;
168158
; X64-LABEL: signbits_ashr_shl_extract_sitofp:
@@ -175,7 +165,7 @@ define float @signbits_ashr_shl_extract_sitofp(<2 x i64> %a0) nounwind {
175165
; X64-NEXT: vpsubq %xmm1, %xmm0, %xmm0
176166
; X64-NEXT: vpsllq $20, %xmm0, %xmm0
177167
; X64-NEXT: vmovq %xmm0, %rax
178-
; X64-NEXT: vcvtsi2ssq %rax, %xmm2, %xmm0
168+
; X64-NEXT: vcvtsi2ssl %eax, %xmm2, %xmm0
179169
; X64-NEXT: retq
180170
%1 = ashr <2 x i64> %a0, <i64 61, i64 60>
181171
%2 = shl <2 x i64> %1, <i64 20, i64 16>

0 commit comments

Comments
 (0)