Skip to content

Commit 4ab2423

Browse files
authored
[ConstantFolding] Generalize constant folding for vector_interleave2 to interleave3-8. (#168473)
1 parent 8f67759 commit 4ab2423

File tree

2 files changed

+68
-7
lines changed

2 files changed

+68
-7
lines changed

llvm/lib/Analysis/ConstantFolding.cpp

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,6 +1659,12 @@ bool llvm::canConstantFoldCallTo(const CallBase *Call, const Function *F) {
16591659
case Intrinsic::vector_extract:
16601660
case Intrinsic::vector_insert:
16611661
case Intrinsic::vector_interleave2:
1662+
case Intrinsic::vector_interleave3:
1663+
case Intrinsic::vector_interleave4:
1664+
case Intrinsic::vector_interleave5:
1665+
case Intrinsic::vector_interleave6:
1666+
case Intrinsic::vector_interleave7:
1667+
case Intrinsic::vector_interleave8:
16621668
case Intrinsic::vector_deinterleave2:
16631669
// Target intrinsics
16641670
case Intrinsic::amdgcn_perm:
@@ -4207,16 +4213,23 @@ static Constant *ConstantFoldFixedVectorCall(
42074213
}
42084214
return ConstantVector::get(Result);
42094215
}
4210-
case Intrinsic::vector_interleave2: {
4216+
case Intrinsic::vector_interleave2:
4217+
case Intrinsic::vector_interleave3:
4218+
case Intrinsic::vector_interleave4:
4219+
case Intrinsic::vector_interleave5:
4220+
case Intrinsic::vector_interleave6:
4221+
case Intrinsic::vector_interleave7:
4222+
case Intrinsic::vector_interleave8: {
42114223
unsigned NumElements =
42124224
cast<FixedVectorType>(Operands[0]->getType())->getNumElements();
4225+
unsigned NumOperands = Operands.size();
42134226
for (unsigned I = 0; I < NumElements; ++I) {
4214-
Constant *Elt0 = Operands[0]->getAggregateElement(I);
4215-
Constant *Elt1 = Operands[1]->getAggregateElement(I);
4216-
if (!Elt0 || !Elt1)
4217-
return nullptr;
4218-
Result[2 * I] = Elt0;
4219-
Result[2 * I + 1] = Elt1;
4227+
for (unsigned J = 0; J < NumOperands; ++J) {
4228+
Constant *Elt = Operands[J]->getAggregateElement(I);
4229+
if (!Elt)
4230+
return nullptr;
4231+
Result[NumOperands * I + J] = Elt;
4232+
}
42204233
}
42214234
return ConstantVector::get(Result);
42224235
}

llvm/test/Transforms/InstSimplify/ConstProp/vector-calls.ll

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,54 @@ define <8 x i32> @fold_vector_interleave2() {
5151
ret <8 x i32> %1
5252
}
5353

54+
define <12 x i32> @fold_vector_interleave3() {
55+
; CHECK-LABEL: define <12 x i32> @fold_vector_interleave3() {
56+
; CHECK-NEXT: ret <12 x i32> <i32 1, i32 5, i32 9, i32 2, i32 6, i32 10, i32 3, i32 7, i32 11, i32 4, i32 8, i32 12>
57+
;
58+
%1 = call <12 x i32> @llvm.vector.interleave3.v12i32(<4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8>, <4 x i32> <i32 9, i32 10, i32 11, i32 12>)
59+
ret <12 x i32> %1
60+
}
61+
62+
define <16 x i32> @fold_vector_interleave4() {
63+
; CHECK-LABEL: define <16 x i32> @fold_vector_interleave4() {
64+
; CHECK-NEXT: ret <16 x i32> <i32 1, i32 5, i32 9, i32 13, i32 2, i32 6, i32 10, i32 14, i32 3, i32 7, i32 11, i32 15, i32 4, i32 8, i32 12, i32 16>
65+
;
66+
%1 = call <16 x i32> @llvm.vector.interleave4.v16i32(<4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8>, <4 x i32> <i32 9, i32 10, i32 11, i32 12>, <4 x i32> <i32 13, i32 14, i32 15, i32 16>)
67+
ret <16 x i32> %1
68+
}
69+
70+
define <20 x i32> @fold_vector_interleave5() {
71+
; CHECK-LABEL: define <20 x i32> @fold_vector_interleave5() {
72+
; CHECK-NEXT: ret <20 x i32> <i32 1, i32 5, i32 9, i32 13, i32 17, i32 2, i32 6, i32 10, i32 14, i32 18, i32 3, i32 7, i32 11, i32 15, i32 19, i32 4, i32 8, i32 12, i32 16, i32 20>
73+
;
74+
%1 = call <20 x i32> @llvm.vector.interleave5.v20i32(<4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8>, <4 x i32> <i32 9, i32 10, i32 11, i32 12>, <4 x i32> <i32 13, i32 14, i32 15, i32 16>, <4 x i32> <i32 17, i32 18, i32 19, i32 20>)
75+
ret <20 x i32> %1
76+
}
77+
78+
define <24 x i32> @fold_vector_interleave6() {
79+
; CHECK-LABEL: define <24 x i32> @fold_vector_interleave6() {
80+
; CHECK-NEXT: ret <24 x i32> <i32 1, i32 5, i32 9, i32 13, i32 17, i32 21, i32 2, i32 6, i32 10, i32 14, i32 18, i32 22, i32 3, i32 7, i32 11, i32 15, i32 19, i32 23, i32 4, i32 8, i32 12, i32 16, i32 20, i32 24>
81+
;
82+
%1 = call <24 x i32> @llvm.vector.interleave6.v24i32(<4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8>, <4 x i32> <i32 9, i32 10, i32 11, i32 12>, <4 x i32> <i32 13, i32 14, i32 15, i32 16>, <4 x i32> <i32 17, i32 18, i32 19, i32 20>, <4 x i32> <i32 21, i32 22, i32 23, i32 24>)
83+
ret <24 x i32> %1
84+
}
85+
86+
define <28 x i32> @fold_vector_interleave7() {
87+
; CHECK-LABEL: define <28 x i32> @fold_vector_interleave7() {
88+
; CHECK-NEXT: ret <28 x i32> <i32 1, i32 5, i32 9, i32 13, i32 17, i32 21, i32 25, i32 2, i32 6, i32 10, i32 14, i32 18, i32 22, i32 26, i32 3, i32 7, i32 11, i32 15, i32 19, i32 23, i32 27, i32 4, i32 8, i32 12, i32 16, i32 20, i32 24, i32 28>
89+
;
90+
%1 = call <28 x i32> @llvm.vector.interleave7.v28i32(<4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8>, <4 x i32> <i32 9, i32 10, i32 11, i32 12>, <4 x i32> <i32 13, i32 14, i32 15, i32 16>, <4 x i32> <i32 17, i32 18, i32 19, i32 20>, <4 x i32> <i32 21, i32 22, i32 23, i32 24>, <4 x i32> <i32 25, i32 26, i32 27, i32 28>)
91+
ret <28 x i32> %1
92+
}
93+
94+
define <32 x i32> @fold_vector_interleave8() {
95+
; CHECK-LABEL: define <32 x i32> @fold_vector_interleave8() {
96+
; CHECK-NEXT: ret <32 x i32> <i32 1, i32 5, i32 9, i32 13, i32 17, i32 21, i32 25, i32 29, i32 2, i32 6, i32 10, i32 14, i32 18, i32 22, i32 26, i32 30, i32 3, i32 7, i32 11, i32 15, i32 19, i32 23, i32 27, i32 31, i32 4, i32 8, i32 12, i32 16, i32 20, i32 24, i32 28, i32 32>
97+
;
98+
%1 = call <32 x i32> @llvm.vector.interleave8.v32i32(<4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8>, <4 x i32> <i32 9, i32 10, i32 11, i32 12>, <4 x i32> <i32 13, i32 14, i32 15, i32 16>, <4 x i32> <i32 17, i32 18, i32 19, i32 20>, <4 x i32> <i32 21, i32 22, i32 23, i32 24>, <4 x i32> <i32 25, i32 26, i32 27, i32 28>, <4 x i32> <i32 29, i32 30, i32 31, i32 32>)
99+
ret <32 x i32> %1
100+
}
101+
54102
define {<4 x i32>, <4 x i32>} @fold_vector_deinterleave2() {
55103
; CHECK-LABEL: define { <4 x i32>, <4 x i32> } @fold_vector_deinterleave2() {
56104
; CHECK-NEXT: ret { <4 x i32>, <4 x i32> } { <4 x i32> <i32 1, i32 2, i32 3, i32 4>, <4 x i32> <i32 5, i32 6, i32 7, i32 8> }

0 commit comments

Comments
 (0)