[Mlir-commits] [mlir] f382dfc - [MLIR][Liveness] Add `currentlyLiveValues`, a way to get a set of values that are live as of a given operation.
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Fri Jul 15 22:11:00 PDT 2022
Author: bzcheeseman
Date: 2022-07-15T22:10:53-07:00
New Revision: f382dfc06bda1a3082f0be940ab061bf4002a86b
URL: https://github.com/llvm/llvm-project/commit/f382dfc06bda1a3082f0be940ab061bf4002a86b
DIFF: https://github.com/llvm/llvm-project/commit/f382dfc06bda1a3082f0be940ab061bf4002a86b.diff
LOG: [MLIR][Liveness] Add `currentlyLiveValues`, a way to get a set of values that are live as of a given operation.
This change allows the user of LivenessBlockInfo to specify an op within the block and get a set of all values that are live as of that op. Semantically it relies on having a dominance-based region that has ordered operations. For DFG regions, computing liveness statically this way doesn't really make sense, it likely needs to be done at runtime.
Reviewed By: rriddle
Differential Revision: https://reviews.llvm.org/D129447
Added:
Modified:
mlir/include/mlir/Analysis/Liveness.h
mlir/lib/Analysis/Liveness.cpp
mlir/test/Analysis/test-liveness.mlir
Removed:
################################################################################
diff --git a/mlir/include/mlir/Analysis/Liveness.h b/mlir/include/mlir/Analysis/Liveness.h
index 3b20506914300..ca4d8dfab3c91 100644
--- a/mlir/include/mlir/Analysis/Liveness.h
+++ b/mlir/include/mlir/Analysis/Liveness.h
@@ -129,6 +129,17 @@ class LivenessBlockInfo {
/// provided (must be referenced in this block).
Operation *getEndOperation(Value value, Operation *startOperation) const;
+ /// Get the set of values that are currently live (if any) for the current op.
+ /// This analysis takes an expansive view of "live" in that if a value is
+ /// defined by or within the operation or is fully consumed (as in last user)
+ /// by or within the operation the value is considered "live". The values in
+ /// the list are not ordered.
+ ///
+ /// This check is quite expensive as it does not cache the results of the
+ /// computation, so the currently live values have to be recomputed for each
+ /// op.
+ ValueSetT currentlyLiveValues(Operation *op) const;
+
private:
/// The underlying block.
Block *block = nullptr;
diff --git a/mlir/lib/Analysis/Liveness.cpp b/mlir/lib/Analysis/Liveness.cpp
index d904ec0d3966a..b3773295a9a02 100644
--- a/mlir/lib/Analysis/Liveness.cpp
+++ b/mlir/lib/Analysis/Liveness.cpp
@@ -307,7 +307,7 @@ void Liveness::print(raw_ostream &os) const {
os << "\n";
// Print liveness intervals.
- os << "// --- BeginLiveness";
+ os << "// --- BeginLivenessIntervals";
for (Operation &op : *block) {
if (op.getNumResults() < 1)
continue;
@@ -327,7 +327,21 @@ void Liveness::print(raw_ostream &os) const {
}
}
}
- os << "\n// --- EndLiveness\n";
+ os << "\n// --- EndLivenessIntervals\n";
+
+ // Print currently live values.
+ os << "// --- BeginCurrentlyLive\n";
+ for (Operation &op : *block) {
+ auto currentlyLive = liveness->currentlyLiveValues(&op);
+ if (currentlyLive.empty())
+ continue;
+ os << "// ";
+ op.print(os);
+ os << " [";
+ printValueRefs(currentlyLive);
+ os << "\b]\n";
+ }
+ os << "// --- EndCurrentlyLive\n";
});
os << "// -------------------\n";
}
@@ -377,3 +391,56 @@ Operation *LivenessBlockInfo::getEndOperation(Value value,
}
return endOperation;
}
+
+/// Return the values that are currently live as of the given operation.
+LivenessBlockInfo::ValueSetT
+LivenessBlockInfo::currentlyLiveValues(Operation *op) const {
+ ValueSetT liveSet;
+
+ // Given a value, check which ops are within its live range. For each of
+ // those ops, add the value to the set of live values as-of that op.
+ auto addValueToCurrentlyLiveSets = [&](Value value) {
+ // Determine the live range of this value inside this block.
+ Operation *startOfLiveRange = value.getDefiningOp();
+ Operation *endOfLiveRange = nullptr;
+ // If it's a live in or a block argument, then the start is the beginning
+ // of the block.
+ if (isLiveIn(value) || value.isa<BlockArgument>())
+ startOfLiveRange = &block->front();
+ else
+ startOfLiveRange = block->findAncestorOpInBlock(*startOfLiveRange);
+
+ // If it's a live out, then the end is the back of the block.
+ if (isLiveOut(value))
+ endOfLiveRange = &block->back();
+
+ // We must have at least a startOfLiveRange at this point. Given this, we
+ // can use the existing getEndOperation to find the end of the live range.
+ if (startOfLiveRange && !endOfLiveRange)
+ endOfLiveRange = getEndOperation(value, startOfLiveRange);
+
+ assert(endOfLiveRange && "Must have endOfLiveRange at this point!");
+ // If this op is within the live range, insert the value into the set.
+ if (!(op->isBeforeInBlock(startOfLiveRange) ||
+ endOfLiveRange->isBeforeInBlock(op)))
+ liveSet.insert(value);
+ };
+
+ // Handle block arguments if any.
+ for (Value arg : block->getArguments())
+ addValueToCurrentlyLiveSets(arg);
+
+ // Handle live-ins. Between the live ins and all the op results that gives us
+ // every value in the block.
+ for (Value in : inValues)
+ addValueToCurrentlyLiveSets(in);
+
+ // Now walk the block and handle all values used in the block and values
+ // defined by the block.
+ for (Operation &walkOp :
+ llvm::make_range(block->begin(), ++op->getIterator()))
+ for (auto result : walkOp.getResults())
+ addValueToCurrentlyLiveSets(result);
+
+ return liveSet;
+}
diff --git a/mlir/test/Analysis/test-liveness.mlir b/mlir/test/Analysis/test-liveness.mlir
index 6477597f1a65e..02179d6472d54 100644
--- a/mlir/test/Analysis/test-liveness.mlir
+++ b/mlir/test/Analysis/test-liveness.mlir
@@ -5,8 +5,10 @@ func.func @func_empty() {
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut:{{ *$}}
- // CHECK-NEXT: BeginLiveness
- // CHECK-NEXT: EndLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
+ // CHECK-NEXT: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK-NEXT: EndCurrentlyLive
return
}
@@ -17,18 +19,28 @@ func.func @func_simpleBranch(%arg0: i32, %arg1 : i32) -> i32 {
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut: arg0 at 0 arg1 at 0
- // CHECK-NEXT: BeginLiveness
- // CHECK-NEXT: EndLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
+ // CHECK-NEXT: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: cf.br
+ // CHECK-SAME: arg0 at 0 arg1 at 0
+ // CHECK-NEXT: EndCurrentlyLive
cf.br ^exit
^exit:
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg0 at 0 arg1 at 0
// CHECK-NEXT: LiveOut:{{ *$}}
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK: val_2
// CHECK-NEXT: %0 = arith.addi
// CHECK-NEXT: return
- // CHECK-NEXT: EndLiveness
+ // CHECK-NEXT: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 val_2
+ // CHECK: return
+ // CHECK-SAME: val_2
+ // CHECK-NEXT EndCurrentlyLive
%result = arith.addi %arg0, %arg1 : i32
return %result : i32
}
@@ -40,28 +52,47 @@ func.func @func_condBranch(%cond : i1, %arg1: i32, %arg2 : i32) -> i32 {
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut: arg1 at 0 arg2 at 0
- // CHECK-NEXT: BeginLiveness
- // CHECK-NEXT: EndLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
+ // CHECK-NEXT: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: cf.cond_br
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0
+ // CHECK-NEXT: EndCurrentlyLive
cf.cond_br %cond, ^bb1, ^bb2
^bb1:
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg1 at 0 arg2 at 0
// CHECK-NEXT: LiveOut: arg1 at 0 arg2 at 0
+ // CHECK: BeginCurrentlyLive
+ // CHECK: cf.br
+ // COM: arg0 at 0 had its last user in the previous block.
+ // CHECK-SAME: arg1 at 0 arg2 at 0
+ // CHECK-NEXT: EndCurrentlyLive
cf.br ^exit
^bb2:
// CHECK: Block: 2
// CHECK-NEXT: LiveIn: arg1 at 0 arg2 at 0
// CHECK-NEXT: LiveOut: arg1 at 0 arg2 at 0
+ // CHECK: BeginCurrentlyLive
+ // CHECK: cf.br
+ // CHECK-SAME: arg1 at 0 arg2 at 0
+ // CHECK-NEXT: EndCurrentlyLive
cf.br ^exit
^exit:
// CHECK: Block: 3
// CHECK-NEXT: LiveIn: arg1 at 0 arg2 at 0
// CHECK-NEXT: LiveOut:{{ *$}}
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK: val_3
// CHECK-NEXT: %0 = arith.addi
// CHECK-NEXT: return
- // CHECK-NEXT: EndLiveness
+ // CHECK-NEXT: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: arith.addi
+ // CHECK-SAME: arg1 at 0 arg2 at 0 val_3
+ // CHECK: return
+ // CHECK-SAME: val_3
+ // CHECK-NEXT: EndCurrentlyLive
%result = arith.addi %arg1, %arg2 : i32
return %result : i32
}
@@ -73,24 +104,36 @@ func.func @func_loop(%arg0 : i32, %arg1 : i32) -> i32 {
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut: arg1 at 0
+ // CHECK: BeginCurrentlyLive
+ // CHECK: arith.constant
+ // CHECK-SAME: arg0 at 0 arg1 at 0 val_2
+ // CHECK: cf.br
+ // CHECK-SAME: arg0 at 0 arg1 at 0 val_2
+ // CHECK-NEXT: EndCurrentlyLive
%const0 = arith.constant 0 : i32
cf.br ^loopHeader(%const0, %arg0 : i32, i32)
^loopHeader(%counter : i32, %i : i32):
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg1 at 0
// CHECK-NEXT: LiveOut: arg1 at 0 arg0 at 1
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_5
// CHECK-NEXT: %2 = arith.cmpi
// CHECK-NEXT: cf.cond_br
- // CHECK-NEXT: EndLiveness
+ // CHECK-NEXT: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: arith.cmpi
+ // CHECK-SAME: arg1 at 0 arg0 at 1 arg1 at 1 val_5
+ // CHECK: cf.cond_br
+ // CHECK-SAME: arg1 at 0 arg0 at 1 arg1 at 1 val_5
+ // CHECK-NEXT: EndCurrentlyLive
%lessThan = arith.cmpi slt, %counter, %arg1 : i32
cf.cond_br %lessThan, ^loopBody(%i : i32), ^exit(%i : i32)
^loopBody(%val : i32):
// CHECK: Block: 2
// CHECK-NEXT: LiveIn: arg1 at 0 arg0 at 1
// CHECK-NEXT: LiveOut: arg1 at 0
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_7
// CHECK-NEXT: %c
// CHECK-NEXT: %4 = arith.addi
@@ -99,7 +142,17 @@ func.func @func_loop(%arg0 : i32, %arg1 : i32) -> i32 {
// CHECK-NEXT: %4 = arith.addi
// CHECK-NEXT: %5 = arith.addi
// CHECK-NEXT: cf.br
- // CHECK: EndLiveness
+ // CHECK: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: arith.constant
+ // CHECK-SAME: arg1 at 0 arg0 at 1 arg0 at 2 val_7
+ // CHECK: arith.addi
+ // CHECK-SAME: arg1 at 0 arg0 at 1 arg0 at 2 val_7 val_8
+ // CHECK: arith.addi
+ // CHECK-SAME: arg1 at 0 arg0 at 1 val_7 val_8 val_9
+ // CHECK: cf.br
+ // CHECK-SAME: arg1 at 0 val_8 val_9
+ // CHECK-NEXT: EndCurrentlyLive
%const1 = arith.constant 1 : i32
%inc = arith.addi %val, %const1 : i32
%inc2 = arith.addi %counter, %const1 : i32
@@ -108,6 +161,12 @@ func.func @func_loop(%arg0 : i32, %arg1 : i32) -> i32 {
// CHECK: Block: 3
// CHECK-NEXT: LiveIn: arg1 at 0
// CHECK-NEXT: LiveOut:{{ *$}}
+ // CHECK: BeginCurrentlyLive
+ // CHECK: arith.addi
+ // CHECK-SAME: arg1 at 0 arg0 at 3 val_11
+ // CHECK: return
+ // CHECK-SAME: val_11
+ // CHECK-NEXT: EndCurrentlyLive
%result = arith.addi %sum, %arg1 : i32
return %result : i32
}
@@ -119,7 +178,7 @@ func.func @func_ranges(%cond : i1, %arg1 : i32, %arg2 : i32, %arg3 : i32) -> i32
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut: arg2 at 0 val_9 val_10
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_4
// CHECK-NEXT: %0 = arith.addi
// CHECK-NEXT: %c
@@ -156,7 +215,25 @@ func.func @func_ranges(%cond : i1, %arg1 : i32, %arg2 : i32, %arg3 : i32) -> i32
// CHECK-NEXT: %5 = arith.addi
// CHECK-NEXT: cf.cond_br
// CHECK-NEXT: %7
- // CHECK: EndLiveness
+ // CHECK: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg3 at 0 val_4
+ // CHECK: arith.constant
+ // CHECK-SAME: arg0 at 0 arg2 at 0 arg3 at 0 val_4 val_5
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg2 at 0 arg3 at 0 val_4 val_5 val_6
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg2 at 0 arg3 at 0 val_4 val_5 val_6 val_7
+ // CHECK: arith.muli
+ // CHECK-SAME: arg0 at 0 arg2 at 0 val_4 val_5 val_6 val_7 val_8
+ // CHECK: arith.muli
+ // CHECK-SAME: arg0 at 0 arg2 at 0 val_5 val_7 val_8 val_9
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg2 at 0 val_5 val_9 val_10
+ // CHECK: cf.cond_br
+ // CHECK-SAME: arg0 at 0 arg2 at 0 val_9 val_10
+ // CHECK-NEXT: EndCurrentlyLive
%0 = arith.addi %arg1, %arg2 : i32
%const1 = arith.constant 1 : i32
%1 = arith.addi %const1, %arg2 : i32
@@ -170,6 +247,14 @@ func.func @func_ranges(%cond : i1, %arg1 : i32, %arg2 : i32, %arg3 : i32) -> i32
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg2 at 0 val_9
// CHECK-NEXT: LiveOut: arg2 at 0
+ // CHECK: BeginCurrentlyLive
+ // CHECK: arith.constant
+ // CHECK-SAME: arg2 at 0 val_9
+ // CHECK: arith.muli
+ // CHECK-SAME: arg2 at 0 val_9
+ // CHECK: cf.br
+ // CHECK-SAME: arg2 at 0
+ // CHECK-NEXT: EndCurrentlyLive
%const4 = arith.constant 4 : i32
%6 = arith.muli %4, %const4 : i32
cf.br ^exit(%6 : i32)
@@ -178,6 +263,14 @@ func.func @func_ranges(%cond : i1, %arg1 : i32, %arg2 : i32, %arg3 : i32) -> i32
// CHECK: Block: 2
// CHECK-NEXT: LiveIn: arg2 at 0 val_9 val_10
// CHECK-NEXT: LiveOut: arg2 at 0
+ // CHECK: BeginCurrentlyLive
+ // CHECK: arith.muli
+ // CHECK-SAME: arg2 at 0 val_9 val_10
+ // CHECK: arith.addi
+ // CHECK-SAME: arg2 at 0
+ // CHECK: cf.br
+ // CHECK-SAME: arg2 at 0
+ // CHECK: EndCurrentlyLive
%7 = arith.muli %4, %5 : i32
%8 = arith.addi %4, %arg2 : i32
cf.br ^exit(%8 : i32)
@@ -186,6 +279,12 @@ func.func @func_ranges(%cond : i1, %arg1 : i32, %arg2 : i32, %arg3 : i32) -> i32
// CHECK: Block: 3
// CHECK-NEXT: LiveIn: arg2 at 0
// CHECK-NEXT: LiveOut:{{ *$}}
+ // CHECK: BeginCurrentlyLive
+ // CHECK: arith.addi
+ // CHECK-SAME: arg2 at 0
+ // CHECK: return
+ // CHECK-NOT: arg2 at 0
+ // CHECK: EndCurrentlyLive
%result = arith.addi %sum, %arg2 : i32
return %result : i32
}
@@ -201,7 +300,7 @@ func.func @nested_region(
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut:{{ *$}}
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_7
// CHECK-NEXT: %0 = arith.addi
// CHECK-NEXT: %1 = arith.addi
@@ -212,13 +311,34 @@ func.func @nested_region(
// CHECK-NEXT: %1 = arith.addi
// CHECK-NEXT: scf.for
// CHECK: // func.return %1
- // CHECK: EndLiveness
+ // CHECK: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg3 at 0 arg4 at 0 arg5 at 0 arg6 at 0 val_7
+ // CHECK: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg4 at 0 arg5 at 0 arg6 at 0 val_7 val_8
+ // CHECK: scf.for
+ // CHECK-NEXT: arith.addi
+ // CHECK-NEXT: arith.addi
+ // CHECK-NEXT: memref.store
+ // CHECK-NEXT: arg5 at 0 arg6 at 0 val_7 val_8
+ // CHECK: return
+ // CHECK-SAME: val_8
+ // CHECK-NEXT: EndCurrentlyLive
%0 = arith.addi %arg3, %arg4 : i32
%1 = arith.addi %arg4, %arg5 : i32
scf.for %arg6 = %arg0 to %arg1 step %arg2 {
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg5 at 0 arg6 at 0 val_7
// CHECK-NEXT: LiveOut:{{ *$}}
+ // CHECK: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg5 at 0 arg6 at 0 val_7 arg0 at 1 val_10
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg6 at 0 val_7 val_10 val_11
+ // CHECK-NEXT: memref.store
+ // CHECK-SAME: arg6 at 0 val_11
+ // CHECK-NEXT: EndCurrentlyLive
%2 = arith.addi %0, %arg5 : i32
%3 = arith.addi %2, %0 : i32
memref.store %3, %buffer[] : memref<i32>
@@ -234,7 +354,7 @@ func.func @nested_region2(
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut:{{ *$}}
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_7
// CHECK-NEXT: %0 = arith.addi
// CHECK-NEXT: %1 = arith.addi
@@ -246,7 +366,21 @@ func.func @nested_region2(
// CHECK-NEXT: %1 = arith.addi
// CHECK-NEXT: scf.for
// CHECK: // func.return %1
- // CHECK: EndLiveness
+ // CHECK: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg3 at 0 arg4 at 0 arg5 at 0 arg6 at 0 val_7
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg4 at 0 arg5 at 0 arg6 at 0 val_7 val_8
+ // CHECK-NEXT: scf.for {{.*}}
+ // CHECK-NEXT: arith.addi
+ // CHECK-NEXT: scf.for {{.*}} {
+ // CHECK-NEXT: arith.addi
+ // CHECK-NEXT: memref.store
+ // CHECK-NEXT: }
+ // CHECK-NEXT: arg0 at 0 arg1 at 0 arg2 at 0 arg5 at 0 arg6 at 0 val_7 val_8
+ // CHECK-NEXT: return
+ // CHECK-SAME: val_8
%arg0 : index, %arg1 : index, %arg2 : index,
%arg3 : i32, %arg4 : i32, %arg5 : i32,
%buffer : memref<i32>) -> i32 {
@@ -256,14 +390,28 @@ func.func @nested_region2(
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg0 at 0 arg1 at 0 arg2 at 0 arg5 at 0 arg6 at 0 val_7
// CHECK-NEXT: LiveOut:{{ *$}}
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_10
// CHECK-NEXT: %2 = arith.addi
// CHECK-NEXT: scf.for
// CHECK: // %3 = arith.addi
- // CHECK: EndLiveness
+ // CHECK: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg5 at 0 arg6 at 0 val_7 arg0 at 1 val_10
+ // CHECK-NEXT: scf.for {{.*}}
+ // CHECK-NEXT: arith.addi
+ // CHECK-NEXT: memref.store
+ // CHECK-NEXT: arg0 at 0 arg1 at 0 arg2 at 0 arg6 at 0 val_7
%2 = arith.addi %0, %arg5 : i32
scf.for %arg7 = %arg0 to %arg1 step %arg2 {
+ // CHECK: Block: 2
+ // CHECK: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg6 at 0 val_7 val_10 arg0 at 2 val_12
+ // CHECK-NEXT: memref.store
+ // CHECK-SAME: arg6 at 0 val_12
+ // CHECK: EndCurrentlyLive
%3 = arith.addi %2, %0 : i32
memref.store %3, %buffer[] : memref<i32>
}
@@ -279,7 +427,7 @@ func.func @nested_region3(
// CHECK: Block: 0
// CHECK-NEXT: LiveIn:{{ *$}}
// CHECK-NEXT: LiveOut: arg0 at 0 arg1 at 0 arg2 at 0 arg6 at 0 val_7 val_8
- // CHECK-NEXT: BeginLiveness
+ // CHECK-NEXT: BeginLivenessIntervals
// CHECK-NEXT: val_7
// CHECK-NEXT: %0 = arith.addi
// CHECK-NEXT: %1 = arith.addi
@@ -288,7 +436,18 @@ func.func @nested_region3(
// CHECK-NEXT: %2 = arith.addi
// CHECK-NEXT: scf.for
// CHECK: // %2 = arith.addi
- // CHECK: EndLiveness
+ // CHECK: EndLivenessIntervals
+ // CHECK-NEXT: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg3 at 0 arg4 at 0 arg5 at 0 arg6 at 0 val_7
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg4 at 0 arg5 at 0 arg6 at 0 val_7 val_8
+ // CHECK-NEXT: scf.for
+ // COM: Skipping the body of the scf.for...
+ // CHECK: arg0 at 0 arg1 at 0 arg2 at 0 arg5 at 0 arg6 at 0 val_7 val_8
+ // CHECK-NEXT: cf.br
+ // CHECK-SAME: arg0 at 0 arg1 at 0 arg2 at 0 arg6 at 0 val_7 val_8
+ // CHECK-NEXT: EndCurrentlyLive
%arg0 : index, %arg1 : index, %arg2 : index,
%arg3 : i32, %arg4 : i32, %arg5 : i32,
%buffer : memref<i32>) -> i32 {
@@ -298,6 +457,12 @@ func.func @nested_region3(
// CHECK: Block: 1
// CHECK-NEXT: LiveIn: arg5 at 0 arg6 at 0 val_7
// CHECK-NEXT: LiveOut:{{ *$}}
+ // CHECK: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg5 at 0 arg6 at 0 val_7 arg0 at 1 val_10
+ // CHECK-NEXT: memref.store
+ // CHECK-SAME: arg6 at 0 val_10
+ // CHECK-NEXT: EndCurrentlyLive
%2 = arith.addi %0, %arg5 : i32
memref.store %2, %buffer[] : memref<i32>
}
@@ -307,10 +472,22 @@ func.func @nested_region3(
// CHECK: Block: 2
// CHECK-NEXT: LiveIn: arg0 at 0 arg1 at 0 arg2 at 0 arg6 at 0 val_7 val_8
// CHECK-NEXT: LiveOut:{{ *$}}
+ // CHECK: BeginCurrentlyLive
+ // CHECK: scf.for
+ // CHECK: arg0 at 0 arg1 at 0 arg2 at 0 arg6 at 0 val_7 val_8
+ // CHECK-NEXT: return
+ // CHECK-SAME: val_8
+ // CHECK-NEXT: EndCurrentlyLive
scf.for %arg7 = %arg0 to %arg1 step %arg2 {
// CHECK: Block: 3
// CHECK-NEXT: LiveIn: arg6 at 0 val_7 val_8
// CHECK-NEXT: LiveOut:{{ *$}}
+ // CHECK: BeginCurrentlyLive
+ // CHECK-NEXT: arith.addi
+ // CHECK-SAME: arg6 at 0 val_7 val_8 arg0 at 3 val_12
+ // CHECK-NEXT: memref.store
+ // CHECK-SAME: arg6 at 0 val_12
+ // CHECK-NEXT: EndCurrentlyLive
%2 = arith.addi %0, %1 : i32
memref.store %2, %buffer[] : memref<i32>
}
More information about the Mlir-commits
mailing list