summaryrefslogtreecommitdiffstats
path: root/mlir
diff options
context:
space:
mode:
Diffstat (limited to 'mlir')
-rw-r--r--mlir/include/mlir/IR/OpImplementation.h2
-rw-r--r--mlir/lib/Dialect/AffineOps/AffineOps.cpp10
-rw-r--r--mlir/lib/Dialect/GPU/IR/GPUDialect.cpp2
-rw-r--r--mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp46
-rw-r--r--mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp11
-rw-r--r--mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp2
-rw-r--r--mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp24
-rw-r--r--mlir/lib/Dialect/LoopOps/LoopOps.cpp4
-rw-r--r--mlir/lib/Dialect/SPIRV/SPIRVOps.cpp10
-rw-r--r--mlir/lib/Dialect/StandardOps/Ops.cpp28
-rw-r--r--mlir/lib/Dialect/VectorOps/VectorOps.cpp8
-rw-r--r--mlir/lib/IR/FunctionSupport.cpp6
-rw-r--r--mlir/lib/IR/Module.cpp2
-rw-r--r--mlir/lib/IR/Operation.cpp4
-rw-r--r--mlir/lib/Parser/Parser.cpp2
15 files changed, 79 insertions, 82 deletions
diff --git a/mlir/include/mlir/IR/OpImplementation.h b/mlir/include/mlir/IR/OpImplementation.h
index a07bb143dc3..6d41f8ffc1b 100644
--- a/mlir/include/mlir/IR/OpImplementation.h
+++ b/mlir/include/mlir/IR/OpImplementation.h
@@ -340,7 +340,7 @@ public:
/// Parse a named dictionary into 'result' if it is present.
virtual ParseResult
- parseOptionalAttributeDict(SmallVectorImpl<NamedAttribute> &result) = 0;
+ parseOptionalAttrDict(SmallVectorImpl<NamedAttribute> &result) = 0;
//===--------------------------------------------------------------------===//
// Identifier Parsing
diff --git a/mlir/lib/Dialect/AffineOps/AffineOps.cpp b/mlir/lib/Dialect/AffineOps/AffineOps.cpp
index 76417bb3289..acec1dde705 100644
--- a/mlir/lib/Dialect/AffineOps/AffineOps.cpp
+++ b/mlir/lib/Dialect/AffineOps/AffineOps.cpp
@@ -209,7 +209,7 @@ ParseResult AffineApplyOp::parse(OpAsmParser &parser, OperationState &result) {
unsigned numDims;
if (parser.parseAttribute(mapAttr, "map", result.attributes) ||
parseDimAndSymbolList(parser, result.operands, numDims) ||
- parser.parseOptionalAttributeDict(result.attributes))
+ parser.parseOptionalAttrDict(result.attributes))
return failure();
auto map = mapAttr.getValue();
@@ -1261,7 +1261,7 @@ ParseResult parseAffineForOp(OpAsmParser &parser, OperationState &result) {
AffineForOp::ensureTerminator(*body, builder, result.location);
// Parse the optional attribute list.
- if (parser.parseOptionalAttributeDict(result.attributes))
+ if (parser.parseOptionalAttrDict(result.attributes))
return failure();
// Set the operands list as resizable so that we can freely modify the bounds.
@@ -1654,7 +1654,7 @@ ParseResult parseAffineIfOp(OpAsmParser &parser, OperationState &result) {
}
// Parse the optional attribute list.
- if (parser.parseOptionalAttributeDict(result.attributes))
+ if (parser.parseOptionalAttrDict(result.attributes))
return failure();
return success();
@@ -1788,7 +1788,7 @@ ParseResult AffineLoadOp::parse(OpAsmParser &parser, OperationState &result) {
parser.parseOperand(memrefInfo) ||
parser.parseAffineMapOfSSAIds(mapOperands, mapAttr, getMapAttrName(),
result.attributes) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(memrefInfo, type, result.operands) ||
parser.resolveOperands(mapOperands, indexTy, result.operands) ||
@@ -1881,7 +1881,7 @@ ParseResult AffineStoreOp::parse(OpAsmParser &parser, OperationState &result) {
parser.parseAffineMapOfSSAIds(mapOperands, mapAttr,
getMapAttrName(),
result.attributes) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(storeValueInfo, type.getElementType(),
result.operands) ||
diff --git a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
index d1f223e389a..d70d51feee7 100644
--- a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
+++ b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
@@ -435,7 +435,7 @@ ParseResult LaunchOp::parse(OpAsmParser &parser, OperationState &result) {
dataTypes.insert(dataTypes.begin(), kNumConfigRegionAttributes, index);
Region *body = result.addRegion();
return failure(parser.parseRegion(*body, regionArgs, dataTypes) ||
- parser.parseOptionalAttributeDict(result.attributes));
+ parser.parseOptionalAttrDict(result.attributes));
}
void LaunchOp::eraseKernelArgument(unsigned index) {
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index cc2de877436..10e82ec9826 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -71,7 +71,7 @@ static ParseResult parseCmpOp(OpAsmParser &parser, OperationState &result) {
if (parser.getCurrentLocation(&predicateLoc) ||
parser.parseAttribute(predicate, "predicate", attrs) ||
parser.parseOperand(lhs) || parser.parseComma() ||
- parser.parseOperand(rhs) || parser.parseOptionalAttributeDict(attrs) ||
+ parser.parseOperand(rhs) || parser.parseOptionalAttrDict(attrs) ||
parser.parseColon() || parser.getCurrentLocation(&trailingTypeLoc) ||
parser.parseType(type) ||
parser.resolveOperand(lhs, type, result.operands) ||
@@ -147,7 +147,7 @@ static ParseResult parseAllocaOp(OpAsmParser &parser, OperationState &result) {
Type type, elemType;
llvm::SMLoc trailingTypeLoc;
if (parser.parseOperand(arraySize) || parser.parseKeyword("x") ||
- parser.parseType(elemType) || parser.parseOptionalAttributeDict(attrs) ||
+ parser.parseType(elemType) || parser.parseOptionalAttrDict(attrs) ||
parser.parseColon() || parser.getCurrentLocation(&trailingTypeLoc) ||
parser.parseType(type))
return failure();
@@ -193,7 +193,7 @@ static ParseResult parseGEPOp(OpAsmParser &parser, OperationState &result) {
llvm::SMLoc trailingTypeLoc;
if (parser.parseOperand(base) ||
parser.parseOperandList(indices, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(attrs) || parser.parseColon() ||
+ parser.parseOptionalAttrDict(attrs) || parser.parseColon() ||
parser.getCurrentLocation(&trailingTypeLoc) || parser.parseType(type))
return failure();
@@ -247,7 +247,7 @@ static ParseResult parseLoadOp(OpAsmParser &parser, OperationState &result) {
Type type;
llvm::SMLoc trailingTypeLoc;
- if (parser.parseOperand(addr) || parser.parseOptionalAttributeDict(attrs) ||
+ if (parser.parseOperand(addr) || parser.parseOptionalAttrDict(attrs) ||
parser.parseColon() || parser.getCurrentLocation(&trailingTypeLoc) ||
parser.parseType(type) ||
parser.resolveOperand(addr, type, result.operands))
@@ -278,7 +278,7 @@ static ParseResult parseStoreOp(OpAsmParser &parser, OperationState &result) {
llvm::SMLoc trailingTypeLoc;
if (parser.parseOperand(value) || parser.parseComma() ||
- parser.parseOperand(addr) || parser.parseOptionalAttributeDict(attrs) ||
+ parser.parseOperand(addr) || parser.parseOptionalAttrDict(attrs) ||
parser.parseColon() || parser.getCurrentLocation(&trailingTypeLoc) ||
parser.parseType(type))
return failure();
@@ -348,7 +348,7 @@ static ParseResult parseCallOp(OpAsmParser &parser, OperationState &result) {
return failure();
if (parser.parseOperandList(operands, OpAsmParser::Delimiter::Paren) ||
- parser.parseOptionalAttributeDict(attrs) || parser.parseColon() ||
+ parser.parseOptionalAttrDict(attrs) || parser.parseColon() ||
parser.getCurrentLocation(&trailingTypeLoc) || parser.parseType(type))
return failure();
@@ -444,7 +444,7 @@ static ParseResult parseExtractElementOp(OpAsmParser &parser,
Type type, i32Type = LLVMType::getInt32Ty(llvmDialect);
if (parser.getCurrentLocation(&loc) || parser.parseOperand(vector) ||
parser.parseComma() || parser.parseOperand(position) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(vector, type, result.operands) ||
parser.resolveOperand(position, i32Type, result.operands))
@@ -534,7 +534,7 @@ static ParseResult parseExtractValueOp(OpAsmParser &parser,
if (parser.parseOperand(container) ||
parser.getCurrentLocation(&attributeLoc) ||
parser.parseAttribute(positionAttr, "position", attrs) ||
- parser.parseOptionalAttributeDict(attrs) || parser.parseColon() ||
+ parser.parseOptionalAttrDict(attrs) || parser.parseColon() ||
parser.getCurrentLocation(&trailingTypeLoc) ||
parser.parseType(containerType) ||
parser.resolveOperand(container, containerType, result.operands))
@@ -574,7 +574,7 @@ static ParseResult parseInsertElementOp(OpAsmParser &parser,
if (parser.getCurrentLocation(&loc) || parser.parseOperand(vector) ||
parser.parseComma() || parser.parseOperand(value) ||
parser.parseComma() || parser.parseOperand(position) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(vectorType))
return failure();
@@ -621,8 +621,8 @@ static ParseResult parseInsertValueOp(OpAsmParser &parser,
parser.parseOperand(container) ||
parser.getCurrentLocation(&attributeLoc) ||
parser.parseAttribute(positionAttr, "position", result.attributes) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
- parser.parseColon() || parser.getCurrentLocation(&trailingTypeLoc) ||
+ parser.parseOptionalAttrDict(result.attributes) || parser.parseColon() ||
+ parser.getCurrentLocation(&trailingTypeLoc) ||
parser.parseType(containerType))
return failure();
@@ -659,7 +659,7 @@ static ParseResult parseSelectOp(OpAsmParser &parser, OperationState &result) {
if (parser.parseOperand(condition) || parser.parseComma() ||
parser.parseOperand(trueValue) || parser.parseComma() ||
parser.parseOperand(falseValue) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(conditionType) || parser.parseComma() ||
parser.parseType(argType))
return failure();
@@ -689,7 +689,7 @@ static ParseResult parseBrOp(OpAsmParser &parser, OperationState &result) {
Block *dest;
SmallVector<Value *, 4> operands;
if (parser.parseSuccessorAndUseList(dest, operands) ||
- parser.parseOptionalAttributeDict(result.attributes))
+ parser.parseOptionalAttrDict(result.attributes))
return failure();
result.addSuccessor(dest, operands);
@@ -727,7 +727,7 @@ static ParseResult parseCondBrOp(OpAsmParser &parser, OperationState &result) {
parser.parseSuccessorAndUseList(trueDest, trueOperands) ||
parser.parseComma() ||
parser.parseSuccessorAndUseList(falseDest, falseOperands) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.resolveOperand(condition, i1Type, result.operands))
return failure();
@@ -758,7 +758,7 @@ static ParseResult parseReturnOp(OpAsmParser &parser, OperationState &result) {
Type type;
if (parser.parseOperandList(operands) ||
- parser.parseOptionalAttributeDict(result.attributes))
+ parser.parseOptionalAttrDict(result.attributes))
return failure();
if (operands.empty())
return success();
@@ -783,7 +783,7 @@ static void printUndefOp(OpAsmPrinter &p, UndefOp &op) {
static ParseResult parseUndefOp(OpAsmParser &parser, OperationState &result) {
Type type;
- if (parser.parseOptionalAttributeDict(result.attributes) ||
+ if (parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type))
return failure();
@@ -812,7 +812,7 @@ static ParseResult parseAddressOfOp(OpAsmParser &parser,
Attribute symRef;
Type type;
if (parser.parseAttribute(symRef, "global_name", result.attributes) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) || parser.addTypeToList(type, result.types))
return failure();
@@ -852,8 +852,7 @@ static ParseResult parseConstantOp(OpAsmParser &parser,
if (parser.parseLParen() ||
parser.parseAttribute(valueAttr, "value", result.attributes) ||
- parser.parseRParen() ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseRParen() || parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type))
return failure();
@@ -920,7 +919,7 @@ static ParseResult parseGlobalOp(OpAsmParser &parser, OperationState &result) {
}
SmallVector<Type, 1> types;
- if (parser.parseOptionalAttributeDict(result.attributes) ||
+ if (parser.parseOptionalAttrDict(result.attributes) ||
parser.parseOptionalColonTypeList(types))
return failure();
@@ -998,9 +997,8 @@ static ParseResult parseShuffleVectorOp(OpAsmParser &parser,
if (parser.getCurrentLocation(&loc) || parser.parseOperand(v1) ||
parser.parseComma() || parser.parseOperand(v2) ||
parser.parseAttribute(maskAttr, "mask", attrs) ||
- parser.parseOptionalAttributeDict(attrs) ||
- parser.parseColonType(typeV1) || parser.parseComma() ||
- parser.parseType(typeV2) ||
+ parser.parseOptionalAttrDict(attrs) || parser.parseColonType(typeV1) ||
+ parser.parseComma() || parser.parseType(typeV2) ||
parser.resolveOperand(v1, typeV1, result.operands) ||
parser.resolveOperand(v2, typeV2, result.operands))
return failure();
@@ -1169,7 +1167,7 @@ static void printNullOp(OpAsmPrinter &p, LLVM::NullOp op) {
// <operation> = `llvm.mlir.null` : type
static ParseResult parseNullOp(OpAsmParser &parser, OperationState &result) {
Type type;
- return failure(parser.parseOptionalAttributeDict(result.attributes) ||
+ return failure(parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.addTypeToList(type, result.types));
}
diff --git a/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp
index febaf28e4e9..0b10391f180 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp
@@ -55,7 +55,7 @@ static void printNVVMIntrinsicOp(OpAsmPrinter &p, Operation *op) {
static ParseResult parseNVVMSpecialRegisterOp(OpAsmParser &parser,
OperationState &result) {
Type type;
- if (parser.parseOptionalAttributeDict(result.attributes) ||
+ if (parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type))
return failure();
@@ -77,7 +77,7 @@ static ParseResult parseNVVMShflSyncBflyOp(OpAsmParser &parser,
SmallVector<OpAsmParser::OperandType, 8> ops;
Type resultType;
if (parser.parseOperandList(ops) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(resultType) ||
parser.addTypeToList(resultType, result.types))
return failure();
@@ -106,7 +106,7 @@ static ParseResult parseNVVMVoteBallotOp(OpAsmParser &parser,
SmallVector<OpAsmParser::OperandType, 8> ops;
Type type;
return failure(parser.parseOperandList(ops) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.addTypeToList(type, result.types) ||
parser.resolveOperands(ops, {int32Ty, int1Ty},
@@ -120,9 +120,8 @@ static ParseResult parseNVVMMmaOp(OpAsmParser &parser, OperationState &result) {
Type type;
llvm::SMLoc typeLoc;
if (parser.parseOperandList(ops) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
- parser.parseColon() || parser.getCurrentLocation(&typeLoc) ||
- parser.parseType(type)) {
+ parser.parseOptionalAttrDict(result.attributes) || parser.parseColon() ||
+ parser.getCurrentLocation(&typeLoc) || parser.parseType(type)) {
return failure();
}
diff --git a/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp
index 075e01d1dfc..487382bb364 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp
@@ -53,7 +53,7 @@ static void printROCDLOp(OpAsmPrinter &p, Operation *op) {
// <operation> ::= `rocdl.XYZ` : type
static ParseResult parseROCDLOp(OpAsmParser &parser, OperationState &result) {
Type type;
- return failure(parser.parseOptionalAttributeDict(result.attributes) ||
+ return failure(parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.addTypeToList(type, result.types));
}
diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
index 24510f05af5..f18f9a3626d 100644
--- a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
+++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
@@ -72,7 +72,7 @@ static ParseResult parseBufferAllocOp(OpAsmParser &parser,
BufferType bufferType;
auto indexTy = parser.getBuilder().getIndexType();
if (parser.parseOperandList(sizeInfo) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(bufferType))
return failure();
if (sizeInfo.empty())
@@ -118,7 +118,7 @@ static ParseResult parseBufferDeallocOp(OpAsmParser &parser,
OpAsmParser::OperandType bufferInfo;
BufferType bufferType;
if (parser.parseOperand(bufferInfo) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(bufferType))
return failure();
return parser.resolveOperands(bufferInfo, bufferType, result.operands);
@@ -140,7 +140,7 @@ static ParseResult parseBufferSizeOp(OpAsmParser &parser,
Type type;
return failure(
parser.parseOperand(op) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(op, type, result.operands) ||
parser.addTypeToList(parser.getBuilder().getIndexType(), result.types));
@@ -189,7 +189,7 @@ static ParseResult parseGenericOp(OpAsmParser &parser, OperationState &result) {
if (!dictAttr.get("fun") &&
parser.parseOptionalRegion(region, regionOperandsInfo, regionTypes))
return failure();
- if (parser.parseOptionalAttributeDict(result.attributes) ||
+ if (parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonTypeList(operandTypes))
return failure();
return parser.resolveOperands(operandsInfo, operandTypes,
@@ -304,7 +304,7 @@ static ParseResult parseRangeOp(OpAsmParser &parser, OperationState &result) {
return failure(parser.parseOperand(rangeInfo[0]) || parser.parseColon() ||
parser.parseOperand(rangeInfo[1]) || parser.parseColon() ||
parser.parseOperand(rangeInfo[2]) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperands(rangeInfo, indexTy, result.operands) ||
parser.addTypeToList(type, result.types));
@@ -353,7 +353,7 @@ static ParseResult parseSliceOp(OpAsmParser &parser, OperationState &result) {
SmallVector<Type, 8> types;
if (parser.parseOperand(baseInfo) ||
parser.parseOperandList(operands, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonTypeList(types))
return failure();
@@ -443,7 +443,7 @@ static ParseResult parseSubViewOp(OpAsmParser &parser, OperationState &result) {
// to something resembling
// linalg.subview %0[%1:%2:%3][%4:%5:%6]
if (parser.parseOperandList(ops, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(memRefType))
return failure();
@@ -504,7 +504,7 @@ static ParseResult parseTransposeOp(OpAsmParser &parser,
parser.parseAttribute(permutation,
TransposeOp::getPermutationAttrName(),
result.attributes) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(view, type, result.operands) ||
parser.addTypeToList(type, result.types));
@@ -543,8 +543,8 @@ static ParseResult parseViewOp(OpAsmParser &parser, OperationState &result) {
Type bType, vType;
if (parser.parseOperand(bufferInfo) ||
parser.parseOperandList(rangesInfo, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
- parser.parseColon() || parser.parseType(bType) || parser.parseArrow() ||
+ parser.parseOptionalAttrDict(result.attributes) || parser.parseColon() ||
+ parser.parseType(bType) || parser.parseArrow() ||
parser.parseType(vType)) {
return failure();
}
@@ -586,7 +586,7 @@ static ParseResult parseYieldOp(OpAsmParser &parser, OperationState &result) {
SmallVector<Type, 2> types;
llvm::SMLoc loc = parser.getCurrentLocation();
return failure(parser.parseOperandList(opInfo) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
(!opInfo.empty() && parser.parseColonTypeList(types)) ||
parser.resolveOperands(opInfo, types, loc, result.operands));
}
@@ -654,7 +654,7 @@ static ParseResult parseLinalgLibraryOp(OpAsmParser &parser,
SmallVector<Type, 3> types;
return failure(
parser.parseOperandList(ops, OpAsmParser::Delimiter::Paren) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonTypeList(types) ||
parser.resolveOperands(ops, types, parser.getNameLoc(), result.operands));
}
diff --git a/mlir/lib/Dialect/LoopOps/LoopOps.cpp b/mlir/lib/Dialect/LoopOps/LoopOps.cpp
index bd0d5dc2d9f..fc8832e9a46 100644
--- a/mlir/lib/Dialect/LoopOps/LoopOps.cpp
+++ b/mlir/lib/Dialect/LoopOps/LoopOps.cpp
@@ -126,7 +126,7 @@ static ParseResult parseForOp(OpAsmParser &parser, OperationState &result) {
ForOp::ensureTerminator(*body, builder, result.location);
// Parse the optional attribute list.
- if (parser.parseOptionalAttributeDict(result.attributes))
+ if (parser.parseOptionalAttrDict(result.attributes))
return failure();
return success();
@@ -207,7 +207,7 @@ static ParseResult parseIfOp(OpAsmParser &parser, OperationState &result) {
}
// Parse the optional attribute list.
- if (parser.parseOptionalAttributeDict(result.attributes))
+ if (parser.parseOptionalAttrDict(result.attributes))
return failure();
return success();
diff --git a/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp
index 2c6dfd6a996..e8176191a8d 100644
--- a/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp
+++ b/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp
@@ -298,7 +298,7 @@ static ParseResult parseVariableDecorations(OpAsmParser &parser,
}
// Parse other attributes
- if (parser.parseOptionalAttributeDict(state.attributes))
+ if (parser.parseOptionalAttrDict(state.attributes))
return failure();
return success();
@@ -383,7 +383,7 @@ static inline bool isMergeBlock(Block &block) {
// Parses an op that has no inputs and no outputs.
static ParseResult parseNoIOOp(OpAsmParser &parser, OperationState &state) {
- if (parser.parseOptionalAttributeDict(state.attributes))
+ if (parser.parseOptionalAttrDict(state.attributes))
return failure();
return success();
}
@@ -1363,8 +1363,8 @@ static ParseResult parseLoadOp(OpAsmParser &parser, OperationState &state) {
if (parseEnumAttribute(storageClass, parser) ||
parser.parseOperand(ptrInfo) ||
parseMemoryAccessAttributes(parser, state) ||
- parser.parseOptionalAttributeDict(state.attributes) ||
- parser.parseColon() || parser.parseType(elementType)) {
+ parser.parseOptionalAttrDict(state.attributes) || parser.parseColon() ||
+ parser.parseType(elementType)) {
return failure();
}
@@ -1629,7 +1629,7 @@ static ParseResult parseModuleOp(OpAsmParser &parser, OperationState &state) {
return failure();
if (succeeded(parser.parseOptionalKeyword("attributes"))) {
- if (parser.parseOptionalAttributeDict(state.attributes))
+ if (parser.parseOptionalAttrDict(state.attributes))
return failure();
}
diff --git a/mlir/lib/Dialect/StandardOps/Ops.cpp b/mlir/lib/Dialect/StandardOps/Ops.cpp
index 6fea2fae38c..22309eb8f53 100644
--- a/mlir/lib/Dialect/StandardOps/Ops.cpp
+++ b/mlir/lib/Dialect/StandardOps/Ops.cpp
@@ -339,7 +339,7 @@ static ParseResult parseAllocOp(OpAsmParser &parser, OperationState &result) {
// memref type.
unsigned numDimOperands;
if (parseDimAndSymbolList(parser, result.operands, numDimOperands) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type))
return failure();
@@ -533,7 +533,7 @@ static ParseResult parseCallOp(OpAsmParser &parser, OperationState &result) {
auto calleeLoc = parser.getNameLoc();
if (parser.parseAttribute(calleeAttr, "callee", result.attributes) ||
parser.parseOperandList(operands, OpAsmParser::Delimiter::Paren) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(calleeType) ||
parser.addTypesToList(calleeType.getResults(), result.types) ||
parser.resolveOperands(operands, calleeType.getInputs(), calleeLoc,
@@ -623,7 +623,7 @@ static ParseResult parseCallIndirectOp(OpAsmParser &parser,
return failure(
parser.parseOperand(callee) || parser.getCurrentLocation(&operandsLoc) ||
parser.parseOperandList(operands, OpAsmParser::Delimiter::Paren) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(calleeType) ||
parser.resolveOperand(callee, calleeType, result.operands) ||
parser.resolveOperands(operands, calleeType.getInputs(), operandsLoc,
@@ -752,7 +752,7 @@ static ParseResult parseCmpIOp(OpAsmParser &parser, OperationState &result) {
if (parser.parseAttribute(predicateNameAttr, CmpIOp::getPredicateAttrName(),
attrs) ||
parser.parseComma() || parser.parseOperandList(ops, 2) ||
- parser.parseOptionalAttributeDict(attrs) || parser.parseColonType(type) ||
+ parser.parseOptionalAttrDict(attrs) || parser.parseColonType(type) ||
parser.resolveOperands(ops, type, result.operands))
return failure();
@@ -928,7 +928,7 @@ static ParseResult parseCmpFOp(OpAsmParser &parser, OperationState &result) {
if (parser.parseAttribute(predicateNameAttr, CmpFOp::getPredicateAttrName(),
attrs) ||
parser.parseComma() || parser.parseOperandList(ops, 2) ||
- parser.parseOptionalAttributeDict(attrs) || parser.parseColonType(type) ||
+ parser.parseOptionalAttrDict(attrs) || parser.parseColonType(type) ||
parser.resolveOperands(ops, type, result.operands))
return failure();
@@ -1158,7 +1158,7 @@ static void print(OpAsmPrinter &p, ConstantOp &op) {
static ParseResult parseConstantOp(OpAsmParser &parser,
OperationState &result) {
Attribute valueAttr;
- if (parser.parseOptionalAttributeDict(result.attributes) ||
+ if (parser.parseOptionalAttrDict(result.attributes) ||
parser.parseAttribute(valueAttr, "value", result.attributes))
return failure();
@@ -1372,7 +1372,7 @@ static ParseResult parseDimOp(OpAsmParser &parser, OperationState &result) {
return failure(
parser.parseOperand(operandInfo) || parser.parseComma() ||
parser.parseAttribute(indexAttr, indexType, "index", result.attributes) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(operandInfo, type, result.operands) ||
parser.addTypeToList(indexType, result.types));
@@ -1700,7 +1700,7 @@ static ParseResult parseExtractElementOp(OpAsmParser &parser,
return failure(
parser.parseOperand(aggregateInfo) ||
parser.parseOperandList(indexInfo, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(aggregateInfo, type, result.operands) ||
parser.resolveOperands(indexInfo, indexTy, result.operands) ||
@@ -1781,7 +1781,7 @@ static ParseResult parseLoadOp(OpAsmParser &parser, OperationState &result) {
return failure(
parser.parseOperand(memrefInfo) ||
parser.parseOperandList(indexInfo, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(memrefInfo, type, result.operands) ||
parser.resolveOperands(indexInfo, indexTy, result.operands) ||
@@ -2003,7 +2003,7 @@ static ParseResult parseSelectOp(OpAsmParser &parser, OperationState &result) {
SmallVector<NamedAttribute, 4> attrs;
Type type;
if (parser.parseOperandList(ops, 3) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type))
return failure();
@@ -2088,7 +2088,7 @@ static ParseResult parseSplatOp(OpAsmParser &parser, OperationState &result) {
ShapedType shapedType;
return failure(parser.parseOperand(splatValueInfo) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(shapedType) ||
parser.resolveOperand(splatValueInfo,
shapedType.getElementType(),
@@ -2146,7 +2146,7 @@ static ParseResult parseStoreOp(OpAsmParser &parser, OperationState &result) {
parser.parseOperand(storeValueInfo) || parser.parseComma() ||
parser.parseOperand(memrefInfo) ||
parser.parseOperandList(indexInfo, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(memrefType) ||
parser.resolveOperand(storeValueInfo, memrefType.getElementType(),
result.operands) ||
@@ -2287,7 +2287,7 @@ static ParseResult parseTensorLoadOp(OpAsmParser &parser,
OpAsmParser::OperandType op;
Type type;
return failure(parser.parseOperand(op) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperand(op, type, result.operands) ||
parser.addTypeToList(
@@ -2312,7 +2312,7 @@ static ParseResult parseTensorStoreOp(OpAsmParser &parser,
llvm::SMLoc loc = parser.getCurrentLocation();
return failure(
parser.parseOperandList(ops, /*requiredOperandCount=*/2) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperands(
ops, {getTensorTypeFromMemRefType(parser.getBuilder(), type), type},
diff --git a/mlir/lib/Dialect/VectorOps/VectorOps.cpp b/mlir/lib/Dialect/VectorOps/VectorOps.cpp
index a7006f0f1a9..8626f241955 100644
--- a/mlir/lib/Dialect/VectorOps/VectorOps.cpp
+++ b/mlir/lib/Dialect/VectorOps/VectorOps.cpp
@@ -64,7 +64,7 @@ static ParseResult parseExtractElementOp(OpAsmParser &parser,
Attribute attr;
if (parser.parseOperand(vector) || parser.getCurrentLocation(&attributeLoc) ||
parser.parseAttribute(attr, "position", attrs) ||
- parser.parseOptionalAttributeDict(attrs) ||
+ parser.parseOptionalAttrDict(attrs) ||
parser.getCurrentLocation(&typeLoc) || parser.parseColonType(type))
return failure();
@@ -257,7 +257,7 @@ ParseResult VectorTransferReadOp::parse(OpAsmParser &parser,
parser.parseOperandList(indexInfo, OpAsmParser::Delimiter::Square) ||
parser.parseTrailingOperandList(paddingInfo,
OpAsmParser::Delimiter::Paren) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonTypeList(types))
return failure();
@@ -420,7 +420,7 @@ ParseResult VectorTransferWriteOp::parse(OpAsmParser &parser,
if (parser.parseOperand(storeValueInfo) || parser.parseComma() ||
parser.parseOperand(memrefInfo) ||
parser.parseOperandList(indexInfo, OpAsmParser::Delimiter::Square) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonTypeList(types))
return failure();
@@ -517,7 +517,7 @@ ParseResult VectorTypeCastOp::parse(OpAsmParser &parser,
OpAsmParser::OperandType operand;
Type srcType, dstType;
return failure(parser.parseOperand(operand) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(srcType) || parser.parseComma() ||
parser.parseType(dstType) ||
parser.addTypeToList(dstType, result.types) ||
diff --git a/mlir/lib/IR/FunctionSupport.cpp b/mlir/lib/IR/FunctionSupport.cpp
index ca1ae813b58..aa9965e89d1 100644
--- a/mlir/lib/IR/FunctionSupport.cpp
+++ b/mlir/lib/IR/FunctionSupport.cpp
@@ -64,7 +64,7 @@ parseArgumentList(OpAsmParser &parser, bool allowVariadic,
// Parse any argument attributes.
SmallVector<NamedAttribute, 2> attrs;
- if (parser.parseOptionalAttributeDict(attrs))
+ if (parser.parseOptionalAttrDict(attrs))
return failure();
argAttrs.push_back(attrs);
return success();
@@ -121,7 +121,7 @@ static ParseResult parseFunctionResultList(
resultTypes.emplace_back();
resultAttrs.emplace_back();
if (parser.parseType(resultTypes.back()) ||
- parser.parseOptionalAttributeDict(resultAttrs.back())) {
+ parser.parseOptionalAttrDict(resultAttrs.back())) {
return failure();
}
} while (succeeded(parser.parseOptionalComma()));
@@ -184,7 +184,7 @@ mlir::impl::parseFunctionLikeOp(OpAsmParser &parser, OperationState &result,
// If function attributes are present, parse them.
if (succeeded(parser.parseOptionalKeyword("attributes")))
- if (parser.parseOptionalAttributeDict(result.attributes))
+ if (parser.parseOptionalAttrDict(result.attributes))
return failure();
// Add the attributes to the function arguments.
diff --git a/mlir/lib/IR/Module.cpp b/mlir/lib/IR/Module.cpp
index f55f960ffa2..3a08ee3bf27 100644
--- a/mlir/lib/IR/Module.cpp
+++ b/mlir/lib/IR/Module.cpp
@@ -49,7 +49,7 @@ ParseResult ModuleOp::parse(OpAsmParser &parser, OperationState &result) {
// If module attributes are present, parse them.
if (succeeded(parser.parseOptionalKeyword("attributes")))
- if (parser.parseOptionalAttributeDict(result.attributes))
+ if (parser.parseOptionalAttrDict(result.attributes))
return failure();
// Parse the module body.
diff --git a/mlir/lib/IR/Operation.cpp b/mlir/lib/IR/Operation.cpp
index adf38ca8366..a712e427c99 100644
--- a/mlir/lib/IR/Operation.cpp
+++ b/mlir/lib/IR/Operation.cpp
@@ -927,7 +927,7 @@ ParseResult impl::parseOneResultSameOperandTypeOp(OpAsmParser &parser,
SmallVector<OpAsmParser::OperandType, 2> ops;
Type type;
return failure(parser.parseOperandList(ops) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(type) ||
parser.resolveOperands(ops, type, result.operands) ||
parser.addTypeToList(type, result.types));
@@ -966,7 +966,7 @@ ParseResult impl::parseCastOp(OpAsmParser &parser, OperationState &result) {
OpAsmParser::OperandType srcInfo;
Type srcType, dstType;
return failure(parser.parseOperand(srcInfo) ||
- parser.parseOptionalAttributeDict(result.attributes) ||
+ parser.parseOptionalAttrDict(result.attributes) ||
parser.parseColonType(srcType) ||
parser.resolveOperand(srcInfo, srcType, result.operands) ||
parser.parseKeywordType("to", dstType) ||
diff --git a/mlir/lib/Parser/Parser.cpp b/mlir/lib/Parser/Parser.cpp
index bc0070231ff..3a45933db87 100644
--- a/mlir/lib/Parser/Parser.cpp
+++ b/mlir/lib/Parser/Parser.cpp
@@ -3868,7 +3868,7 @@ public:
/// Parse a named dictionary into 'result' if it is present.
ParseResult
- parseOptionalAttributeDict(SmallVectorImpl<NamedAttribute> &result) override {
+ parseOptionalAttrDict(SmallVectorImpl<NamedAttribute> &result) override {
if (parser.getToken().isNot(Token::l_brace))
return success();
return parser.parseAttributeDict(result);
OpenPOWER on IntegriCloud