Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mlir] Verifier: steal bit to track seen instead of set. #102626

Merged
merged 1 commit into from
Aug 9, 2024
Merged

[mlir] Verifier: steal bit to track seen instead of set. #102626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions mlir/lib/IR/Verifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "mlir/IR/RegionKindInterface.h"
#include "mlir/IR/Threading.h"
#include "llvm/ADT/DenseMapInfoVariant.h"
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/PrettyStackTrace.h"
Expand All @@ -55,6 +56,7 @@ class OperationVerifier {

private:
using WorkItem = llvm::PointerUnion<Operation *, Block *>;
using WorkItemEntry = llvm::PointerIntPair<WorkItem, 1, bool>;

/// This verifier uses a DFS of the tree of operations/blocks. The method
/// verifyOnEntrance is invoked when we visit a node for the first time, i.e.
Expand Down Expand Up @@ -267,35 +269,38 @@ LogicalResult OperationVerifier::verifyOnExit(Operation &op) {
/// Such ops are collected separately and verified inside
/// verifyBlockPostChildren.
LogicalResult OperationVerifier::verifyOperation(Operation &op) {
SmallVector<WorkItem> worklist{{&op}};
SmallPtrSet<WorkItem, 8> seen;
SmallVector<WorkItemEntry> worklist{{&op, false}};
while (!worklist.empty()) {
WorkItem top = worklist.back();
WorkItemEntry &top = worklist.back();

auto visit = [](auto &&visitor, WorkItem w) {
if (w.is<Operation *>())
return visitor(w.get<Operation *>());
return visitor(w.get<Block *>());
};

const bool isExit = !seen.insert(top).second;
const bool isExit = top.getInt();
top.setInt(true);
auto item = top.getPointer();

// 2nd visit of this work item ("exit").
if (isExit) {
worklist.pop_back();
if (failed(visit(
[this](auto *workItem) { return verifyOnExit(*workItem); }, top)))
if (failed(
visit([this](auto *workItem) { return verifyOnExit(*workItem); },
item)))
return failure();
worklist.pop_back();
continue;
}

// 1st visit of this work item ("entrance").
if (failed(visit(
[this](auto *workItem) { return verifyOnEntrance(*workItem); },
top)))
item)))
return failure();

if (top.is<Block *>()) {
Block &currentBlock = *top.get<Block *>();
if (item.is<Block *>()) {
Block &currentBlock = *item.get<Block *>();
// Skip "isolated from above operations".
for (Operation &o : llvm::reverse(currentBlock)) {
if (o.getNumRegions() == 0 ||
Expand All @@ -305,7 +310,7 @@ LogicalResult OperationVerifier::verifyOperation(Operation &op) {
continue;
}

Operation &currentOp = *top.get<Operation *>();
Operation &currentOp = *item.get<Operation *>();
if (verifyRecursively)
for (Region &region : llvm::reverse(currentOp.getRegions()))
for (Block &block : llvm::reverse(region))
Expand Down
Loading