This is an archive of the discontinued LLVM Phabricator instance.

Differential D104025

[mlir][[linalg] Remove deprecated structured op interface methods.
ClosedPublic

Authored by gysit on Jun 10 2021, 5:37 AM.

Details

Reviewers
nicolasvasilache
rsuderman
Commits
rG6b4b98d98c94: [mlir][[linalg] Remove deprecated structured op interface methods.
Summary

Cleanup the refactoring started by https://reviews.llvm.org/D103394.

Diff Detail

Event Timeline

gysit created this revision.Jun 10 2021, 5:37 AM
Herald added subscribers: dcaballe, cota, mravishankar and 17 others. · View Herald TranscriptJun 10 2021, 5:37 AM
gysit requested review of this revision.Jun 10 2021, 5:37 AM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptJun 10 2021, 5:37 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: limo1996, stephenneuendorffer, nicolasvasilache. · View Herald Transcript
gysit added a reviewer: rsuderman.Jun 10 2021, 5:38 AM
Harbormaster completed remote builds in B108601: Diff 351140.Jun 10 2021, 6:18 AM
gysit updated this revision to Diff 351357.Jun 11 2021, 1:09 AM

Minor performance tweaks.

Harbormaster completed remote builds in B108756: Diff 351357.Jun 11 2021, 1:38 AM
nicolasvasilache accepted this revision.Jun 11 2021, 5:09 AM

Nice!

This revision is now accepted and ready to land.Jun 11 2021, 5:09 AM
This revision was landed with ongoing or failed builds.Jun 11 2021, 5:46 AM
Closed by commit rG6b4b98d98c94: [mlir][[linalg] Remove deprecated structured op interface methods. (authored by gysit). · Explain Why
This revision was automatically updated to reflect the committed changes.
gysit added a commit: rG6b4b98d98c94: [mlir][[linalg] Remove deprecated structured op interface methods..

Revision Contents

PathSize
mlir/
include/
mlir/
Dialect/
Linalg/
IR/
520 lines

Diff 351422

mlir/include/mlir/Dialect/Linalg/IR/LinalgInterfaces.td

Show First 20 Lines • Show All 277 Lines • ▼ Show 20 Lines InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the input operands. Return the input operands.
}], }],
/*retTy=*/"OpOperandVector", /*retTy=*/"OpOperandVector",
/*methodName=*/"getInputOperands", /*methodName=*/"getInputOperands",
/*args=*/(ins), /*args=*/(ins),
/*methodBody=*/"", /*methodBody=*/"",
/*defaultImplementation=*/[{ /*defaultImplementation=*/[{
int64_t numInputs = getNumInputs();
OpOperandVector result; OpOperandVector result;
result.reserve(getNumInputs()); result.reserve(numInputs);
llvm::transform( llvm::transform(
this->getOperation()->getOpOperands().take_front(getNumInputs()), this->getOperation()->getOpOperands().take_front(numInputs),
std::back_inserter(result), std::back_inserter(result),
[](OpOperand &opOperand) { return &opOperand; }); [](OpOperand &opOperand) { return &opOperand; });
return result; return result;
}] }]
>, >,
InterfaceMethod< InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the `i`-th input operand. Return the `i`-th input operand.
}], }],
/*retTy=*/"OpOperand*", /*retTy=*/"OpOperand*",
/*methodName=*/"getInputOperand", /*methodName=*/"getInputOperand",
/*args=*/(ins "int64_t":$i), /*args=*/(ins "int64_t":$i),
/*methodBody=*/"", /*methodBody=*/"",
/*defaultImplementation=*/[{ /*defaultImplementation=*/[{
assert(i < getNumInputs()); assert(i >= 0 && i < getNumInputs());
return getInputOperands()[i]; return &this->getOperation()->getOpOperand(i);
}] }]
>, >,
InterfaceMethod< InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the subset of input operands that are of buffer type. Return the subset of input operands that are of buffer type.
}], }],
/*retTy=*/"OpOperandVector", /*retTy=*/"OpOperandVector",
/*methodName=*/"getInputBufferOperands", /*methodName=*/"getInputBufferOperands",
Show All 36 Lines InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the output operands. Return the output operands.
}], }],
/*retTy=*/"OpOperandVector", /*retTy=*/"OpOperandVector",
/*methodName=*/"getOutputOperands", /*methodName=*/"getOutputOperands",
/*args=*/(ins), /*args=*/(ins),
/*methodBody=*/"", /*methodBody=*/"",
/*defaultImplementation=*/[{ /*defaultImplementation=*/[{
int64_t numOutputs = getNumOutputs();
OpOperandVector result; OpOperandVector result;
result.reserve(getNumOutputs()); result.reserve(numOutputs);
llvm::transform( llvm::transform(
this->getOperation()->getOpOperands() this->getOperation()->getOpOperands()
.drop_front(getNumInputs()) .drop_front(getNumInputs())
.take_front(getNumOutputs()), .take_front(numOutputs),
std::back_inserter(result), std::back_inserter(result),
[](OpOperand &opOperand) { return &opOperand; }); [](OpOperand &opOperand) { return &opOperand; });
return result; return result;
}] }]
>, >,
InterfaceMethod< InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the `i`-th output operand. Return the `i`-th output operand.
}], }],
/*retTy=*/"OpOperand*", /*retTy=*/"OpOperand*",
/*methodName=*/"getOutputOperand", /*methodName=*/"getOutputOperand",
/*args=*/(ins "int64_t":$i), /*args=*/(ins "int64_t":$i),
/*methodBody=*/"", /*methodBody=*/"",
/*defaultImplementation=*/[{ /*defaultImplementation=*/[{
assert(i < getNumOutputs()); assert(i >= 0 && i < getNumOutputs());
return getOutputOperands()[i]; return &this->getOperation()->getOpOperand(getNumInputs() + i);
}] }]
>, >,
InterfaceMethod< InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the subset of output operands that are of buffer type. Return the subset of output operands that are of buffer type.
}], }],
/*retTy=*/"OpOperandVector", /*retTy=*/"OpOperandVector",
/*methodName=*/"getOutputBufferOperands", /*methodName=*/"getOutputBufferOperands",
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return the range over input and output operands. Return the range over input and output operands.
}], }],
/*retTy=*/"OpOperandVector", /*retTy=*/"OpOperandVector",
/*methodName=*/"getInputAndOutputOperands", /*methodName=*/"getInputAndOutputOperands",
/*args=*/(ins), /*args=*/(ins),
/*methodBody=*/"", /*methodBody=*/"",
/*defaultImplementation=*/[{ /*defaultImplementation=*/[{
int64_t numInputsAndOutputs = getNumInputsAndOutputs();
OpOperandVector result; OpOperandVector result;
result.reserve(getNumInputsAndOutputs()); result.reserve(numInputsAndOutputs);
llvm::transform( llvm::transform(
this->getOperation()->getOpOperands() this->getOperation()->getOpOperands()
.take_front(getNumInputsAndOutputs()), .take_front(numInputsAndOutputs),
std::back_inserter(result), std::back_inserter(result),
[](OpOperand &opOperand) { return &opOperand; }); [](OpOperand &opOperand) { return &opOperand; });
return result; return result;
}] }]
>, >,
InterfaceMethod< InterfaceMethod<
/*desc=*/[{ /*desc=*/[{
Return true if the payload uses the value loaded from `opOperand`. This Return true if the payload uses the value loaded from `opOperand`. This
▲ Show 20 Lines • Show All 410 Lines • ▼ Show 20 Lines StaticInterfaceMethod<
Returns the region builder for constructing the body for linalg.generic. Returns the region builder for constructing the body for linalg.generic.
Returns a null function if this named op does not define a region Returns a null function if this named op does not define a region
builder. builder.
}], }],
/*retTy=*/"std::function<void(ImplicitLocOpBuilder &, Block &, ValueRange)>", /*retTy=*/"std::function<void(ImplicitLocOpBuilder &, Block &, ValueRange)>",
/*methodName=*/"getRegionBuilder", /*methodName=*/"getRegionBuilder",
(ins), (ins),
[{ return ConcreteOp::getRegionBuilder(); }] [{ return ConcreteOp::getRegionBuilder(); }]
>,
//===------------------------------------------------------------------===//
// DEPRECATED METHODS
//===------------------------------------------------------------------===//
InterfaceMethod<
/*desc=*/[{
Return true if the payload uses the value loaded from `opOperand`. This
is useful to avoid loading from "write-only" memory that may be
uninitialized, as well as properly cloning "read-write" operands.
}],
/*retTy=*/"bool",
/*methodName=*/"payloadUsesValueFromOpOperand",
/*args=*/(ins "OpOperand *":$opOperand),
/*methodBody=*/"",
/*defaultImplementation=*/[{
unsigned bbArgNumber =
$_op.getNumPayloadInductionVariables() + opOperand->getOperandNumber();
// Safeguard against the named linalg ops that are manually defined and
// that only support buffer semantics: we should not be there.
// Such ops have an empty regionBuilder and are not constructed with a
// region for now. In the future they are slated to disappear.
assert(this->getOperation()->getNumRegions() == 1 && "unexpected "
"missing region (calling `payloadUsesValueFromOpOperand` on "
"manually defined named Linalg op?)");
Block &block = this->getOperation()->getRegion(0).front();
// Init tensors have uses.
return !block.getArgument(bbArgNumber).use_empty();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return true if the payload uses the value loaded from input operand
`index`.
}],
/*retTy=*/"bool",
/*methodName=*/"payloadUsesValueFromInputOperandIndex",
/*args=*/(ins "unsigned":$index),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return payloadUsesValueFromOpOperand(getInputOperand(index));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return true if the payload uses the value loaded from output operand
`index`.
}],
/*retTy=*/"bool",
/*methodName=*/"payloadUsesValueFromOutputOperandIndex",
/*args=*/(ins "unsigned":$index),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return payloadUsesValueFromOpOperand(getOutputOperand(index));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `i`-th input operand.
}],
/*retTy=*/"Value",
/*methodName=*/"getInput",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(i < $_op.getNumInputs());
return this->getOperation()->getOperand(i);
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `i`-th input shaped type
}],
/*retTy=*/"ShapedType",
/*methodName=*/"getInputShapedType",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return getInput(i).getType().template cast<ShapedType>();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the range of input operands.
}],
/*retTy=*/"Operation::operand_range",
/*methodName=*/"getInputs",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
auto range = this->getOperation()->getOperands();
return {range.begin(), range.begin() + $_op.getNumInputs()};
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the OpOperands for the input operands.
}],
/*retTy=*/" MutableArrayRef<OpOperand>",
/*methodName=*/"getInputOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return this->getOperation()->getOpOperands().take_front(getNumInputs());
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of input operands that are of buffer type.
}],
/*retTy=*/"SmallVector<Value, 4>",
/*methodName=*/"getInputBuffers",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return llvm::to_vector<4>(llvm::make_filter_range(
getInputs(), [](Value in){ return in.getType().template isa<MemRefType>(); }));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the number of input buffer operands.
}],
/*retTy=*/"unsigned",
/*methodName=*/"getNumInputBuffers",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return $_op.getInputBuffers().size();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `index`^th input buffer.
}],
/*retTy=*/"Value",
/*methodName=*/"getInputBuffer",
/*args=*/(ins "unsigned":$index),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(index < getNumInputBuffers());
return getInputBuffers()[index];
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of input operands that are of buffer type.
}],
/*retTy=*/"SmallVector<OpOperand*, 4>",
/*methodName=*/"getInputBuffersOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
SmallVector<OpOperand*, 4> res;
res.reserve(getNumInputs());
for (OpOperand &o : getInputOpOperands())
if (o.get().getType().isa<MemRefType>())
res.push_back(&o);
return res;
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of input operands that are of tensor type.
}],
/*retTy=*/"SmallVector<Value, 4>",
/*methodName=*/"getInputTensors",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return llvm::to_vector<4>(llvm::make_filter_range(
getInputs(),
[](Value in){ return in.getType().template isa<RankedTensorType>(); }));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of op operands that are of tensor type.
}],
/*retTy=*/"SmallVector<OpOperand*, 4>",
/*methodName=*/"getInputTensorsOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
SmallVector<OpOperand*, 4> res;
res.reserve(getNumInputs());
for (OpOperand &o : getInputOpOperands())
if (o.get().getType().isa<RankedTensorType>())
res.push_back(&o);
return res;
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `i`-th output operand.
}],
/*retTy=*/"Value",
/*methodName=*/"getOutput",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(i < $_op.getNumOutputs());
return this->getOperation()->getOperand(i + $_op.getNumInputs());
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `i`-th output shaped type
}],
/*retTy=*/"ShapedType",
/*methodName=*/"getOutputShapedType",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return getOutput(i).getType().template cast<ShapedType>();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the range of output operands.
}],
/*retTy=*/"Operation::operand_range",
/*methodName=*/"getOutputs",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
auto start =
this->getOperation()->getOperands().begin() + $_op.getNumInputs();
return {start, start + $_op.getNumOutputs()};
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the OpOperands for the output operands.
}],
/*retTy=*/" MutableArrayRef<OpOperand>",
/*methodName=*/"getOutputOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return this->getOperation()->getOpOperands().slice(
getNumInputs(), getNumOutputs());
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of output operands that are of buffer type.
}],
/*retTy=*/"SmallVector<Value, 4>",
/*methodName=*/"getOutputBuffers",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return llvm::to_vector<4>(llvm::make_filter_range(
getOutputs(), [](Value in){ return in.getType().template isa<MemRefType>(); }));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `index`^th output buffer.
}],
/*retTy=*/"Value",
/*methodName=*/"getOutputBuffer",
/*args=*/(ins "unsigned":$index),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(index < getNumOutputBuffers());
return getOutputBuffers()[index];
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of output operands that are of buffer type.
}],
/*retTy=*/"SmallVector<OpOperand*, 4>",
/*methodName=*/"getOutputBuffersOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
SmallVector<OpOperand*, 4> res;
res.reserve(getNumOutputs());
for (OpOperand &o : getOutputOpOperands())
if (o.get().getType().isa<MemRefType>())
res.push_back(&o);
return res;
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the number of output buffer operands.
}],
/*retTy=*/"unsigned",
/*methodName=*/"getNumOutputBuffers",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return $_op.getOutputBuffers().size();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of output operands that are of tensor type.
}],
/*retTy=*/"SmallVector<Value, 4>",
/*methodName=*/"getOutputTensors",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return llvm::to_vector<4>(llvm::make_filter_range(
getOutputs(),
[](Value in){ return in.getType().template isa<RankedTensorType>(); }));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the subset of output operands that are of tensor type.
}],
/*retTy=*/"SmallVector<OpOperand*, 4>",
/*methodName=*/"getOutputTensorsOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
SmallVector<OpOperand*, 4> res;
res.reserve(getNumOutputs());
for (OpOperand &o : getOutputOpOperands())
if (o.get().getType().isa<RankedTensorType>())
res.push_back(&o);
return res;
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the number of output tensor operands.
}],
/*retTy=*/"unsigned",
/*methodName=*/"getNumOutputTensors",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return $_op.getOutputTensors().size();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the number of input and output operands.
}],
/*retTy=*/"unsigned",
/*methodName=*/"getNumShapedOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return $_op.getNumInputs() + $_op.getNumOutputs();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `i`-th shaped operand value.
}],
/*retTy=*/"Value",
/*methodName=*/"getShapedOperand",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(i < $_op.getNumShapedOperands());
return this->getOperation()->getOperand(i);
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the range over input and output operands.
}],
/*retTy=*/"Operation::operand_range",
/*methodName=*/"getShapedOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
auto range = this->getOperation()->getOperands();
return {range.begin(), range.begin() + getNumShapedOperands()};
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the OpOperands for all the shaped operands.
}],
/*retTy=*/" MutableArrayRef<OpOperand>",
/*methodName=*/"getShapedOpOperands",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return this->getOperation()->getOpOperands().take_front(
getNumShapedOperands());
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the OpOperands for all the shaped operands.
}],
/*retTy=*/" OpOperand&",
/*methodName=*/"getShapedOpOperand",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return *(this->getShapedOpOperands().begin() + i);
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the range over input and output operands.
}],
/*retTy=*/"SmallVector<ShapedType, 4>",
/*methodName=*/"getShapedOperandTypes",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return llvm::to_vector<4>(
llvm::map_range(
getShapedOperands(),
[](Value v) { return v.getType().cast<ShapedType>(); }));
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the `i`-th shaped type
}],
/*retTy=*/"ShapedType",
/*methodName=*/"getShapedType",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
return $_op.getShapedOperand(i).getType().template cast<ShapedType>();
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the input or output indexing map at index `i`.
}],
/*retTy=*/"AffineMap",
/*methodName=*/"getIndexingMap",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(i < $_op.getNumShapedOperands());
return getIndexingMaps()[i];
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the input indexing map at index `i`.
}],
/*retTy=*/"AffineMap",
/*methodName=*/"getInputIndexingMap",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(i < $_op.getNumInputs());
return getIndexingMaps()[i];
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the input indexing maps.
}],
/*retTy=*/"SmallVector<AffineMap>",
/*methodName=*/"getInputIndexingMaps",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
auto maps = $_op.getIndexingMaps();
return SmallVector<AffineMap>{maps.begin(),
maps.begin() + $_op.getNumInputs()};
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the output indexing map at index `i`.
}],
/*retTy=*/"AffineMap",
/*methodName=*/"getOutputIndexingMap",
/*args=*/(ins "unsigned":$i),
/*methodBody=*/"",
/*defaultImplementation=*/[{
assert(i < $_op.getNumOutputs());
return getIndexingMaps()[i + $_op.getNumInputs()];
}]
>,
InterfaceMethod<
/*desc=*/[{
Return the output indexing maps.
}],
/*retTy=*/"SmallVector<AffineMap>",
/*methodName=*/"getOutputIndexingMaps",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
auto maps = $_op.getIndexingMaps();
return SmallVector<AffineMap>{maps.begin() + $_op.getNumInputs(),
maps.begin() + $_op.getNumShapedOperands()};
}]
> >
]; ];
let extraClassDeclaration = [{ let extraClassDeclaration = [{
/// Return the flat list of all operand dimension sizes in the order they /// Return the flat list of all operand dimension sizes in the order they
/// appear in the operands. /// appear in the operands.
SmallVector<Value, 4> createFlatListOfOperandDims(OpBuilder &, Location); SmallVector<Value, 4> createFlatListOfOperandDims(OpBuilder &, Location);
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines