Skip to content

Commit b1c34b7

Browse files
committed
Expand only for scalable vector arguments
1 parent 05cd3cf commit b1c34b7

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,14 @@ bool PreISelIntrinsicLowering::lowerIntrinsics(Module &M) const {
457457
case Intrinsic::exp:
458458
case Intrinsic::exp2:
459459
Changed |= forEachCall(F, [&](CallInst *CI) {
460-
// TODO: Check legality and check if scalable
461-
if (!CI->getArgOperand(0)->getType()->isVectorTy())
460+
unsigned Op = ISD::exp;
461+
if (F.getIntrinsicID() == Intrinsic::exp2)
462+
Op = ISD::exp2;
463+
Type *Ty = CI->getArgOperand(0)->getType();
464+
if (!Ty->isVectorTy() || !Ty->isScalableTy())
465+
return false;
466+
const TargetLowering *TL = TM->getSubtargetImpl(F)->getTargetLowering();
467+
if (!TL->isOperationExpand(Op, EVT::getEVT(Ty)))
462468
return false;
463469
return lowerUnaryVectorIntrinsicAsLoop(M, CI);
464470
});

llvm/test/Transforms/PreISelIntrinsicLowering/AArch64/expand-exp.ll

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ define <vscale x 4 x float> @scalable_vec_exp(<vscale x 4 x float> %input) {
1111
; CHECK-NEXT: br label %[[BB3:.*]]
1212
; CHECK: [[BB3]]:
1313
; CHECK-NEXT: [[TMP4:%.*]] = phi i64 [ 0, [[TMP0:%.*]] ], [ [[TMP9:%.*]], %[[BB3]] ]
14-
; CHECK-NEXT: [[TMP5:%.*]] = phi <vscale x 4 x float> [ [[INPUT]], [[TMP0]] ], [ [[NEW_VEC:%.*]], %[[BB3]] ]
14+
; CHECK-NEXT: [[TMP5:%.*]] = phi <vscale x 4 x float> [ [[INPUT]], [[TMP0]] ], [ [[TMP8:%.*]], %[[BB3]] ]
1515
; CHECK-NEXT: [[TMP6:%.*]] = extractelement <vscale x 4 x float> [[TMP5]], i64 [[TMP4]]
1616
; CHECK-NEXT: [[TMP7:%.*]] = call float @llvm.exp.f32(float [[TMP6]])
17-
; CHECK-NEXT: [[NEW_VEC]] = insertelement <vscale x 4 x float> [[TMP5]], float [[TMP7]], i64 [[TMP4]]
17+
; CHECK-NEXT: [[TMP8]] = insertelement <vscale x 4 x float> [[TMP5]], float [[TMP7]], i64 [[TMP4]]
1818
; CHECK-NEXT: [[TMP9]] = add i64 [[TMP4]], 1
1919
; CHECK-NEXT: [[TMP10:%.*]] = icmp eq i64 [[TMP9]], [[TMP2]]
2020
; CHECK-NEXT: br i1 [[TMP10]], label %[[BB11:.*]], label %[[BB3]]
2121
; CHECK: [[BB11]]:
22-
; CHECK-NEXT: ret <vscale x 4 x float> [[NEW_VEC]]
22+
; CHECK-NEXT: ret <vscale x 4 x float> [[TMP8]]
2323
;
2424
%output = call <vscale x 4 x float> @llvm.exp.nxv4f32(<vscale x 4 x float> %input)
2525
ret <vscale x 4 x float> %output
@@ -28,18 +28,8 @@ define <vscale x 4 x float> @scalable_vec_exp(<vscale x 4 x float> %input) {
2828
define <4 x float> @fixed_vec_exp(<4 x float> %input) {
2929
; CHECK-LABEL: define <4 x float> @fixed_vec_exp(
3030
; CHECK-SAME: <4 x float> [[INPUT:%.*]]) {
31-
; CHECK-NEXT: br label %[[BB1:.*]]
32-
; CHECK: [[BB1]]:
33-
; CHECK-NEXT: [[TMP2:%.*]] = phi i64 [ 0, [[TMP0:%.*]] ], [ [[TMP7:%.*]], %[[BB1]] ]
34-
; CHECK-NEXT: [[TMP3:%.*]] = phi <4 x float> [ [[INPUT]], [[TMP0]] ], [ [[TMP6:%.*]], %[[BB1]] ]
35-
; CHECK-NEXT: [[TMP4:%.*]] = extractelement <4 x float> [[TMP3]], i64 [[TMP2]]
36-
; CHECK-NEXT: [[TMP5:%.*]] = call float @llvm.exp.f32(float [[TMP4]])
37-
; CHECK-NEXT: [[TMP6]] = insertelement <4 x float> [[TMP3]], float [[TMP5]], i64 [[TMP2]]
38-
; CHECK-NEXT: [[TMP7]] = add i64 [[TMP2]], 1
39-
; CHECK-NEXT: [[TMP8:%.*]] = icmp eq i64 [[TMP7]], 4
40-
; CHECK-NEXT: br i1 [[TMP8]], label %[[BB9:.*]], label %[[BB1]]
41-
; CHECK: [[BB9]]:
42-
; CHECK-NEXT: ret <4 x float> [[TMP6]]
31+
; CHECK-NEXT: [[OUTPUT:%.*]] = call <4 x float> @llvm.exp.v4f32(<4 x float> [[INPUT]])
32+
; CHECK-NEXT: ret <4 x float> [[OUTPUT]]
4333
;
4434
%output = call <4 x float> @llvm.exp.v4f32(<4 x float> %input)
4535
ret <4 x float> %output

0 commit comments

Comments
 (0)