[flang] Implement !DIR$ NOVECTOR and !DIR$ NOUNROLL[_AND_JAM] (#133885)
Hi,
This patch implements support for the following directives :
- `!DIR$ NOUNROLL_AND_JAM` to disable unrolling and jamming on a DO
LOOP.
- `!DIR$ NOUNROLL` to disable unrolling on a DO LOOP.
- `!DIR$ NOVECTOR` to disable vectorization on a DO LOOP.
diff --git a/flang/docs/Directives.md b/flang/docs/Directives.md
index 5e76d43..91c27cb 100644
--- a/flang/docs/Directives.md
+++ b/flang/docs/Directives.md
@@ -50,6 +50,9 @@
integer that specifying the unrolling factor. When `N` is `0` or `1`, the loop
should not be unrolled at all. If `N` is omitted the optimizer will
selects the number of times to unroll the loop.
+* `!dir$ novector` disabling vectorization on the following loop.
+* `!dir$ nounroll` disabling unrolling on the following loop.
+* `!dir$ nounroll_and_jam` disabling unrolling and jamming on the following loop.
# Directive Details
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 41ad157..c66f073 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -210,6 +210,9 @@
NODE(CompilerDirective, VectorAlways)
NODE(CompilerDirective, Unroll)
NODE(CompilerDirective, UnrollAndJam)
+ NODE(CompilerDirective, NoVector)
+ NODE(CompilerDirective, NoUnroll)
+ NODE(CompilerDirective, NoUnrollAndJam)
NODE(parser, ComplexLiteralConstant)
NODE(parser, ComplexPart)
NODE(parser, ComponentArraySpec)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index b026c26..eeb4389 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3351,6 +3351,9 @@
// !DIR$ name[=value] [, name[=value]]... = can be :
// !DIR$ UNROLL [N]
// !DIR$ UNROLL_AND_JAM [N]
+// !DIR$ NOVECTOR
+// !DIR$ NOUNROLL
+// !DIR$ NOUNROLL_AND_JAM
// !DIR$ <anything else>
struct CompilerDirective {
UNION_CLASS_BOILERPLATE(CompilerDirective);
@@ -3376,10 +3379,14 @@
struct UnrollAndJam {
WRAPPER_CLASS_BOILERPLATE(UnrollAndJam, std::optional<std::uint64_t>);
};
+ EMPTY_CLASS(NoVector);
+ EMPTY_CLASS(NoUnroll);
+ EMPTY_CLASS(NoUnrollAndJam);
EMPTY_CLASS(Unrecognized);
CharBlock source;
std::variant<std::list<IgnoreTKR>, LoopCount, std::list<AssumeAligned>,
- VectorAlways, std::list<NameValue>, Unroll, UnrollAndJam, Unrecognized>
+ VectorAlways, std::list<NameValue>, Unroll, UnrollAndJam, Unrecognized,
+ NoVector, NoUnroll, NoUnrollAndJam>
u;
};
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index 178f3e0..65edf1c 100644
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -2268,6 +2268,23 @@
uja = genLoopUnrollAndJamAttr(u.v);
has_attrs = true;
},
+ [&](const Fortran::parser::CompilerDirective::NoVector &u) {
+ mlir::BoolAttr trueAttr =
+ mlir::BoolAttr::get(builder->getContext(), true);
+ va = mlir::LLVM::LoopVectorizeAttr::get(builder->getContext(),
+ /*disable=*/trueAttr,
+ {}, {}, {}, {}, {}, {});
+ has_attrs = true;
+ },
+ [&](const Fortran::parser::CompilerDirective::NoUnroll &u) {
+ ua = genLoopUnrollAttr(/*unrollingFactor=*/0);
+ has_attrs = true;
+ },
+ [&](const Fortran::parser::CompilerDirective::NoUnrollAndJam &u) {
+ uja = genLoopUnrollAndJamAttr(/*unrollingFactor=*/0);
+ has_attrs = true;
+ },
+
[&](const auto &) {}},
dir->u);
}
@@ -2932,6 +2949,15 @@
[&](const Fortran::parser::CompilerDirective::UnrollAndJam &) {
attachDirectiveToLoop(dir, &eval);
},
+ [&](const Fortran::parser::CompilerDirective::NoVector &) {
+ attachDirectiveToLoop(dir, &eval);
+ },
+ [&](const Fortran::parser::CompilerDirective::NoUnroll &) {
+ attachDirectiveToLoop(dir, &eval);
+ },
+ [&](const Fortran::parser::CompilerDirective::NoUnrollAndJam &) {
+ attachDirectiveToLoop(dir, &eval);
+ },
[&](const auto &) {}},
dir.u);
}
diff --git a/flang/lib/Parser/Fortran-parsers.cpp b/flang/lib/Parser/Fortran-parsers.cpp
index cfe9ecb2..fbe629a 100644
--- a/flang/lib/Parser/Fortran-parsers.cpp
+++ b/flang/lib/Parser/Fortran-parsers.cpp
@@ -1310,6 +1310,10 @@
"UNROLL" >> construct<CompilerDirective::Unroll>(maybe(digitString64))};
constexpr auto unrollAndJam{"UNROLL_AND_JAM" >>
construct<CompilerDirective::UnrollAndJam>(maybe(digitString64))};
+constexpr auto novector{"NOVECTOR" >> construct<CompilerDirective::NoVector>()};
+constexpr auto nounroll{"NOUNROLL" >> construct<CompilerDirective::NoUnroll>()};
+constexpr auto nounrollAndJam{
+ "NOUNROLL_AND_JAM" >> construct<CompilerDirective::NoUnrollAndJam>()};
TYPE_PARSER(beginDirective >> "DIR$ "_tok >>
sourced((construct<CompilerDirective>(ignore_tkr) ||
construct<CompilerDirective>(loopCount) ||
@@ -1317,6 +1321,9 @@
construct<CompilerDirective>(vectorAlways) ||
construct<CompilerDirective>(unrollAndJam) ||
construct<CompilerDirective>(unroll) ||
+ construct<CompilerDirective>(novector) ||
+ construct<CompilerDirective>(nounrollAndJam) ||
+ construct<CompilerDirective>(nounroll) ||
construct<CompilerDirective>(
many(construct<CompilerDirective::NameValue>(
name, maybe(("="_tok || ":"_tok) >> digitString64))))) /
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 85c6338..47dae0a 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -1855,6 +1855,15 @@
Word("!DIR$ UNROLL_AND_JAM");
Walk(" ", unrollAndJam.v);
},
+ [&](const CompilerDirective::NoVector &) {
+ Word("!DIR$ NOVECTOR");
+ },
+ [&](const CompilerDirective::NoUnroll &) {
+ Word("!DIR$ NOUNROLL");
+ },
+ [&](const CompilerDirective::NoUnrollAndJam &) {
+ Word("!DIR$ NOUNROLL_AND_JAM");
+ },
[&](const CompilerDirective::Unrecognized &) {
Word("!DIR$ ");
Word(x.source.ToString());
diff --git a/flang/lib/Semantics/canonicalize-directives.cpp b/flang/lib/Semantics/canonicalize-directives.cpp
index 1a0a0d1..104df25 100644
--- a/flang/lib/Semantics/canonicalize-directives.cpp
+++ b/flang/lib/Semantics/canonicalize-directives.cpp
@@ -57,7 +57,10 @@
return std::holds_alternative<parser::CompilerDirective::VectorAlways>(
dir.u) ||
std::holds_alternative<parser::CompilerDirective::Unroll>(dir.u) ||
- std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(dir.u);
+ std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(dir.u) ||
+ std::holds_alternative<parser::CompilerDirective::NoVector>(dir.u) ||
+ std::holds_alternative<parser::CompilerDirective::NoUnroll>(dir.u) ||
+ std::holds_alternative<parser::CompilerDirective::NoUnrollAndJam>(dir.u);
}
void CanonicalizationOfDirectives::Post(parser::SpecificationPart &spec) {
@@ -119,6 +122,15 @@
[&](parser::CompilerDirective::UnrollAndJam &) {
CheckLoopDirective(*dir, block, it);
},
+ [&](parser::CompilerDirective::NoVector &) {
+ CheckLoopDirective(*dir, block, it);
+ },
+ [&](parser::CompilerDirective::NoUnroll &) {
+ CheckLoopDirective(*dir, block, it);
+ },
+ [&](parser::CompilerDirective::NoUnrollAndJam &) {
+ CheckLoopDirective(*dir, block, it);
+ },
[&](auto &) {}},
dir->u);
}
diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index 8ba476e..11c0ecc 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -9573,7 +9573,10 @@
void ResolveNamesVisitor::Post(const parser::CompilerDirective &x) {
if (std::holds_alternative<parser::CompilerDirective::VectorAlways>(x.u) ||
std::holds_alternative<parser::CompilerDirective::Unroll>(x.u) ||
- std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(x.u)) {
+ std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(x.u) ||
+ std::holds_alternative<parser::CompilerDirective::NoVector>(x.u) ||
+ std::holds_alternative<parser::CompilerDirective::NoUnroll>(x.u) ||
+ std::holds_alternative<parser::CompilerDirective::NoUnrollAndJam>(x.u)) {
return;
}
if (const auto *tkr{
diff --git a/flang/test/Integration/unroll_and_jam.f90 b/flang/test/Integration/unroll_and_jam.f90
index 771b7fb..b9c16d3 100644
--- a/flang/test/Integration/unroll_and_jam.f90
+++ b/flang/test/Integration/unroll_and_jam.f90
@@ -30,6 +30,16 @@
end do
end subroutine unroll_and_jam_dir_1
+! CHECK-LABEL: nounroll_and_jam_dir
+subroutine nounroll_and_jam_dir
+ integer :: a(10)
+ !dir$ nounroll_and_jam
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE]]
+ do i=1,10
+ a(i)=i
+ end do
+end subroutine nounroll_and_jam_dir
+
! CHECK-LABEL: unroll_and_jam_dir_no_factor
subroutine unroll_and_jam_dir_no_factor
integer :: a(10)
diff --git a/flang/test/Integration/vector-always.f90 b/flang/test/Integration/vector-always.f90
index 7216698..ee2aa8a 100644
--- a/flang/test/Integration/vector-always.f90
+++ b/flang/test/Integration/vector-always.f90
@@ -10,5 +10,17 @@
end do
end subroutine vector_always
+! CHECK-LABEL: no_vector
+subroutine no_vector
+ integer :: a(10)
+ !dir$ novector
+ ! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION2:.*]]
+ do i=1,10
+ a(i)=i
+ end do
+end subroutine no_vector
+
! CHECK: ![[ANNOTATION]] = distinct !{![[ANNOTATION]], ![[VECTORIZE:.*]]}
! CHECK: ![[VECTORIZE]] = !{!"llvm.loop.vectorize.enable", i1 true}
+! CHECK: ![[ANNOTATION2]] = distinct !{![[ANNOTATION2]], ![[VECTORIZE2:.*]]}
+! CHECK: ![[VECTORIZE2]] = !{!"llvm.loop.vectorize.enable", i1 false}
diff --git a/flang/test/Lower/unroll_and_jam.f90 b/flang/test/Lower/unroll_and_jam.f90
index afc5a7b..a9f6e1d 100644
--- a/flang/test/Lower/unroll_and_jam.f90
+++ b/flang/test/Lower/unroll_and_jam.f90
@@ -2,8 +2,10 @@
! CHECK: #loop_unroll_and_jam = #llvm.loop_unroll_and_jam<disable = false>
! CHECK: #loop_unroll_and_jam1 = #llvm.loop_unroll_and_jam<disable = false, count = 2 : i64>
+! CHECK: #loop_unroll_and_jam2 = #llvm.loop_unroll_and_jam<disable = true>
! CHECK: #loop_annotation = #llvm.loop_annotation<unrollAndJam = #loop_unroll_and_jam>
! CHECK: #loop_annotation1 = #llvm.loop_annotation<unrollAndJam = #loop_unroll_and_jam1>
+! CHECK: #loop_annotation2 = #llvm.loop_annotation<unrollAndJam = #loop_unroll_and_jam2>
! CHECK-LABEL: unroll_and_jam_dir
subroutine unroll_and_jam_dir
@@ -32,3 +34,14 @@
a(i)=i
end do
end subroutine intermediate_directive
+
+
+! CHECK-LABEL: nounroll_and_jam_dir
+subroutine nounroll_and_jam_dir
+ integer :: a(10)
+ !dir$ nounroll_and_jam
+ !CHECK: fir.do_loop {{.*}} attributes {loopAnnotation = #loop_annotation2}
+ do i=1,10
+ a(i)=i
+ end do
+end subroutine nounroll_and_jam_dir
diff --git a/flang/test/Lower/vector-always.f90 b/flang/test/Lower/vector-always.f90
index 1822fc3..75753de 100644
--- a/flang/test/Lower/vector-always.f90
+++ b/flang/test/Lower/vector-always.f90
@@ -1,7 +1,9 @@
! RUN: %flang_fc1 -emit-hlfir -o - %s | FileCheck %s
! CHECK: #loop_vectorize = #llvm.loop_vectorize<disable = false>
+! CHECK: #loop_vectorize1 = #llvm.loop_vectorize<disable = true>
! CHECK: #loop_annotation = #llvm.loop_annotation<vectorize = #loop_vectorize>
+! CHECK: #loop_annotation1 = #llvm.loop_annotation<vectorize = #loop_vectorize1>
! CHECK-LABEL: vector_always
subroutine vector_always
@@ -24,3 +26,14 @@
a(i)=i
end do
end subroutine intermediate_directive
+
+
+! CHECK-LABEL: no_vector
+subroutine no_vector
+ integer :: a(10)
+ !dir$ novector
+ !CHECK: fir.do_loop {{.*}} attributes {loopAnnotation = #loop_annotation1}
+ do i=1,10
+ a(i)=i
+ end do
+end subroutine no_vector
diff --git a/flang/test/Parser/compiler-directives.f90 b/flang/test/Parser/compiler-directives.f90
index d1e386a..04d22ff 100644
--- a/flang/test/Parser/compiler-directives.f90
+++ b/flang/test/Parser/compiler-directives.f90
@@ -45,6 +45,10 @@
! CHECK: !DIR$ UNROLL 2
do i=1,10
enddo
+ !dir$ nounroll
+ ! CHECK: !DIR$ NOUNROLL
+ do i=1,10
+ enddo
end subroutine
subroutine unroll_and_jam
@@ -56,4 +60,15 @@
! CHECK: !DIR$ UNROLL_AND_JAM 2
do i=1,10
enddo
+ !dir$ nounroll_and_jam
+ ! CHECK: !DIR$ NOUNROLL_AND_JAM
+ do i=1,10
+ enddo
+end subroutine
+
+subroutine no_vector
+ !dir$ novector
+ ! CHECK: !DIR$ NOVECTOR
+ do i=1,10
+ enddo
end subroutine
