[mlir][acc] Clean up TypedValue builders #126968
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
When MappableType was introduced alongside PointerLikeType, the data clause operation builders were duplicated to accept a `TypedValue` of one of the two type options. However, the underlying builder takes a `Value` and this difference is not relevant for it. The only difference is that `varType` is set differently depending on the type. Having two duplicated builders can lead to clunky building since a `Value` must always be cast to one of the two options. Thus, simply clean this up - the verifier already checks that it is a type that implements one of the two interfaces.
|
@llvm/pr-subscribers-mlir @llvm/pr-subscribers-openacc Author: Razvan Lupusoru (razvanlupusoru) ChangesWhen MappableType was introduced alongside PointerLikeType, the data clause operation builders were duplicated to accept a Having two duplicated builders can lead to clunky building since a Full diff: https://github.com/llvm/llvm-project/pull/126968.diff 1 Files Affected:
diff --git a/mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td b/mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td
index 42da20251c190..70a2ba0919952 100644
--- a/mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td
+++ b/mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td
@@ -562,53 +562,33 @@ class OpenACC_DataEntryOp<string mnemonic, string clause, string extraDescriptio
let hasVerifier = 1;
let builders = [
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$varPtr,
- "bool":$structured, "bool":$implicit,
- CArg<"::mlir::ValueRange", "{}">:$bounds),
- [{
- build($_builder, $_state, varPtr.getType(), varPtr,
- /*varType=*/::mlir::TypeAttr::get(
- varPtr.getType().getElementType()),
- /*varPtrPtr=*/{}, bounds, /*asyncOperands=*/{},
- /*asyncOperandsDeviceType=*/nullptr,
- /*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
- /*structured=*/$_builder.getBoolAttr(structured),
- /*implicit=*/$_builder.getBoolAttr(implicit), /*name=*/nullptr);
- }]>,
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$varPtr,
- "bool":$structured, "bool":$implicit,
- "const ::llvm::Twine &":$name,
- CArg<"::mlir::ValueRange", "{}">:$bounds),
- [{
- build($_builder, $_state, varPtr.getType(), varPtr,
- /*varType=*/::mlir::TypeAttr::get(
- varPtr.getType().getElementType()),
- /*varPtrPtr=*/{}, bounds, /*asyncOperands=*/{},
- /*asyncOperandsDeviceType=*/nullptr,
- /*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
- /*structured=*/$_builder.getBoolAttr(structured),
- /*implicit=*/$_builder.getBoolAttr(implicit),
- /*name=*/$_builder.getStringAttr(name));
- }]>,
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::MappableType>":$var,
+ OpBuilder<(ins "::mlir::Value":$var,
"bool":$structured, "bool":$implicit,
CArg<"::mlir::ValueRange", "{}">:$bounds),
[{
+ auto ptrLikeTy = ::mlir::dyn_cast<::mlir::acc::PointerLikeType>(
+ var.getType());
build($_builder, $_state, var.getType(), var,
- /*varType=*/::mlir::TypeAttr::get(var.getType()),
+ /*varType=*/ptrLikeTy ?
+ ::mlir::TypeAttr::get(ptrLikeTy.getElementType()) :
+ ::mlir::TypeAttr::get(var.getType()),
/*varPtrPtr=*/{}, bounds, /*asyncOperands=*/{},
/*asyncOperandsDeviceType=*/nullptr,
/*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
/*structured=*/$_builder.getBoolAttr(structured),
/*implicit=*/$_builder.getBoolAttr(implicit), /*name=*/nullptr);
}]>,
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::MappableType>":$var,
+ OpBuilder<(ins "::mlir::Value":$var,
"bool":$structured, "bool":$implicit,
"const ::llvm::Twine &":$name,
CArg<"::mlir::ValueRange", "{}">:$bounds),
[{
+ auto ptrLikeTy = ::mlir::dyn_cast<::mlir::acc::PointerLikeType>(
+ var.getType());
build($_builder, $_state, var.getType(), var,
- /*varType=*/::mlir::TypeAttr::get(var.getType()),
+ /*varType=*/ptrLikeTy ?
+ ::mlir::TypeAttr::get(ptrLikeTy.getElementType()) :
+ ::mlir::TypeAttr::get(var.getType()),
/*varPtrPtr=*/{}, bounds, /*asyncOperands=*/{},
/*asyncOperandsDeviceType=*/nullptr,
/*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
@@ -942,28 +922,34 @@ class OpenACC_DataExitOpWithVarPtr<string mnemonic, string clause>
}];
let builders = [
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$accPtr,
- "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$varPtr,
+ OpBuilder<(ins "::mlir::Value":$accVar,
+ "::mlir::Value":$var,
"bool":$structured, "bool":$implicit,
CArg<"::mlir::ValueRange", "{}">:$bounds),
[{
- build($_builder, $_state, accPtr, varPtr,
- /*varType=*/::mlir::TypeAttr::get(
- varPtr.getType().getElementType()),
+ auto ptrLikeTy = ::mlir::dyn_cast<::mlir::acc::PointerLikeType>(
+ var.getType());
+ build($_builder, $_state, accVar, var,
+ /*varType=*/ptrLikeTy ?
+ ::mlir::TypeAttr::get(ptrLikeTy.getElementType()) :
+ ::mlir::TypeAttr::get(var.getType()),
bounds, /*asyncOperands=*/{}, /*asyncOperandsDeviceType=*/nullptr,
/*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
/*structured=*/$_builder.getBoolAttr(structured),
/*implicit=*/$_builder.getBoolAttr(implicit), /*name=*/nullptr);
}]>,
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$accPtr,
- "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$varPtr,
+ OpBuilder<(ins "::mlir::Value":$accVar,
+ "::mlir::Value":$var,
"bool":$structured, "bool":$implicit,
"const ::llvm::Twine &":$name,
CArg<"::mlir::ValueRange", "{}">:$bounds),
[{
- build($_builder, $_state, accPtr, varPtr,
- /*varType=*/::mlir::TypeAttr::get(
- varPtr.getType().getElementType()),
+ auto ptrLikeTy = ::mlir::dyn_cast<::mlir::acc::PointerLikeType>(
+ var.getType());
+ build($_builder, $_state, accVar, var,
+ /*varType=*/ptrLikeTy ?
+ ::mlir::TypeAttr::get(ptrLikeTy.getElementType()) :
+ ::mlir::TypeAttr::get(var.getType()),
bounds, /*asyncOperands=*/{}, /*asyncOperandsDeviceType=*/nullptr,
/*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
/*structured=*/$_builder.getBoolAttr(structured),
@@ -996,22 +982,22 @@ class OpenACC_DataExitOpNoVarPtr<string mnemonic, string clause> :
}];
let builders = [
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$accPtr,
+ OpBuilder<(ins "::mlir::Value":$accVar,
"bool":$structured, "bool":$implicit,
CArg<"::mlir::ValueRange", "{}">:$bounds),
[{
- build($_builder, $_state, accPtr,
+ build($_builder, $_state, accVar,
bounds, /*asyncOperands=*/{}, /*asyncOperandsDeviceType=*/nullptr,
/*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
/*structured=*/$_builder.getBoolAttr(structured),
/*implicit=*/$_builder.getBoolAttr(implicit), /*name=*/nullptr);
}]>,
- OpBuilder<(ins "::mlir::TypedValue<::mlir::acc::PointerLikeType>":$accPtr,
+ OpBuilder<(ins "::mlir::Value":$accVar,
"bool":$structured, "bool":$implicit,
"const ::llvm::Twine &":$name,
CArg<"::mlir::ValueRange", "{}">:$bounds),
[{
- build($_builder, $_state, accPtr,
+ build($_builder, $_state, accVar,
bounds, /*asyncOperands=*/{}, /*asyncOperandsDeviceType=*/nullptr,
/*asyncOnly=*/nullptr, /*dataClause=*/nullptr,
/*structured=*/$_builder.getBoolAttr(structured),
|
flovent
pushed a commit
to flovent/llvm-project
that referenced
this pull request
Feb 13, 2025
When MappableType was introduced alongside PointerLikeType, the data clause operation builders were duplicated to accept a `TypedValue` of one of the two type options. However, the underlying builder takes a `Value` and this difference is not relevant for it. The only difference is that `varType` is set differently depending on the type. Having two duplicated builders can lead to clunky building since a `Value` must always be cast to one of the two options. Thus, simply clean this up - the verifier already checks that it is a type that implements one of the two interfaces.
joaosaffran
pushed a commit
to joaosaffran/llvm-project
that referenced
this pull request
Feb 14, 2025
When MappableType was introduced alongside PointerLikeType, the data clause operation builders were duplicated to accept a `TypedValue` of one of the two type options. However, the underlying builder takes a `Value` and this difference is not relevant for it. The only difference is that `varType` is set differently depending on the type. Having two duplicated builders can lead to clunky building since a `Value` must always be cast to one of the two options. Thus, simply clean this up - the verifier already checks that it is a type that implements one of the two interfaces.
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
When MappableType was introduced alongside PointerLikeType, the data clause operation builders were duplicated to accept a `TypedValue` of one of the two type options. However, the underlying builder takes a `Value` and this difference is not relevant for it. The only difference is that `varType` is set differently depending on the type. Having two duplicated builders can lead to clunky building since a `Value` must always be cast to one of the two options. Thus, simply clean this up - the verifier already checks that it is a type that implements one of the two interfaces.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When MappableType was introduced alongside PointerLikeType, the data clause operation builders were duplicated to accept a
TypedValueof one of the two type options. However, the underlying builder takes aValueand this difference is not relevant for it. The only difference is thatvarTypeis set differently depending on the type.Having two duplicated builders can lead to clunky building since a
Valuemust always be cast to one of the two options. Thus, simply clean this up - the verifier already checks that it is a type that implements one of the two interfaces.