[Mlir-commits] [mlir] 96bbe1b - [mlir] Rename mlir::SmallVector -> llvm::SmallVector
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Tue May 24 08:03:25 PDT 2022
Author: Mogball
Date: 2022-05-24T15:03:19Z
New Revision: 96bbe1bd61c6ec8898e9157b921a7782ea09b158
URL: https://github.com/llvm/llvm-project/commit/96bbe1bd61c6ec8898e9157b921a7782ea09b158
DIFF: https://github.com/llvm/llvm-project/commit/96bbe1bd61c6ec8898e9157b921a7782ea09b158.diff
LOG: [mlir] Rename mlir::SmallVector -> llvm::SmallVector
Added:
Modified:
mlir/include/mlir/Interfaces/ControlFlowInterfaces.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
mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
mlir/tools/mlir-tblgen/OpFormatGen.cpp
mlir/tools/mlir-tblgen/RewriterGen.cpp
Removed:
################################################################################
diff --git a/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td b/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
index 3eace4606fa6b..9266bc33b4924 100644
--- a/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
+++ b/mlir/include/mlir/Interfaces/ControlFlowInterfaces.td
@@ -161,7 +161,7 @@ def RegionBranchOpInterface : OpInterface<"RegionBranchOpInterface"> {
"void", "getSuccessorRegions",
(ins "::mlir::Optional<unsigned>":$index,
"::mlir::ArrayRef<::mlir::Attribute>":$operands,
- "::mlir::SmallVectorImpl<::mlir::RegionSuccessor> &":$regions)
+ "::llvm::SmallVectorImpl<::mlir::RegionSuccessor> &":$regions)
>,
InterfaceMethod<[{
Populates `invocationBounds` with the minimum and maximum number of
diff --git a/mlir/include/mlir/Interfaces/InferTypeOpInterface.td b/mlir/include/mlir/Interfaces/InferTypeOpInterface.td
index ef41a08bdab33..09bbba68be52b 100644
--- a/mlir/include/mlir/Interfaces/InferTypeOpInterface.td
+++ b/mlir/include/mlir/Interfaces/InferTypeOpInterface.td
@@ -100,7 +100,7 @@ def InferShapedTypeOpInterface : OpInterface<"InferShapedTypeOpInterface"> {
"::mlir::ValueShapeRange":$operands,
"::mlir::DictionaryAttr":$attributes,
"::mlir::RegionRange":$regions,
- "::mlir::SmallVectorImpl<::mlir::ShapedTypeComponents>&":
+ "::llvm::SmallVectorImpl<::mlir::ShapedTypeComponents>&":
$inferredReturnShapes),
/*methodBody=*/[{}],
/*defaultImplementation=*/[{ return ::mlir::failure(); }]
@@ -126,7 +126,7 @@ def InferShapedTypeOpInterface : OpInterface<"InferShapedTypeOpInterface"> {
/*methodName=*/"reifyReturnTypeShapes",
/*args=*/(ins "::mlir::OpBuilder&":$builder,
"::mlir::ValueRange":$operands,
- "::mlir::SmallVectorImpl<::mlir::Value> &":$reifiedReturnShapes),
+ "::llvm::SmallVectorImpl<::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 3bfde2eb0d766..0bb9ad6c7febb 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 "::mlir::SmallVectorImpl<::mlir::SideEffects::EffectInstance<"
+ (ins "::llvm::SmallVectorImpl<::mlir::SideEffects::EffectInstance<"
# baseEffect # ">> &":$effects)
>,
];
diff --git a/mlir/include/mlir/Interfaces/VectorInterfaces.td b/mlir/include/mlir/Interfaces/VectorInterfaces.td
index 00e69e2b89c1b..c36d6d1d7aa60 100644
--- a/mlir/include/mlir/Interfaces/VectorInterfaces.td
+++ b/mlir/include/mlir/Interfaces/VectorInterfaces.td
@@ -28,7 +28,7 @@ def VectorUnrollOpInterface : OpInterface<"VectorUnrollOpInterface"> {
`targetShape`. Return `None` if the op cannot be unrolled to the target
vector shape.
}],
- /*retTy=*/"::mlir::Optional<::mlir::SmallVector<int64_t, 4>>",
+ /*retTy=*/"::mlir::Optional<::llvm::SmallVector<int64_t, 4>>",
/*methodName=*/"getShapeForUnroll",
/*args=*/(ins),
/*methodBody=*/"",
@@ -38,7 +38,7 @@ def VectorUnrollOpInterface : OpInterface<"VectorUnrollOpInterface"> {
template dyn_cast<::mlir::VectorType>();
if (!vt)
return ::mlir::None;
- ::mlir::SmallVector<int64_t, 4> res(vt.getShape().begin(), vt.getShape().end());
+ ::llvm::SmallVector<int64_t, 4> res(vt.getShape().begin(), vt.getShape().end());
return res;
}]
>,
diff --git a/mlir/include/mlir/Interfaces/ViewLikeInterface.td b/mlir/include/mlir/Interfaces/ViewLikeInterface.td
index e3cbd2c667b71..d389bab840a6a 100644
--- a/mlir/include/mlir/Interfaces/ViewLikeInterface.td
+++ b/mlir/include/mlir/Interfaces/ViewLikeInterface.td
@@ -160,7 +160,7 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
/*desc=*/[{
Return a vector of all the static or dynamic sizes of the op.
}],
- /*retTy=*/"::mlir::SmallVector<::mlir::OpFoldResult, 4>",
+ /*retTy=*/"::llvm::SmallVector<::mlir::OpFoldResult, 4>",
/*methodName=*/"getMixedOffsets",
/*args=*/(ins),
/*methodBody=*/"",
@@ -173,7 +173,7 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
/*desc=*/[{
Return a vector of all the static or dynamic sizes of the op.
}],
- /*retTy=*/"::mlir::SmallVector<::mlir::OpFoldResult, 4>",
+ /*retTy=*/"::llvm::SmallVector<::mlir::OpFoldResult, 4>",
/*methodName=*/"getMixedSizes",
/*args=*/(ins),
/*methodBody=*/"",
@@ -185,7 +185,7 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
/*desc=*/[{
Return a vector of all the static or dynamic strides of the op.
}],
- /*retTy=*/"::mlir::SmallVector<::mlir::OpFoldResult, 4>",
+ /*retTy=*/"::llvm::SmallVector<::mlir::OpFoldResult, 4>",
/*methodName=*/"getMixedStrides",
/*args=*/(ins),
/*methodBody=*/"",
diff --git a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
index 2028fe417d2c4..a3626b5d3f791 100644
--- a/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
@@ -1631,7 +1631,7 @@ void OpEmitter::genInferredTypeCollectiveParamBuilder() {
// Result types
body << formatv(R"(
- ::mlir::SmallVector<::mlir::Type, 2> inferredReturnTypes;
+ ::llvm::SmallVector<::mlir::Type, 2> inferredReturnTypes;
if (::mlir::succeeded({0}::inferReturnTypes(odsBuilder.getContext(),
{1}.location, operands,
{1}.attributes.getDictionary({1}.getContext()),
@@ -2271,7 +2271,7 @@ void OpEmitter::genSideEffectInterfaceMethods() {
for (auto &it : interfaceEffects) {
// Generate the 'getEffects' method.
- std::string type = llvm::formatv("::mlir::SmallVectorImpl<::mlir::"
+ std::string type = llvm::formatv("::llvm::SmallVectorImpl<::mlir::"
"SideEffects::EffectInstance<{0}>> &",
it.first())
.str();
diff --git a/mlir/tools/mlir-tblgen/OpFormatGen.cpp b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
index 5044f67f42287..0eda318f894a7 100644
--- a/mlir/tools/mlir-tblgen/OpFormatGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
@@ -793,7 +793,7 @@ static void genElementParserStorage(FormatElement *element, const Operator &op,
genElementParserStorage(paramElement, op, body);
} else if (isa<OperandsDirective>(element)) {
- body << " ::mlir::SmallVector<::mlir::OpAsmParser::UnresolvedOperand, 4> "
+ body << " ::llvm::SmallVector<::mlir::OpAsmParser::UnresolvedOperand, 4> "
"allOperands;\n";
} else if (isa<RegionsDirective>(element)) {
@@ -812,7 +812,7 @@ static void genElementParserStorage(FormatElement *element, const Operator &op,
StringRef name = operand->getVar()->name;
if (operand->getVar()->isVariableLength()) {
body
- << " ::mlir::SmallVector<::mlir::OpAsmParser::UnresolvedOperand, 4> "
+ << " ::llvm::SmallVector<::mlir::OpAsmParser::UnresolvedOperand, 4> "
<< name << "Operands;\n";
if (operand->getVar()->isVariadicOfVariadic()) {
body << " llvm::SmallVector<int32_t> " << name
@@ -855,7 +855,7 @@ static void genElementParserStorage(FormatElement *element, const Operator &op,
ArgumentLengthKind lengthKind;
StringRef name = getTypeListName(dir->getArg(), lengthKind);
if (lengthKind != ArgumentLengthKind::Single)
- body << " ::mlir::SmallVector<::mlir::Type, 1> " << name << "Types;\n";
+ body << " ::llvm::SmallVector<::mlir::Type, 1> " << name << "Types;\n";
else
body << llvm::formatv(" ::mlir::Type {0}RawTypes[1];\n", name)
<< llvm::formatv(
diff --git a/mlir/tools/mlir-tblgen/RewriterGen.cpp b/mlir/tools/mlir-tblgen/RewriterGen.cpp
index d7dfa7315684d..d55e199f25a91 100644
--- a/mlir/tools/mlir-tblgen/RewriterGen.cpp
+++ b/mlir/tools/mlir-tblgen/RewriterGen.cpp
@@ -1485,7 +1485,7 @@ std::string PatternEmitter::handleOpCreation(DagNode tree, int resultIndex,
// Then prepare the result types. We need to specify the types for all
// results.
- os.indent() << formatv("::mlir::SmallVector<::mlir::Type, 4> tblgen_types; "
+ os.indent() << formatv("::llvm::SmallVector<::mlir::Type, 4> tblgen_types; "
"(void)tblgen_types;\n");
int numResults = resultOp.getNumResults();
if (tail.returnType) {
@@ -1531,7 +1531,7 @@ void PatternEmitter::createSeparateLocalVarsForOpArgs(
std::string varName;
if (operand->isVariadic()) {
varName = std::string(formatv("tblgen_values_{0}", valueIndex++));
- os << formatv("::mlir::SmallVector<::mlir::Value, 4> {0};\n", varName);
+ os << formatv("::llvm::SmallVector<::mlir::Value, 4> {0};\n", varName);
std::string range;
if (node.isNestedDagArg(argIndex)) {
range = childNodeNames[argIndex];
@@ -1614,9 +1614,9 @@ void PatternEmitter::createAggregateLocalVarsForOpArgs(
Operator &resultOp = node.getDialectOp(opMap);
auto scope = os.scope();
- os << formatv("::mlir::SmallVector<::mlir::Value, 4> "
+ os << formatv("::llvm::SmallVector<::mlir::Value, 4> "
"tblgen_values; (void)tblgen_values;\n");
- os << formatv("::mlir::SmallVector<::mlir::NamedAttribute, 4> "
+ os << formatv("::llvm::SmallVector<::mlir::NamedAttribute, 4> "
"tblgen_attrs; (void)tblgen_attrs;\n");
const char *addAttrCmd =
More information about the Mlir-commits
mailing list