[llvm-branch-commits] [llvm] [LLVM][OpenMP] Implement getLeafOrCompositeConstructs (PR #89104)
Krzysztof Parzyszek via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Apr 22 07:20:36 PDT 2024
https://github.com/kparzysz updated https://github.com/llvm/llvm-project/pull/89104
>From 4593582b2a480dfffd2dceb4611cc0dec9cd7de5 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Thu, 11 Apr 2024 10:33:44 -0500
Subject: [PATCH 1/3] [LLVM][OpenMP] Implement getLeafOrCompositeConstructs
This function will break up a construct into constituent leaf and
composite constructs, e.g. if OMPD_c_d_e and OMPD_d_e are composite
constructs, then OMPD_a_b_c_d_e will be broken up into the list
{OMPD_a, OMPD_b, OMPD_c_d_e}.
---
llvm/include/llvm/Frontend/OpenMP/OMP.h | 6 ++
llvm/lib/Frontend/OpenMP/OMP.cpp | 88 ++++++++++++++++---
.../Frontend/OpenMPCompositionTest.cpp | 32 +++++++
3 files changed, 113 insertions(+), 13 deletions(-)
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.h b/llvm/include/llvm/Frontend/OpenMP/OMP.h
index ec8ae68f1c2ca0..6f7a39acac1d31 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.h
@@ -16,9 +16,15 @@
#include "llvm/Frontend/OpenMP/OMP.h.inc"
#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/SmallVector.h"
namespace llvm::omp {
ArrayRef<Directive> getLeafConstructs(Directive D);
+ArrayRef<Directive> getLeafConstructsOrSelf(Directive D);
+
+ArrayRef<Directive>
+getLeafOrCompositeConstructs(Directive D, SmallVectorImpl<Directive> &Output);
+
Directive getCompoundConstruct(ArrayRef<Directive> Parts);
bool isLeafConstruct(Directive D);
diff --git a/llvm/lib/Frontend/OpenMP/OMP.cpp b/llvm/lib/Frontend/OpenMP/OMP.cpp
index 4b9b7037ee4ad5..2ebadf5216a084 100644
--- a/llvm/lib/Frontend/OpenMP/OMP.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMP.cpp
@@ -25,6 +25,43 @@ using namespace llvm::omp;
#define GEN_DIRECTIVES_IMPL
#include "llvm/Frontend/OpenMP/OMP.inc"
+static iterator_range<ArrayRef<Directive>::iterator>
+getFirstCompositeRange(iterator_range<ArrayRef<Directive>::iterator> Leafs) {
+ // OpenMP Spec 5.2: [17.3, 8-9]
+ // If directive-name-A and directive-name-B both correspond to loop-
+ // associated constructs then directive-name is a composite construct
+ // otherwise directive-name is a combined construct.
+ //
+ // In the list of leaf constructs, find the first loop-associated construct,
+ // this is the beginning of the range. Then, starting from the immediately
+ // following leaf construct, find the first sequence of adjacent loop-
+ // -associated constructs. The last of those is the last one of the range.
+
+ auto firstLoopAssociated =
+ [](iterator_range<ArrayRef<Directive>::iterator> List) {
+ for (auto It = List.begin(), End = List.end(); It != End; ++It) {
+ if (getDirectiveAssociation(*It) == Association::Loop)
+ return It;
+ }
+ return List.end();
+ };
+
+ auto Begin = firstLoopAssociated(Leafs);
+ if (Begin == Leafs.end())
+ return llvm::make_range(Leafs.end(), Leafs.end());
+
+ auto End =
+ firstLoopAssociated(llvm::make_range(std::next(Begin), Leafs.end()));
+ if (End == Leafs.end())
+ return llvm::make_range(Begin, std::next(Begin));
+
+ for (; End != Leafs.end(); ++End) {
+ if (getDirectiveAssociation(*End) != Association::Loop)
+ break;
+ }
+ return llvm::make_range(Begin, End);
+}
+
namespace llvm::omp {
ArrayRef<Directive> getLeafConstructs(Directive D) {
auto Idx = static_cast<std::size_t>(D);
@@ -34,6 +71,40 @@ ArrayRef<Directive> getLeafConstructs(Directive D) {
return ArrayRef(&Row[2], &Row[2] + static_cast<int>(Row[1]));
}
+ArrayRef<Directive> getLeafConstructsOrSelf(Directive D) {
+ if (auto Leafs = getLeafConstructs(D); !Leafs.empty())
+ return Leafs;
+ auto Idx = static_cast<size_t>(D);
+ assert(Idx < Directive_enumSize && "Invalid directive");
+ const auto *Row = LeafConstructTable[LeafConstructTableOrdering[Idx]];
+ // The first entry in the row is the directive itself.
+ return ArrayRef(&Row[0], &Row[0] + 1);
+}
+
+ArrayRef<Directive>
+getLeafOrCompositeConstructs(Directive D, SmallVectorImpl<Directive> &Output) {
+ using ArrayTy = ArrayRef<Directive>;
+ using IteratorTy = ArrayTy::iterator;
+ ArrayRef<Directive> Leafs = getLeafConstructsOrSelf(D);
+
+ IteratorTy Iter = Leafs.begin();
+ do {
+ auto Range = getFirstCompositeRange(llvm::make_range(Iter, Leafs.end()));
+ // All directives before the range are leaf constructs.
+ for (; Iter != Range.begin(); ++Iter)
+ Output.push_back(*Iter);
+ if (!Range.empty()) {
+ Directive Comp =
+ getCompoundConstruct(ArrayTy(Range.begin(), Range.end()));
+ assert(Comp != OMPD_unknown);
+ Output.push_back(Comp);
+ }
+ Iter = Range.end();
+ } while (Iter != Leafs.end());
+
+ return Output;
+}
+
Directive getCompoundConstruct(ArrayRef<Directive> Parts) {
if (Parts.empty())
return OMPD_unknown;
@@ -88,20 +159,11 @@ Directive getCompoundConstruct(ArrayRef<Directive> Parts) {
bool isLeafConstruct(Directive D) { return getLeafConstructs(D).empty(); }
bool isCompositeConstruct(Directive D) {
- // OpenMP Spec 5.2: [17.3, 8-9]
- // If directive-name-A and directive-name-B both correspond to loop-
- // associated constructs then directive-name is a composite construct
- llvm::ArrayRef<Directive> Leafs{getLeafConstructs(D)};
- if (Leafs.empty())
- return false;
- if (getDirectiveAssociation(Leafs.front()) != Association::Loop)
+ ArrayRef<Directive> Leafs = getLeafConstructsOrSelf(D);
+ if (Leafs.size() <= 1)
return false;
-
- size_t numLoopConstructs =
- llvm::count_if(Leafs.drop_front(), [](Directive L) {
- return getDirectiveAssociation(L) == Association::Loop;
- });
- return numLoopConstructs != 0;
+ auto Range = getFirstCompositeRange(Leafs);
+ return Range.begin() == Leafs.begin() && Range.end() == Leafs.end();
}
bool isCombinedConstruct(Directive D) {
diff --git a/llvm/unittests/Frontend/OpenMPCompositionTest.cpp b/llvm/unittests/Frontend/OpenMPCompositionTest.cpp
index 0b32e0d96dc84c..6915a0cbcaac2d 100644
--- a/llvm/unittests/Frontend/OpenMPCompositionTest.cpp
+++ b/llvm/unittests/Frontend/OpenMPCompositionTest.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/Frontend/OpenMP/OMP.h"
#include "gtest/gtest.h"
@@ -38,6 +39,37 @@ TEST(Composition, GetCompoundConstruct) {
ASSERT_EQ(C6, OMPD_parallel_for_simd);
}
+TEST(Composition, GetLeafOrCompositeConstructs) {
+ SmallVector<Directive> Out1;
+ auto Ret1 = getLeafOrCompositeConstructs(
+ OMPD_target_teams_distribute_parallel_for, Out1);
+ ASSERT_EQ(Ret1, ArrayRef<Directive>(Out1));
+ ASSERT_EQ((ArrayRef<Directive>(Out1)),
+ (ArrayRef<Directive>{OMPD_target, OMPD_teams,
+ OMPD_distribute_parallel_for}));
+
+ SmallVector<Directive> Out2;
+ auto Ret2 =
+ getLeafOrCompositeConstructs(OMPD_parallel_masked_taskloop_simd, Out2);
+ ASSERT_EQ(Ret2, ArrayRef<Directive>(Out2));
+ ASSERT_EQ(
+ (ArrayRef<Directive>(Out2)),
+ (ArrayRef<Directive>{OMPD_parallel, OMPD_masked, OMPD_taskloop_simd}));
+
+ SmallVector<Directive> Out3;
+ auto Ret3 =
+ getLeafOrCompositeConstructs(OMPD_distribute_parallel_do_simd, Out3);
+ ASSERT_EQ(Ret3, ArrayRef<Directive>(Out3));
+ ASSERT_EQ((ArrayRef<Directive>(Out3)),
+ (ArrayRef<Directive>{OMPD_distribute_parallel_do_simd}));
+
+ SmallVector<Directive> Out4;
+ auto Ret4 = getLeafOrCompositeConstructs(OMPD_target_parallel_loop, Out4);
+ ASSERT_EQ(Ret4, ArrayRef<Directive>(Out4));
+ ASSERT_EQ((ArrayRef<Directive>(Out4)),
+ (ArrayRef<Directive>{OMPD_target, OMPD_parallel, OMPD_loop}));
+}
+
TEST(Composition, IsLeafConstruct) {
ASSERT_TRUE(isLeafConstruct(OMPD_loop));
ASSERT_TRUE(isLeafConstruct(OMPD_teams));
>From a626be8e9b0561c58c26ed77f92966109bbd7041 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Mon, 22 Apr 2024 09:18:15 -0500
Subject: [PATCH 2/3] Address review comments
---
llvm/lib/Frontend/OpenMP/OMP.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/Frontend/OpenMP/OMP.cpp b/llvm/lib/Frontend/OpenMP/OMP.cpp
index 2ebadf5216a084..59f80838a9989e 100644
--- a/llvm/lib/Frontend/OpenMP/OMP.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMP.cpp
@@ -66,9 +66,9 @@ namespace llvm::omp {
ArrayRef<Directive> getLeafConstructs(Directive D) {
auto Idx = static_cast<std::size_t>(D);
if (Idx >= Directive_enumSize)
- return {};
+ return std::nullopt;
const auto *Row = LeafConstructTable[LeafConstructTableOrdering[Idx]];
- return ArrayRef(&Row[2], &Row[2] + static_cast<int>(Row[1]));
+ return ArrayRef(&Row[2], static_cast<int>(Row[1]));
}
ArrayRef<Directive> getLeafConstructsOrSelf(Directive D) {
>From a37ae8670ca04293b65b4787664e2b85d46030e9 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Mon, 22 Apr 2024 09:20:17 -0500
Subject: [PATCH 3/3] Revert "Address review comments"
This reverts commit a626be8e9b0561c58c26ed77f92966109bbd7041.
---
llvm/lib/Frontend/OpenMP/OMP.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/Frontend/OpenMP/OMP.cpp b/llvm/lib/Frontend/OpenMP/OMP.cpp
index 59f80838a9989e..2ebadf5216a084 100644
--- a/llvm/lib/Frontend/OpenMP/OMP.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMP.cpp
@@ -66,9 +66,9 @@ namespace llvm::omp {
ArrayRef<Directive> getLeafConstructs(Directive D) {
auto Idx = static_cast<std::size_t>(D);
if (Idx >= Directive_enumSize)
- return std::nullopt;
+ return {};
const auto *Row = LeafConstructTable[LeafConstructTableOrdering[Idx]];
- return ArrayRef(&Row[2], static_cast<int>(Row[1]));
+ return ArrayRef(&Row[2], &Row[2] + static_cast<int>(Row[1]));
}
ArrayRef<Directive> getLeafConstructsOrSelf(Directive D) {
More information about the llvm-branch-commits
mailing list