Skip to content

[mlir] Allow loop-like operations in AbstractDenseForwardDataFlowAnalysis #66179

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

Merged
merged 1 commit into from
Sep 14, 2023
Merged

[mlir] Allow loop-like operations in AbstractDenseForwardDataFlowAnalysis #66179

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
2 changes: 0 additions & 2 deletions mlir/lib/Analysis/DataFlow/DenseAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ void AbstractDenseForwardDataFlowAnalysis::visitRegionBranchOperation(
op == branch ? std::optional<unsigned>()
: op->getBlock()->getParent()->getRegionNumber();
if (auto *toBlock = point.dyn_cast<Block *>()) {
assert(op == branch ||
toBlock->getParent() != op->getBlock()->getParent());
unsigned regionTo = toBlock->getParent()->getRegionNumber();
visitRegionBranchControlFlowTransfer(branch, regionFrom, regionTo,
*before, after);
Expand Down
119 changes: 119 additions & 0 deletions mlir/test/Analysis/DataFlow/test-last-modified.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,122 @@ func.func @store_with_a_region_after_containing_a_store(%arg0: memref<f32>) -> m
memref.store %1, %arg0[] {tag_name = "post"} : memref<f32>
return {tag = "return"} %arg0 : memref<f32>
}

// CHECK-LABEL: test_tag: store_with_a_loop_region_before::before:
// CHECK: operand #0
// CHECK: - pre
// CHECK: test_tag: inside_region:
// CHECK: operand #0
// CHECK: - region
// CHECK: test_tag: after:
// CHECK: operand #0
// CHECK: - region
// CHECK: test_tag: return:
// CHECK: operand #0
// CHECK: - post
func.func @store_with_a_loop_region_before(%arg0: memref<f32>) -> memref<f32> {
%0 = arith.constant 0.0 : f32
%1 = arith.constant 1.0 : f32
memref.store %0, %arg0[] {tag_name = "pre"} : memref<f32>
memref.load %arg0[] {tag = "store_with_a_loop_region_before::before"} : memref<f32>
test.store_with_a_loop_region %arg0 attributes { tag_name = "region", store_before_region = true } {
memref.load %arg0[] {tag = "inside_region"} : memref<f32>
test.store_with_a_region_terminator
} : memref<f32>
memref.load %arg0[] {tag = "after"} : memref<f32>
memref.store %1, %arg0[] {tag_name = "post"} : memref<f32>
return {tag = "return"} %arg0 : memref<f32>
}

// CHECK-LABEL: test_tag: store_with_a_loop_region_after::before:
// CHECK: operand #0
// CHECK: - pre
// CHECK: test_tag: inside_region:
// CHECK: operand #0
// CHECK: - pre
// CHECK: test_tag: after:
// CHECK: operand #0
// CHECK: - region
// CHECK: test_tag: return:
// CHECK: operand #0
// CHECK: - post
func.func @store_with_a_loop_region_after(%arg0: memref<f32>) -> memref<f32> {
%0 = arith.constant 0.0 : f32
%1 = arith.constant 1.0 : f32
memref.store %0, %arg0[] {tag_name = "pre"} : memref<f32>
memref.load %arg0[] {tag = "store_with_a_loop_region_after::before"} : memref<f32>
test.store_with_a_loop_region %arg0 attributes { tag_name = "region", store_before_region = false } {
memref.load %arg0[] {tag = "inside_region"} : memref<f32>
test.store_with_a_region_terminator
} : memref<f32>
memref.load %arg0[] {tag = "after"} : memref<f32>
memref.store %1, %arg0[] {tag_name = "post"} : memref<f32>
return {tag = "return"} %arg0 : memref<f32>
}

// CHECK-LABEL: test_tag: store_with_a_loop_region_before_containing_a_store::before:
// CHECK: operand #0
// CHECK: - pre
// CHECK: test_tag: enter_region:
// CHECK: operand #0
// CHECK-DAG: - region
// CHECK-DAG: - inner
// CHECK: test_tag: exit_region:
// CHECK: operand #0
// CHECK: - inner
// CHECK: test_tag: after:
// CHECK: operand #0
// CHECK-DAG: - region
// CHECK-DAG: - inner
// CHECK: test_tag: return:
// CHECK: operand #0
// CHECK: - post
func.func @store_with_a_loop_region_before_containing_a_store(%arg0: memref<f32>) -> memref<f32> {
%0 = arith.constant 0.0 : f32
%1 = arith.constant 1.0 : f32
memref.store %0, %arg0[] {tag_name = "pre"} : memref<f32>
memref.load %arg0[] {tag = "store_with_a_loop_region_before_containing_a_store::before"} : memref<f32>
test.store_with_a_loop_region %arg0 attributes { tag_name = "region", store_before_region = true } {
memref.load %arg0[] {tag = "enter_region"} : memref<f32>
%2 = arith.constant 2.0 : f32
memref.store %2, %arg0[] {tag_name = "inner"} : memref<f32>
memref.load %arg0[] {tag = "exit_region"} : memref<f32>
test.store_with_a_region_terminator
} : memref<f32>
memref.load %arg0[] {tag = "after"} : memref<f32>
memref.store %1, %arg0[] {tag_name = "post"} : memref<f32>
return {tag = "return"} %arg0 : memref<f32>
}

// CHECK-LABEL: test_tag: store_with_a_loop_region_after_containing_a_store::before:
// CHECK: operand #0
// CHECK: - pre
// CHECK: test_tag: enter_region:
// CHECK: operand #0
// CHECK-DAG: - pre
// CHECK-DAG: - inner
// CHECK: test_tag: exit_region:
// CHECK: operand #0
// CHECK: - inner
// CHECK: test_tag: after:
// CHECK: operand #0
// CHECK: - region
// CHECK: test_tag: return:
// CHECK: operand #0
// CHECK: - post
func.func @store_with_a_loop_region_after_containing_a_store(%arg0: memref<f32>) -> memref<f32> {
%0 = arith.constant 0.0 : f32
%1 = arith.constant 1.0 : f32
memref.store %0, %arg0[] {tag_name = "pre"} : memref<f32>
memref.load %arg0[] {tag = "store_with_a_loop_region_after_containing_a_store::before"} : memref<f32>
test.store_with_a_loop_region %arg0 attributes { tag_name = "region", store_before_region = false } {
memref.load %arg0[] {tag = "enter_region"} : memref<f32>
%2 = arith.constant 2.0 : f32
memref.store %2, %arg0[] {tag_name = "inner"} : memref<f32>
memref.load %arg0[] {tag = "exit_region"} : memref<f32>
test.store_with_a_region_terminator
} : memref<f32>
memref.load %arg0[] {tag = "after"} : memref<f32>
memref.store %1, %arg0[] {tag_name = "post"} : memref<f32>
return {tag = "return"} %arg0 : memref<f32>
}
24 changes: 15 additions & 9 deletions mlir/test/lib/Analysis/DataFlow/TestDenseForwardDataFlowAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include "mlir/Analysis/DataFlow/DenseAnalysis.h"
#include "mlir/Interfaces/SideEffectInterfaces.h"
#include "mlir/Pass/Pass.h"
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/TypeSwitch.h"
#include <optional>

using namespace mlir;
Expand Down Expand Up @@ -133,15 +135,19 @@ void LastModifiedAnalysis::visitRegionBranchControlFlowTransfer(
RegionBranchOpInterface branch, std::optional<unsigned> regionFrom,
std::optional<unsigned> regionTo, const LastModification &before,
LastModification *after) {
auto testStoreWithARegion =
dyn_cast<::test::TestStoreWithARegion>(branch.getOperation());
if (testStoreWithARegion &&
((!regionTo && !testStoreWithARegion.getStoreBeforeRegion()) ||
(!regionFrom && testStoreWithARegion.getStoreBeforeRegion()))) {
return visitOperation(branch, before, after);
}
AbstractDenseForwardDataFlowAnalysis::visitRegionBranchControlFlowTransfer(
branch, regionFrom, regionTo, before, after);
auto defaultHandling = [&]() {
AbstractDenseForwardDataFlowAnalysis::visitRegionBranchControlFlowTransfer(
branch, regionFrom, regionTo, before, after);
};
TypeSwitch<Operation *>(branch.getOperation())
.Case<::test::TestStoreWithARegion, ::test::TestStoreWithALoopRegion>(
[=](auto storeWithRegion) {
if ((!regionTo && !storeWithRegion.getStoreBeforeRegion()) ||
(!regionFrom && storeWithRegion.getStoreBeforeRegion()))
visitOperation(branch, before, after);
defaultHandling();
})
.Default([=](auto) { defaultHandling(); });
}

namespace {
Expand Down
10 changes: 10 additions & 0 deletions mlir/test/lib/Dialect/Test/TestDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,16 @@ void TestStoreWithARegion::getSuccessorRegions(
regions.emplace_back();
}

void TestStoreWithALoopRegion::getSuccessorRegions(
RegionBranchPoint point, SmallVectorImpl<RegionSuccessor> &regions) {
// Both the operation itself and the region may be branching into the body or
// back into the operation itself. It is possible for the operation not to
// enter the body.
regions.emplace_back(
RegionSuccessor(&getBody(), getBody().front().getArguments()));
regions.emplace_back();
}

LogicalResult
TestVersionedOpA::readProperties(::mlir::DialectBytecodeReader &reader,
::mlir::OperationState &state) {
Expand Down
12 changes: 12 additions & 0 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 @@ -2953,6 +2953,18 @@ def TestStoreWithARegion : TEST_Op<"store_with_a_region",
"$address attr-dict-with-keyword regions `:` type($address)";
}

def TestStoreWithALoopRegion : TEST_Op<"store_with_a_loop_region",
[DeclareOpInterfaceMethods<RegionBranchOpInterface>,
SingleBlock]> {
let arguments = (ins
Arg<AnyMemRef, "", [MemWrite]>:$address,
BoolAttr:$store_before_region
);
let regions = (region AnyRegion:$body);
let assemblyFormat =
"$address attr-dict-with-keyword regions `:` type($address)";
}

def TestStoreWithARegionTerminator : TEST_Op<"store_with_a_region_terminator",
[ReturnLike, Terminator, NoMemoryEffect]> {
let assemblyFormat = "attr-dict";
Expand Down