Skip to content

[loop-interchange] Move tests to use remarks #123053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 20 additions & 92 deletions llvm/test/Transforms/LoopInterchange/gh54176-scalar-deps.ll
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
; RUN: opt < %s -passes=loop-interchange -S | FileCheck %s
; RUN: opt < %s -passes=loop-interchange -pass-remarks-output=%t -disable-output
; RUN: FileCheck -input-file %t %s

@f = dso_local local_unnamed_addr global [4 x [9 x i32]] [[9 x i32] [i32 5, i32 3, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0], [9 x i32] zeroinitializer, [9 x i32] zeroinitializer, [9 x i32] zeroinitializer], align 4
@g = common dso_local local_unnamed_addr global i32 0, align 4
Expand All @@ -23,54 +23,18 @@
; return g;
; }
;
define dso_local i32 @test1(i1 %cond) {
;
; FIXME: if there's an output dependency inside the loop and Src doesn't
; dominate Dst, we should not interchange. Thus, this currently miscompiles.
;
define dso_local i32 @test1(i1 %cond) {
; CHECK-LABEL: define dso_local i32 @test1(
; CHECK-SAME: i1 [[COND:%.*]]) {
; CHECK-NEXT: [[FOR_PREHEADER:.*:]]
; CHECK-NEXT: br label %[[INNERLOOP_PREHEADER:.*]]
; CHECK: [[OUTERLOOP_PREHEADER:.*]]:
; CHECK-NEXT: br label %[[OUTERLOOP:.*]]
; CHECK: [[OUTERLOOP]]:
; CHECK-NEXT: [[I:%.*]] = phi i64 [ [[INDVARS_IV_NEXT21_I:%.*]], %[[FOR_LATCH:.*]] ], [ 0, %[[OUTERLOOP_PREHEADER]] ]
; CHECK-NEXT: br label %[[INNERLOOP_SPLIT:.*]]
; CHECK: [[INNERLOOP_PREHEADER]]:
; CHECK-NEXT: br label %[[INNERLOOP:.*]]
; CHECK: [[INNERLOOP]]:
; CHECK-NEXT: [[J:%.*]] = phi i64 [ [[TMP0:%.*]], %[[IF_END_SPLIT:.*]] ], [ 0, %[[INNERLOOP_PREHEADER]] ]
; CHECK-NEXT: br label %[[OUTERLOOP_PREHEADER]]
; CHECK: [[INNERLOOP_SPLIT]]:
; CHECK-NEXT: [[ARRAYIDX6_I:%.*]] = getelementptr inbounds [4 x [9 x i32]], ptr @f, i64 0, i64 [[J]], i64 [[I]]
; CHECK-NEXT: [[I1:%.*]] = load i32, ptr [[ARRAYIDX6_I]], align 4
; CHECK-NEXT: [[TOBOOL_I:%.*]] = icmp eq i32 [[I1]], 0
; CHECK-NEXT: br i1 [[TOBOOL_I]], label %[[LAND_END:.*]], label %[[LAND_RHS:.*]]
; CHECK: [[LAND_RHS]]:
; CHECK-NEXT: store i32 3, ptr @g, align 4
; CHECK-NEXT: br label %[[LAND_END]]
; CHECK: [[LAND_END]]:
; CHECK-NEXT: br i1 [[COND]], label %[[IF_END:.*]], label %[[IF_THEN:.*]]
; CHECK: [[IF_THEN]]:
; CHECK-NEXT: [[I2:%.*]] = load i32, ptr @g, align 4
; CHECK-NEXT: [[INC_I:%.*]] = add i32 [[I2]], 1
; CHECK-NEXT: store i32 [[INC_I]], ptr @g, align 4
; CHECK-NEXT: br label %[[IF_END]]
; CHECK: [[IF_END]]:
; CHECK-NEXT: [[J_NEXT:%.*]] = add nuw nsw i64 [[J]], 1
; CHECK-NEXT: [[EXITCOND_I:%.*]] = icmp eq i64 [[J_NEXT]], 3
; CHECK-NEXT: br label %[[FOR_LATCH]]
; CHECK: [[IF_END_SPLIT]]:
; CHECK-NEXT: [[TMP0]] = add nuw nsw i64 [[J]], 1
; CHECK-NEXT: [[TMP1:%.*]] = icmp eq i64 [[TMP0]], 3
; CHECK-NEXT: br i1 [[TMP1]], label %[[EXIT:.*]], label %[[INNERLOOP]]
; CHECK: [[FOR_LATCH]]:
; CHECK-NEXT: [[INDVARS_IV_NEXT21_I]] = add nsw i64 [[I]], 1
; CHECK-NEXT: [[CMP_I:%.*]] = icmp slt i64 [[I]], 2
; CHECK-NEXT: br i1 [[CMP_I]], label %[[OUTERLOOP]], label %[[IF_END_SPLIT]]
; CHECK: [[EXIT]]:
; CHECK-NEXT: [[I3:%.*]] = load i32, ptr @g, align 4
; CHECK-NEXT: ret i32 [[I3]]
; CHECK: --- !Passed
; CHECK-NEXT: Pass: loop-interchange
; CHECK-NEXT: Name: Interchanged
; CHECK-NEXT: Function: test1
; CHECK-NEXT: Args:
; CHECK-NEXT: - String: Loop interchanged with enclosing loop.
; CHECK-NEXT: ...
;
for.preheader:
br label %outerloop
Expand Down Expand Up @@ -133,54 +97,18 @@ exit:
; return g;
; }
;
define dso_local i32 @test2(i1 %cond) {
;
; FIXME: if there's an output dependency inside the loop and Src doesn't
; dominate Dst, we should not interchange. Thus, this currently miscompiles.
;
define dso_local i32 @test2(i1 %cond) {
; CHECK-LABEL: define dso_local i32 @test2(
; CHECK-SAME: i1 [[COND:%.*]]) {
; CHECK-NEXT: [[FOR_PREHEADER:.*:]]
; CHECK-NEXT: br label %[[INNERLOOP_PREHEADER:.*]]
; CHECK: [[OUTERLOOP_PREHEADER:.*]]:
; CHECK-NEXT: br label %[[OUTERLOOP:.*]]
; CHECK: [[OUTERLOOP]]:
; CHECK-NEXT: [[I:%.*]] = phi i64 [ [[INDVARS_IV_NEXT21_I:%.*]], %[[FOR_LATCH:.*]] ], [ 0, %[[OUTERLOOP_PREHEADER]] ]
; CHECK-NEXT: br label %[[INNERLOOP_SPLIT:.*]]
; CHECK: [[INNERLOOP_PREHEADER]]:
; CHECK-NEXT: br label %[[INNERLOOP:.*]]
; CHECK: [[INNERLOOP]]:
; CHECK-NEXT: [[J:%.*]] = phi i64 [ [[TMP0:%.*]], %[[IF_END_SPLIT:.*]] ], [ 0, %[[INNERLOOP_PREHEADER]] ]
; CHECK-NEXT: br label %[[OUTERLOOP_PREHEADER]]
; CHECK: [[INNERLOOP_SPLIT]]:
; CHECK-NEXT: [[ARRAYIDX6_I:%.*]] = getelementptr inbounds [4 x [9 x i32]], ptr @f, i64 0, i64 [[J]], i64 [[I]]
; CHECK-NEXT: [[I1:%.*]] = load i32, ptr [[ARRAYIDX6_I]], align 4
; CHECK-NEXT: [[TOBOOL_I:%.*]] = icmp eq i32 [[I1]], 0
; CHECK-NEXT: store i32 3, ptr @g, align 4
; CHECK-NEXT: br i1 [[TOBOOL_I]], label %[[LAND_END:.*]], label %[[LAND_RHS:.*]]
; CHECK: [[LAND_RHS]]:
; CHECK-NEXT: br label %[[LAND_END]]
; CHECK: [[LAND_END]]:
; CHECK-NEXT: br i1 [[COND]], label %[[IF_END:.*]], label %[[IF_THEN:.*]]
; CHECK: [[IF_THEN]]:
; CHECK-NEXT: [[I2:%.*]] = load i32, ptr @g, align 4
; CHECK-NEXT: [[INC_I:%.*]] = add i32 [[I2]], 1
; CHECK-NEXT: store i32 [[INC_I]], ptr @g, align 4
; CHECK-NEXT: br label %[[IF_END]]
; CHECK: [[IF_END]]:
; CHECK-NEXT: [[J_NEXT:%.*]] = add nuw nsw i64 [[J]], 1
; CHECK-NEXT: [[EXITCOND_I:%.*]] = icmp eq i64 [[J_NEXT]], 3
; CHECK-NEXT: br label %[[FOR_LATCH]]
; CHECK: [[IF_END_SPLIT]]:
; CHECK-NEXT: [[TMP0]] = add nuw nsw i64 [[J]], 1
; CHECK-NEXT: [[TMP1:%.*]] = icmp eq i64 [[TMP0]], 3
; CHECK-NEXT: br i1 [[TMP1]], label %[[EXIT:.*]], label %[[INNERLOOP]]
; CHECK: [[FOR_LATCH]]:
; CHECK-NEXT: [[INDVARS_IV_NEXT21_I]] = add nsw i64 [[I]], 1
; CHECK-NEXT: [[CMP_I:%.*]] = icmp slt i64 [[I]], 2
; CHECK-NEXT: br i1 [[CMP_I]], label %[[OUTERLOOP]], label %[[IF_END_SPLIT]]
; CHECK: [[EXIT]]:
; CHECK-NEXT: [[I3:%.*]] = load i32, ptr @g, align 4
; CHECK-NEXT: ret i32 [[I3]]
; CHECK: --- !Passed
; CHECK-NEXT: Pass: loop-interchange
; CHECK-NEXT: Name: Interchanged
; CHECK-NEXT: Function: test2
; CHECK-NEXT: Args:
; CHECK-NEXT: - String: Loop interchanged with enclosing loop.
; CHECK-NEXT: ...
;
for.preheader:
br label %outerloop
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
; RUN: opt < %s -passes=loop-interchange -verify-dom-info -verify-loop-info -S 2>&1 | FileCheck %s
; RUN: opt < %s -passes=loop-interchange -verify-dom-info -verify-loop-info -pass-remarks-output=%t -disable-output
; RUN: FileCheck -input-file %t %s

@a = common global i32 0, align 4
@d = common dso_local local_unnamed_addr global [1 x [6 x i32]] zeroinitializer, align 4
Expand All @@ -9,53 +9,29 @@
; values defined in the new innermost loop not available in the exiting block of
; the entire loop nest.
;
define void @innermost_latch_uses_values_in_middle_header() {
; CHECK-LABEL: define void @innermost_latch_uses_values_in_middle_header() {
; CHECK-NEXT: [[ENTRY:.*]]:
; CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr @a, align 4
; CHECK-NEXT: [[B:%.*]] = add i32 80, 1
; CHECK-NEXT: br label %[[OUTERMOST_HEADER:.*]]
; CHECK: [[OUTERMOST_HEADER]]:
; CHECK-NEXT: [[INDVAR_OUTERMOST:%.*]] = phi i32 [ 10, %[[ENTRY]] ], [ [[INDVAR_OUTERMOST_NEXT:%.*]], %[[OUTERMOST_LATCH:.*]] ]
; CHECK-NEXT: [[TOBOOL71_I:%.*]] = icmp eq i32 [[TMP0]], 0
; CHECK-NEXT: br i1 [[TOBOOL71_I]], label %[[INNERMOST_HEADER_PREHEADER:.*]], label %[[OUTERMOST_LATCH]]
; CHECK: [[MIDDLE_HEADER_PREHEADER:.*]]:
; CHECK-NEXT: br label %[[MIDDLE_HEADER:.*]]
; CHECK: [[MIDDLE_HEADER]]:
; CHECK-NEXT: [[INDVAR_MIDDLE:%.*]] = phi i64 [ [[INDVAR_MIDDLE_NEXT:%.*]], %[[MIDDLE_LATCH:.*]] ], [ 4, %[[MIDDLE_HEADER_PREHEADER]] ]
; CHECK-NEXT: [[INDVAR_MIDDLE_WIDE:%.*]] = zext i32 [[B]] to i64
; CHECK-NEXT: br label %[[INNERMOST_BODY:.*]]
; CHECK: [[INNERMOST_HEADER_PREHEADER]]:
; CHECK-NEXT: br label %[[INNERMOST_HEADER:.*]]
; CHECK: [[INNERMOST_HEADER]]:
; CHECK-NEXT: [[INDVAR_INNERMOST:%.*]] = phi i64 [ [[TMP1:%.*]], %[[INNERMOST_LATCH_SPLIT:.*]] ], [ 4, %[[INNERMOST_HEADER_PREHEADER]] ]
; CHECK-NEXT: br label %[[MIDDLE_HEADER_PREHEADER]]
; CHECK: [[INNERMOST_BODY]]:
; CHECK-NEXT: [[ARRAYIDX9_I:%.*]] = getelementptr inbounds [1 x [6 x i32]], ptr @d, i64 0, i64 [[INDVAR_INNERMOST]], i64 [[INDVAR_MIDDLE]]
; CHECK-NEXT: store i32 0, ptr [[ARRAYIDX9_I]], align 4
; CHECK-NEXT: br label %[[INNERMOST_LATCH:.*]]
; CHECK: [[INNERMOST_LATCH]]:
; CHECK-NEXT: [[INDVAR_INNERMOST_NEXT:%.*]] = add nsw i64 [[INDVAR_INNERMOST]], 1
; CHECK-NEXT: [[TOBOOL5_I:%.*]] = icmp eq i64 [[INDVAR_INNERMOST_NEXT]], [[INDVAR_MIDDLE_WIDE]]
; CHECK-NEXT: br label %[[MIDDLE_LATCH]]
; CHECK: [[INNERMOST_LATCH_SPLIT]]:
; CHECK-NEXT: [[INDVAR_MIDDLE_WIDE_LCSSA:%.*]] = phi i64 [ [[INDVAR_MIDDLE_WIDE]], %[[MIDDLE_LATCH]] ]
; CHECK-NEXT: [[TMP1]] = add nsw i64 [[INDVAR_INNERMOST]], 1
; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i64 [[TMP1]], [[INDVAR_MIDDLE_WIDE_LCSSA]]
; CHECK-NEXT: br i1 [[TMP2]], label %[[OUTERMOST_LATCH_LOOPEXIT:.*]], label %[[INNERMOST_HEADER]]
; CHECK: [[MIDDLE_LATCH]]:
; CHECK-NEXT: [[INDVAR_MIDDLE_NEXT]] = add nsw i64 [[INDVAR_MIDDLE]], -1
; CHECK-NEXT: [[TOBOOL2_I:%.*]] = icmp eq i64 [[INDVAR_MIDDLE_NEXT]], 0
; CHECK-NEXT: br i1 [[TOBOOL2_I]], label %[[INNERMOST_LATCH_SPLIT]], label %[[MIDDLE_HEADER]]
; CHECK: [[OUTERMOST_LATCH_LOOPEXIT]]:
; CHECK-NEXT: br label %[[OUTERMOST_LATCH]]
; CHECK: [[OUTERMOST_LATCH]]:
; CHECK-NEXT: [[INDVAR_OUTERMOST_NEXT]] = add nsw i32 [[INDVAR_OUTERMOST]], -5
; CHECK-NEXT: [[TOBOOL_I:%.*]] = icmp eq i32 [[INDVAR_OUTERMOST_NEXT]], 0
; CHECK-NEXT: br i1 [[TOBOOL_I]], label %[[OUTERMOST_EXIT:.*]], label %[[OUTERMOST_HEADER]]
; CHECK: [[OUTERMOST_EXIT]]:
; CHECK-NEXT: ret void
; CHECK: --- !Passed
; CHECK: Pass: loop-interchange
; CHECK: Name: Interchanged
; CHECK: Function: innermost_latch_uses_values_in_middle_header
; CHECK: Args:
; CHECK: - String: Loop interchanged with enclosing loop.
; CHECK: ...
; CHECK: --- !Missed
; CHECK: Pass: loop-interchange
; CHECK: Name: UnsupportedInnerLatchPHI
; CHECK: Function: innermost_latch_uses_values_in_middle_header
; CHECK: Args:
; CHECK: - String: Cannot interchange loops because unsupported PHI nodes found in inner loop latch.
; CHECK: ...
; CHECK: --- !Missed
; CHECK: Pass: loop-interchange
; CHECK: Name: UnsupportedExitPHI
; CHECK: Function: innermost_latch_uses_values_in_middle_header
; CHECK: Args:
; CHECK: - String: Found unsupported PHI node in loop exit.
; CHECK: ...
;
define void @innermost_latch_uses_values_in_middle_header() {
entry:
%0 = load i32, ptr @a, align 4
%b = add i32 80, 1
Expand Down
72 changes: 24 additions & 48 deletions llvm/test/Transforms/LoopInterchange/interchange-flow-dep-outer.ll
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
; RUN: opt < %s -passes=loop-interchange -cache-line-size=64 -verify-dom-info -verify-loop-info -S 2>&1 | FileCheck %s
; RUN: opt < %s -passes=loop-interchange -cache-line-size=64 -verify-dom-info -verify-loop-info -pass-remarks-output=%t -disable-output
; RUN: FileCheck -input-file %t %s

target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

Expand All @@ -24,53 +24,29 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
; So, loops InnerLoopId = 2 and OuterLoopId = 1 should be interchanged,
; but not InnerLoopId = 1 and OuterLoopId = 0.
;
; CHECK: --- !Passed
; CHECK-NEXT: Pass: loop-interchange
; CHECK-NEXT: Name: Interchanged
; CHECK-NEXT: Function: interchange_09
; CHECK-NEXT: Args:
; CHECK-NEXT: - String: Loop interchanged with enclosing loop.
; CHECK-NEXT: ...
; CHECK-NEXT: --- !Missed
; CHECK-NEXT: Pass: loop-interchange
; CHECK-NEXT: Name: NotTightlyNested
; CHECK-NEXT: Function: interchange_09
; CHECK-NEXT: Args:
; CHECK-NEXT: - String: Cannot interchange loops because they are not tightly nested.
; CHECK-NEXT: ...
; CHECK-NEXT: --- !Missed
; CHECK-NEXT: Pass: loop-interchange
; CHECK-NEXT: Name: InterchangeNotProfitable
; CHECK-NEXT: Function: interchange_09
; CHECK-NEXT: Args:
; CHECK-NEXT: - String: Interchanging loops is not considered to improve cache locality nor vectorization.
; CHECK-NEXT: ...

define void @interchange_09(i32 %k) {
; CHECK-LABEL: define void @interchange_09(
; CHECK-SAME: i32 [[K:%.*]]) {
; CHECK-NEXT: [[ENTRY:.*]]:
; CHECK-NEXT: br label %[[FOR_BODY:.*]]
; CHECK: [[FOR_COND_CLEANUP:.*]]:
; CHECK-NEXT: ret void
; CHECK: [[FOR_BODY]]:
; CHECK-NEXT: [[INDVARS_IV45:%.*]] = phi i64 [ 0, %[[ENTRY]] ], [ [[INDVARS_IV_NEXT46:%.*]], %[[FOR_COND_CLEANUP4:.*]] ]
; CHECK-NEXT: [[CALL:%.*]] = call double @fn1()
; CHECK-NEXT: [[ARRAYIDX:%.*]] = getelementptr inbounds [100 x double], ptr @T, i64 0, i64 [[INDVARS_IV45]]
; CHECK-NEXT: store double [[CALL]], ptr [[ARRAYIDX]], align 8
; CHECK-NEXT: br label %[[FOR_BODY9_PREHEADER:.*]]
; CHECK: [[FOR_COND6_PREHEADER_PREHEADER:.*]]:
; CHECK-NEXT: br label %[[FOR_COND6_PREHEADER:.*]]
; CHECK: [[FOR_COND6_PREHEADER]]:
; CHECK-NEXT: [[INDVARS_IV42:%.*]] = phi i64 [ [[INDVARS_IV_NEXT43:%.*]], %[[FOR_COND_CLEANUP8:.*]] ], [ 0, %[[FOR_COND6_PREHEADER_PREHEADER]] ]
; CHECK-NEXT: br label %[[FOR_BODY9_SPLIT1:.*]]
; CHECK: [[FOR_BODY9_PREHEADER]]:
; CHECK-NEXT: br label %[[FOR_BODY9:.*]]
; CHECK: [[FOR_COND_CLEANUP4]]:
; CHECK-NEXT: [[TMP:%.*]] = load double, ptr [[ARRAYIDX]], align 8
; CHECK-NEXT: call void @fn2(double [[TMP]])
; CHECK-NEXT: [[INDVARS_IV_NEXT46]] = add nuw nsw i64 [[INDVARS_IV45]], 1
; CHECK-NEXT: [[EXITCOND47:%.*]] = icmp ne i64 [[INDVARS_IV_NEXT46]], 100
; CHECK-NEXT: br i1 [[EXITCOND47]], label %[[FOR_BODY]], label %[[FOR_COND_CLEANUP]]
; CHECK: [[FOR_COND_CLEANUP8]]:
; CHECK-NEXT: [[INDVARS_IV_NEXT43]] = add nuw nsw i64 [[INDVARS_IV42]], 1
; CHECK-NEXT: [[EXITCOND44:%.*]] = icmp ne i64 [[INDVARS_IV_NEXT43]], 1000
; CHECK-NEXT: br i1 [[EXITCOND44]], label %[[FOR_COND6_PREHEADER]], label %[[FOR_BODY9_SPLIT:.*]]
; CHECK: [[FOR_BODY9]]:
; CHECK-NEXT: [[INDVARS_IV:%.*]] = phi i64 [ [[TMP0:%.*]], %[[FOR_BODY9_SPLIT]] ], [ 1, %[[FOR_BODY9_PREHEADER]] ]
; CHECK-NEXT: br label %[[FOR_COND6_PREHEADER_PREHEADER]]
; CHECK: [[FOR_BODY9_SPLIT1]]:
; CHECK-NEXT: [[ARRAYIDX13:%.*]] = getelementptr inbounds [1000 x [1000 x i32]], ptr @Arr, i64 0, i64 [[INDVARS_IV]], i64 [[INDVARS_IV42]]
; CHECK-NEXT: [[T1:%.*]] = load i32, ptr [[ARRAYIDX13]], align 4
; CHECK-NEXT: [[T2:%.*]] = trunc i64 [[INDVARS_IV45]] to i32
; CHECK-NEXT: [[ADD:%.*]] = add nsw i32 [[T1]], [[T2]]
; CHECK-NEXT: store i32 [[ADD]], ptr [[ARRAYIDX13]], align 4
; CHECK-NEXT: [[INDVARS_IV_NEXT:%.*]] = add nuw nsw i64 [[INDVARS_IV]], 1
; CHECK-NEXT: [[EXITCOND:%.*]] = icmp ne i64 [[INDVARS_IV_NEXT]], 1000
; CHECK-NEXT: br label %[[FOR_COND_CLEANUP8]]
; CHECK: [[FOR_BODY9_SPLIT]]:
; CHECK-NEXT: [[TMP0]] = add nuw nsw i64 [[INDVARS_IV]], 1
; CHECK-NEXT: [[TMP1:%.*]] = icmp ne i64 [[TMP0]], 1000
; CHECK-NEXT: br i1 [[TMP1]], label %[[FOR_BODY9]], label %[[FOR_COND_CLEANUP4]]
;
entry:
br label %for.body

Expand Down
Loading
Loading