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/02/01 20:27:42 UTC
[GitHub] [tvm] altanh commented on a change in pull request #7374: [WIP][Relay][Passes] Iterative A-normal Traversals
altanh commented on a change in pull request #7374:
URL: https://github.com/apache/tvm/pull/7374#discussion_r568114858
##########
File path: src/relay/transforms/fold_constant.cc
##########
@@ -92,19 +92,33 @@ class ConstantFolder : public MixedModeMutator {
using MixedModeMutator::VisitExpr_;
Expr VisitExpr_(const LetNode* op) final {
- Expr value = this->Mutate(op->value);
- if (value.as<ConstantNode>()) {
- memo_[op->var] = value;
- return this->Mutate(op->body);
- } else {
- Var var = Downcast<Var>(this->Mutate(op->var));
- Expr body = this->Mutate(op->body);
- if (var.same_as(op->var) && value.same_as(op->value) && body.same_as(op->body)) {
- return GetRef<Expr>(op);
+ auto pre_visit = [this](const LetNode* op) {
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[op->var] = value;
Review comment:
explicitly use `this->memo_`
##########
File path: src/relay/transforms/de_duplicate.cc
##########
@@ -61,8 +63,19 @@ Expr DeDup(const Expr& e) {
}
Expr VisitExpr_(const LetNode* op) final {
- Var v = Fresh(op->var);
- return Let(v, VisitExpr(op->value), VisitExpr(op->body));
+ std::unordered_map<Expr, Var, ObjectPtrHash, ObjectPtrEqual> new_vars;
+ auto pre_visit = [this, &new_vars](const LetNode* op) {
+ Expr expr = GetRef<Expr>(op);
+ new_vars[expr] = Fresh(op->var);
+ // Rely on the Memoizer to cache pre-visit values
+ VisitExpr(op->value);
+ };
+ auto post_visit = [this, &new_vars](const LetNode* op) {
+ Expr expr = GetRef<Expr>(op);
+ memo_[expr] = Let(new_vars[expr], VisitExpr(op->value), VisitExpr(op->body));
Review comment:
explicitly use `this->memo_`
##########
File path: src/relay/transforms/de_duplicate.cc
##########
@@ -61,8 +63,19 @@ Expr DeDup(const Expr& e) {
}
Expr VisitExpr_(const LetNode* op) final {
- Var v = Fresh(op->var);
- return Let(v, VisitExpr(op->value), VisitExpr(op->body));
+ std::unordered_map<Expr, Var, ObjectPtrHash, ObjectPtrEqual> new_vars;
+ auto pre_visit = [this, &new_vars](const LetNode* op) {
+ Expr expr = GetRef<Expr>(op);
+ new_vars[expr] = Fresh(op->var);
+ // Rely on the Memoizer to cache pre-visit values
+ VisitExpr(op->value);
Review comment:
explicitly use `this->VisitExpr`
##########
File path: src/relay/transforms/fold_constant.cc
##########
@@ -92,19 +92,33 @@ class ConstantFolder : public MixedModeMutator {
using MixedModeMutator::VisitExpr_;
Expr VisitExpr_(const LetNode* op) final {
- Expr value = this->Mutate(op->value);
- if (value.as<ConstantNode>()) {
- memo_[op->var] = value;
- return this->Mutate(op->body);
- } else {
- Var var = Downcast<Var>(this->Mutate(op->var));
- Expr body = this->Mutate(op->body);
- if (var.same_as(op->var) && value.same_as(op->value) && body.same_as(op->body)) {
- return GetRef<Expr>(op);
+ auto pre_visit = [this](const LetNode* op) {
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[op->var] = value;
} else {
- return Let(var, value, body);
+ this->Mutate(op->var);
}
- }
+ };
+ auto post_visit = [this](const LetNode* op) {
+ Expr expr = GetRef<Expr>(op);
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[expr] = this->Mutate(op->body);
Review comment:
`this->memo_`
##########
File path: src/relay/transforms/fold_constant.cc
##########
@@ -92,19 +92,33 @@ class ConstantFolder : public MixedModeMutator {
using MixedModeMutator::VisitExpr_;
Expr VisitExpr_(const LetNode* op) final {
- Expr value = this->Mutate(op->value);
- if (value.as<ConstantNode>()) {
- memo_[op->var] = value;
- return this->Mutate(op->body);
- } else {
- Var var = Downcast<Var>(this->Mutate(op->var));
- Expr body = this->Mutate(op->body);
- if (var.same_as(op->var) && value.same_as(op->value) && body.same_as(op->body)) {
- return GetRef<Expr>(op);
+ auto pre_visit = [this](const LetNode* op) {
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[op->var] = value;
} else {
- return Let(var, value, body);
+ this->Mutate(op->var);
}
- }
+ };
+ auto post_visit = [this](const LetNode* op) {
+ Expr expr = GetRef<Expr>(op);
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[expr] = this->Mutate(op->body);
+ } else {
+ Var var = Downcast<Var>(this->Mutate(op->var));
+ Expr body = this->Mutate(op->body);
+ if (var.same_as(op->var) && value.same_as(op->value) && body.same_as(op->body)) {
+ memo_[expr] = expr;
+ } else {
+ memo_[expr] = Let(var, value, body);
Review comment:
`this->memo_`
##########
File path: src/relay/transforms/fold_constant.cc
##########
@@ -92,19 +92,33 @@ class ConstantFolder : public MixedModeMutator {
using MixedModeMutator::VisitExpr_;
Expr VisitExpr_(const LetNode* op) final {
- Expr value = this->Mutate(op->value);
- if (value.as<ConstantNode>()) {
- memo_[op->var] = value;
- return this->Mutate(op->body);
- } else {
- Var var = Downcast<Var>(this->Mutate(op->var));
- Expr body = this->Mutate(op->body);
- if (var.same_as(op->var) && value.same_as(op->value) && body.same_as(op->body)) {
- return GetRef<Expr>(op);
+ auto pre_visit = [this](const LetNode* op) {
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[op->var] = value;
} else {
- return Let(var, value, body);
+ this->Mutate(op->var);
}
- }
+ };
+ auto post_visit = [this](const LetNode* op) {
+ Expr expr = GetRef<Expr>(op);
+ // Rely on the Memoizer to cache pre-visit values
+ Expr value = this->Mutate(op->value);
+ if (value.as<ConstantNode>()) {
+ memo_[expr] = this->Mutate(op->body);
+ } else {
+ Var var = Downcast<Var>(this->Mutate(op->var));
+ Expr body = this->Mutate(op->body);
+ if (var.same_as(op->var) && value.same_as(op->value) && body.same_as(op->body)) {
+ memo_[expr] = expr;
Review comment:
`this->memo_`
##########
File path: src/relay/transforms/fuse_ops.cc
##########
@@ -315,11 +315,20 @@ class IndexedForwardGraph::Creator : private ExprVisitor {
void VisitExpr_(const LetNode* op) final {
// do not fuse through let.
- this->Update(op->var, nullptr, kOpaque);
- this->Update(op->value, nullptr, kOpaque);
- this->Update(op->body, nullptr, kOpaque);
- ExprVisitor::VisitExpr_(op);
- this->AddNode(op);
+ auto pre_visit = [this](const LetNode* op) {
+ // Rely on the Memoizer to cache pre-visit values
+ this->Update(op->var, nullptr, kOpaque);
+ this->Update(op->value, nullptr, kOpaque);
+ this->Update(op->body, nullptr, kOpaque);
+ VisitExpr(op->var);
+ VisitExpr(op->value);
+ };
+ auto post_visit = [this](const LetNode* op) {
+ VisitExpr(op->body);
+ visit_counter_[op] += 1;
+ this->AddNode(op);
Review comment:
explicit `this` in here
----------------------------------------------------------------
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