You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2021/04/18 11:41:59 UTC
[GitHub] [tvm] Hzfengsy opened a new pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Hzfengsy opened a new pull request #7873:
URL: https://github.com/apache/tvm/pull/7873
This PR is part of the TensorIR upstreaming effort (#7527) as one of the M1c stages, introducing the pass PlanUpdateBufferAllocationLocation.
This Pass will Locate the buffer allocation to the exact position (usually is the lca of buffer access) and inject opaque block
with alloc_buffers to annotate the buffer allocation site.
cc @tqchen @comaniac @jroesch @junrushao1994
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] tqchen commented on pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Posted by GitBox <gi...@apache.org>.
tqchen commented on pull request #7873:
URL: https://github.com/apache/tvm/pull/7873#issuecomment-822434604
The current naming is fine given it is a pass only used internally. Realize may also may not best describe it, as this pass
"moves"(aka updates) the location of buffer allocation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] tqchen commented on a change in pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Posted by GitBox <gi...@apache.org>.
tqchen commented on a change in pull request #7873:
URL: https://github.com/apache/tvm/pull/7873#discussion_r615811726
##########
File path: tests/python/unittest/test_tir_transform_plan_update_buffer_allocation_location.py
##########
@@ -0,0 +1,128 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import tvm
+from tvm import tir
+from tvm.script import ty
+
+
+def _check(original, transformed):
+ func = original
+ mod = tvm.IRModule.from_expr(func)
+ mod = tvm.tir.transform.PlanAndUpdateBufferAllocationLocation()(mod)
+ tvm.ir.assert_structural_equal(mod["main"], transformed)
+
+
+@tvm.script.tir
+def element_func(a: ty.handle, c: ty.handle) -> None:
+ A = tir.match_buffer(a, (16, 16))
+ C = tir.match_buffer(c, (16, 16))
+ B = tir.alloc_buffer((16, 16))
+ for i_0 in range(0, 16):
+ for j_0 in range(0, 16):
+ with tir.block([16, 16]) as [i, j]:
+ B[i, j] = A[i, j] + 1.0
+ for j_0 in range(0, 16):
+ with tir.block([16, 16]) as [i, j]:
+ C[i, j] = B[i, j] * 2.0
+
+
+@tvm.script.tir
+def transformed_element_func(a: ty.handle, c: ty.handle) -> None:
+ A = tir.match_buffer(a, [16, 16])
+ C = tir.match_buffer(c, [16, 16])
+
+ for i_0 in range(0, 16):
+ with tir.block([]):
+ tir.reads([A[i_0, 0:16]])
+ tir.writes([C[i_0, 0:16]])
+ B = tir.alloc_buffer([16, 16])
Review comment:
@jcf94 i believe your understanding is correct in this case
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] junrushao1994 merged pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Posted by GitBox <gi...@apache.org>.
junrushao1994 merged pull request #7873:
URL: https://github.com/apache/tvm/pull/7873
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] junrushao1994 commented on pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Posted by GitBox <gi...@apache.org>.
junrushao1994 commented on pull request #7873:
URL: https://github.com/apache/tvm/pull/7873#issuecomment-822047228
Shall we find a shorter name this this pass 😆
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] junrushao1994 commented on a change in pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Posted by GitBox <gi...@apache.org>.
junrushao1994 commented on a change in pull request #7873:
URL: https://github.com/apache/tvm/pull/7873#discussion_r615443552
##########
File path: src/tir/transforms/plan_update_buffer_allocation_location.cc
##########
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \brief Planning where buffers to be allocated and update the AST.
+ * \file plan_update_buffer_allocation_location.cc
+ */
+
+#include <tvm/tir/analysis.h>
+#include <tvm/tir/stmt_functor.h>
+#include <tvm/tir/transform.h>
+
+namespace tvm {
+namespace tir {
+
+class BufferAllocationLocator : public StmtExprMutator {
+ public:
+ explicit BufferAllocationLocator(const PrimFunc& func) {
+ Map<Buffer, Stmt> buffer_lca = DetectBufferAccessLCA(func);
+ std::unordered_set<const BufferNode*> arg_buffers;
+ for (const auto& kv : func->buffer_map) {
+ const Buffer& buffer = kv.second;
+ arg_buffers.emplace(buffer.get());
+ buffer_data_to_buffer_.Set(buffer->data, buffer);
+ }
+ // create buffers to be allocated at each stmts
+ for (const auto& kv : buffer_lca) {
+ const Buffer& buffer = kv.first;
+ const StmtNode* stmt = kv.second.get();
+ if (arg_buffers.count(buffer.get())) {
+ continue;
+ }
+ alloc_buffers_[stmt].push_back(buffer);
+ }
+ }
+
+ private:
+ Stmt VisitStmt_(const ForNode* op) final {
+ auto it = alloc_buffers_.find(op);
+ if (it == alloc_buffers_.end()) {
+ return StmtMutator::VisitStmt_(op);
+ }
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.Set(buf->data, buf);
+ }
+ Stmt stmt = StmtMutator::VisitStmt_(op);
+ op = stmt.as<ForNode>();
+ ICHECK(op != nullptr);
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.erase(buf->data);
+ }
+ Stmt body = InjectOpaqueBlock(op->body, it->second);
+ auto n = CopyOnWrite(op);
+ n->body = std::move(body);
+ return Stmt(n);
+ }
+
+ Stmt VisitStmt_(const BlockNode* op) final {
+ ICHECK(!op->init.defined());
+ bool is_root = is_root_;
+ is_root_ = false;
+ Array<Buffer> alloc_buffers;
+ auto it = alloc_buffers_.find(op);
+ if (it != alloc_buffers_.end()) {
+ alloc_buffers = it->second;
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.Set(buf->data, buf);
+ }
+ }
+ Stmt stmt = StmtMutator::VisitStmt_(op);
+ op = stmt.as<BlockNode>();
+ ICHECK(op != nullptr);
+
+ // Ignore buffer allocated inside the block when getting access region.
+ if (it != alloc_buffers_.end()) {
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.erase(buf->data);
+ }
+ }
+
+ auto n = CopyOnWrite(op);
Review comment:
ditto
```suggestion
ObjectPtr<BlockNode> n = CopyOnWrite(op);
```
##########
File path: src/tir/transforms/plan_update_buffer_allocation_location.cc
##########
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \brief Planning where buffers to be allocated and update the AST.
+ * \file plan_update_buffer_allocation_location.cc
+ */
+
+#include <tvm/tir/analysis.h>
+#include <tvm/tir/stmt_functor.h>
+#include <tvm/tir/transform.h>
+
+namespace tvm {
+namespace tir {
+
+class BufferAllocationLocator : public StmtExprMutator {
+ public:
+ explicit BufferAllocationLocator(const PrimFunc& func) {
+ Map<Buffer, Stmt> buffer_lca = DetectBufferAccessLCA(func);
+ std::unordered_set<const BufferNode*> arg_buffers;
+ for (const auto& kv : func->buffer_map) {
+ const Buffer& buffer = kv.second;
+ arg_buffers.emplace(buffer.get());
+ buffer_data_to_buffer_.Set(buffer->data, buffer);
+ }
+ // create buffers to be allocated at each stmts
+ for (const auto& kv : buffer_lca) {
+ const Buffer& buffer = kv.first;
+ const StmtNode* stmt = kv.second.get();
+ if (arg_buffers.count(buffer.get())) {
+ continue;
+ }
+ alloc_buffers_[stmt].push_back(buffer);
+ }
+ }
+
+ private:
+ Stmt VisitStmt_(const ForNode* op) final {
+ auto it = alloc_buffers_.find(op);
+ if (it == alloc_buffers_.end()) {
+ return StmtMutator::VisitStmt_(op);
+ }
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.Set(buf->data, buf);
+ }
+ Stmt stmt = StmtMutator::VisitStmt_(op);
+ op = stmt.as<ForNode>();
+ ICHECK(op != nullptr);
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.erase(buf->data);
+ }
+ Stmt body = InjectOpaqueBlock(op->body, it->second);
+ auto n = CopyOnWrite(op);
Review comment:
Don't use auto unless the type is as long as iterators, or has appeared on the same line
```suggestion
ObjectPtr<ForNode> n = CopyOnWrite(op);
```
##########
File path: src/tir/transforms/plan_update_buffer_allocation_location.cc
##########
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \brief Planning where buffers to be allocated and update the AST.
+ * \file plan_update_buffer_allocation_location.cc
+ */
+
+#include <tvm/tir/analysis.h>
+#include <tvm/tir/stmt_functor.h>
+#include <tvm/tir/transform.h>
+
+namespace tvm {
+namespace tir {
+
+class BufferAllocationLocator : public StmtExprMutator {
+ public:
+ explicit BufferAllocationLocator(const PrimFunc& func) {
+ Map<Buffer, Stmt> buffer_lca = DetectBufferAccessLCA(func);
+ std::unordered_set<const BufferNode*> arg_buffers;
+ for (const auto& kv : func->buffer_map) {
+ const Buffer& buffer = kv.second;
+ arg_buffers.emplace(buffer.get());
+ buffer_data_to_buffer_.Set(buffer->data, buffer);
+ }
+ // create buffers to be allocated at each stmts
+ for (const auto& kv : buffer_lca) {
+ const Buffer& buffer = kv.first;
+ const StmtNode* stmt = kv.second.get();
+ if (arg_buffers.count(buffer.get())) {
+ continue;
+ }
+ alloc_buffers_[stmt].push_back(buffer);
+ }
+ }
+
+ private:
+ Stmt VisitStmt_(const ForNode* op) final {
+ auto it = alloc_buffers_.find(op);
+ if (it == alloc_buffers_.end()) {
+ return StmtMutator::VisitStmt_(op);
+ }
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.Set(buf->data, buf);
+ }
+ Stmt stmt = StmtMutator::VisitStmt_(op);
+ op = stmt.as<ForNode>();
+ ICHECK(op != nullptr);
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.erase(buf->data);
+ }
+ Stmt body = InjectOpaqueBlock(op->body, it->second);
+ auto n = CopyOnWrite(op);
+ n->body = std::move(body);
+ return Stmt(n);
+ }
+
+ Stmt VisitStmt_(const BlockNode* op) final {
+ ICHECK(!op->init.defined());
+ bool is_root = is_root_;
+ is_root_ = false;
+ Array<Buffer> alloc_buffers;
+ auto it = alloc_buffers_.find(op);
+ if (it != alloc_buffers_.end()) {
+ alloc_buffers = it->second;
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.Set(buf->data, buf);
+ }
+ }
+ Stmt stmt = StmtMutator::VisitStmt_(op);
+ op = stmt.as<BlockNode>();
+ ICHECK(op != nullptr);
+
+ // Ignore buffer allocated inside the block when getting access region.
+ if (it != alloc_buffers_.end()) {
+ for (const Buffer& buf : it->second) {
+ buffer_data_to_buffer_.erase(buf->data);
+ }
+ }
+
+ auto n = CopyOnWrite(op);
+ n->alloc_buffers = std::move(alloc_buffers);
+ // The read/write regions of root block are always empty.
+ if (!is_root) {
+ // Recalculate block access region
+ CollectReadWrite(GetRef<Block>(op), &n->reads, &n->writes);
+ }
+
+ return Stmt(n);
+ }
+
+ Stmt VisitStmt_(const BufferRealizeNode* op) final {
+ ICHECK(false) << "Internal Error: BufferRealizeNode is not allowed in TensorIR.";
+ throw;
+ }
+
+ Stmt InjectOpaqueBlock(Stmt body, const Array<Buffer>& alloc_buffers) {
+ ICHECK(!alloc_buffers.empty());
+ Block opaque_block(/*iter_vars=*/{},
+ /*reads=*/{},
+ /*writes=*/{},
+ /*name_hint=*/"",
+ /*body=*/std::move(body),
+ /*init=*/NullOpt,
+ /*alloc_buffers=*/alloc_buffers);
+ auto n = CopyOnWrite(opaque_block.get());
Review comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [tvm] jcf94 commented on a change in pull request #7873: [TensorIR][PASS][M1c] PlanUpdateBufferAllocationLocation
Posted by GitBox <gi...@apache.org>.
jcf94 commented on a change in pull request #7873:
URL: https://github.com/apache/tvm/pull/7873#discussion_r615752672
##########
File path: tests/python/unittest/test_tir_transform_plan_update_buffer_allocation_location.py
##########
@@ -0,0 +1,128 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import tvm
+from tvm import tir
+from tvm.script import ty
+
+
+def _check(original, transformed):
+ func = original
+ mod = tvm.IRModule.from_expr(func)
+ mod = tvm.tir.transform.PlanAndUpdateBufferAllocationLocation()(mod)
+ tvm.ir.assert_structural_equal(mod["main"], transformed)
+
+
+@tvm.script.tir
+def element_func(a: ty.handle, c: ty.handle) -> None:
+ A = tir.match_buffer(a, (16, 16))
+ C = tir.match_buffer(c, (16, 16))
+ B = tir.alloc_buffer((16, 16))
+ for i_0 in range(0, 16):
+ for j_0 in range(0, 16):
+ with tir.block([16, 16]) as [i, j]:
+ B[i, j] = A[i, j] + 1.0
+ for j_0 in range(0, 16):
+ with tir.block([16, 16]) as [i, j]:
+ C[i, j] = B[i, j] * 2.0
+
+
+@tvm.script.tir
+def transformed_element_func(a: ty.handle, c: ty.handle) -> None:
+ A = tir.match_buffer(a, [16, 16])
+ C = tir.match_buffer(c, [16, 16])
+
+ for i_0 in range(0, 16):
+ with tir.block([]):
+ tir.reads([A[i_0, 0:16]])
+ tir.writes([C[i_0, 0:16]])
+ B = tir.alloc_buffer([16, 16])
Review comment:
Does this test case means that the buffer defined outside this block(the original element_func) will be transformed to a buffer inside the block?
What if the `for i_0 in range(0, 16)` is a axis with `parallel`, this will turns a thread common buffer to a thread local buffer?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org