diff --git a/llvm/lib/Analysis/LoopAccessAnalysis.cpp b/llvm/lib/Analysis/LoopAccessAnalysis.cpp --- a/llvm/lib/Analysis/LoopAccessAnalysis.cpp +++ b/llvm/lib/Analysis/LoopAccessAnalysis.cpp @@ -1101,7 +1101,12 @@ } auto &DL = Lp->getHeader()->getModule()->getDataLayout(); - int64_t Size = DL.getTypeAllocSize(AccessTy); + TypeSize AllocSize = DL.getTypeAllocSize(AccessTy); + if (AllocSize.isScalable()) { + // Scalable types not yet supported - give up. + return 0; + } + int64_t Size = AllocSize.getFixedSize(); const APInt &APStepVal = C->getAPInt(); // Huge step value - give up. diff --git a/llvm/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll b/llvm/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll deleted file mode 100644 --- a/llvm/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll +++ /dev/null @@ -1,21 +0,0 @@ -; RUN: opt -loop-load-elim -mtriple=aarch64--linux-gnu -mattr=+sve < %s - -; This regression test is verifying that a GEP instruction performed on a -; scalable vector does not produce a 'assumption that TypeSize is not scalable' -; warning in the llvm::getGEPInductionOperand function. - -define void @get_gep_induction_operand_typesize_warning(i64 %n, * %a) { -entry: - br label %loop.body - -loop.body: - %0 = phi i64 [ 0, %entry ], [ %1, %loop.body ] - %idx = getelementptr , * %a, i64 %0 - store zeroinitializer, * %idx - %1 = add i64 %0, 1 - %2 = icmp eq i64 %1, %n - br i1 %2, label %loop.end, label %loop.body - -loop.end: - ret void -} diff --git a/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll b/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Analysis/LoopAccessAnalysis/scalable-vector-regression-tests.ll @@ -0,0 +1,35 @@ +; RUN: opt -loop-load-elim -mtriple=aarch64 -mattr=+sve < %s + +; Regression tests verifying "assumption that TypeSize is not scalable" and "Invalid size request on a scalable vector." are not produced by -load-loop-elim. + +define void @regression_test_get_gep_induction_operand_typesize_warning(i64 %n, * %a) { +entry: + br label %loop.body + +loop.body: + %0 = phi i64 [ 0, %entry ], [ %1, %loop.body ] + %idx = getelementptr , * %a, i64 %0 + store zeroinitializer, * %idx + %1 = add i64 %0, 1 + %2 = icmp eq i64 %1, %n + br i1 %2, label %loop.end, label %loop.body + +loop.end: + ret void +} + +define i1 @regression_test_scalable_loop_access_typesize() { + br i1 false, label %2, label %1 +1: + ret i1 false +2: + %3 = phi i8* [ %6, %2 ], [ null, %0 ] + %4 = bitcast i8* %3 to * + %5 = load , * %4, align 16 + store zeroinitializer, * %4, align 16 + %6 = getelementptr inbounds i8, i8* %3, i64 1 + br i1 true, label %1, label %2 +} + +declare @llvm.masked.load.nxv16i8.p0nxv16i8(*, i32 immarg, , ) +declare void @llvm.masked.store.nxv16i8.p0nxv16i8(, *, i32 immarg, )