Skip to content

Commit 7215dcf

Browse files
[SVE] Fix ShuffleVector cast<FixedVectorType> in truncateToMinimalBitwidths
Depends on D104239 Reviewed By: sdesmalen Differential Revision: https://reviews.llvm.org/D105341
1 parent b55aedd commit 7215dcf

File tree

2 files changed

+55
-8
lines changed

2 files changed

+55
-8
lines changed

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4003,16 +4003,14 @@ void InnerLoopVectorizer::truncateToMinimalBitwidths(VPTransformState &State) {
40034003
break;
40044004
}
40054005
} else if (auto *SI = dyn_cast<ShuffleVectorInst>(I)) {
4006-
auto Elements0 = cast<FixedVectorType>(SI->getOperand(0)->getType())
4007-
->getNumElements();
4006+
auto Elements0 =
4007+
cast<VectorType>(SI->getOperand(0)->getType())->getElementCount();
40084008
auto *O0 = B.CreateZExtOrTrunc(
4009-
SI->getOperand(0),
4010-
FixedVectorType::get(ScalarTruncatedTy, Elements0));
4011-
auto Elements1 = cast<FixedVectorType>(SI->getOperand(1)->getType())
4012-
->getNumElements();
4009+
SI->getOperand(0), VectorType::get(ScalarTruncatedTy, Elements0));
4010+
auto Elements1 =
4011+
cast<VectorType>(SI->getOperand(1)->getType())->getElementCount();
40134012
auto *O1 = B.CreateZExtOrTrunc(
4014-
SI->getOperand(1),
4015-
FixedVectorType::get(ScalarTruncatedTy, Elements1));
4013+
SI->getOperand(1), VectorType::get(ScalarTruncatedTy, Elements1));
40164014

40174015
NewI = B.CreateShuffleVector(O0, O1, SI->getShuffleMask());
40184016
} else if (isa<LoadInst>(I) || isa<PHINode>(I)) {

llvm/test/Transforms/LoopVectorize/scalable-trunc-min-bitwidth.ll

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,55 @@ for.exit:
6262
ret void
6363
}
6464

65+
define void @trunc_minimal_bitwidths_shufflevector (i8* %p, i32 %arg1, i64 %len) {
66+
; CHECK-LABEL: @trunc_minimal_bitwidths_shufflevector(
67+
; CHECK-NEXT: entry:
68+
; CHECK-NEXT: [[TMP0:%.*]] = call i64 @llvm.vscale.i64()
69+
; CHECK-NEXT: [[TMP1:%.*]] = mul i64 [[TMP0]], 4
70+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[LEN:%.*]], [[TMP1]]
71+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
72+
; CHECK: vector.ph:
73+
; CHECK-NEXT: [[TMP2:%.*]] = call i64 @llvm.vscale.i64()
74+
; CHECK-NEXT: [[TMP3:%.*]] = mul i64 [[TMP2]], 4
75+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[LEN]], [[TMP3]]
76+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[LEN]], [[N_MOD_VF]]
77+
; CHECK-NEXT: [[BROADCAST_SPLATINSERT:%.*]] = insertelement <vscale x 4 x i32> poison, i32 [[ARG1:%.*]], i32 0
78+
; CHECK-NEXT: [[BROADCAST_SPLAT:%.*]] = shufflevector <vscale x 4 x i32> [[BROADCAST_SPLATINSERT]], <vscale x 4 x i32> poison, <vscale x 4 x i32> zeroinitializer
79+
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
80+
; CHECK: vector.body:
81+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
82+
; CHECK-NEXT: [[TMP4:%.*]] = getelementptr inbounds i8, i8* [[P:%.*]], i64 [[INDEX]]
83+
; CHECK-NEXT: [[TMP5:%.*]] = bitcast i8* [[TMP4]] to <vscale x 4 x i8>*
84+
; CHECK-NEXT: [[WIDE_LOAD:%.*]] = load <vscale x 4 x i8>, <vscale x 4 x i8>* [[TMP5]], align 1
85+
; CHECK-NEXT: [[TMP6:%.*]] = trunc <vscale x 4 x i32> [[BROADCAST_SPLAT]] to <vscale x 4 x i8>
86+
; CHECK-NEXT: [[TMP7:%.*]] = xor <vscale x 4 x i8> [[WIDE_LOAD]], [[TMP6]]
87+
; CHECK-NEXT: [[TMP8:%.*]] = mul <vscale x 4 x i8> [[TMP7]], [[WIDE_LOAD]]
88+
; CHECK-NEXT: [[TMP9:%.*]] = bitcast i8* [[TMP4]] to <vscale x 4 x i8>*
89+
; CHECK-NEXT: store <vscale x 4 x i8> [[TMP8]], <vscale x 4 x i8>* [[TMP9]], align 1
90+
; CHECK-NEXT: [[TMP10:%.*]] = call i64 @llvm.vscale.i64()
91+
; CHECK-NEXT: [[TMP11:%.*]] = mul i64 [[TMP10]], 4
92+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], [[TMP11]]
93+
; CHECK-NEXT: [[TMP12:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
94+
; CHECK-NEXT: br i1 [[TMP12]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
95+
entry:
96+
br label %for.body
97+
98+
for.body: ; preds = %entry
99+
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
100+
%arrayidx = getelementptr inbounds i8, i8* %p, i64 %indvars.iv
101+
%0 = load i8, i8* %arrayidx
102+
%conv = zext i8 %0 to i32
103+
%conv17 = xor i32 %conv, %arg1
104+
%mul18 = mul nuw nsw i32 %conv17, %conv
105+
%conv19 = trunc i32 %mul18 to i8
106+
store i8 %conv19, i8* %arrayidx
107+
%indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
108+
%exitcond = icmp eq i64 %indvars.iv.next, %len
109+
br i1 %exitcond, label %for.exit, label %for.body, !llvm.loop !0
110+
111+
for.exit: ; preds = %for.body
112+
ret void
113+
}
65114
!0 = !{!0, !1, !2}
66115
!1 = !{!"llvm.loop.vectorize.width", i32 4}
67116
!2 = !{!"llvm.loop.vectorize.scalable.enable", i1 true}

0 commit comments

Comments
 (0)