Skip to content

Commit 7132c5a

Browse files
JDPailleuxJDPailleux
committed
[flang] Implement !DIR$ NOVECTOR and !DIR$ NOUNROLL[_AND_JAM]
1 parent 924c7ea commit 7132c5a

File tree

13 files changed

+136
-3
lines changed

13 files changed

+136
-3
lines changed

‎flang/docs/Directives.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ A list of non-standard directives supported by Flang
5050
integer that specifying the unrolling factor. When `N` is `0` or `1`, the loop
5151
should not be unrolled at all. If `N` is omitted the optimizer will
5252
selects the number of times to unroll the loop.
53+
* `!dir$ novector` disabling vectorization on the following loop.
54+
* `!dir$ nounroll` disabling unrolling on the following loop.
55+
* `!dir$ nounroll_and_jam` disabling unrolling and jamming on the following loop.
5356

5457
# Directive Details
5558

‎flang/include/flang/Parser/dump-parse-tree.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ class ParseTreeDumper {
210210
NODE(CompilerDirective, VectorAlways)
211211
NODE(CompilerDirective, Unroll)
212212
NODE(CompilerDirective, UnrollAndJam)
213+
NODE(CompilerDirective, NoVector)
214+
NODE(CompilerDirective, NoUnroll)
215+
NODE(CompilerDirective, NoUnrollAndJam)
213216
NODE(parser, ComplexLiteralConstant)
214217
NODE(parser, ComplexPart)
215218
NODE(parser, ComponentArraySpec)

‎flang/include/flang/Parser/parse-tree.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3351,6 +3351,9 @@ struct StmtFunctionStmt {
33513351
// !DIR$ name[=value] [, name[=value]]... = can be :
33523352
// !DIR$ UNROLL [N]
33533353
// !DIR$ UNROLL_AND_JAM [N]
3354+
// !DIR$ NOVECTOR
3355+
// !DIR$ NOUNROLL
3356+
// !DIR$ NOUNROLL_AND_JAM
33543357
// !DIR$ <anything else>
33553358
struct CompilerDirective {
33563359
UNION_CLASS_BOILERPLATE(CompilerDirective);
@@ -3376,10 +3379,14 @@ struct CompilerDirective {
33763379
struct UnrollAndJam {
33773380
WRAPPER_CLASS_BOILERPLATE(UnrollAndJam, std::optional<std::uint64_t>);
33783381
};
3382+
EMPTY_CLASS(NoVector);
3383+
EMPTY_CLASS(NoUnroll);
3384+
EMPTY_CLASS(NoUnrollAndJam);
33793385
EMPTY_CLASS(Unrecognized);
33803386
CharBlock source;
33813387
std::variant<std::list<IgnoreTKR>, LoopCount, std::list<AssumeAligned>,
3382-
VectorAlways, std::list<NameValue>, Unroll, UnrollAndJam, Unrecognized>
3388+
VectorAlways, std::list<NameValue>, Unroll, UnrollAndJam, Unrecognized,
3389+
NoVector, NoUnroll, NoUnrollAndJam>
33833390
u;
33843391
};
33853392

‎flang/lib/Lower/Bridge.cpp‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,6 +2261,23 @@ class FirConverter : public Fortran::lower::AbstractConverter {
22612261
uja = genLoopUnrollAndJamAttr(u.v);
22622262
has_attrs = true;
22632263
},
2264+
[&](const Fortran::parser::CompilerDirective::NoVector &u) {
2265+
mlir::BoolAttr trueAttr =
2266+
mlir::BoolAttr::get(builder->getContext(), true);
2267+
va = mlir::LLVM::LoopVectorizeAttr::get(builder->getContext(),
2268+
/*disable=*/trueAttr,
2269+
{}, {}, {}, {}, {}, {});
2270+
has_attrs = true;
2271+
},
2272+
[&](const Fortran::parser::CompilerDirective::NoUnroll &u) {
2273+
ua = genLoopUnrollAttr(0);
2274+
has_attrs = true;
2275+
},
2276+
[&](const Fortran::parser::CompilerDirective::NoUnrollAndJam &u) {
2277+
uja = genLoopUnrollAndJamAttr(0);
2278+
has_attrs = true;
2279+
},
2280+
22642281
[&](const auto &) {}},
22652282
dir->u);
22662283
}
@@ -2925,6 +2942,15 @@ class FirConverter : public Fortran::lower::AbstractConverter {
29252942
[&](const Fortran::parser::CompilerDirective::UnrollAndJam &) {
29262943
attachDirectiveToLoop(dir, &eval);
29272944
},
2945+
[&](const Fortran::parser::CompilerDirective::NoVector &) {
2946+
attachDirectiveToLoop(dir, &eval);
2947+
},
2948+
[&](const Fortran::parser::CompilerDirective::NoUnroll &) {
2949+
attachDirectiveToLoop(dir, &eval);
2950+
},
2951+
[&](const Fortran::parser::CompilerDirective::NoUnrollAndJam &) {
2952+
attachDirectiveToLoop(dir, &eval);
2953+
},
29282954
[&](const auto &) {}},
29292955
dir.u);
29302956
}

