[OpenACC][NFC] Simplify Reduction Recipe Storage #163393
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The inheritence link between the Reduction Recipe and the version with storage made it overly complicated of an implementation for near zero gain. This patch removes that link, and uses the private constructor of the non-storage version to ensure only the 'right' ones get created in the right place.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Erich Keane (erichkeane) ChangesThe inheritence link between the Reduction Recipe and the version with storage made it overly complicated of an implementation for near zero gain. This patch removes that link, and uses the private constructor of the non-storage version to ensure only the 'right' ones get created in the right place. Full diff: https://github.com/llvm/llvm-project/pull/163393.diff 2 Files Affected:
diff --git a/clang/include/clang/AST/OpenACCClause.h b/clang/include/clang/AST/OpenACCClause.h
index 1e351f31f4b92..83f2b18435633 100644
--- a/clang/include/clang/AST/OpenACCClause.h
+++ b/clang/include/clang/AST/OpenACCClause.h
@@ -1301,46 +1301,25 @@ struct OpenACCReductionRecipe {
// AST), or in a separate collection when being semantically analyzed.
llvm::ArrayRef<CombinerRecipe> CombinerRecipes;
+ bool isSet() const { return AllocaDecl; }
+
+private:
+ friend class OpenACCReductionClause;
OpenACCReductionRecipe(VarDecl *A, llvm::ArrayRef<CombinerRecipe> Combiners)
: AllocaDecl(A), CombinerRecipes(Combiners) {}
-
- bool isSet() const { return AllocaDecl; }
};
// A version of the above that is used for semantic analysis, at a time before
// the OpenACCReductionClause node has been created. This one has storage for
// the CombinerRecipe, since Trailing storage for it doesn't exist yet.
-struct OpenACCReductionRecipeWithStorage : OpenACCReductionRecipe {
-private:
- llvm::SmallVector<CombinerRecipe, 1> CombinerRecipeStorage;
-
-public:
- OpenACCReductionRecipeWithStorage(VarDecl *A,
- llvm::ArrayRef<CombinerRecipe> Combiners)
- : OpenACCReductionRecipe(A, {}), CombinerRecipeStorage(Combiners) {
- CombinerRecipes = CombinerRecipeStorage;
- }
+struct OpenACCReductionRecipeWithStorage {
+ VarDecl *AllocaDecl;
+ llvm::SmallVector<OpenACCReductionRecipe::CombinerRecipe, 1> CombinerRecipes;
OpenACCReductionRecipeWithStorage(
- const OpenACCReductionRecipeWithStorage &Other)
- : OpenACCReductionRecipe(Other),
- CombinerRecipeStorage(Other.CombinerRecipeStorage) {
- CombinerRecipes = CombinerRecipeStorage;
- }
-
- OpenACCReductionRecipeWithStorage(OpenACCReductionRecipeWithStorage &&Other)
- : OpenACCReductionRecipe(std::move(Other)),
- CombinerRecipeStorage(std::move(Other.CombinerRecipeStorage)) {
- CombinerRecipes = CombinerRecipeStorage;
- }
-
- // There is no real problem implementing these, we just have to make sure the
- // array-ref this inherits from stays in sync. But as we don't need it at the
- // moment, make sure we don't accidentially call these.
- OpenACCReductionRecipeWithStorage &
- operator=(OpenACCReductionRecipeWithStorage &&) = delete;
- OpenACCReductionRecipeWithStorage &
- operator=(const OpenACCReductionRecipeWithStorage &) = delete;
+ VarDecl *A,
+ llvm::ArrayRef<OpenACCReductionRecipe::CombinerRecipe> Combiners)
+ : AllocaDecl(A), CombinerRecipes(Combiners) {}
static OpenACCReductionRecipeWithStorage Empty() {
return OpenACCReductionRecipeWithStorage(/*AllocaDecl=*/nullptr, {});
diff --git a/clang/lib/AST/OpenACCClause.cpp b/clang/lib/AST/OpenACCClause.cpp
index 17c6bece44c82..142c9329141a9 100644
--- a/clang/lib/AST/OpenACCClause.cpp
+++ b/clang/lib/AST/OpenACCClause.cpp
@@ -509,7 +509,7 @@ OpenACCReductionClause *OpenACCReductionClause::Create(
ArrayRef<OpenACCReductionRecipeWithStorage> Recipes,
SourceLocation EndLoc) {
size_t NumCombiners = llvm::accumulate(
- Recipes, 0, [](size_t Num, const OpenACCReductionRecipe &R) {
+ Recipes, 0, [](size_t Num, const OpenACCReductionRecipeWithStorage &R) {
return Num + R.CombinerRecipes.size();
});
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/88/builds/17097 Here is the relevant piece of the build log for the reference |
akadutta
pushed a commit
to akadutta/llvm-project
that referenced
this pull request
Oct 14, 2025
The inheritence link between the Reduction Recipe and the version with storage made it overly complicated of an implementation for near zero gain. This patch removes that link, and uses the private constructor of the non-storage version to ensure only the 'right' ones get created in the right place.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The inheritence link between the Reduction Recipe and the version with storage made it overly complicated of an implementation for near zero gain. This patch removes that link, and uses the private constructor of the non-storage version to ensure only the 'right' ones get created in the right place.