[LV] Add tests for non-constant stride pointer inductions

Reduced from the case which triggered the revert of 498aa534f472, and then generalized to cover both expansion paths.

diff --git a/llvm/test/Transforms/LoopVectorize/pointer-induction-unroll.ll b/llvm/test/Transforms/LoopVectorize/pointer-induction-unroll.ll
new file mode 100644 (file)
index 0000000..8257463
--- /dev/null
+++ b/llvm/test/Transforms/LoopVectorize/pointer-induction-unroll.ll
@@ -0,0 +1,40 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt < %s -passes=loop-vectorize -force-vector-interleave=4 -force-vector-width=1 -S | FileCheck %s
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+
+; Test the scalar expansion of a non-constant stride pointer IV
+define void @non_constant_scalar_expansion(i32 %0, ptr %call) {
+; CHECK-LABEL: @non_constant_scalar_expansion(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[MUL:%.*]] = shl i32 [[TMP0:%.*]], 1
+; CHECK-NEXT:    br label [[FOR_COND:%.*]]
+; CHECK:       for.cond:
+; CHECK-NEXT:    [[TMP1:%.*]] = phi i32 [ 30, [[ENTRY:%.*]] ], [ [[INC:%.*]], [[FOR_COND]] ]
+; CHECK-NEXT:    [[P_0:%.*]] = phi ptr [ null, [[ENTRY]] ], [ [[ADD_PTR:%.*]], [[FOR_COND]] ]
+; CHECK-NEXT:    [[ADD_PTR]] = getelementptr i8, ptr [[P_0]], i32 [[MUL]]
+; CHECK-NEXT:    [[ARRAYIDX:%.*]] = getelementptr ptr, ptr [[CALL:%.*]], i32 [[TMP1]]
+; CHECK-NEXT:    store ptr [[P_0]], ptr [[ARRAYIDX]], align 4
+; CHECK-NEXT:    [[INC]] = add i32 [[TMP1]], 1
+; CHECK-NEXT:    [[TOBOOL_NOT:%.*]] = icmp eq i32 [[TMP1]], 0
+; CHECK-NEXT:    br i1 [[TOBOOL_NOT]], label [[FOR_END:%.*]], label [[FOR_COND]]
+; CHECK:       for.end:
+; CHECK-NEXT:    ret void
+;
+entry:
+  %mul = shl i32 %0, 1
+  br label %for.cond
+
+for.cond:                                         ; preds = %for.body, %entry
+  %1 = phi i32 [ 30, %entry ], [ %inc, %for.cond ]
+  %p.0 = phi ptr [ null, %entry ], [ %add.ptr, %for.cond ]
+  %add.ptr = getelementptr i8, ptr %p.0, i32 %mul
+  %arrayidx = getelementptr ptr, ptr %call, i32 %1
+  store ptr %p.0, ptr %arrayidx, align 4
+  %inc = add i32 %1, 1
+  %tobool.not = icmp eq i32 %1, 0
+  br i1 %tobool.not, label %for.end, label %for.cond
+
+
+for.end:                                          ; preds = %for.cond
+  ret void
+}

diff --git a/llvm/test/Transforms/LoopVectorize/pointer-induction.ll b/llvm/test/Transforms/LoopVectorize/pointer-induction.ll
index 1e90db0..9c5bedf 100644 (file)
--- a/llvm/test/Transforms/LoopVectorize/pointer-induction.ll
+++ b/llvm/test/Transforms/LoopVectorize/pointer-induction.ll
@@ -93,7 +93,7 @@ define void @a(ptr readnone %b) {
 ; CHECK-NEXT:    br label [[IF_END]]
 ; CHECK:       if.end:
 ; CHECK-NEXT:    [[CMP_NOT:%.*]] = icmp eq ptr [[INCDEC_PTR]], [[B]]
-; CHECK-NEXT:    br i1 [[CMP_NOT]], label [[FOR_COND_CLEANUP_LOOPEXIT]], label [[FOR_BODY]], !llvm.loop [[LOOP2:![0-9]+]]
+; CHECK-NEXT:    br i1 [[CMP_NOT]], label [[FOR_COND_CLEANUP_LOOPEXIT]], label [[FOR_BODY]], !llvm.loop [[LOOP3:![0-9]+]]
 ;
 
 entry:
@@ -205,3 +205,40 @@ loop.body:                                    ; preds = %loop.body, %entry
 exit:                            ; preds = %loop.body
   ret void
 }
+
+; Test the vector expansion of a non-constant stride pointer IV
+define void @non_constant_vector_expansion(i32 %0, ptr %call) {
+; CHECK-LABEL: @non_constant_vector_expansion(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[MUL:%.*]] = shl i32 [[TMP0:%.*]], 1
+; CHECK-NEXT:    br label [[FOR_COND:%.*]]
+; CHECK:       for.cond:
+; CHECK-NEXT:    [[TMP1:%.*]] = phi i32 [ 30, [[ENTRY:%.*]] ], [ [[INC:%.*]], [[FOR_COND]] ]
+; CHECK-NEXT:    [[P_0:%.*]] = phi ptr [ null, [[ENTRY]] ], [ [[ADD_PTR:%.*]], [[FOR_COND]] ]
+; CHECK-NEXT:    [[ADD_PTR]] = getelementptr i8, ptr [[P_0]], i32 [[MUL]]
+; CHECK-NEXT:    [[ARRAYIDX:%.*]] = getelementptr ptr, ptr [[CALL:%.*]], i32 [[TMP1]]
+; CHECK-NEXT:    store ptr [[P_0]], ptr [[ARRAYIDX]], align 4
+; CHECK-NEXT:    [[INC]] = add i32 [[TMP1]], 1
+; CHECK-NEXT:    [[TOBOOL_NOT:%.*]] = icmp eq i32 [[TMP1]], 0
+; CHECK-NEXT:    br i1 [[TOBOOL_NOT]], label [[FOR_END:%.*]], label [[FOR_COND]]
+; CHECK:       for.end:
+; CHECK-NEXT:    ret void
+;
+entry:
+  %mul = shl i32 %0, 1
+  br label %for.cond
+
+for.cond:                                         ; preds = %for.body, %entry
+  %1 = phi i32 [ 30, %entry ], [ %inc, %for.cond ]
+  %p.0 = phi ptr [ null, %entry ], [ %add.ptr, %for.cond ]
+  %add.ptr = getelementptr i8, ptr %p.0, i32 %mul
+  %arrayidx = getelementptr ptr, ptr %call, i32 %1
+  store ptr %p.0, ptr %arrayidx, align 4
+  %inc = add i32 %1, 1
+  %tobool.not = icmp eq i32 %1, 0
+  br i1 %tobool.not, label %for.end, label %for.cond
+
+
+for.end:                                          ; preds = %for.cond
+  ret void
+}