Add a skipRegion() feature to the OpPrintingFlags for MLIR ASM printer

This is a convenient flag for context where we intend to summarize a top-level
operation without the full-blown regions it may hold.

Reviewed By: rriddle

Differential Revision: https://reviews.llvm.org/D145889
This commit is contained in:
Mehdi Amini 2023-03-13 14:33:31 +01:00
parent 930744fcda
commit 5736a8a2da
4 changed files with 40 additions and 22 deletions

View File

@ -834,6 +834,9 @@ public:
/// Always print operations in the generic form.
OpPrintingFlags &printGenericOpForm();
/// Skip printing regions.
OpPrintingFlags &skipRegions();
/// Do not verify the operation when using custom operation printers.
OpPrintingFlags &assumeVerified();
@ -861,6 +864,9 @@ public:
/// Return if operations should be printed in the generic form.
bool shouldPrintGenericOpForm() const;
/// Return if regions should be skipped.
bool shouldSkipRegions() const;
/// Return if operation verification should be skipped.
bool shouldAssumeVerified() const;
@ -882,6 +888,9 @@ private:
/// Print operations in the generic form.
bool printGenericOpFormFlag : 1;
/// Always skip Regions.
bool skipRegionsFlag : 1;
/// Skip operation verification.
bool assumeVerifiedFlag : 1;

View File

@ -183,8 +183,9 @@ void mlir::registerAsmPrinterCLOptions() {
/// Initialize the printing flags with default supplied by the cl::opts above.
OpPrintingFlags::OpPrintingFlags()
: printDebugInfoFlag(false), printDebugInfoPrettyFormFlag(false),
printGenericOpFormFlag(false), assumeVerifiedFlag(false),
printLocalScope(false), printValueUsersFlag(false) {
printGenericOpFormFlag(false), skipRegionsFlag(false),
assumeVerifiedFlag(false), printLocalScope(false),
printValueUsersFlag(false) {
// Initialize based upon command line options, if they are available.
if (!clOptions.isConstructed())
return;
@ -223,6 +224,12 @@ OpPrintingFlags &OpPrintingFlags::printGenericOpForm() {
return *this;
}
/// Always skip Regions.
OpPrintingFlags &OpPrintingFlags::skipRegions() {
skipRegionsFlag = true;
return *this;
}
/// Do not verify the operation when using custom operation printers.
OpPrintingFlags &OpPrintingFlags::assumeVerified() {
assumeVerifiedFlag = true;
@ -270,6 +277,9 @@ bool OpPrintingFlags::shouldPrintGenericOpForm() const {
return printGenericOpFormFlag;
}
/// Return if Region should be skipped.
bool OpPrintingFlags::shouldSkipRegions() const { return skipRegionsFlag; }
/// Return if operation verification should be skipped.
bool OpPrintingFlags::shouldAssumeVerified() const {
return assumeVerifiedFlag;
@ -614,9 +624,11 @@ private:
/// Print the given operation in the generic form.
void printGenericOp(Operation *op, bool printOpName = true) override {
// Consider nested operations for aliases.
for (Region &region : op->getRegions())
printRegion(region, /*printEntryBlockArgs=*/true,
/*printBlockTerminators=*/true);
if (!printerFlags.shouldSkipRegions()) {
for (Region &region : op->getRegions())
printRegion(region, /*printEntryBlockArgs=*/true,
/*printBlockTerminators=*/true);
}
// Visit all the types used in the operation.
for (Type type : op->getOperandTypes())
@ -665,6 +677,10 @@ private:
bool printEmptyBlock = false) override {
if (region.empty())
return;
if (printerFlags.shouldSkipRegions()) {
os << "{...}";
return;
}
auto *entryBlock = &region.front();
print(entryBlock, printEntryBlockArgs, printBlockTerminators);
@ -3463,6 +3479,10 @@ void OperationPrinter::printSuccessorAndUseList(Block *successor,
void OperationPrinter::printRegion(Region &region, bool printEntryBlockArgs,
bool printBlockTerminators,
bool printEmptyBlock) {
if (printerFlags.shouldSkipRegions()) {
os << "{...}";
return;
}
os << "{" << newLine;
if (!region.empty()) {
auto restoreDefaultDialect =

View File

@ -516,23 +516,12 @@ std::optional<lsp::Hover> MLIRDocument::buildHoverForOperation(
os << "Generic Form:\n\n```mlir\n";
// Temporary drop the regions of this operation so that they don't get
// printed in the output. This helps keeps the size of the output hover
// small.
SmallVector<std::unique_ptr<Region>> regions;
for (Region &region : op.op->getRegions()) {
regions.emplace_back(std::make_unique<Region>());
regions.back()->takeBody(region);
}
op.op->print(
os, OpPrintingFlags().printGenericOpForm().elideLargeElementsAttrs());
op.op->print(os, OpPrintingFlags()
.printGenericOpForm()
.elideLargeElementsAttrs()
.skipRegions());
os << "\n```\n";
// Move the regions back to the current operation.
for (Region &region : op.op->getRegions())
region.takeBody(*regions.back());
return hover;
}

View File

@ -114,7 +114,7 @@
// CHECK-NEXT: "result": {
// CHECK-NEXT: "contents": {
// CHECK-NEXT: "kind": "markdown",
// CHECK-NEXT: "value": "\"func.func\" : public @foo\n\nGeneric Form:\n\n```mlir\n\"func.func\"() ({\n}) {function_type = (i1) -> (), sym_name = \"foo\"} : () -> ()\n```\n"
// CHECK-NEXT: "value": "\"func.func\" : public @foo\n\nGeneric Form:\n\n```mlir\n\"func.func\"() ({...}) {function_type = (i1) -> (), sym_name = \"foo\"} : () -> ()\n```\n"
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "end": {
@ -138,7 +138,7 @@
// CHECK-NEXT: "result": {
// CHECK-NEXT: "contents": {
// CHECK-NEXT: "kind": "markdown",
// CHECK-NEXT: "value": "\"func.func\" : public @foo\n\nGeneric Form:\n\n```mlir\n\"func.func\"() ({\n}) {function_type = (i1) -> (), sym_name = \"foo\"} : () -> ()\n```\n"
// CHECK-NEXT: "value": "\"func.func\" : public @foo\n\nGeneric Form:\n\n```mlir\n\"func.func\"() ({...}) {function_type = (i1) -> (), sym_name = \"foo\"} : () -> ()\n```\n"
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "end": {