Skip to content
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

[opt] Avoid storing constants across offloaded tasks #812

Merged
merged 2 commits into from
Apr 18, 2020
Merged

[opt] Avoid storing constants across offloaded tasks #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3bd6c
[opt] Avoid storing constants across offloaded tasks
xumingkuan Apr 17, 2020
3a4c3ab
use `advanced_optimization`
xumingkuan Apr 17, 2020
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
4 changes: 4 additions & 0 deletions taichi/ir/ir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,10 @@ void SNodeOpExpression::flatten(VecStatement &ret) {
stmt = ret.back().get();
}

std::unique_ptr<ConstStmt> ConstStmt::copy() {
return std::make_unique<ConstStmt>(val);
}

For::For(const Expr &s, const Expr &e, const std::function<void(Expr)> &func) {
auto i = Expr(std::make_shared<IdExpression>());
auto stmt_unique = std::make_unique<FrontendForStmt>(i, s, e);
Expand Down
2 changes: 2 additions & 0 deletions taichi/ir/ir.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,6 +1622,8 @@ class ConstStmt : public Stmt {
return false;
}

std::unique_ptr<ConstStmt> copy();

TI_STMT_DEF_FIELDS(ret_type, val);
DEFINE_ACCEPT
};
Expand Down
20 changes: 18 additions & 2 deletions taichi/transforms/offload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,12 @@ class IdentifyValuesUsedInOtherOffloads : public BasicStmtVisitor {
return;
if (stmt_to_offloaded[stmt] == current_offloaded)
return;
if (advanced_optimization) {
if (stmt->is<ConstStmt>()) {
// Directly insert copies of ConstStmts later
return;
}
}
if (local_to_global.find(stmt) == local_to_global.end()) {
// Not yet allocated
local_to_global[stmt] = allocate_global(stmt->ret_type);
Expand Down Expand Up @@ -435,11 +441,21 @@ class FixCrossOffloadReferences : public BasicStmtVisitor {
auto op = stmt->operand(i);
if (op == nullptr)
continue;
if (local_to_global_offset.find(op) == local_to_global_offset.end())
continue;
if (stmt_to_offloaded[stmt] ==
stmt_to_offloaded[op]) // same OffloadedStmt
continue;
if (advanced_optimization) {
if (op->is<ConstStmt>()) {
auto copy = op->as<ConstStmt>()->copy();
stmt_to_offloaded[copy.get()] = stmt_to_offloaded[stmt];
stmt->set_operand(i, copy.get());
stmt->insert_before_me(std::move(copy));
modified = true;
continue;
}
}
if (local_to_global_offset.find(op) == local_to_global_offset.end())
continue;

auto global = Stmt::make<GlobalTemporaryStmt>(local_to_global_offset[op],
op->ret_type);
Expand Down