Skip to content

Commit 54fe64b

Browse files
committed
[DAGCombiner] Remove shuffle support from simplifyShuffleMask
rL310372 enabled simplifyShuffleMask to support undef shuffle mask inputs, but its causing hangs. Removing support until I can triage the problem git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@310699 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 954fd55 commit 54fe64b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15161,8 +15161,6 @@ static SDValue simplifyShuffleMask(ShuffleVectorSDNode *SVN, SDValue N0,
1516115161
// TODO - handle more cases as required.
1516215162
if (V.getOpcode() == ISD::BUILD_VECTOR)
1516315163
return V.getOperand(Idx).isUndef();
15164-
if (auto *SVN = dyn_cast<ShuffleVectorSDNode>(V))
15165-
return SVN->getMaskElt(Idx) < 0;
1516615164
return false;
1516715165
};
1516815166

test/CodeGen/X86/oddshuffles.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ define void @v7i8(<4 x i8> %a, <4 x i8> %b, <7 x i8>* %p) nounwind {
258258
; SSE42-NEXT: pextrb $0, %xmm1, 6(%rdi)
259259
; SSE42-NEXT: pshufb {{.*#+}} xmm1 = xmm1[8,9,8,9,4,5,8,9,0,1,12,13,0,1,14,15]
260260
; SSE42-NEXT: pblendw {{.*#+}} xmm1 = xmm0[0],xmm1[1],xmm0[2],xmm1[3],xmm0[4],xmm1[5,6,7]
261-
; SSE42-NEXT: pshufb {{.*#+}} xmm1 = xmm1[0,2,4,6,8,10,12,u,u,u,u,u,u,u,u,u]
261+
; SSE42-NEXT: pshufb {{.*#+}} xmm1 = xmm1[0,2,4,6,8,10,12,14,u,u,u,u,u,u,u,u]
262262
; SSE42-NEXT: pextrw $2, %xmm1, 4(%rdi)
263263
; SSE42-NEXT: movd %xmm1, (%rdi)
264264
; SSE42-NEXT: retq
@@ -268,7 +268,7 @@ define void @v7i8(<4 x i8> %a, <4 x i8> %b, <7 x i8>* %p) nounwind {
268268
; AVX-NEXT: vpshufd {{.*#+}} xmm0 = xmm0[0,3,1,3]
269269
; AVX-NEXT: vpshufb {{.*#+}} xmm2 = xmm1[8,9,8,9,4,5,8,9,0,1,12,13,0,1,14,15]
270270
; AVX-NEXT: vpblendw {{.*#+}} xmm0 = xmm0[0],xmm2[1],xmm0[2],xmm2[3],xmm0[4],xmm2[5,6,7]
271-
; AVX-NEXT: vpshufb {{.*#+}} xmm0 = xmm0[0,2,4,6,8,10,12,u,u,u,u,u,u,u,u,u]
271+
; AVX-NEXT: vpshufb {{.*#+}} xmm0 = xmm0[0,2,4,6,8,10,12,14,u,u,u,u,u,u,u,u]
272272
; AVX-NEXT: vpextrb $0, %xmm1, 6(%rdi)
273273
; AVX-NEXT: vpextrw $2, %xmm0, 4(%rdi)
274274
; AVX-NEXT: vmovd %xmm0, (%rdi)

0 commit comments

Comments
 (0)