Skip to content

Commit 5b7fd70

Browse files
googlewaltgooglewalt
authored
Revert "[DAG] visitEXTRACT_SUBVECTOR - accumulate SimplifyDemandedVectorElts demanded elts across all EXTRACT_SUBVECTOR uses" (#133331)
Reverts #133130 This touches a common file as #133083, which is causing failures
1 parent 50ea777 commit 5b7fd70

10 files changed

+71
-82
lines changed

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

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25557,31 +25557,8 @@ SDValue DAGCombiner::visitEXTRACT_SUBVECTOR(SDNode *N) {
2555725557
if (SDValue NarrowBOp = narrowExtractedVectorBinOp(N, DAG, LegalOperations))
2555825558
return NarrowBOp;
2555925559

25560-
// If only EXTRACT_SUBVECTOR nodes use the source vector we can
25561-
// simplify it based on the (valid) extractions.
25562-
if (!V.getValueType().isScalableVector() &&
25563-
llvm::all_of(V->users(), [&](SDNode *Use) {
25564-
return Use->getOpcode() == ISD::EXTRACT_SUBVECTOR &&
25565-
Use->getOperand(0) == V;
25566-
})) {
25567-
unsigned NumElts = V.getValueType().getVectorNumElements();
25568-
APInt DemandedElts = APInt::getZero(NumElts);
25569-
for (SDNode *User : V->users()) {
25570-
unsigned ExtIdx = User->getConstantOperandVal(1);
25571-
unsigned NumSubElts = User->getValueType(0).getVectorNumElements();
25572-
DemandedElts.setBits(ExtIdx, ExtIdx + NumSubElts);
25573-
}
25574-
if (SimplifyDemandedVectorElts(V, DemandedElts, /*AssumeSingleUse=*/true)) {
25575-
// We simplified the vector operand of this extract subvector. If this
25576-
// extract is not dead, visit it again so it is folded properly.
25577-
if (N->getOpcode() != ISD::DELETED_NODE)
25578-
AddToWorklist(N);
25579-
return SDValue(N, 0);
25580-
}
25581-
} else {
25582-
if (SimplifyDemandedVectorElts(SDValue(N, 0)))
25583-
return SDValue(N, 0);
25584-
}
25560+
if (SimplifyDemandedVectorElts(SDValue(N, 0)))
25561+
return SDValue(N, 0);
2558525562

2558625563
return SDValue();
2558725564
}

‎llvm/test/CodeGen/X86/any_extend_vector_inreg_of_broadcast.ll

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,7 +2573,8 @@ define void @vec384_i8_widen_to_i24_factor3_broadcast_to_v16i24_factor16(ptr %in
25732573
; AVX512F-NEXT: vpalignr {{.*#+}} xmm1 = xmm1[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15],xmm0[0]
25742574
; AVX512F-NEXT: vpshufb {{.*#+}} xmm1 = xmm1[15,0,1,15,3,4,15,6,7,15,9,10,15,12,13,15]
25752575
; AVX512F-NEXT: vpbroadcastb %xmm0, %ymm0
2576-
; AVX512F-NEXT: vpblendd {{.*#+}} ymm1 = ymm1[0,1,2,3],ymm0[4,5,6,7]
2576+
; AVX512F-NEXT: vinserti64x4 $1, %ymm0, %zmm0, %zmm0
2577+
; AVX512F-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm1
25772578
; AVX512F-NEXT: vpaddb (%rdx), %ymm1, %ymm1
25782579
; AVX512F-NEXT: vpaddb 32(%rdx), %ymm0, %ymm0
25792580
; AVX512F-NEXT: vmovdqa %ymm0, 32(%rcx)
@@ -2590,7 +2591,8 @@ define void @vec384_i8_widen_to_i24_factor3_broadcast_to_v16i24_factor16(ptr %in
25902591
; AVX512DQ-NEXT: vpalignr {{.*#+}} xmm1 = xmm1[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15],xmm0[0]
25912592
; AVX512DQ-NEXT: vpshufb {{.*#+}} xmm1 = xmm1[15,0,1,15,3,4,15,6,7,15,9,10,15,12,13,15]
25922593
; AVX512DQ-NEXT: vpbroadcastb %xmm0, %ymm0
2593-
; AVX512DQ-NEXT: vpblendd {{.*#+}} ymm1 = ymm1[0,1,2,3],ymm0[4,5,6,7]
2594+
; AVX512DQ-NEXT: vinserti64x4 $1, %ymm0, %zmm0, %zmm0
2595+
; AVX512DQ-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm1
25942596
; AVX512DQ-NEXT: vpaddb (%rdx), %ymm1, %ymm1
25952597
; AVX512DQ-NEXT: vpaddb 32(%rdx), %ymm0, %ymm0
25962598
; AVX512DQ-NEXT: vmovdqa %ymm0, 32(%rcx)
@@ -3608,11 +3610,12 @@ define void @vec384_i16_widen_to_i48_factor3_broadcast_to_v8i48_factor8(ptr %in.
36083610
; AVX512F: # %bb.0:
36093611
; AVX512F-NEXT: vmovdqa (%rdi), %xmm0
36103612
; AVX512F-NEXT: vmovdqa 48(%rdi), %xmm1
3611-
; AVX512F-NEXT: vpaddb 48(%rsi), %xmm1, %xmm1
36123613
; AVX512F-NEXT: vpaddb (%rsi), %xmm0, %xmm0
36133614
; AVX512F-NEXT: vpbroadcastw %xmm0, %ymm0
3615+
; AVX512F-NEXT: vinserti64x4 $1, %ymm0, %zmm0, %zmm0
3616+
; AVX512F-NEXT: vpaddb 48(%rsi), %xmm1, %xmm1
36143617
; AVX512F-NEXT: vpblendw {{.*#+}} xmm1 = xmm0[0],xmm1[1,2],xmm0[3],xmm1[4,5],xmm0[6],xmm1[7]
3615-
; AVX512F-NEXT: vpblendd {{.*#+}} ymm1 = ymm1[0,1,2,3],ymm0[4,5,6,7]
3618+
; AVX512F-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm1
36163619
; AVX512F-NEXT: vpaddb (%rdx), %ymm1, %ymm1
36173620
; AVX512F-NEXT: vpaddb 32(%rdx), %ymm0, %ymm0
36183621
; AVX512F-NEXT: vmovdqa %ymm0, 32(%rcx)
@@ -3624,11 +3627,12 @@ define void @vec384_i16_widen_to_i48_factor3_broadcast_to_v8i48_factor8(ptr %in.
36243627
; AVX512DQ: # %bb.0:
36253628
; AVX512DQ-NEXT: vmovdqa (%rdi), %xmm0
36263629
; AVX512DQ-NEXT: vmovdqa 48(%rdi), %xmm1
3627-
; AVX512DQ-NEXT: vpaddb 48(%rsi), %xmm1, %xmm1
36283630
; AVX512DQ-NEXT: vpaddb (%rsi), %xmm0, %xmm0
36293631
; AVX512DQ-NEXT: vpbroadcastw %xmm0, %ymm0
3632+
; AVX512DQ-NEXT: vinserti64x4 $1, %ymm0, %zmm0, %zmm0
3633+
; AVX512DQ-NEXT: vpaddb 48(%rsi), %xmm1, %xmm1
36303634
; AVX512DQ-NEXT: vpblendw {{.*#+}} xmm1 = xmm0[0],xmm1[1,2],xmm0[3],xmm1[4,5],xmm0[6],xmm1[7]
3631-
; AVX512DQ-NEXT: vpblendd {{.*#+}} ymm1 = ymm1[0,1,2,3],ymm0[4,5,6,7]
3635+
; AVX512DQ-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm1
36323636
; AVX512DQ-NEXT: vpaddb (%rdx), %ymm1, %ymm1
36333637
; AVX512DQ-NEXT: vpaddb 32(%rdx), %ymm0, %ymm0
36343638
; AVX512DQ-NEXT: vmovdqa %ymm0, 32(%rcx)

‎llvm/test/CodeGen/X86/pr42905.ll

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
define <4 x double> @autogen_SD30452(i1 %L230) {
55
; CHECK-LABEL: autogen_SD30452:
66
; CHECK: # %bb.0: # %BB
7-
; CHECK-NEXT: movdqa {{.*#+}} xmm0 = [151829,151829]
8-
; CHECK-NEXT: pshufd {{.*#+}} xmm0 = xmm0[0,2,2,3]
9-
; CHECK-NEXT: cvtdq2pd %xmm0, %xmm0
10-
; CHECK-NEXT: movaps %xmm0, %xmm1
7+
; CHECK-NEXT: movdqa {{.*#+}} xmm1 = [151829,151829]
8+
; CHECK-NEXT: movq %xmm0, %rax
9+
; CHECK-NEXT: cvtsi2sd %rax, %xmm0
10+
; CHECK-NEXT: pshufd {{.*#+}} xmm2 = xmm0[2,3,2,3]
11+
; CHECK-NEXT: movq %xmm2, %rax
12+
; CHECK-NEXT: xorps %xmm2, %xmm2
13+
; CHECK-NEXT: cvtsi2sd %rax, %xmm2
14+
; CHECK-NEXT: unpcklpd {{.*#+}} xmm0 = xmm0[0],xmm2[0]
15+
; CHECK-NEXT: pshufd {{.*#+}} xmm1 = xmm1[0,2,2,3]
16+
; CHECK-NEXT: cvtdq2pd %xmm1, %xmm1
1117
; CHECK-NEXT: retq
1218
BB:
1319
%I = insertelement <4 x i64> zeroinitializer, i64 151829, i32 3

‎llvm/test/CodeGen/X86/sad.ll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,8 @@ define dso_local i32 @sad_nonloop_64i8(ptr nocapture readonly %p, i64, ptr nocap
927927
; AVX512F-NEXT: vmovdqu 32(%rdi), %ymm1
928928
; AVX512F-NEXT: vpsadbw 32(%rdx), %ymm1, %ymm1
929929
; AVX512F-NEXT: vpsadbw (%rdx), %ymm0, %ymm0
930-
; AVX512F-NEXT: vpaddq %ymm1, %ymm0, %ymm0
930+
; AVX512F-NEXT: vinserti64x4 $1, %ymm1, %zmm0, %zmm0
931+
; AVX512F-NEXT: vpaddq %zmm1, %zmm0, %zmm0
931932
; AVX512F-NEXT: vextracti128 $1, %ymm0, %xmm1
932933
; AVX512F-NEXT: vpaddq %xmm1, %xmm0, %xmm0
933934
; AVX512F-NEXT: vpshufd {{.*#+}} xmm1 = xmm0[2,3,2,3]

‎llvm/test/CodeGen/X86/vector-interleaved-store-i16-stride-7.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,7 @@ define void @store_i16_stride7_vf16(ptr %in.vecptr0, ptr %in.vecptr1, ptr %in.ve
20792079
; AVX-NEXT: vpsrld $16, %xmm8, %xmm10
20802080
; AVX-NEXT: vpunpckhdq {{.*#+}} xmm10 = xmm3[2],xmm10[2],xmm3[3],xmm10[3]
20812081
; AVX-NEXT: vpunpckhwd {{.*#+}} xmm12 = xmm8[4],xmm3[4],xmm8[5],xmm3[5],xmm8[6],xmm3[6],xmm8[7],xmm3[7]
2082-
; AVX-NEXT: vpshufd {{.*#+}} xmm12 = xmm12[1,1,2,3]
2082+
; AVX-NEXT: vpshuflw {{.*#+}} xmm12 = xmm12[2,2,2,2,4,5,6,7]
20832083
; AVX-NEXT: vpshufhw {{.*#+}} xmm12 = xmm12[0,1,2,3,4,5,5,4]
20842084
; AVX-NEXT: vinsertf128 $1, %xmm10, %ymm12, %ymm10
20852085
; AVX-NEXT: vandnps %ymm10, %ymm6, %ymm6

‎llvm/test/CodeGen/X86/vector-reduce-fmax-fmin-fast.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ define float @test_v16f32(<16 x float> %a0) {
170170
; AVX512-LABEL: test_v16f32:
171171
; AVX512: # %bb.0:
172172
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
173-
; AVX512-NEXT: vmaxps %ymm1, %ymm0, %ymm0
173+
; AVX512-NEXT: vmaxps %zmm1, %zmm0, %zmm0
174174
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
175175
; AVX512-NEXT: vmaxps %xmm1, %xmm0, %xmm0
176176
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
@@ -264,7 +264,7 @@ define double @test_v8f64(<8 x double> %a0) {
264264
; AVX512-LABEL: test_v8f64:
265265
; AVX512: # %bb.0:
266266
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
267-
; AVX512-NEXT: vminpd %ymm1, %ymm0, %ymm0
267+
; AVX512-NEXT: vminpd %zmm1, %zmm0, %zmm0
268268
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
269269
; AVX512-NEXT: vminpd %xmm1, %xmm0, %xmm0
270270
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
@@ -306,7 +306,7 @@ define double @test_v16f64(<16 x double> %a0) {
306306
; AVX512: # %bb.0:
307307
; AVX512-NEXT: vmaxpd %zmm1, %zmm0, %zmm0
308308
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
309-
; AVX512-NEXT: vmaxpd %ymm1, %ymm0, %ymm0
309+
; AVX512-NEXT: vmaxpd %zmm1, %zmm0, %zmm0
310310
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
311311
; AVX512-NEXT: vmaxpd %xmm1, %xmm0, %xmm0
312312
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]

‎llvm/test/CodeGen/X86/vector-reduce-fmax-nnan.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ define float @test_v16f32(<16 x float> %a0) {
175175
; AVX512-LABEL: test_v16f32:
176176
; AVX512: # %bb.0:
177177
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
178-
; AVX512-NEXT: vmaxps %ymm1, %ymm0, %ymm0
178+
; AVX512-NEXT: vmaxps %zmm1, %zmm0, %zmm0
179179
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
180180
; AVX512-NEXT: vmaxps %xmm1, %xmm0, %xmm0
181181
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
@@ -311,7 +311,7 @@ define double @test_v8f64(<8 x double> %a0) {
311311
; AVX512-LABEL: test_v8f64:
312312
; AVX512: # %bb.0:
313313
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
314-
; AVX512-NEXT: vmaxpd %ymm1, %ymm0, %ymm0
314+
; AVX512-NEXT: vmaxpd %zmm1, %zmm0, %zmm0
315315
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
316316
; AVX512-NEXT: vmaxpd %xmm1, %xmm0, %xmm0
317317
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
@@ -353,7 +353,7 @@ define double @test_v16f64(<16 x double> %a0) {
353353
; AVX512: # %bb.0:
354354
; AVX512-NEXT: vmaxpd %zmm1, %zmm0, %zmm0
355355
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
356-
; AVX512-NEXT: vmaxpd %ymm1, %ymm0, %ymm0
356+
; AVX512-NEXT: vmaxpd %zmm1, %zmm0, %zmm0
357357
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
358358
; AVX512-NEXT: vmaxpd %xmm1, %xmm0, %xmm0
359359
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]

‎llvm/test/CodeGen/X86/vector-reduce-fmin-nnan.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ define float @test_v16f32(<16 x float> %a0) {
216216
; AVX512-LABEL: test_v16f32:
217217
; AVX512: # %bb.0:
218218
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
219-
; AVX512-NEXT: vminps %ymm1, %ymm0, %ymm0
219+
; AVX512-NEXT: vminps %zmm1, %zmm0, %zmm0
220220
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
221221
; AVX512-NEXT: vminps %xmm1, %xmm0, %xmm0
222222
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
@@ -310,7 +310,7 @@ define double @test_v8f64(<8 x double> %a0) {
310310
; AVX512-LABEL: test_v8f64:
311311
; AVX512: # %bb.0:
312312
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
313-
; AVX512-NEXT: vminpd %ymm1, %ymm0, %ymm0
313+
; AVX512-NEXT: vminpd %zmm1, %zmm0, %zmm0
314314
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
315315
; AVX512-NEXT: vminpd %xmm1, %xmm0, %xmm0
316316
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
@@ -352,7 +352,7 @@ define double @test_v16f64(<16 x double> %a0) {
352352
; AVX512: # %bb.0:
353353
; AVX512-NEXT: vminpd %zmm1, %zmm0, %zmm0
354354
; AVX512-NEXT: vextractf64x4 $1, %zmm0, %ymm1
355-
; AVX512-NEXT: vminpd %ymm1, %ymm0, %ymm0
355+
; AVX512-NEXT: vminpd %zmm1, %zmm0, %zmm0
356356
; AVX512-NEXT: vextractf128 $1, %ymm0, %xmm1
357357
; AVX512-NEXT: vminpd %xmm1, %xmm0, %xmm0
358358
; AVX512-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]

‎llvm/test/CodeGen/X86/vector-reduce-mul.ll

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ define i64 @test_v8i64(<8 x i64> %a0) {
357357
; AVX512BW-LABEL: test_v8i64:
358358
; AVX512BW: # %bb.0:
359359
; AVX512BW-NEXT: vextracti64x4 $1, %zmm0, %ymm1
360-
; AVX512BW-NEXT: vpsrlq $32, %ymm0, %ymm2
361-
; AVX512BW-NEXT: vpmuludq %ymm1, %ymm2, %ymm2
362-
; AVX512BW-NEXT: vpsrlq $32, %ymm1, %ymm3
363-
; AVX512BW-NEXT: vpmuludq %ymm3, %ymm0, %ymm3
364-
; AVX512BW-NEXT: vpaddq %ymm2, %ymm3, %ymm2
365-
; AVX512BW-NEXT: vpsllq $32, %ymm2, %ymm2
366-
; AVX512BW-NEXT: vpmuludq %ymm1, %ymm0, %ymm0
367-
; AVX512BW-NEXT: vpaddq %ymm2, %ymm0, %ymm0
360+
; AVX512BW-NEXT: vpsrlq $32, %zmm0, %zmm2
361+
; AVX512BW-NEXT: vpmuludq %zmm1, %zmm2, %zmm2
362+
; AVX512BW-NEXT: vpsrlq $32, %zmm1, %zmm3
363+
; AVX512BW-NEXT: vpmuludq %zmm3, %zmm0, %zmm3
364+
; AVX512BW-NEXT: vpaddq %zmm2, %zmm3, %zmm2
365+
; AVX512BW-NEXT: vpsllq $32, %zmm2, %zmm2
366+
; AVX512BW-NEXT: vpmuludq %zmm1, %zmm0, %zmm0
367+
; AVX512BW-NEXT: vpaddq %zmm2, %zmm0, %zmm0
368368
; AVX512BW-NEXT: vextracti128 $1, %ymm0, %xmm1
369369
; AVX512BW-NEXT: vpsrlq $32, %xmm0, %xmm2
370370
; AVX512BW-NEXT: vpmuludq %xmm1, %xmm2, %xmm2
@@ -390,14 +390,14 @@ define i64 @test_v8i64(<8 x i64> %a0) {
390390
; AVX512BWVL-LABEL: test_v8i64:
391391
; AVX512BWVL: # %bb.0:
392392
; AVX512BWVL-NEXT: vextracti64x4 $1, %zmm0, %ymm1
393-
; AVX512BWVL-NEXT: vpsrlq $32, %ymm0, %ymm2
394-
; AVX512BWVL-NEXT: vpmuludq %ymm1, %ymm2, %ymm2
395-
; AVX512BWVL-NEXT: vpsrlq $32, %ymm1, %ymm3
396-
; AVX512BWVL-NEXT: vpmuludq %ymm3, %ymm0, %ymm3
397-
; AVX512BWVL-NEXT: vpaddq %ymm2, %ymm3, %ymm2
398-
; AVX512BWVL-NEXT: vpsllq $32, %ymm2, %ymm2
399-
; AVX512BWVL-NEXT: vpmuludq %ymm1, %ymm0, %ymm0
400-
; AVX512BWVL-NEXT: vpaddq %ymm2, %ymm0, %ymm0
393+
; AVX512BWVL-NEXT: vpsrlq $32, %zmm0, %zmm2
394+
; AVX512BWVL-NEXT: vpmuludq %zmm1, %zmm2, %zmm2
395+
; AVX512BWVL-NEXT: vpsrlq $32, %zmm1, %zmm3
396+
; AVX512BWVL-NEXT: vpmuludq %zmm3, %zmm0, %zmm3
397+
; AVX512BWVL-NEXT: vpaddq %zmm2, %zmm3, %zmm2
398+
; AVX512BWVL-NEXT: vpsllq $32, %zmm2, %zmm2
399+
; AVX512BWVL-NEXT: vpmuludq %zmm1, %zmm0, %zmm0
400+
; AVX512BWVL-NEXT: vpaddq %zmm2, %zmm0, %zmm0
401401
; AVX512BWVL-NEXT: vextracti128 $1, %ymm0, %xmm1
402402
; AVX512BWVL-NEXT: vpsrlq $32, %xmm0, %xmm2
403403
; AVX512BWVL-NEXT: vpmuludq %xmm1, %xmm2, %xmm2
@@ -667,14 +667,14 @@ define i64 @test_v16i64(<16 x i64> %a0) {
667667
; AVX512BW-NEXT: vpmuludq %zmm1, %zmm0, %zmm0
668668
; AVX512BW-NEXT: vpaddq %zmm2, %zmm0, %zmm0
669669
; AVX512BW-NEXT: vextracti64x4 $1, %zmm0, %ymm1
670-
; AVX512BW-NEXT: vpsrlq $32, %ymm0, %ymm2
671-
; AVX512BW-NEXT: vpmuludq %ymm1, %ymm2, %ymm2
672-
; AVX512BW-NEXT: vpsrlq $32, %ymm1, %ymm3
673-
; AVX512BW-NEXT: vpmuludq %ymm3, %ymm0, %ymm3
674-
; AVX512BW-NEXT: vpaddq %ymm2, %ymm3, %ymm2
675-
; AVX512BW-NEXT: vpsllq $32, %ymm2, %ymm2
676-
; AVX512BW-NEXT: vpmuludq %ymm1, %ymm0, %ymm0
677-
; AVX512BW-NEXT: vpaddq %ymm2, %ymm0, %ymm0
670+
; AVX512BW-NEXT: vpsrlq $32, %zmm0, %zmm2
671+
; AVX512BW-NEXT: vpmuludq %zmm1, %zmm2, %zmm2
672+
; AVX512BW-NEXT: vpsrlq $32, %zmm1, %zmm3
673+
; AVX512BW-NEXT: vpmuludq %zmm3, %zmm0, %zmm3
674+
; AVX512BW-NEXT: vpaddq %zmm2, %zmm3, %zmm2
675+
; AVX512BW-NEXT: vpsllq $32, %zmm2, %zmm2
676+
; AVX512BW-NEXT: vpmuludq %zmm1, %zmm0, %zmm0
677+
; AVX512BW-NEXT: vpaddq %zmm2, %zmm0, %zmm0
678678
; AVX512BW-NEXT: vextracti128 $1, %ymm0, %xmm1
679679
; AVX512BW-NEXT: vpsrlq $32, %xmm0, %xmm2
680680
; AVX512BW-NEXT: vpmuludq %xmm1, %xmm2, %xmm2
@@ -708,14 +708,14 @@ define i64 @test_v16i64(<16 x i64> %a0) {
708708
; AVX512BWVL-NEXT: vpmuludq %zmm1, %zmm0, %zmm0
709709
; AVX512BWVL-NEXT: vpaddq %zmm2, %zmm0, %zmm0
710710
; AVX512BWVL-NEXT: vextracti64x4 $1, %zmm0, %ymm1
711-
; AVX512BWVL-NEXT: vpsrlq $32, %ymm0, %ymm2
712-
; AVX512BWVL-NEXT: vpmuludq %ymm1, %ymm2, %ymm2
713-
; AVX512BWVL-NEXT: vpsrlq $32, %ymm1, %ymm3
714-
; AVX512BWVL-NEXT: vpmuludq %ymm3, %ymm0, %ymm3
715-
; AVX512BWVL-NEXT: vpaddq %ymm2, %ymm3, %ymm2
716-
; AVX512BWVL-NEXT: vpsllq $32, %ymm2, %ymm2
717-
; AVX512BWVL-NEXT: vpmuludq %ymm1, %ymm0, %ymm0
718-
; AVX512BWVL-NEXT: vpaddq %ymm2, %ymm0, %ymm0
711+
; AVX512BWVL-NEXT: vpsrlq $32, %zmm0, %zmm2
712+
; AVX512BWVL-NEXT: vpmuludq %zmm1, %zmm2, %zmm2
713+
; AVX512BWVL-NEXT: vpsrlq $32, %zmm1, %zmm3
714+
; AVX512BWVL-NEXT: vpmuludq %zmm3, %zmm0, %zmm3
715+
; AVX512BWVL-NEXT: vpaddq %zmm2, %zmm3, %zmm2
716+
; AVX512BWVL-NEXT: vpsllq $32, %zmm2, %zmm2
717+
; AVX512BWVL-NEXT: vpmuludq %zmm1, %zmm0, %zmm0
718+
; AVX512BWVL-NEXT: vpaddq %zmm2, %zmm0, %zmm0
719719
; AVX512BWVL-NEXT: vextracti128 $1, %ymm0, %xmm1
720720
; AVX512BWVL-NEXT: vpsrlq $32, %xmm0, %xmm2
721721
; AVX512BWVL-NEXT: vpmuludq %xmm1, %xmm2, %xmm2

‎llvm/test/CodeGen/X86/zero_extend_vector_inreg_of_broadcast_from_memory.ll

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3862,14 +3862,15 @@ define void @vec384_i32_widen_to_i96_factor3_broadcast_to_v4i96_factor4(ptr %in.
38623862
; AVX-NEXT: vpxor %xmm2, %xmm2, %xmm2
38633863
; AVX-NEXT: vpblendw {{.*#+}} xmm0 = xmm0[0,1],xmm2[2,3,4,5,6,7]
38643864
; AVX-NEXT: vpshufd {{.*#+}} xmm0 = xmm0[1,0,1,1]
3865-
; AVX-NEXT: vbroadcastss (%rdi), %xmm3
3865+
; AVX-NEXT: vbroadcastss (%rdi), %ymm3
38663866
; AVX-NEXT: vpaddb 32(%rsi), %xmm0, %xmm0
3867-
; AVX-NEXT: vpaddb (%rsi), %xmm1, %xmm1
38683867
; AVX-NEXT: vpblendw {{.*#+}} xmm2 = xmm2[0,1,2,3],xmm3[4,5],xmm2[6,7]
38693868
; AVX-NEXT: vpaddb 16(%rsi), %xmm2, %xmm2
3870-
; AVX-NEXT: vmovdqa %xmm2, 16(%rdx)
3869+
; AVX-NEXT: vpaddb (%rsi), %xmm1, %xmm1
38713870
; AVX-NEXT: vmovdqa %xmm1, (%rdx)
3871+
; AVX-NEXT: vmovdqa %xmm2, 16(%rdx)
38723872
; AVX-NEXT: vmovdqa %xmm0, 32(%rdx)
3873+
; AVX-NEXT: vzeroupper
38733874
; AVX-NEXT: retq
38743875
;
38753876
; AVX2-SLOW-LABEL: vec384_i32_widen_to_i96_factor3_broadcast_to_v4i96_factor4:
@@ -4115,7 +4116,7 @@ define void @vec384_i32_widen_to_i192_factor6_broadcast_to_v2i192_factor2(ptr %i
41154116
; AVX: # %bb.0:
41164117
; AVX-NEXT: vmovdqa 48(%rdi), %xmm0
41174118
; AVX-NEXT: vpblendw {{.*#+}} xmm0 = mem[0,1],xmm0[2,3,4,5,6,7]
4118-
; AVX-NEXT: vbroadcastss (%rdi), %xmm1
4119+
; AVX-NEXT: vbroadcastss (%rdi), %ymm1
41194120
; AVX-NEXT: vmovaps 32(%rsi), %ymm2
41204121
; AVX-NEXT: vxorps %xmm3, %xmm3, %xmm3
41214122
; AVX-NEXT: vblendps {{.*#+}} xmm1 = xmm3[0,1],xmm1[2],xmm3[3]

0 commit comments

Comments
 (0)