Skip to content

[mlir][acc] Clean up TypedValue builders #126968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

[mlir][acc] Clean up TypedValue builders #126968

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 32 additions & 46 deletions mlir/include/mlir/Dialect/OpenACC/OpenACCOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down