[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
Mon Feb 10 09:53:58 PST 2025
https://github.com/ashermancinelli updated https://github.com/llvm/llvm-project/pull/126082
>From 246c0c68cd4ea6b115ad0e44771094bc0c846ade 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 b09bbf6106dbbb1..0e03d574f40709e 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 00eb0e7a756ee6f..ec06b94a3d0f8d2 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 aa47e465b63fceb..294c2a6807b9370 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 7216698f901c1fe..8c71f439027834f 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 bc67191b890c89292bd80c5a8e51d4b9ed02884e 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 0e03d574f40709e..8a9e9b80134b8ef 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 6dca032e96a999b335d5ee3eb278ccf7ed0e881a Mon Sep 17 00:00:00 2001
From: Asher Mancinelli <ashermancinelli at gmail.com>
Date: Mon, 10 Feb 2025 09:53:31 -0800
Subject: [PATCH 3/3] Fix tests wrt #126170
---
flang/test/Integration/unroll.f90 | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/flang/test/Integration/unroll.f90 b/flang/test/Integration/unroll.f90
index 294c2a6807b9370..3ef3e8d88c4360a 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_ANNO:.*]]
do i=1,10
a(i)=i
end do
@@ -47,5 +53,5 @@ end subroutine unroll_dir_2
! CHECK: ![[UNROLL_FULL:.*]] = !{!"llvm.loop.unroll.full"}
! CHECK: ![[UNROLL_DISABLE_ANNO]] = distinct !{![[UNROLL_DISABLE_ANNO]], ![[UNROLL_DISABLE:.*]]}
! CHECK: ![[UNROLL_DISABLE]] = !{!"llvm.loop.unroll.disable"}
-! CHECK: ![[UNROLL_ENABLE_COUNT_2]] = distinct !{![[UNROLL_ENABLE_COUNT_2]], ![[UNROLL_ENABLE]], ![[UNROLL_COUNT_2:.*]]}
+! CHECK: ![[UNROLL_ENABLE_COUNT_2_ANNO]] = distinct !{![[UNROLL_ENABLE_COUNT_2_ANNO]], ![[UNROLL_ENABLE]], ![[UNROLL_COUNT_2:.*]]}
! CHECK: ![[UNROLL_COUNT_2]] = !{!"llvm.loop.unroll.count", i32 2}
More information about the flang-commits
mailing list