maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mlir] Don't use Optional::getValue (NFC)

This commit is contained in:
Kazu Hirata 2022-06-20 23:20:25 -07:00
parent 3815ae29b5
commit 6d5fc1e3d5
59 changed files with 108 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mlir/include/mlir/Dialect/MemRef/IR/MemRefOps.td
View File

@ -875,7 +875,7 @@ def MemRef_GlobalOp : MemRef_Op<"global", [Symbol]> {
let extraClassDeclaration = [{
bool isExternal() { return !initial_value(); }
bool isUninitialized() {
return !isExternal() && initial_value().getValue().isa<UnitAttr>();
return !isExternal() && initial_value()->isa<UnitAttr>();
}
/// Returns the constant initial value if the memref.global is a constant,
/// or null otherwise.

2
mlir/include/mlir/Dialect/SPIRV/IR/ParserUtils.h
View File

@ -32,7 +32,7 @@ parseEnumKeywordAttr(EnumClass &value, ParserType &parser,
if (parser.parseKeyword(&keyword))
return failure();
if (Optional<EnumClass> attr = spirv::symbolizeEnum<EnumClass>(keyword)) {
value = attr.getValue();
value = *attr;
return success();
}
return parser.emitError(loc, "invalid ")

2
mlir/include/mlir/IR/DialectImplementation.h
View File

@ -118,7 +118,7 @@ struct FieldParser<
auto element = FieldParser<ElementT>::parse(parser);
if (failed(element))
return failure();
elements.push_back(element.getValue());
elements.push_back(*element);
return success();
};
if (parser.parseCommaSeparatedList(elementParser))

2
mlir/lib/Analysis/Presburger/IntegerRelation.cpp
View File

@ -771,7 +771,7 @@ Optional<SmallVector<int64_t, 8>> IntegerRelation::findIntegerSample() const {
SmallVector<int64_t, 8> coneSample(llvm::map_range(shrunkenConeSample, ceil));
// 6) Return transform * concat(boundedSample, coneSample).
SmallVector<int64_t, 8> &sample = boundedSample.getValue();
SmallVector<int64_t, 8> &sample = *boundedSample;
sample.append(coneSample.begin(), coneSample.end());
return transform.postMultiplyWithColumn(sample);
}

4
mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp
View File

@ -224,7 +224,7 @@ public:
arith::symbolizeAtomicRMWKind(
static_cast<uint64_t>(reduction.cast<IntegerAttr>().getInt()));
assert(reductionOp && "Reduction operation cannot be of None Type");
arith::AtomicRMWKind reductionOpValue = reductionOp.getValue();
arith::AtomicRMWKind reductionOpValue = *reductionOp;
identityVals.push_back(
arith::getIdentityValue(reductionOpValue, resultType, rewriter, loc));
}
@ -244,7 +244,7 @@ public:
arith::symbolizeAtomicRMWKind(
reductions[i].cast<IntegerAttr>().getInt());
assert(reductionOp && "Reduction Operation cannot be of None Type");
arith::AtomicRMWKind reductionOpValue = reductionOp.getValue();
arith::AtomicRMWKind reductionOpValue = *reductionOp;
rewriter.setInsertionPoint(&parOp.getBody()->back());
auto reduceOp = rewriter.create<scf::ReduceOp>(
loc, affineParOpTerminator->getOperand(i));

2
mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
View File

@ -314,7 +314,7 @@ LogicalResult GPUModuleConversion::matchAndRewrite(
// Add a keyword to the module name to avoid symbolic conflict.
std::string spvModuleName = (kSPIRVModule + moduleOp.getName()).str();
auto spvModule = rewriter.create<spirv::ModuleOp>(
moduleOp.getLoc(), addressingModel, memoryModel.getValue(), llvm::None,
moduleOp.getLoc(), addressingModel, *memoryModel, llvm::None,
StringRef(spvModuleName));
// Move the region from the module op into the SPIR-V module.

5
mlir/lib/Conversion/GPUToVulkan/ConvertLaunchFuncToVulkanCalls.cpp
View File

@ -103,8 +103,7 @@ private:
/// Checks whether the given LLVM::CallOp is a vulkan launch call op.
bool isVulkanLaunchCallOp(LLVM::CallOp callOp) {
return (callOp.getCallee() &&
callOp.getCallee().getValue() == kVulkanLaunch &&
return (callOp.getCallee() && *callOp.getCallee() == kVulkanLaunch &&
callOp.getNumOperands() >= kVulkanLaunchNumConfigOperands);
}
@ -112,7 +111,7 @@ private:
/// op.
bool isCInterfaceVulkanLaunchCallOp(LLVM::CallOp callOp) {
return (callOp.getCallee() &&
callOp.getCallee().getValue() == kCInterfaceVulkanLaunch &&
*callOp.getCallee() == kCInterfaceVulkanLaunch &&
callOp.getNumOperands() >= kVulkanLaunchNumConfigOperands);
}

2
mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp
View File

@ -402,7 +402,7 @@ private:
// Take advantage if index is constant.
MemRefType memRefType = operandType.cast<MemRefType>();
if (Optional<int64_t> index = getConstantDimIndex(dimOp)) {
int64_t i = index.getValue();
int64_t i = *index;
if (memRefType.isDynamicDim(i)) {
// extract dynamic size from the memref descriptor.
MemRefDescriptor descriptor(adaptor.source());

2
mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp
View File

@ -121,7 +121,7 @@ static LogicalResult getKernelGlobalVariables(
/// Encodes the SPIR-V module's symbolic name into the name of the entry point
/// function.
static LogicalResult encodeKernelName(spirv::ModuleOp module) {
StringRef spvModuleName = module.sym_name().getValue();
StringRef spvModuleName = *module.sym_name();
// We already know that the module contains exactly one entry point function
// based on `getKernelGlobalVariables()` call. Update this function's name
// to:

5
mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
View File

@ -539,8 +539,7 @@ public:
ElementsAttr branchWeights = nullptr;
if (auto weights = op.branch_weights()) {
VectorType weightType = VectorType::get(2, rewriter.getI32Type());
branchWeights =
DenseElementsAttr::get(weightType, weights.getValue().getValue());
branchWeights = DenseElementsAttr::get(weightType, weights->getValue());
}
rewriter.replaceOpWithNewOp<LLVM::CondBrOp>(
@ -902,7 +901,7 @@ public:
/*isVolatile=*/false,
/*isNonTemporal=*/false);
}
auto memoryAccess = op.memory_access().getValue();
auto memoryAccess = *op.memory_access();
switch (memoryAccess) {
case spirv::MemoryAccess::Aligned:
case spirv::MemoryAccess::None:

2
mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp
View File

@ -1847,7 +1847,7 @@ public:
} else if (elementTy.isa<IntegerType>() && !padOp.quantization_info()) {
constantAttr = rewriter.getIntegerAttr(elementTy, 0);
} else if (elementTy.isa<IntegerType>() && padOp.quantization_info()) {
int64_t value = padOp.quantization_info().getValue().getInputZp();
int64_t value = padOp.quantization_info()->getInputZp();
constantAttr = rewriter.getIntegerAttr(elementTy, value);
}
if (constantAttr)

8
mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp
View File

@ -540,7 +540,7 @@ public:
return success();
}
auto quantizationInfo = op.quantization_info().getValue();
auto quantizationInfo = *op.quantization_info();
auto aZp = rewriter.create<arith::ConstantOp>(
loc, rewriter.getI32IntegerAttr(quantizationInfo.getAZp()));
auto bZp = rewriter.create<arith::ConstantOp>(
@ -650,7 +650,7 @@ public:
return success();
}
auto quantizationInfo = op.quantization_info().getValue();
auto quantizationInfo = *op.quantization_info();
auto inputZp = rewriter.create<arith::ConstantOp>(
loc, rewriter.getI32IntegerAttr(quantizationInfo.getInputZp()));
auto outputZp = rewriter.create<arith::ConstantOp>(
@ -890,7 +890,7 @@ public:
// If we have quantization information we need to apply an offset
// for the input zp value.
if (op.quantization_info()) {
auto quantizationInfo = op.quantization_info().getValue();
auto quantizationInfo = *op.quantization_info();
auto inputZp = rewriter.create<arith::ConstantOp>(
loc, b.getIntegerAttr(accETy, quantizationInfo.getInputZp()));
Value offset =
@ -926,7 +926,7 @@ public:
// If we have quantization information we need to apply output
// zeropoint.
if (op.quantization_info()) {
auto quantizationInfo = op.quantization_info().getValue();
auto quantizationInfo = *op.quantization_info();
auto outputZp = rewriter.create<arith::ConstantOp>(
loc, b.getIntegerAttr(scaled.getType(),
quantizationInfo.getOutputZp()));

2
mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp
View File

@ -171,7 +171,7 @@ static Value generateInBoundsCheck(
vector::createOrFoldDimOp(b, loc, xferOp.getSource(), *dim);
AffineExpr d0, d1;
bindDims(xferOp.getContext(), d0, d1);
Value base = xferOp.getIndices()[dim.getValue()];
Value base = xferOp.getIndices()[*dim];
Value memrefIdx = makeComposedAffineApply(b, loc, d0 + d1, {base, iv});
cond = lb.create<arith::CmpIOp>(arith::CmpIPredicate::sgt, memrefDim,
memrefIdx);

4
mlir/lib/Dialect/Affine/Analysis/Utils.cpp
View File

@ -634,7 +634,7 @@ Optional<int64_t> MemRefRegion::getRegionSize() {
LLVM_DEBUG(llvm::dbgs() << "Dynamic shapes not yet supported\n");
return None;
}
return getMemRefEltSizeInBytes(memRefType) * numElements.getValue();
return getMemRefEltSizeInBytes(memRefType) * *numElements;
}
/// Returns the size of memref data in bytes if it's statically shaped, None
@ -964,7 +964,7 @@ mlir::computeSliceUnion(ArrayRef<Operation *> opsA, ArrayRef<Operation *> opsB,
LLVM_DEBUG(llvm::dbgs() << "Cannot determine if the slice is valid\n");
return SliceComputationResult::GenericFailure;
}
if (!isSliceValid.getValue())
if (!*isSliceValid)
return SliceComputationResult::IncorrectSliceFailure;
return SliceComputationResult::Success;

4
mlir/lib/Dialect/Affine/Transforms/LoopFusion.cpp
View File

@ -639,7 +639,7 @@ static bool canRemoveSrcNodeAfterFusion(
return false;
}
if (!isMaximal.getValue()) {
if (!*isMaximal) {
LLVM_DEBUG(llvm::dbgs()
<< "Src loop can't be removed: fusion is not maximal\n");
return false;
@ -1247,7 +1247,7 @@ static bool isFusionProfitable(Operation *srcOpInst, Operation *srcStoreOpInst,
}
// Set dstLoopDepth based on best values from search.
*dstLoopDepth = bestDstLoopDepth.getValue();
*dstLoopDepth = *bestDstLoopDepth;
LLVM_DEBUG(
llvm::dbgs() << " LoopFusion fusion stats:"

4
mlir/lib/Dialect/Affine/Transforms/LoopTiling.cpp
View File

@ -73,7 +73,7 @@ static void adjustToDivisorsOfTripCounts(ArrayRef<AffineForOp> band,
continue;
// Adjust the tile size to largest factor of the trip count less than
// tSize.
uint64_t constTripCount = mayConst.getValue();
uint64_t constTripCount = *mayConst;
if (constTripCount > 1 && tSizeAdjusted > constTripCount / 2)
tSizeAdjusted = constTripCount / 2;
while (constTripCount % tSizeAdjusted != 0)
@ -129,7 +129,7 @@ void LoopTiling::getTileSizes(ArrayRef<AffineForOp> band,
// Check how many times larger the cache size is when compared to footprint.
uint64_t cacheSizeBytes = cacheSizeInKiB * 1024;
uint64_t excessFactor = llvm::divideCeil(fp.getValue(), cacheSizeBytes);
uint64_t excessFactor = llvm::divideCeil(*fp, cacheSizeBytes);
if (excessFactor <= 1) {
// No need of any tiling - set tile size to 1.
std::fill(tileSizes->begin(), tileSizes->end(), 1);

4
mlir/lib/Dialect/Affine/Utils/LoopFusionUtils.cpp
View File

@ -370,7 +370,7 @@ LogicalResult promoteSingleIterReductionLoop(AffineForOp forOp,
bool siblingFusionUser) {
// Check if the reduction loop is a single iteration loop.
Optional<uint64_t> tripCount = getConstantTripCount(forOp);
if (!tripCount || tripCount.getValue() != 1)
if (!tripCount || *tripCount != 1)
return failure();
auto iterOperands = forOp.getIterOperands();
auto *parentOp = forOp->getParentOp();
@ -509,7 +509,7 @@ bool mlir::getLoopNestStats(AffineForOp forOpRoot, LoopNestStats *stats) {
return WalkResult::interrupt();
}
stats->tripCountMap[childForOp] = maybeConstTripCount.getValue();
stats->tripCountMap[childForOp] = *maybeConstTripCount;
return WalkResult::advance();
});
return !walkResult.wasInterrupted();

13
mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp
View File

@ -130,7 +130,7 @@ static void replaceIterArgsAndYieldResults(AffineForOp forOp) {
// TODO: extend this for arbitrary affine bounds.
LogicalResult mlir::promoteIfSingleIteration(AffineForOp forOp) {
Optional<uint64_t> tripCount = getConstantTripCount(forOp);
if (!tripCount || tripCount.getValue() != 1)
if (!tripCount || *tripCount != 1)
return failure();
if (forOp.getLowerBoundMap().getNumResults() != 1)
@ -250,7 +250,7 @@ LogicalResult mlir::affineForOpBodySkew(AffineForOp forOp,
LLVM_DEBUG(forOp.emitRemark("non-constant trip count loop not handled"));
return success();
}
uint64_t tripCount = mayBeConstTripCount.getValue();
uint64_t tripCount = *mayBeConstTripCount;
assert(isOpwiseShiftValid(forOp, shifts) &&
"shifts will lead to an invalid transformation\n");
@ -1437,7 +1437,7 @@ static bool checkLoopInterchangeDependences(
for (unsigned j = 0; j < maxLoopDepth; ++j) {
unsigned permIndex = loopPermMapInv[j];
assert(depComps[permIndex].lb);
int64_t depCompLb = depComps[permIndex].lb.getValue();
int64_t depCompLb = *depComps[permIndex].lb;
if (depCompLb > 0)
break;
if (depCompLb < 0)
@ -2095,7 +2095,7 @@ static LogicalResult generateCopy(
return failure();
}
if (numElements.getValue() == 0) {
if (*numElements == 0) {
LLVM_DEBUG(llvm::dbgs() << "Nothing to copy\n");
*sizeInBytes = 0;
return success();
@ -2173,7 +2173,7 @@ static LogicalResult generateCopy(
// Record it.
fastBufferMap[memref] = fastMemRef;
// fastMemRefType is a constant shaped memref.
*sizeInBytes = getMemRefSizeInBytes(fastMemRefType).getValue();
*sizeInBytes = *getMemRefSizeInBytes(fastMemRefType);
LLVM_DEBUG(emitRemarkForBlock(*block)
<< "Creating fast buffer of type " << fastMemRefType
<< " and size " << llvm::divideCeil(*sizeInBytes, 1024)
@ -2184,8 +2184,7 @@ static LogicalResult generateCopy(
*sizeInBytes = 0;
}
auto numElementsSSA =
top.create<arith::ConstantIndexOp>(loc, numElements.getValue());
auto numElementsSSA = top.create<arith::ConstantIndexOp>(loc, *numElements);
Value dmaStride = nullptr;
Value numEltPerDmaStride = nullptr;

2
mlir/lib/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.cpp
View File

@ -41,7 +41,7 @@ struct ConstantOpInterface
getGlobalFor(constantOp, options.bufferAlignment);
if (failed(globalOp))
return failure();
memref::GlobalOp globalMemref = globalOp.getValue();
memref::GlobalOp globalMemref = *globalOp;
replaceOpWithNewBufferizedOp<memref::GetGlobalOp>(
rewriter, op, globalMemref.type(), globalMemref.getName());

2
mlir/lib/Dialect/Async/Transforms/AsyncRuntimeRefCounting.cpp
View File

@ -498,7 +498,7 @@ AsyncRuntimePolicyBasedRefCountingPass::addRefCounting(Value value) {
if (failed(refCount))
return failure();
int cnt = refCount.getValue();
int cnt = *refCount;
// Create `add_ref` operation before the operand owner.
if (cnt > 0) {

3
mlir/lib/Dialect/Bufferization/Transforms/FuncBufferizableOpInterfaceImpl.cpp
View File

@ -246,8 +246,7 @@ struct CallOpInterface
getAliasingOpOperand(op, opResult, state);
assert(aliasingOpOperands.size() == 1 &&
"expected exactly 1 aliasing OpOperand");
assert(aliasingOpOperands.front()->getOperandNumber() ==
maybeEquiv.getValue() &&
assert(aliasingOpOperands.front()->getOperandNumber() == *maybeEquiv &&
"inconsistent analysis state");
#endif
return BufferRelation::Equivalent;

2
mlir/lib/Dialect/ControlFlow/IR/ControlFlowOps.cpp
View File

@ -745,7 +745,7 @@ static LogicalResult simplifyPassThroughSwitch(SwitchOp op,
return failure();
rewriter.replaceOpWithNewOp<SwitchOp>(op, op.getFlag(), defaultDest,
defaultOperands, caseValues.getValue(),
defaultOperands, *caseValues,
newCaseDests, newCaseOperands);
return success();
}

4
mlir/lib/Dialect/EmitC/IR/EmitC.cpp
View File

@ -85,7 +85,7 @@ LogicalResult emitc::CallOp::verify() {
return emitOpError("callee must not be empty");
if (Optional<ArrayAttr> argsAttr = args()) {
for (Attribute arg : argsAttr.getValue()) {
for (Attribute arg : *argsAttr) {
if (arg.getType().isa<IndexType>()) {
int64_t index = arg.cast<IntegerAttr>().getInt();
// Args with elements of type index must be in range
@ -101,7 +101,7 @@ LogicalResult emitc::CallOp::verify() {
}
if (Optional<ArrayAttr> templateArgsAttr = template_args()) {
for (Attribute tArg : templateArgsAttr.getValue()) {
for (Attribute tArg : *templateArgsAttr) {
if (!tArg.isa<TypeAttr>() && !tArg.isa<IntegerAttr>() &&
!tArg.isa<FloatAttr>() && !tArg.isa<emitc::OpaqueAttr>())
return emitOpError("template argument has invalid type");

2
mlir/lib/Dialect/GPU/Transforms/SerializeToHsaco.cpp
View File

@ -292,7 +292,7 @@ SerializeToHsacoPass::translateToLLVMIR(llvm::LLVMContext &llvmContext) {
}
llvm::Linker linker(*ret);
for (std::unique_ptr<llvm::Module> &libModule : mbModules.getValue()) {
for (std::unique_ptr<llvm::Module> &libModule : *mbModules) {
// This bitcode linking code is substantially similar to what is used in
// hip-clang It imports the library functions into the module, allowing LLVM
// optimization passes (which must run after linking) to optimize across the

8
mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
View File

@ -158,7 +158,7 @@ static ParseResult parseCmpOp(OpAsmParser &parser, OperationState &result) {
return parser.emitError(predicateLoc)
<< "'" << predicateAttr.getValue()
<< "' is an incorrect value of the 'predicate' attribute";
predicateValue = static_cast<int64_t>(predicate.getValue());
predicateValue = static_cast<int64_t>(*predicate);
} else {
Optional<FCmpPredicate> predicate =
symbolizeFCmpPredicate(predicateAttr.getValue());
@ -166,7 +166,7 @@ static ParseResult parseCmpOp(OpAsmParser &parser, OperationState &result) {
return parser.emitError(predicateLoc)
<< "'" << predicateAttr.getValue()
<< "' is an incorrect value of the 'predicate' attribute";
predicateValue = static_cast<int64_t>(predicate.getValue());
predicateValue = static_cast<int64_t>(*predicate);
}
result.attributes.set("predicate",
@ -2425,7 +2425,7 @@ static ParseResult parseAtomicBinOp(OpAsmParser &parser, OperationState &result,
<< "' attribute";
}
auto value = static_cast<int64_t>(kind.getValue());
auto value = static_cast<int64_t>(*kind);
auto attr = parser.getBuilder().getI64IntegerAttr(value);
result.addAttribute(attrName, attr);
@ -2452,7 +2452,7 @@ static ParseResult parseAtomicOrdering(OpAsmParser &parser,
<< "' attribute";
}
auto value = static_cast<int64_t>(kind.getValue());
auto value = static_cast<int64_t>(*kind);
auto attr = parser.getBuilder().getI64IntegerAttr(value);
result.addAttribute(attrName, attr);

6
mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp
View File

@ -372,7 +372,7 @@ LogicalResult MmaOp::verify() {
if (mmaShape[0] == 16) {
int64_t kFactor;
Type multiplicandFragType;
switch (getMultiplicandAPtxType().getValue()) {
switch (*getMultiplicandAPtxType()) {
case MMATypes::tf32:
kFactor = 4;
multiplicandFragType = i32Ty;
@ -421,7 +421,7 @@ LogicalResult MmaOp::verify() {
// In the M=8 case, there is only 1 possible case per data type.
if (mmaShape[0] == 8) {
if (getMultiplicandAPtxType().getValue() == MMATypes::f16) {
if (*getMultiplicandAPtxType() == MMATypes::f16) {
expectedA.emplace_back(2, f16x2Ty);
expectedB.emplace_back(2, f16x2Ty);
expectedResult.push_back(f16x2x4StructTy);
@ -430,7 +430,7 @@ LogicalResult MmaOp::verify() {
expectedC.emplace_back(8, f32Ty);
allowedShapes.push_back({8, 8, 4});
}
if (getMultiplicandAPtxType().getValue() == MMATypes::f64) {
if (*getMultiplicandAPtxType() == MMATypes::f64) {
Type f64Ty = Float64Type::get(context);
expectedA.emplace_back(1, f64Ty);
expectedB.emplace_back(1, f64Ty);

2
mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
View File

@ -1472,7 +1472,7 @@ AffineMap mlir::linalg::extractOrIdentityMap(Optional<AffineMap> maybeMap,
unsigned rank,
MLIRContext *context) {
if (maybeMap)
return maybeMap.getValue();
return *maybeMap;
if (rank == 0)
return AffineMap::get(context);
return AffineMap::getMultiDimIdentityMap(rank, context);

6
mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp
View File

@ -841,7 +841,7 @@ public:
fuseWithReshapeByExpansion(genericOp, reshapeOp, opOperand, rewriter);
if (!replacementValues)
return failure();
rewriter.replaceOp(genericOp, replacementValues.getValue());
rewriter.replaceOp(genericOp, *replacementValues);
return success();
}
return failure();
@ -876,7 +876,7 @@ struct FoldReshapeWithGenericOpByExpansion
producer, reshapeOp, producer.getOutputOperand(0), rewriter);
if (!replacementValues)
return failure();
rewriter.replaceOp(reshapeOp, replacementValues.getValue());
rewriter.replaceOp(reshapeOp, *replacementValues);
return success();
}
@ -1465,7 +1465,7 @@ public:
genericOp, "failed to do the fusion by collapsing transformation");
}
rewriter.replaceOp(genericOp, replacements.getValue());
rewriter.replaceOp(genericOp, *replacements);
return success();
}
return failure();

5
mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp
View File

@ -302,8 +302,7 @@ findFusableProducer(OpOperand &consumerOpOperand,
elem.getIndexingOpViewOperandNum();
return isa<LinalgOp>(elem.getDependentOp()) &&
v == consumerOpOperand.get() && operandNum &&
operandNum.getValue() ==
consumerOpOperand.getOperandNumber();
*operandNum == consumerOpOperand.getOperandNumber();
})) {
// Consumer consumes this view, `isStructurallyFusableProducer` also
// checks whether it is a strict subview of the producer view.
@ -533,7 +532,7 @@ static bool doesTransposeAccess(AffineMap map,
lastFusableLoop = pos;
continue;
}
if (pos <= lastFusableLoop.getValue())
if (pos <= *lastFusableLoop)
return true;
lastFusableLoop = pos;
}

3
mlir/lib/Dialect/Linalg/Transforms/FusionOnTensors.cpp
View File

@ -288,8 +288,7 @@ LogicalResult TileLoopNest::tileRootOp(
.setTileSizes(tileSizes)
.setLoopType(LinalgTilingLoopType::Loops);
if (tileDistribution)
tilingOptions =
tilingOptions.setDistributionOptions(tileDistribution.getValue());
tilingOptions = tilingOptions.setDistributionOptions(*tileDistribution);
// TODO: Propagate RewriterBase everywhere.
IRRewriter rewriter(b);

12
mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp
View File

@ -116,7 +116,7 @@ bool mlir::linalg::LinalgTransformationFilter::hasReplacementFilter(
return false;
auto attr = op->getAttr(LinalgTransforms::kLinalgTransformMarker)
.dyn_cast<StringAttr>();
return attr && attr == replacement.getValue();
return attr && attr == *replacement;
}
LinalgTilingOptions &
@ -239,7 +239,7 @@ static FailureOr<Value> padOperandToSmallestStaticBoundingBox(
LLVM_DEBUG(DBGS() << "No constant bounding box can be found for padding");
return failure();
}
paddedShape[shapeIdx++] = upperBound.getValue();
paddedShape[shapeIdx++] = *upperBound;
}
assert(shapeIdx == static_cast<int64_t>(shape.size()) &&
"expect the dynamic and static ranks to match");
@ -393,7 +393,7 @@ LogicalResult mlir::linalg::LinalgBaseTileAndFusePattern::matchAndRewrite(
// could assert, but continue if this is not the case.
if (!operandNumber)
continue;
if (!fusionOptions.indicesToFuse.count(operandNumber.getValue()))
if (!fusionOptions.indicesToFuse.count(*operandNumber))
continue;
if (isa<LinalgOp>(dependence.getDependentOp()))
producers.insert(dependence.getDependentOp());
@ -554,7 +554,7 @@ mlir::linalg::LinalgPaddingPattern::returningMatchAndRewrite(
padOp, en.value(), transposeVector, hoistedOp, transposeOps);
if (failed(newResult))
continue;
rewriter.replaceOp(padOp, newResult.getValue());
rewriter.replaceOp(padOp, *newResult);
// Do not apply hoist padding to the newly introduced transpose operations.
for (GenericOp transposeOp : transposeOps)
@ -562,7 +562,7 @@ mlir::linalg::LinalgPaddingPattern::returningMatchAndRewrite(
}
// Replace the original operation to pad.
rewriter.replaceOp(linalgOp, newResults.getValue());
rewriter.replaceOp(linalgOp, *newResults);
filter.replaceLinalgTransformationFilter(rewriter, paddedOp);
return paddedOp;
@ -969,7 +969,7 @@ LogicalResult ExtractSliceOfPadTensorSwapPattern::matchAndRewrite(
bool zeroSliceGuard = true;
if (controlFn) {
if (Optional<bool> control = controlFn(sliceOp))
zeroSliceGuard = control.getValue();
zeroSliceGuard = *control;
else
return failure();
}

5
mlir/lib/Dialect/Linalg/Utils/Utils.cpp
View File

@ -257,8 +257,7 @@ void getUpperBoundForIndex(Value value, AffineMap &boundMap,
if (!ubConst)
return;
boundMap =
AffineMap::getConstantMap(ubConst.getValue(), value.getContext());
boundMap = AffineMap::getConstantMap(*ubConst, value.getContext());
return;
}
@ -714,7 +713,7 @@ void GenerateLoopNest<scf::ParallelOp>::doit(
// Modify the lb, ub, and step based on the distribution options.
SmallVector<DistributionMethod, 0> distributionMethod;
if (distributionOptions) {
auto &options = distributionOptions.getValue();
auto &options = *distributionOptions;
distributionMethod.assign(distributionOptions->distributionMethod.begin(),
distributionOptions->distributionMethod.end());
SmallVector<Range, 2> parallelLoopRanges;

8
mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp
View File

@ -762,7 +762,7 @@ LogicalResult DimOp::verify() {
// Check that constant index is not knowingly out of range.
auto type = source().getType();
if (auto memrefType = type.dyn_cast<MemRefType>()) {
if (index.getValue() >= memrefType.getRank())
if (*index >= memrefType.getRank())
return emitOpError("index is out of range");
} else if (type.isa<UnrankedMemRefType>()) {
// Assume index to be in range.
@ -1316,7 +1316,7 @@ LogicalResult GlobalOp::verify() {
}
if (Optional<uint64_t> alignAttr = alignment()) {
uint64_t alignment = alignAttr.getValue();
uint64_t alignment = *alignAttr;
if (!llvm::isPowerOf2_64(alignment))
return emitError() << "alignment attribute value " << alignment
@ -2452,7 +2452,7 @@ static MemRefType getCanonicalSubViewResultType(
}
AffineMap layoutMap = nonRankReducedType.getLayout().getAffineMap();
if (!layoutMap.isIdentity())
layoutMap = getProjectedMap(layoutMap, unusedDims.getValue());
layoutMap = getProjectedMap(layoutMap, *unusedDims);
return MemRefType::get(shape, nonRankReducedType.getElementType(), layoutMap,
nonRankReducedType.getMemorySpace());
}
@ -2499,7 +2499,7 @@ static bool isTrivialSubViewOp(SubViewOp subViewOp) {
ArrayRef<int64_t> sourceShape = subViewOp.getSourceType().getShape();
for (const auto &size : llvm::enumerate(mixedSizes)) {
Optional<int64_t> intValue = getConstantIntValue(size.value());
if (!intValue || intValue.getValue() != sourceShape[size.index()])
if (!intValue || *intValue != sourceShape[size.index()])
return false;
}
// All conditions met. The `SubViewOp` is foldable as a no-op.

3
mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
View File

@ -791,8 +791,7 @@ LogicalResult OrderedOp::verify() {
<< "nested inside a worksharing-loop with ordered "
<< "clause with parameter present";
if (container.ordered_valAttr().getInt() !=
(int64_t)num_loops_val().getValue())
if (container.ordered_valAttr().getInt() != (int64_t)*num_loops_val())
return emitOpError() << "number of variables in depend clause does not "
<< "match number of iteration variables in the "
<< "doacross loop";

2
mlir/lib/Dialect/SCF/IR/SCF.cpp
View File

@ -497,7 +497,7 @@ void ForOp::getSuccessorRegions(Optional<unsigned> index,
}
// Otherwise, the loop may branch back to itself or the parent operation.
assert(index.getValue() == 0 && "expected loop region");
assert(*index == 0 && "expected loop region");
regions.push_back(RegionSuccessor(&getLoopBody(), getRegionIterArgs()));
regions.push_back(RegionSuccessor(getResults()));
}

6
mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
View File

@ -268,7 +268,7 @@ static LogicalResult parseOptionalArrayStride(const SPIRVDialect &dialect,
if (!optStride)
return failure();
if (!(stride = optStride.getValue())) {
if (!(stride = *optStride)) {
parser.emitError(strideLoc, "ArrayStride must be greater than zero");
return failure();
}
@ -507,7 +507,7 @@ template <typename ParseType> struct ParseCommaSeparatedList<ParseType> {
Optional<std::tuple<ParseType>> operator()(SPIRVDialect const &dialect,
DialectAsmParser &parser) const {
if (auto value = parseAndVerify<ParseType>(dialect, parser))
return std::tuple<ParseType>(value.getValue());
return std::tuple<ParseType>(*value);
return llvm::None;
}
};
@ -542,7 +542,7 @@ static Type parseImageType(SPIRVDialect const &dialect,
if (parser.parseGreater())
return Type();
return ImageType::get(value.getValue());
return ImageType::get(*value);
}
// sampledImage-type :: = `!spv.sampledImage<` image-type `>`

4
mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
View File

@ -188,7 +188,7 @@ parseEnumStrAttr(EnumClass &value, OpAsmParser &parser,
return parser.emitError(loc, "invalid ")
<< attrName << " attribute specification: " << attrVal;
}
value = attrOptional.getValue();
value = *attrOptional;
return success();
}
@ -2497,7 +2497,7 @@ void spirv::GlobalVariableOp::print(OpAsmPrinter &printer) {
// Print optional initializer
if (auto initializer = this->initializer()) {
printer << " " << kInitializerAttrName << '(';
printer.printSymbolName(initializer.getValue());
printer.printSymbolName(*initializer);
printer << ')';
elidedAttrs.push_back(kInitializerAttrName);
}

8
mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp
View File

@ -207,7 +207,7 @@ getTypeNumBytes(const SPIRVTypeConverter::Options &options, Type type) {
auto elementSize = getTypeNumBytes(options, vecType.getElementType());
if (!elementSize)
return llvm::None;
return vecType.getNumElements() * elementSize.getValue();
return vecType.getNumElements() * *elementSize;
}
if (auto memRefType = type.dyn_cast<MemRefType>()) {
@ -239,7 +239,7 @@ getTypeNumBytes(const SPIRVTypeConverter::Options &options, Type type) {
for (const auto &shape : enumerate(dims))
memrefSize = std::max(memrefSize, shape.value() * strides[shape.index()]);
return (offset + memrefSize) * elementSize.getValue();
return (offset + memrefSize) * *elementSize;
}
if (auto tensorType = type.dyn_cast<TensorType>()) {
@ -250,7 +250,7 @@ getTypeNumBytes(const SPIRVTypeConverter::Options &options, Type type) {
if (!elementSize)
return llvm::None;
int64_t size = elementSize.getValue();
int64_t size = *elementSize;
for (auto shape : tensorType.getShape())
size *= shape;
@ -604,7 +604,7 @@ static spirv::GlobalVariableOp getBuiltinVariable(Block &body,
spirv::SPIRVDialect::getAttributeName(
spirv::Decoration::BuiltIn))) {
auto varBuiltIn = spirv::symbolizeBuiltIn(builtinAttr.getValue());
if (varBuiltIn && varBuiltIn.getValue() == builtin) {
if (varBuiltIn && *varBuiltIn == builtin) {
return varOp;
}
}

2
mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorConversion.cpp
View File

@ -415,7 +415,7 @@ public:
return failure();
// Generate the call.
Value src = adaptor.getOperands()[0];
int64_t idx = index.getValue();
int64_t idx = *index;
rewriter.replaceOp(op, genDimSizeCall(rewriter, op, enc, src, idx));
return success();
}

4
mlir/lib/Dialect/Tensor/IR/TensorOps.cpp
View File

@ -309,7 +309,7 @@ LogicalResult DimOp::verify() {
// Check that constant index is not knowingly out of range.
auto type = source().getType();
if (auto tensorType = type.dyn_cast<RankedTensorType>()) {
if (index.getValue() >= tensorType.getRank())
if (*index >= tensorType.getRank())
return emitOpError("index is out of range");
} else if (type.isa<UnrankedTensorType>()) {
// Assume index to be in range.
@ -1138,7 +1138,7 @@ llvm::SmallBitVector ExtractSliceOp::getDroppedDims() {
// If the size is not 1, or if the current matched dimension of the result
// is the same static shape as the size value (which is 1), then the
// dimension is preserved.
if (!sizeVal || sizeVal.getValue() != 1 ||
if (!sizeVal || *sizeVal != 1 ||
(shapePos < resultShape.size() && resultShape[shapePos] == 1)) {
shapePos++;
continue;

2
mlir/lib/Dialect/Tensor/Transforms/SplitPadding.cpp
View File

@ -27,7 +27,7 @@ using namespace mlir;
/// Returns true if the the given `attrOrValue` is a constant zero.
static bool isZero(OpFoldResult attrOrValue) {
if (Optional<int64_t> val = getConstantIntValue(attrOrValue))
return val.getValue() == 0;
return *val == 0;
return false;
}

2
mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
View File

@ -347,7 +347,7 @@ struct MaterializePadValue : public OpRewritePattern<tosa::PadOp> {
} else if (elementTy.isa<IntegerType>() && !op.quantization_info()) {
constantAttr = rewriter.getIntegerAttr(elementTy, 0);
} else if (elementTy.isa<IntegerType>() && op.quantization_info()) {
auto value = op.quantization_info().getValue().getInputZp();
auto value = op.quantization_info()->getInputZp();
constantAttr = rewriter.getIntegerAttr(elementTy, value);
}

2
mlir/lib/Dialect/Tosa/Transforms/TosaDecomposeConv2D.cpp
View File

@ -87,7 +87,7 @@ struct Conv2DIsFullyConnected : public OpRewritePattern<tosa::Conv2DOp> {
rewriter
.create<tosa::FullyConnectedOp>(
op.getLoc(), fullyConnectedShapeType, reshapedInput,
reshapedWeight, op.bias(), op.quantization_info().getValue())
reshapedWeight, op.bias(), *op.quantization_info())
.getResult();
} else {
fullyConnectedValue = rewriter

5
mlir/lib/Dialect/Tosa/Transforms/TosaDecomposeTransposeConv.cpp
View File

@ -134,8 +134,7 @@ public:
conv2d = rewriter.create<tosa::Conv2DOp>(
loc, resultTy, input, reverse2, bias,
rewriter.getI64ArrayAttr(convPad), rewriter.getI64ArrayAttr(stride),
rewriter.getI64ArrayAttr(dilation),
op.quantization_info().getValue());
rewriter.getI64ArrayAttr(dilation), *op.quantization_info());
} else {
conv2d = rewriter.create<tosa::Conv2DOp>(
loc, resultTy, input, reverse2, bias,
@ -304,7 +303,7 @@ public:
/*pad=*/rewriter.getI64ArrayAttr({0, 0, 0, 0}),
/*stride=*/rewriter.getI64ArrayAttr({1, 1}),
/*dilation=*/rewriter.getI64ArrayAttr({1, 1}),
op.quantization_info().getValue())
*op.quantization_info())
.getResult();
} else {
conv2d = createOpAndInfer<tosa::Conv2DOp>(

2
mlir/lib/Dialect/Vector/IR/VectorOps.cpp
View File

@ -272,7 +272,7 @@ Attribute CombiningKindAttr::parse(AsmParser &parser, Type type) {
if (failed(parser.parseGreater()))
return {};
return CombiningKindAttr::get(kind.getValue(), parser.getContext());
return CombiningKindAttr::get(*kind, parser.getContext());
}
Attribute VectorDialect::parseAttribute(DialectAsmParser &parser,

2
mlir/lib/ExecutionEngine/ExecutionEngine.cpp
View File

@ -303,7 +303,7 @@ ExecutionEngine::create(ModuleOp m, const ExecutionEngineOptions &options) {
auto compileFunctionCreator = [&](JITTargetMachineBuilder jtmb)
-> Expected<std::unique_ptr<IRCompileLayer::IRCompiler>> {
if (options.jitCodeGenOptLevel)
jtmb.setCodeGenOptLevel(options.jitCodeGenOptLevel.getValue());
jtmb.setCodeGenOptLevel(*options.jitCodeGenOptLevel);
auto tm = jtmb.createTargetMachine();
if (!tm)
return tm.takeError();

3
mlir/lib/ExecutionEngine/JitRunner.cpp
View File

@ -148,8 +148,7 @@ static Error compileAndExecute(Options &options, ModuleOp module,
CompileAndExecuteConfig config, void **args) {
Optional<llvm::CodeGenOpt::Level> jitCodeGenOptLevel;
if (auto clOptLevel = getCommandLineOptLevel(options))
jitCodeGenOptLevel =
static_cast<llvm::CodeGenOpt::Level>(clOptLevel.getValue());
jitCodeGenOptLevel = static_cast<llvm::CodeGenOpt::Level>(*clOptLevel);
// If shared library implements custom mlir-runner library init and destroy
// functions, we'll use them to register the library with the execution

3
mlir/lib/IR/AffineExpr.cpp
View File

@ -580,8 +580,7 @@ static AffineExpr simplifyAdd(AffineExpr lhs, AffineExpr rhs) {
if (rLhsConst && rRhsConst && firstExpr == secondExpr)
return getAffineBinaryOpExpr(
AffineExprKind::Mul, firstExpr,
getAffineConstantExpr(rLhsConst.getValue() + rRhsConst.getValue(),
lhs.getContext()));
getAffineConstantExpr(*rLhsConst + *rRhsConst, lhs.getContext()));
// When doing successive additions, bring constant to the right: turn (d0 + 2)
// + d1 into (d0 + d1) + 2.

4
mlir/lib/Parser/AttributeParser.cpp
View File

@ -325,7 +325,7 @@ Attribute Parser::parseFloatAttr(Type type, bool isNegative) {
if (!type.isa<FloatType>())
return (emitError("floating point value not valid for specified type"),
nullptr);
return FloatAttr::get(type, isNegative ? -val.getValue() : val.getValue());
return FloatAttr::get(type, isNegative ? -*val : *val);
}
/// Construct an APint from a parsed value, a known attribute type and
@ -696,7 +696,7 @@ DenseElementsAttr TensorLiteralParser::getHexAttr(SMLoc loc,
}
std::string data;
if (parseElementAttrHexValues(p, hexStorage.getValue(), data))
if (parseElementAttrHexValues(p, *hexStorage, data))
return nullptr;
ArrayRef<char> rawData(data.data(), data.size());

2
mlir/lib/Parser/Parser.cpp
View File

@ -776,7 +776,7 @@ ParseResult OperationParser::parseSSAUse(UnresolvedOperand &result,
return emitError("result number not allowed in argument list");
if (auto value = getToken().getHashIdentifierNumber())
result.number = value.getValue();
result.number = *value;
else
return emitError("invalid SSA value result number");
consumeToken(Token::hash_identifier);

6
mlir/lib/Parser/TypeParser.cpp
View File

@ -161,7 +161,7 @@ ParseResult Parser::parseStridedLayout(int64_t &offset,
bool question = getToken().is(Token::question);
if (!maybeOffset && !question)
return emitWrongTokenError("invalid offset");
offset = maybeOffset ? static_cast<int64_t>(maybeOffset.getValue())
offset = maybeOffset ? static_cast<int64_t>(*maybeOffset)
: MemRefType::getDynamicStrideOrOffset();
consumeToken();
@ -323,7 +323,7 @@ Type Parser::parseNonFunctionType() {
signSemantics = *signedness ? IntegerType::Signed : IntegerType::Unsigned;
consumeToken(Token::inttype);
return IntegerType::get(getContext(), width.getValue(), signSemantics);
return IntegerType::get(getContext(), *width, signSemantics);
}
// float-type
@ -590,7 +590,7 @@ ParseResult Parser::parseIntegerInDimensionList(int64_t &value) {
if (!dimension ||
*dimension > (uint64_t)std::numeric_limits<int64_t>::max())
return emitError("invalid dimension");
value = (int64_t)dimension.getValue();
value = (int64_t)*dimension;
consumeToken(Token::integer);
}
return success();

2
mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
View File

@ -536,7 +536,7 @@ convertOmpOrdered(Operation &opInst, llvm::IRBuilderBase &builder,
omp::ClauseDepend dependType = *orderedOp.depend_type_val();
bool isDependSource = dependType == omp::ClauseDepend::dependsource;
unsigned numLoops = orderedOp.num_loops_val().getValue();
unsigned numLoops = *orderedOp.num_loops_val();
SmallVector<llvm::Value *> vecValues =
moduleTranslation.lookupValues(orderedOp.depend_vec_vars());

4
mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
View File

@ -1005,7 +1005,7 @@ LogicalResult ModuleTranslation::createAliasScopeMetadata() {
llvm::SmallVector<llvm::Metadata *, 2> operands;
operands.push_back({}); // Placeholder for self-reference
if (Optional<StringRef> description = op.getDescription())
operands.push_back(llvm::MDString::get(ctx, description.getValue()));
operands.push_back(llvm::MDString::get(ctx, *description));
llvm::MDNode *domain = llvm::MDNode::get(ctx, operands);
domain->replaceOperandWith(0, domain); // Self-reference for uniqueness
aliasScopeDomainMetadataMapping.insert({op, domain});
@ -1024,7 +1024,7 @@ LogicalResult ModuleTranslation::createAliasScopeMetadata() {
operands.push_back({}); // Placeholder for self-reference
operands.push_back(domain);
if (Optional<StringRef> description = op.getDescription())
operands.push_back(llvm::MDString::get(ctx, description.getValue()));
operands.push_back(llvm::MDString::get(ctx, *description));
llvm::MDNode *scope = llvm::MDNode::get(ctx, operands);
scope->replaceOperandWith(0, scope); // Self-reference for uniqueness
aliasScopeMetadataMapping.insert({op, scope});

4
mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp
View File

@ -143,7 +143,7 @@ Serializer::processSpecConstantOperationOp(spirv::SpecConstantOperationOp op) {
return failure();
}
operands.push_back(static_cast<uint32_t>(enclosedOpcode.getValue()));
operands.push_back(static_cast<uint32_t>(*enclosedOpcode));
// Append operands to the enclosed op to the list of operands.
for (Value operand : enclosedOp.getOperands()) {
@ -332,7 +332,7 @@ Serializer::processGlobalVariableOp(spirv::GlobalVariableOp varOp) {
// Encode initialization.
if (auto initializer = varOp.initializer()) {
auto initializerID = getVariableID(initializer.getValue());
auto initializerID = getVariableID(*initializer);
if (!initializerID) {
return emitError(varOp.getLoc(),
"invalid usage of undefined variable as initializer");

6
mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
View File

@ -210,7 +210,7 @@ LogicalResult Serializer::processDecoration(Location loc, uint32_t resultID,
<< attrName;
}
SmallVector<uint32_t, 1> args;
switch (decoration.getValue()) {
switch (*decoration) {
case spirv::Decoration::Binding:
case spirv::Decoration::DescriptorSet:
case spirv::Decoration::Location:
@ -223,7 +223,7 @@ LogicalResult Serializer::processDecoration(Location loc, uint32_t resultID,
if (auto strAttr = attr.getValue().dyn_cast<StringAttr>()) {
auto enumVal = spirv::symbolizeBuiltIn(strAttr.getValue());
if (enumVal) {
args.push_back(static_cast<uint32_t>(enumVal.getValue()));
args.push_back(static_cast<uint32_t>(*enumVal));
break;
}
return emitError(loc, "invalid ")
@ -244,7 +244,7 @@ LogicalResult Serializer::processDecoration(Location loc, uint32_t resultID,
default:
return emitError(loc, "unhandled decoration ") << decorationName;
}
return emitDecoration(resultID, decoration.getValue(), args);
return emitDecoration(resultID, *decoration, args);
}
LogicalResult Serializer::processName(uint32_t resultID, StringRef name) {

4
mlir/lib/Transforms/Utils/DialectConversion.cpp
View File

@ -1337,7 +1337,7 @@ FailureOr<Block *> ConversionPatternRewriterImpl::convertBlockSignature(
argReplacements);
if (failed(result))
return failure();
if (Block *newBlock = result.getValue()) {
if (Block *newBlock = *result) {
if (newBlock != block)
blockActions.push_back(BlockAction::getTypeConversion(newBlock));
}
@ -3044,7 +3044,7 @@ Value TypeConverter::materializeConversion(
OpBuilder &builder, Location loc, Type resultType, ValueRange inputs) {
for (MaterializationCallbackFn &fn : llvm::reverse(materializations))
if (Optional<Value> result = fn(builder, resultType, inputs, loc))
return result.getValue();
return *result;
return nullptr;
}

2
mlir/test/lib/Dialect/Test/TestTypes.h
View File

@ -61,7 +61,7 @@ struct FieldParser<test::CustomParam> {
auto value = FieldParser<int>::parse(parser);
if (failed(value))
return failure();
return test::CustomParam{value.getValue()};
return test::CustomParam{*value};
}
};

2
mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp
View File

@ -419,7 +419,7 @@ findTypeValue(StringRef typeVar, SmallVectorImpl<LinalgOperandDef> &args) {
it.value().kind != LinalgOperandDefKind::Scalar &&
it.value().kind != LinalgOperandDefKind::OutputTensor)
continue;
if (it.value().typeVar.getValue() == typeVar)
if (*it.value().typeVar == typeVar)
return llvm::formatv("block.getArgument({0}).getType()", it.index())
.str();
}

2
mlir/tools/mlir-tblgen/OpFormatGen.cpp
View File

@ -1043,7 +1043,7 @@ static void genEnumAttrParser(const NamedAttribute *var, MethodBody &body,
{
llvm::raw_string_ostream os(attrBuilderStr);
os << tgfmt(enumAttr.getConstBuilderTemplate(), &attrTypeCtx,
"attrOptional.getValue()");
"attrOptional.value()");
}
// Build a string containing the cases that can be formatted as a keyword.