[Mlir-commits] [mlir] 3e6d2cb - [mlir] Fully qualify types and expressions in Interfaces
Markus Böck
llvmlistbot at llvm.org
Thu Jul 8 07:44:27 PDT 2021
Author: Markus Böck
Date: 2021-07-08T16:44:16+02:00
New Revision: 3e6d2cbf268e66e350ebd321345c7d846933da68
URL: https://github.com/llvm/llvm-project/commit/3e6d2cbf268e66e350ebd321345c7d846933da68
DIFF: https://github.com/llvm/llvm-project/commit/3e6d2cbf268e66e350ebd321345c7d846933da68.diff
LOG: [mlir] Fully qualify types and expressions in Interfaces
This patch adds full qualification to the types and function calls used inside of (Static)InterfaceMethod in OpInterfaces. Without this patch using many of these interfaces in a downstream project yields compiler errors as the types and default implementations are mostly copied verbatim. Without then putting using namespace mlir; in the header file of the implementations of those interfaces, compilation is impossible.
Using fully qualified lookup fixes this issue.
Differential Revision: https://reviews.llvm.org/D105619
Added:
Modified:
mlir/include/mlir/Interfaces/CallInterfaces.td
mlir/include/mlir/Interfaces/CastInterfaces.td
mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
mlir/include/mlir/Interfaces/DataLayoutInterfaces.td
mlir/include/mlir/Interfaces/DerivedAttributeOpInterface.td
mlir/include/mlir/Interfaces/InferTypeOpInterface.td
mlir/include/mlir/Interfaces/SideEffectInterfaceBase.td
mlir/include/mlir/Interfaces/VectorInterfaces.td
mlir/include/mlir/Interfaces/ViewLikeInterface.td
Removed:
################################################################################
diff --git a/mlir/include/mlir/Interfaces/CallInterfaces.td b/mlir/include/mlir/Interfaces/CallInterfaces.td
index d51252305c237..8bee7cf85ca60 100644
--- a/mlir/include/mlir/Interfaces/CallInterfaces.td
+++ b/mlir/include/mlir/Interfaces/CallInterfaces.td
@@ -38,13 +38,13 @@ def CallOpInterface : OpInterface<"CallOpInterface"> {
SSA value. If the reference is an SSA value, the SSA value corresponds
to a region of a lambda-like operation.
}],
- "CallInterfaceCallable", "getCallableForCallee"
+ "::mlir::CallInterfaceCallable", "getCallableForCallee"
>,
InterfaceMethod<[{
Returns the operands within this call that are used as arguments to the
callee.
}],
- "Operation::operand_range", "getArgOperands"
+ "::mlir::Operation::operand_range", "getArgOperands"
>,
];
@@ -76,13 +76,13 @@ def CallableOpInterface : OpInterface<"CallableOpInterface"> {
return null in the case of an external callable object, e.g. an external
function.
}],
- "Region *", "getCallableRegion"
+ "::mlir::Region *", "getCallableRegion"
>,
InterfaceMethod<[{
Returns the results types that the callable region produces when
executed.
}],
- "ArrayRef<Type>", "getCallableResults"
+ "::mlir::ArrayRef<::mlir::Type>", "getCallableResults"
>,
];
}
diff --git a/mlir/include/mlir/Interfaces/CastInterfaces.td b/mlir/include/mlir/Interfaces/CastInterfaces.td
index c2a01df42c7f6..cff239773d0dd 100644
--- a/mlir/include/mlir/Interfaces/CastInterfaces.td
+++ b/mlir/include/mlir/Interfaces/CastInterfaces.td
@@ -32,7 +32,7 @@ def CastOpInterface : OpInterface<"CastOpInterface"> {
to cast using this cast operation.
}],
"bool", "areCastCompatible",
- (ins "mlir::TypeRange":$inputs, "mlir::TypeRange":$outputs)
+ (ins "::mlir::TypeRange":$inputs, "::mlir::TypeRange":$outputs)
>,
];
diff --git a/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td b/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
index bb69ed8deef41..b12d62b52925d 100644
--- a/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
+++ b/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
@@ -34,7 +34,7 @@ def BranchOpInterface : OpInterface<"BranchOpInterface"> {
successor are non-materialized values, i.e. they are internal to the
operation.
}],
- "Optional<MutableOperandRange>", "getMutableSuccessorOperands",
+ "::mlir::Optional<::mlir::MutableOperandRange>", "getMutableSuccessorOperands",
(ins "unsigned":$index)
>,
InterfaceMethod<[{
@@ -43,11 +43,11 @@ def BranchOpInterface : OpInterface<"BranchOpInterface"> {
successor are non-materialized values, i.e. they are internal to the
operation.
}],
- "Optional<OperandRange>", "getSuccessorOperands",
+ "::mlir::Optional<::mlir::OperandRange>", "getSuccessorOperands",
(ins "unsigned":$index), [{}], [{
ConcreteOp *op = static_cast<ConcreteOp *>(this);
auto operands = op->getMutableSuccessorOperands(index);
- return operands ? Optional<OperandRange>(*operands) : llvm::None;
+ return operands ? ::mlir::Optional<::mlir::OperandRange>(*operands) : ::llvm::None;
}]
>,
InterfaceMethod<[{
@@ -55,36 +55,36 @@ def BranchOpInterface : OpInterface<"BranchOpInterface"> {
some successor, or None if `operandIndex` isn't a successor operand
index.
}],
- "Optional<BlockArgument>", "getSuccessorBlockArgument",
+ "::mlir::Optional<::mlir::BlockArgument>", "getSuccessorBlockArgument",
(ins "unsigned":$operandIndex), [{
- Operation *opaqueOp = $_op;
+ ::mlir::Operation *opaqueOp = $_op;
for (unsigned i = 0, e = opaqueOp->getNumSuccessors(); i != e; ++i) {
- if (Optional<BlockArgument> arg = detail::getBranchSuccessorArgument(
+ if (::mlir::Optional<::mlir::BlockArgument> arg = ::mlir::detail::getBranchSuccessorArgument(
$_op.getSuccessorOperands(i), operandIndex,
opaqueOp->getSuccessor(i)))
return arg;
}
- return llvm::None;
+ return ::llvm::None;
}]
>,
InterfaceMethod<[{
Returns the successor that would be chosen with the given constant
operands. Returns nullptr if a single successor could not be chosen.
}],
- "Block *", "getSuccessorForOperands",
- (ins "ArrayRef<Attribute>":$operands), [{}],
+ "::mlir::Block *", "getSuccessorForOperands",
+ (ins "::mlir::ArrayRef<::mlir::Attribute>":$operands), [{}],
/*defaultImplementation=*/[{ return nullptr; }]
>
];
let verify = [{
- auto concreteOp = cast<ConcreteOp>($_op);
+ auto concreteOp = ::mlir::cast<ConcreteOp>($_op);
for (unsigned i = 0, e = $_op->getNumSuccessors(); i != e; ++i) {
- Optional<OperandRange> operands = concreteOp.getSuccessorOperands(i);
- if (failed(detail::verifyBranchSuccessorOperands($_op, i, operands)))
- return failure();
+ ::mlir::Optional<OperandRange> operands = concreteOp.getSuccessorOperands(i);
+ if (::mlir::failed(::mlir::detail::verifyBranchSuccessorOperands($_op, i, operands)))
+ return ::mlir::failure();
}
- return success();
+ return ::mlir::success();
}];
}
@@ -107,10 +107,10 @@ def RegionBranchOpInterface : OpInterface<"RegionBranchOpInterface"> {
operation by `getSuccessorRegions`. These operands should correspond 1-1
with the successor inputs specified in `getSuccessorRegions`.
}],
- "OperandRange", "getSuccessorEntryOperands",
+ "::mlir::OperandRange", "getSuccessorEntryOperands",
(ins "unsigned":$index), [{}], /*defaultImplementation=*/[{
auto operandEnd = this->getOperation()->operand_end();
- return OperandRange(operandEnd, operandEnd);
+ return ::mlir::OperandRange(operandEnd, operandEnd);
}]
>,
InterfaceMethod<[{
@@ -128,8 +128,8 @@ def RegionBranchOpInterface : OpInterface<"RegionBranchOpInterface"> {
successor region must be non-empty.
}],
"void", "getSuccessorRegions",
- (ins "Optional<unsigned>":$index, "ArrayRef<Attribute>":$operands,
- "SmallVectorImpl<RegionSuccessor> &":$regions)
+ (ins "::mlir::Optional<unsigned>":$index, "::mlir::ArrayRef<::mlir::Attribute>":$operands,
+ "::mlir::SmallVectorImpl<::mlir::RegionSuccessor> &":$regions)
>,
InterfaceMethod<[{
Populates countPerRegion with the number of times this operation will
@@ -143,8 +143,8 @@ def RegionBranchOpInterface : OpInterface<"RegionBranchOpInterface"> {
operand is not a constant.
}],
"void", "getNumRegionInvocations",
- (ins "ArrayRef<Attribute>":$operands,
- "SmallVectorImpl<int64_t> &":$countPerRegion), [{}],
+ (ins "::mlir::ArrayRef<::mlir::Attribute>":$operands,
+ "::mlir::SmallVectorImpl<int64_t> &":$countPerRegion), [{}],
/*defaultImplementation=*/[{
unsigned numRegions = this->getOperation()->getNumRegions();
assert(countPerRegion.empty());
diff --git a/mlir/include/mlir/Interfaces/DataLayoutInterfaces.td b/mlir/include/mlir/Interfaces/DataLayoutInterfaces.td
index 62606995930cf..06bc6f21946a9 100644
--- a/mlir/include/mlir/Interfaces/DataLayoutInterfaces.td
+++ b/mlir/include/mlir/Interfaces/DataLayoutInterfaces.td
@@ -98,7 +98,7 @@ def DataLayoutSpecInterface : AttrInterface<"DataLayoutSpecInterface"> {
"innermost (newest). Returns null on failure.",
/*retTy=*/"::mlir::DataLayoutSpecInterface",
/*methodName=*/"combineWith",
- /*args=*/(ins "::llvm::ArrayRef<DataLayoutSpecInterface>":$specs)
+ /*args=*/(ins "::llvm::ArrayRef<::mlir::DataLayoutSpecInterface>":$specs)
>,
InterfaceMethod<
/*description=*/"Returns the list of layout entries.",
@@ -193,7 +193,7 @@ def DataLayoutOpInterface : OpInterface<"DataLayoutOpInterface"> {
InterfaceMethod<
/*description=*/"Returns the data layout specification for this op, or "
"null if it does not exist.",
- /*retTy=*/"DataLayoutSpecInterface",
+ /*retTy=*/"::mlir::DataLayoutSpecInterface",
/*methodName=*/"getDataLayoutSpec",
/*args=*/(ins)
>,
diff --git a/mlir/include/mlir/Interfaces/DerivedAttributeOpInterface.td b/mlir/include/mlir/Interfaces/DerivedAttributeOpInterface.td
index 92c901840790e..0317d64ae0f4d 100644
--- a/mlir/include/mlir/Interfaces/DerivedAttributeOpInterface.td
+++ b/mlir/include/mlir/Interfaces/DerivedAttributeOpInterface.td
@@ -30,14 +30,14 @@ def DerivedAttributeOpInterface : OpInterface<"DerivedAttributeOpInterface"> {
/*desc=*/"Returns whether name corresponds to a derived attribute.",
/*retTy=*/"bool",
/*methodName=*/"isDerivedAttribute",
- /*args=*/(ins "StringRef":$name)
+ /*args=*/(ins "::mlir::StringRef":$name)
>,
InterfaceMethod<
/*desc=*/[{
Materializes the derived attributes. Returns null attribute where
unable to materialize a derived attribute as attribute.
}],
- /*retTy=*/"DictionaryAttr",
+ /*retTy=*/"::mlir::DictionaryAttr",
/*methodName=*/"materializeDerivedAttributes"
>,
];
diff --git a/mlir/include/mlir/Interfaces/InferTypeOpInterface.td b/mlir/include/mlir/Interfaces/InferTypeOpInterface.td
index 485eed6a4f86b..4d0271dc10f6c 100644
--- a/mlir/include/mlir/Interfaces/InferTypeOpInterface.td
+++ b/mlir/include/mlir/Interfaces/InferTypeOpInterface.td
@@ -124,7 +124,7 @@ def InferShapedTypeOpInterface : OpInterface<"InferShapedTypeOpInterface"> {
/*methodName=*/"reifyReturnTypeShapes",
/*args=*/(ins "::mlir::OpBuilder&":$builder,
"::mlir::ValueRange":$operands,
- "::mlir::SmallVectorImpl<Value> &":$reifiedReturnShapes),
+ "::mlir::SmallVectorImpl<::mlir::Value> &":$reifiedReturnShapes),
/*methodBody=*/[{}],
/*defaultImplementation=*/[{ return ::mlir::failure(); }]
>,
@@ -151,7 +151,7 @@ def InferShapedTypeOpInterface : OpInterface<"InferShapedTypeOpInterface"> {
/*retTy=*/"::mlir::LogicalResult",
/*methodName=*/"reifyReturnTypeShapesPerResultDim",
/*args=*/(ins "::mlir::OpBuilder&":$builder,
- "::mlir::SmallVectorImpl<SmallVector<::mlir::Value>>&"
+ "::mlir::SmallVectorImpl<::mlir::SmallVector<::mlir::Value>>&"
:$reifiedReturnShapes),
/*methodBody=*/[{}],
/*defaultImplementation=*/[{ return ::mlir::failure(); }]
diff --git a/mlir/include/mlir/Interfaces/SideEffectInterfaceBase.td b/mlir/include/mlir/Interfaces/SideEffectInterfaceBase.td
index 48f1bb2a7633f..3bfde2eb0d766 100644
--- a/mlir/include/mlir/Interfaces/SideEffectInterfaceBase.td
+++ b/mlir/include/mlir/Interfaces/SideEffectInterfaceBase.td
@@ -52,7 +52,7 @@ class EffectOpInterfaceBase<string name, string baseEffect>
Collects all of the operation's effects into `effects`.
}],
"void", "getEffects",
- (ins "SmallVectorImpl<::mlir::SideEffects::EffectInstance<"
+ (ins "::mlir::SmallVectorImpl<::mlir::SideEffects::EffectInstance<"
# baseEffect # ">> &":$effects)
>,
];
diff --git a/mlir/include/mlir/Interfaces/VectorInterfaces.td b/mlir/include/mlir/Interfaces/VectorInterfaces.td
index e29ff9a58d360..27c302aa37682 100644
--- a/mlir/include/mlir/Interfaces/VectorInterfaces.td
+++ b/mlir/include/mlir/Interfaces/VectorInterfaces.td
@@ -28,17 +28,17 @@ def VectorUnrollOpInterface : OpInterface<"VectorUnrollOpInterface"> {
`targetShape`. Return `None` if the op cannot be unrolled to the target
vector shape.
}],
- /*retTy=*/"Optional<SmallVector<int64_t, 4>>",
+ /*retTy=*/"::mlir::Optional<::mlir::SmallVector<int64_t, 4>>",
/*methodName=*/"getShapeForUnroll",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert($_op->getNumResults() == 1);
auto vt = $_op.getResult().getType().
- template dyn_cast<VectorType>();
+ template dyn_cast<::mlir::VectorType>();
if (!vt)
- return None;
- SmallVector<int64_t, 4> res(vt.getShape().begin(), vt.getShape().end());
+ return ::mlir::None;
+ ::mlir::SmallVector<int64_t, 4> res(vt.getShape().begin(), vt.getShape().end());
return res;
}]
>,
@@ -54,7 +54,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
let methods = [
StaticInterfaceMethod<
/*desc=*/"Return the `in_bounds` attribute name.",
- /*retTy=*/"StringRef",
+ /*retTy=*/"::mlir::StringRef",
/*methodName=*/"getInBoundsAttrName",
/*args=*/(ins),
/*methodBody=*/"",
@@ -62,7 +62,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
>,
StaticInterfaceMethod<
/*desc=*/"Return the `permutation_map` attribute name.",
- /*retTy=*/"StringRef",
+ /*retTy=*/"::mlir::StringRef",
/*methodName=*/"getPermutationMapAttrName",
/*args=*/(ins),
/*methodBody=*/"",
@@ -78,13 +78,13 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
/*defaultImplementation=*/[{
return $_op.isBroadcastDim(dim)
|| ($_op.in_bounds()
- && $_op.in_bounds()->template cast<ArrayAttr>()[dim]
- .template cast<BoolAttr>().getValue());
+ && $_op.in_bounds()->template cast<::mlir::ArrayAttr>()[dim]
+ .template cast<::mlir::BoolAttr>().getValue());
}]
>,
InterfaceMethod<
/*desc=*/"Return the memref or ranked tensor operand.",
- /*retTy=*/"Value",
+ /*retTy=*/"::mlir::Value",
/*methodName=*/"source",
/*args=*/(ins),
/*methodBody=*/"return $_op.source();"
@@ -92,7 +92,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
>,
InterfaceMethod<
/*desc=*/"Return the vector operand or result.",
- /*retTy=*/"Value",
+ /*retTy=*/"::mlir::Value",
/*methodName=*/"vector",
/*args=*/(ins),
/*methodBody=*/"return $_op.vector();"
@@ -100,7 +100,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
>,
InterfaceMethod<
/*desc=*/"Return the indices operands.",
- /*retTy=*/"ValueRange",
+ /*retTy=*/"::mlir::ValueRange",
/*methodName=*/"indices",
/*args=*/(ins),
/*methodBody=*/"return $_op.indices();"
@@ -108,7 +108,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
>,
InterfaceMethod<
/*desc=*/"Return the permutation map.",
- /*retTy=*/"AffineMap",
+ /*retTy=*/"::mlir::AffineMap",
/*methodName=*/"permutation_map",
/*args=*/(ins),
/*methodBody=*/"return $_op.permutation_map();"
@@ -122,8 +122,8 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
/*methodBody=*/"",
/*defaultImplementation=*/[{
auto expr = $_op.permutation_map().getResult(idx);
- return expr.template isa<AffineConstantExpr>() &&
- expr.template dyn_cast<AffineConstantExpr>().getValue() == 0;
+ return expr.template isa<::mlir::AffineConstantExpr>() &&
+ expr.template dyn_cast<::mlir::AffineConstantExpr>().getValue() == 0;
}]
>,
InterfaceMethod<
@@ -143,7 +143,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
>,
InterfaceMethod<
/*desc=*/"Return the `in_bounds` boolean ArrayAttr.",
- /*retTy=*/"Optional<ArrayAttr>",
+ /*retTy=*/"::mlir::Optional<::mlir::ArrayAttr>",
/*methodName=*/"in_bounds",
/*args=*/(ins),
/*methodBody=*/"return $_op.in_bounds();"
@@ -151,34 +151,34 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
>,
InterfaceMethod<
/*desc=*/"Return the ShapedType.",
- /*retTy=*/"ShapedType",
+ /*retTy=*/"::mlir::ShapedType",
/*methodName=*/"getShapedType",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/
- "return $_op.source().getType().template cast<ShapedType>();"
+ "return $_op.source().getType().template cast<::mlir::ShapedType>();"
>,
InterfaceMethod<
/*desc=*/"Return the VectorType.",
- /*retTy=*/"VectorType",
+ /*retTy=*/"::mlir::VectorType",
/*methodName=*/"getVectorType",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
- return $_op.vector().getType().template dyn_cast<VectorType>();
+ return $_op.vector().getType().template dyn_cast<::mlir::VectorType>();
}]
>,
InterfaceMethod<
/*desc=*/"Return the mask type if the op has a mask.",
- /*retTy=*/"VectorType",
+ /*retTy=*/"::mlir::VectorType",
/*methodName=*/"getMaskType",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return $_op.mask()
- ? mlir::vector::detail::transferMaskType(
+ ? ::mlir::vector::detail::transferMaskType(
$_op.getVectorType(), $_op.permutation_map())
- : VectorType();
+ : ::mlir::VectorType();
}]
>,
InterfaceMethod<
@@ -232,7 +232,7 @@ def VectorTransferOpInterface : OpInterface<"VectorTransferOpInterface"> {
}],
/*retTy=*/"void",
/*methodName=*/"zipResultAndIndexing",
- /*args=*/(ins "llvm::function_ref<void(int64_t, int64_t)>":$fun),
+ /*args=*/(ins "::llvm::function_ref<void(int64_t, int64_t)>":$fun),
/*methodBody=*/"",
/*defaultImplementation=*/[{
for (int64_t resultIdx = 0,
diff --git a/mlir/include/mlir/Interfaces/ViewLikeInterface.td b/mlir/include/mlir/Interfaces/ViewLikeInterface.td
index 2ba9038cec775..f5227361165b3 100644
--- a/mlir/include/mlir/Interfaces/ViewLikeInterface.td
+++ b/mlir/include/mlir/Interfaces/ViewLikeInterface.td
@@ -427,11 +427,11 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
}],
/*retTy=*/"bool",
/*methodName=*/"isSameAs",
- /*args=*/(ins "OffsetSizeAndStrideOpInterface":$other,
- "llvm::function_ref<bool(OpFoldResult, OpFoldResult)>":$cmp),
+ /*args=*/(ins "::mlir::OffsetSizeAndStrideOpInterface":$other,
+ "::llvm::function_ref<bool(::mlir::OpFoldResult, ::mlir::OpFoldResult)>":$cmp),
/*methodBody=*/"",
/*defaultImplementation=*/[{
- return detail::sameOffsetsSizesAndStrides(
+ return ::mlir::detail::sameOffsetsSizesAndStrides(
::mlir::cast<::mlir::OffsetSizeAndStrideOpInterface>(
$_op.getOperation()), other, cmp);
}]
@@ -443,7 +443,7 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
- return ::llvm::all_of(getMixedStrides(), [](OpFoldResult ofr) {
+ return ::llvm::all_of(getMixedStrides(), [](::mlir::OpFoldResult ofr) {
return ::mlir::getConstantIntValue(ofr) == static_cast<int64_t>(1);
});
}]
@@ -455,7 +455,7 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
- return ::llvm::all_of(getMixedOffsets(), [](OpFoldResult ofr) {
+ return ::llvm::all_of(getMixedOffsets(), [](::mlir::OpFoldResult ofr) {
return ::mlir::getConstantIntValue(ofr) == static_cast<int64_t>(0);
});
}]
More information about the Mlir-commits
mailing list