-
Notifications
You must be signed in to change notification settings - Fork 14.9k
[MLIR] Change getBackwardSlice to return a logicalresult rather than crash #140961
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.
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,22 +80,25 @@ void mlir::getForwardSlice(Value root, SetVector<Operation *> *forwardSlice, | |
forwardSlice->insert(v.rbegin(), v.rend()); | ||
} | ||
|
||
static void getBackwardSliceImpl(Operation *op, | ||
SetVector<Operation *> *backwardSlice, | ||
const BackwardSliceOptions &options) { | ||
static LogicalResult getBackwardSliceImpl(Operation *op, | ||
SetVector<Operation *> *backwardSlice, | ||
const BackwardSliceOptions &options) { | ||
if (!op || op->hasTrait<OpTrait::IsIsolatedFromAbove>()) | ||
return; | ||
return success(); | ||
|
||
// Evaluate whether we should keep this def. | ||
// This is useful in particular to implement scoping; i.e. return the | ||
// transitive backwardSlice in the current scope. | ||
if (options.filter && !options.filter(op)) | ||
return; | ||
return success(); | ||
|
||
bool succeeded = true; | ||
|
||
auto processValue = [&](Value value) { | ||
if (auto *definingOp = value.getDefiningOp()) { | ||
if (backwardSlice->count(definingOp) == 0) | ||
getBackwardSliceImpl(definingOp, backwardSlice, options); | ||
succeeded &= getBackwardSliceImpl(definingOp, backwardSlice, options) | ||
wsmoses marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
.succeeded(); | ||
} else if (auto blockArg = dyn_cast<BlockArgument>(value)) { | ||
if (options.omitBlockArguments) | ||
return; | ||
|
@@ -106,9 +109,13 @@ static void getBackwardSliceImpl(Operation *op, | |
// blocks of parentOp, which are not technically backward unless they flow | ||
// into us. For now, just bail. | ||
if (parentOp && backwardSlice->count(parentOp) == 0) { | ||
assert(parentOp->getNumRegions() == 1 && | ||
llvm::hasSingleElement(parentOp->getRegion(0).getBlocks())); | ||
getBackwardSliceImpl(parentOp, backwardSlice, options); | ||
if (parentOp->getNumRegions() == 1 && | ||
llvm::hasSingleElement(parentOp->getRegion(0).getBlocks())) { | ||
succeeded &= getBackwardSliceImpl(parentOp, backwardSlice, options) | ||
.succeeded(); | ||
} else { | ||
succeeded = false; | ||
} | ||
} | ||
} else { | ||
llvm_unreachable("No definingOp and not a block argument."); | ||
|
@@ -133,28 +140,30 @@ static void getBackwardSliceImpl(Operation *op, | |
llvm::for_each(op->getOperands(), processValue); | ||
|
||
backwardSlice->insert(op); | ||
return success(succeeded); | ||
} | ||
|
||
void mlir::getBackwardSlice(Operation *op, | ||
SetVector<Operation *> *backwardSlice, | ||
const BackwardSliceOptions &options) { | ||
getBackwardSliceImpl(op, backwardSlice, options); | ||
LogicalResult | ||
mlir::getBackwardSlice(Operation *op, SetVector<Operation *> *backwardSlice, | ||
const BackwardSliceOptions &options) { | ||
LogicalResult result = getBackwardSliceImpl(op, backwardSlice, options); | ||
|
||
if (!options.inclusive) { | ||
// Don't insert the top level operation, we just queried on it and don't | ||
// want it in the results. | ||
backwardSlice->remove(op); | ||
} | ||
return result; | ||
} | ||
|
||
void mlir::getBackwardSlice(Value root, SetVector<Operation *> *backwardSlice, | ||
const BackwardSliceOptions &options) { | ||
LogicalResult mlir::getBackwardSlice(Value root, | ||
SetVector<Operation *> *backwardSlice, | ||
const BackwardSliceOptions &options) { | ||
if (Operation *definingOp = root.getDefiningOp()) { | ||
getBackwardSlice(definingOp, backwardSlice, options); | ||
return; | ||
return getBackwardSlice(definingOp, backwardSlice, options); | ||
} | ||
Operation *bbAargOwner = cast<BlockArgument>(root).getOwner()->getParentOp(); | ||
getBackwardSlice(bbAargOwner, backwardSlice, options); | ||
return getBackwardSlice(bbAargOwner, backwardSlice, options); | ||
} | ||
|
||
SetVector<Operation *> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We may want to return |
||
|
@@ -170,7 +179,9 @@ mlir::getSlice(Operation *op, const BackwardSliceOptions &backwardSliceOptions, | |
auto *currentOp = (slice)[currentIndex]; | ||
// Compute and insert the backwardSlice starting from currentOp. | ||
backwardSlice.clear(); | ||
getBackwardSlice(currentOp, &backwardSlice, backwardSliceOptions); | ||
auto result = | ||
getBackwardSlice(currentOp, &backwardSlice, backwardSliceOptions); | ||
assert(result.succeeded()); | ||
wsmoses marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
slice.insert_range(backwardSlice); | ||
|
||
// Compute and insert the forwardSlice starting from currentOp. | ||
|
@@ -193,7 +204,8 @@ static bool dependsOnCarriedVals(Value value, | |
sliceOptions.filter = [&](Operation *op) { | ||
return !ancestorOp->isAncestor(op); | ||
}; | ||
getBackwardSlice(value, &slice, sliceOptions); | ||
auto result = getBackwardSlice(value, &slice, sliceOptions); | ||
wsmoses marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
assert(result.succeeded()); | ||
|
||
// Check that none of the operands of the operations in the backward slice are | ||
// loop iteration arguments, and neither is the value itself. | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.