‎flang/lib/Parser/Fortran-parsers.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,13 +1310,20 @@ constexpr auto unroll{
13101310
"UNROLL" >> construct<CompilerDirective::Unroll>(maybe(digitString64))};
13111311
constexpr auto unrollAndJam{"UNROLL_AND_JAM" >>
13121312
construct<CompilerDirective::UnrollAndJam>(maybe(digitString64))};
1313+
constexpr auto novector{"NOVECTOR" >> construct<CompilerDirective::NoVector>()};
1314+
constexpr auto nounroll{"NOUNROLL" >> construct<CompilerDirective::NoUnroll>()};
1315+
constexpr auto nounrollAndJam{
1316+
"NOUNROLL_AND_JAM" >> construct<CompilerDirective::NoUnrollAndJam>()};
13131317
TYPE_PARSER(beginDirective >> "DIR$ "_tok >>
13141318
sourced((construct<CompilerDirective>(ignore_tkr) ||
13151319
construct<CompilerDirective>(loopCount) ||
13161320
construct<CompilerDirective>(assumeAligned) ||
13171321
construct<CompilerDirective>(vectorAlways) ||
13181322
construct<CompilerDirective>(unrollAndJam) ||
13191323
construct<CompilerDirective>(unroll) ||
1324+
construct<CompilerDirective>(novector) ||
1325+
construct<CompilerDirective>(nounrollAndJam) ||
1326+
construct<CompilerDirective>(nounroll) ||
13201327
construct<CompilerDirective>(
13211328
many(construct<CompilerDirective::NameValue>(
13221329
name, maybe(("="_tok || ":"_tok) >> digitString64))))) /

‎flang/lib/Parser/unparse.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,6 +1855,15 @@ class UnparseVisitor {
18551855
Word("!DIR$ UNROLL_AND_JAM");
18561856
Walk(" ", unrollAndJam.v);
18571857
},
1858+
[&](const CompilerDirective::NoVector &) {
1859+
Word("!DIR$ NOVECTOR");
1860+
},
1861+
[&](const CompilerDirective::NoUnroll &) {
1862+
Word("!DIR$ NOUNROLL");
1863+
},
1864+
[&](const CompilerDirective::NoUnrollAndJam &) {
1865+
Word("!DIR$ NOUNROLL_AND_JAM");
1866+
},
18581867
[&](const CompilerDirective::Unrecognized &) {
18591868
Word("!DIR$ ");
18601869
Word(x.source.ToString());

‎flang/lib/Semantics/canonicalize-directives.cpp‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ static bool IsExecutionDirective(const parser::CompilerDirective &dir) {
5757
return std::holds_alternative<parser::CompilerDirective::VectorAlways>(
5858
dir.u) ||
5959
std::holds_alternative<parser::CompilerDirective::Unroll>(dir.u) ||
60-
std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(dir.u);
60+
std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(dir.u) ||
61+
std::holds_alternative<parser::CompilerDirective::NoVector>(dir.u) ||
62+
std::holds_alternative<parser::CompilerDirective::NoUnroll>(dir.u) ||
63+
std::holds_alternative<parser::CompilerDirective::NoUnrollAndJam>(dir.u);
6164
}
6265

6366
void CanonicalizationOfDirectives::Post(parser::SpecificationPart &spec) {
@@ -119,6 +122,15 @@ void CanonicalizationOfDirectives::Post(parser::Block &block) {
119122
[&](parser::CompilerDirective::UnrollAndJam &) {
120123
CheckLoopDirective(*dir, block, it);
121124
},
125+
[&](parser::CompilerDirective::NoVector &) {
126+
CheckLoopDirective(*dir, block, it);
127+
},
128+
[&](parser::CompilerDirective::NoUnroll &) {
129+
CheckLoopDirective(*dir, block, it);
130+
},
131+
[&](parser::CompilerDirective::NoUnrollAndJam &) {
132+
CheckLoopDirective(*dir, block, it);
133+
},
122134
[&](auto &) {}},
123135
dir->u);
124136
}

‎flang/lib/Semantics/resolve-names.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9573,7 +9573,10 @@ void ResolveNamesVisitor::Post(const parser::AssignedGotoStmt &x) {
95739573
void ResolveNamesVisitor::Post(const parser::CompilerDirective &x) {
95749574
if (std::holds_alternative<parser::CompilerDirective::VectorAlways>(x.u) ||
95759575
std::holds_alternative<parser::CompilerDirective::Unroll>(x.u) ||
9576-
std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(x.u)) {
9576+
std::holds_alternative<parser::CompilerDirective::UnrollAndJam>(x.u) ||
9577+
std::holds_alternative<parser::CompilerDirective::NoVector>(x.u) ||
9578+
std::holds_alternative<parser::CompilerDirective::NoUnroll>(x.u) ||
9579+
std::holds_alternative<parser::CompilerDirective::NoUnrollAndJam>(x.u)) {
95779580
return;
95789581
}
95799582
if (const auto *tkr{

‎flang/test/Integration/unroll_and_jam.f90‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ subroutine unroll_and_jam_dir_1
3030
end do
3131
end subroutine unroll_and_jam_dir_1
3232

33+
! CHECK-LABEL: nounroll_and_jam_dir
34+
subroutine nounroll_and_jam_dir
35+
integer :: a(10)
36+
!dir$ nounroll_and_jam
37+
! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION_DISABLE]]
38+
do i=1,10
39+
a(i)=i
40+
end do
41+
end subroutine nounroll_and_jam_dir
42+
3343
! CHECK-LABEL: unroll_and_jam_dir_no_factor
3444
subroutine unroll_and_jam_dir_no_factor
3545
integer :: a(10)

‎flang/test/Integration/vector-always.f90‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,17 @@ subroutine vector_always
1010
end do
1111
end subroutine vector_always
1212

13+
! CHECK-LABEL: no_vector
14+
subroutine no_vector
15+
integer :: a(10)
16+
!dir$ novector
17+
! CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !llvm.loop ![[ANNOTATION2:.*]]
18+
do i=1,10
19+
a(i)=i
20+
end do
21+
end subroutine no_vector
22+
1323
! CHECK: ![[ANNOTATION]] = distinct !{![[ANNOTATION]], ![[VECTORIZE:.*]]}
1424
! CHECK: ![[VECTORIZE]] = !{!"llvm.loop.vectorize.enable", i1 true}
25+
! CHECK: ![[ANNOTATION2]] = distinct !{![[ANNOTATION2]], ![[VECTORIZE2:.*]]}
26+
! CHECK: ![[VECTORIZE2]] = !{!"llvm.loop.vectorize.enable", i1 false}

0 commit comments

Comments
 (0)