Skip to content

Revert "[MLIR] getBackwardSlice: don't bail on ops that are IsolatedFromAbove" #160160

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

Closed
wants to merge 1 commit into from
Closed

Revert "[MLIR] getBackwardSlice: don't bail on ops that are IsolatedFromAbove" #160160

Show file tree
Hide file tree
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
8 changes: 3 additions & 5 deletions mlir/lib/Analysis/SliceAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static LogicalResult getBackwardSliceImpl(Operation *op,
DenseSet<Operation *> &visited,
SetVector<Operation *> *backwardSlice,
const BackwardSliceOptions &options) {
if (!op)
if (!op || op->hasTrait<OpTrait::IsIsolatedFromAbove>())
return success();

// Evaluate whether we should keep this def.
Expand All @@ -136,8 +136,7 @@ static LogicalResult 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) {
if (!parentOp->hasTrait<OpTrait::IsIsolatedFromAbove>() &&
parentOp->getNumRegions() == 1 &&
if (parentOp->getNumRegions() == 1 &&
parentOp->getRegion(0).hasOneBlock()) {
return getBackwardSliceImpl(parentOp, visited, backwardSlice,
options);
Expand All @@ -151,8 +150,7 @@ static LogicalResult getBackwardSliceImpl(Operation *op,

bool succeeded = true;

if (!options.omitUsesFromAbove &&
!op->hasTrait<OpTrait::IsIsolatedFromAbove>()) {
if (!options.omitUsesFromAbove) {
llvm::for_each(op->getRegions(), [&](Region &region) {
// Walk this region recursively to collect the regions that descend from
// this op's nested regions (inclusive).
Expand Down
28 changes: 0 additions & 28 deletions mlir/test/Transforms/move-operation-deps.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,31 +460,3 @@ module attributes {transform.with_named_sequence} {
transform.yield
}
}

// -----

func.func @move_isolated_from_above() -> () {
%1 = "before"() : () -> (f32)
%2 = "moved0"() : () -> (f32)
%3 = test.isolated_one_region_op %2 {} : f32 -> f32
%4 = "moved1"(%3) : (f32) -> (f32)
return
}
// CHECK-LABEL: func @move_isolated_from_above()
// CHECK: %[[MOVED0:.+]] = "moved0"
// CHECK: %[[ISOLATED:.+]] = test.isolated_one_region_op %[[MOVED0]]
// CHECK: %[[MOVED1:.+]] = "moved1"(%[[ISOLATED]])
// CHECK: %[[BEFORE:.+]] = "before"

module attributes {transform.with_named_sequence} {
transform.named_sequence @__transform_main(%arg0 : !transform.any_op {transform.readonly}) {
%op1 = transform.structured.match ops{["before"]} in %arg0
: (!transform.any_op) -> !transform.any_op
%op2 = transform.structured.match ops{["moved1"]} in %arg0
: (!transform.any_op) -> !transform.any_op
%v1 = transform.get_result %op2[0] : (!transform.any_op) -> !transform.any_value
transform.test.move_value_defns %v1 before %op1
: (!transform.any_value), !transform.any_op
transform.yield
}
}
3 changes: 1 addition & 2 deletions mlir/test/lib/Dialect/Test/TestOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,10 +552,9 @@ def OneRegionWithOperandsOp : TEST_Op<"one_region_with_operands_op", []> {

def IsolatedOneRegionOp : TEST_Op<"isolated_one_region_op", [IsolatedFromAbove]> {
let arguments = (ins Variadic<AnyType>:$operands);
let results = (outs Variadic<AnyType>:$results);
let regions = (region AnyRegion:$my_region);
let assemblyFormat = [{
attr-dict-with-keyword $operands $my_region `:` type($operands) `->` type($results)
attr-dict-with-keyword $operands $my_region `:` type($operands)
}];
}

Expand Down
4 changes: 2 additions & 2 deletions mlir/test/lib/Transforms/TestMakeIsolatedFromAbove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ makeIsolatedFromAboveImpl(RewriterBase &rewriter,
makeRegionIsolatedFromAbove(rewriter, region, callBack);
SmallVector<Value> operands = regionOp.getOperands();
operands.append(capturedValues);
auto isolatedRegionOp = test::IsolatedOneRegionOp::create(
rewriter, regionOp.getLoc(), TypeRange(), operands);
auto isolatedRegionOp =
test::IsolatedOneRegionOp::create(rewriter, regionOp.getLoc(), operands);
rewriter.inlineRegionBefore(region, isolatedRegionOp.getRegion(),
isolatedRegionOp.getRegion().begin());
rewriter.eraseOp(regionOp);
Expand Down