[flang-commits] [flang] [flang] Add loop annotation attributes to the loop backedge instead of the loop header's conditional branch (PR #126082)
Asher Mancinelli via flang-commits
flang-commits at lists.llvm.org
Tue May 13 11:44:22 PDT 2025
https://github.com/ashermancinelli updated https://github.com/llvm/llvm-project/pull/126082
>From 28a8f74342ac628ea50de746434735c028701ac8 Mon Sep 17 00:00:00 2001
From: Asher Mancinelli <ashermancinelli at gmail.com>
Date: Wed, 5 Feb 2025 16:41:50 -0800
Subject: [PATCH 1/3] Add loop attr info to the backedge, not condition
---
.../Optimizer/Transforms/ControlFlowConverter.cpp | 12 ++++++------
flang/test/Fir/vector-always.fir | 4 +++-
flang/test/Integration/unroll.f90 | 6 ++++--
flang/test/Integration/vector-always.f90 | 4 +++-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp b/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp
index b09bbf6106dbb..0e03d574f4070 100644
--- a/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp
+++ b/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp
@@ -123,23 +123,23 @@ class CfgLoopConv : public mlir::OpRewritePattern<fir::DoLoopOp> {
: terminator->operand_begin();
loopCarried.append(begin, terminator->operand_end());
loopCarried.push_back(itersMinusOne);
- rewriter.create<mlir::cf::BranchOp>(loc, conditionalBlock, loopCarried);
+ auto backEdge = rewriter.create<mlir::cf::BranchOp>(loc, conditionalBlock, loopCarried);
rewriter.eraseOp(terminator);
+ // Copy loop annotations from the do loop to the loop back edge.
+ if (auto ann = loop.getLoopAnnotation())
+ backEdge->setAttr("loop_annotation", *ann);
+
// Conditional block
rewriter.setInsertionPointToEnd(conditionalBlock);
auto zero = rewriter.create<mlir::arith::ConstantIndexOp>(loc, 0);
auto comparison = rewriter.create<mlir::arith::CmpIOp>(
loc, arith::CmpIPredicate::sgt, itersLeft, zero);
- auto cond = rewriter.create<mlir::cf::CondBranchOp>(
+ rewriter.create<mlir::cf::CondBranchOp>(
loc, comparison, firstBlock, llvm::ArrayRef<mlir::Value>(), endBlock,
llvm::ArrayRef<mlir::Value>());
- // Copy loop annotations from the do loop to the loop entry condition.
- if (auto ann = loop.getLoopAnnotation())
- cond->setAttr("loop_annotation", *ann);
-
// The result of the loop operation is the values of the condition block
// arguments except the induction variable on the last iteration.
auto args = loop.getFinalValue()
diff --git a/flang/test/Fir/vector-always.fir b/flang/test/Fir/vector-always.fir
index 00eb0e7a756ee..ec06b94a3d0f8 100644
--- a/flang/test/Fir/vector-always.fir
+++ b/flang/test/Fir/vector-always.fir
@@ -13,7 +13,9 @@ func.func @_QPvector_always() -> i32 {
%c10_i32 = arith.constant 10 : i32
%c1_i32 = arith.constant 1 : i32
%c10 = arith.constant 10 : index
-// CHECK: cf.cond_br %{{.*}}, ^{{.*}}, ^{{.*}} {loop_annotation = #[[ANNOTATION]]}
+// CHECK: cf.cond_br
+// CHECK-NOT: loop_annotation
+// CHECK: cf.br ^{{.*}} {loop_annotation = #[[ANNOTATION]]}
%8:2 = fir.do_loop %arg0 = %c1 to %c10 step %c1 iter_args(%arg1 = %c1_i32) -> (index, i32) attributes {loopAnnotation = #loop_annotation} {
fir.result %c1, %c1_i32 : index, i32
}
diff --git a/flang/test/Integration/unroll.f90 b/flang/test/Integration/unroll.f90
index aa47e465b63fc..294c2a6807b93 100644
--- a/flang/test/Integration/unroll.f90
+++ b/flang/test/Integration/unroll.f90
@@ -3,8 +3,10 @@
! CHECK-LABEL: unroll_dir
subroutine unroll_dir
integer :: a(10)
- !dir$ unroll
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[UNROLL_ENABLE_FULL_ANNO:.*]]
+ !dir$ unroll
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[UNROLL_ENABLE_FULL_ANNO:.*]]
do i=1,10
a(i)=i
end do
diff --git a/flang/test/Integration/vector-always.f90 b/flang/test/Integration/vector-always.f90
index ee2aa8ab485e0..b73b439ecad18 100644
--- a/flang/test/Integration/vector-always.f90
+++ b/flang/test/Integration/vector-always.f90
@@ -4,7 +4,9 @@
subroutine vector_always
integer :: a(10)
!dir$ vector always
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION:.*]]
do i=1,10
a(i)=i
end do
>From cd02a9181d13e232b0cf947c6b996c7a8d337532 Mon Sep 17 00:00:00 2001
From: Asher Mancinelli <ashermancinelli at gmail.com>
Date: Thu, 6 Feb 2025 07:45:06 -0800
Subject: [PATCH 2/3] formatting
---
flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp b/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp
index 0e03d574f4070..8a9e9b80134b8 100644
--- a/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp
+++ b/flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp
@@ -123,7 +123,8 @@ class CfgLoopConv : public mlir::OpRewritePattern<fir::DoLoopOp> {
: terminator->operand_begin();
loopCarried.append(begin, terminator->operand_end());
loopCarried.push_back(itersMinusOne);
- auto backEdge = rewriter.create<mlir::cf::BranchOp>(loc, conditionalBlock, loopCarried);
+ auto backEdge =
+ rewriter.create<mlir::cf::BranchOp>(loc, conditionalBlock, loopCarried);
rewriter.eraseOp(terminator);
// Copy loop annotations from the do loop to the loop back edge.
>From 7f006579e09ae9fa62c0b9805fe1296b881d44e9 Mon Sep 17 00:00:00 2001
From: Asher Mancinelli <ashermancinelli at gmail.com>
Date: Tue, 13 May 2025 11:37:25 -0700
Subject: [PATCH 3/3] Update tests wrt recent loop metadata changes
---
flang/test/Integration/unroll.f90 | 12 +++++++++---
flang/test/Integration/unroll_and_jam.f90 | 20 +++++++++++++++-----
flang/test/Integration/vector-always.f90 | 4 +++-
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/flang/test/Integration/unroll.f90 b/flang/test/Integration/unroll.f90
index 294c2a6807b93..f2c2ecb5cffac 100644
--- a/flang/test/Integration/unroll.f90
+++ b/flang/test/Integration/unroll.f90
@@ -16,7 +16,9 @@ end subroutine unroll_dir
subroutine unroll_dir_0
integer :: a(10)
!dir$ unroll 0
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[UNROLL_DISABLE_ANNO:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[UNROLL_DISABLE_ANNO:.*]]
do i=1,10
a(i)=i
end do
@@ -26,7 +28,9 @@ end subroutine unroll_dir_0
subroutine unroll_dir_1
integer :: a(10)
!dir$ unroll 1
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[UNROLL_DISABLE_ANNO]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[UNROLL_DISABLE_ANNO]]
do i=1,10
a(i)=i
end do
@@ -36,7 +40,9 @@ end subroutine unroll_dir_1
subroutine unroll_dir_2
integer :: a(10)
!dir$ unroll 2
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[UNROLL_ENABLE_COUNT_2:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[UNROLL_ENABLE_COUNT_2:.*]]
do i=1,10
a(i)=i
end do
diff --git a/flang/test/Integration/unroll_and_jam.f90 b/flang/test/Integration/unroll_and_jam.f90
index b9c16d34ac90a..05b3aaa04a1e0 100644
--- a/flang/test/Integration/unroll_and_jam.f90
+++ b/flang/test/Integration/unroll_and_jam.f90
@@ -4,7 +4,9 @@
subroutine unroll_and_jam_dir
integer :: a(10)
!dir$ unroll_and_jam 4
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION:.*]]
do i=1,10
a(i)=i
end do
@@ -14,7 +16,9 @@ end subroutine unroll_and_jam_dir
subroutine unroll_and_jam_dir_0
integer :: a(10)
!dir$ unroll_and_jam 0
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE:.*]]
do i=1,10
a(i)=i
end do
@@ -24,7 +28,9 @@ end subroutine unroll_and_jam_dir_0
subroutine unroll_and_jam_dir_1
integer :: a(10)
!dir$ unroll_and_jam 1
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE]]
do i=1,10
a(i)=i
end do
@@ -34,7 +40,9 @@ end subroutine unroll_and_jam_dir_1
subroutine nounroll_and_jam_dir
integer :: a(10)
!dir$ nounroll_and_jam
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE]]
do i=1,10
a(i)=i
end do
@@ -44,7 +52,9 @@ end subroutine nounroll_and_jam_dir
subroutine unroll_and_jam_dir_no_factor
integer :: a(10)
!dir$ unroll_and_jam
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION_NO_FACTOR:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION_NO_FACTOR:.*]]
do i=1,10
a(i)=i
end do
diff --git a/flang/test/Integration/vector-always.f90 b/flang/test/Integration/vector-always.f90
index b73b439ecad18..1d8aad97bde70 100644
--- a/flang/test/Integration/vector-always.f90
+++ b/flang/test/Integration/vector-always.f90
@@ -16,7 +16,9 @@ end subroutine vector_always
subroutine no_vector
integer :: a(10)
!dir$ novector
- ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION2:.*]]
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}
+ ! CHECK-NOT: !llvm.loop
+ ! CHECK: br label {{.*}}, !llvm.loop ![[ANNOTATION2:.*]]
do i=1,10
a(i)=i
end do
More information about the flang-commits
mailing list