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

[Lang] Migrate irpass::scalarize() after irpass::detect_read_only() #7939

Merged
merged 8 commits into from
May 8, 2023
Merged

[Lang] Migrate irpass::scalarize() after irpass::detect_read_only() #7939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c9e5993
[Lang] Migrate irpass::scalarize() after irpass::offload()
jim19930609 May 4, 2023
0a51519
Merge branch 'master' of github.com:taichi-dev/taichi into matrix_ada…
jim19930609 May 4, 2023
e45c557
code adjustment
jim19930609 May 5, 2023
4447d48
[Lang] Migrate irpass::scalarize() to the end of compile_to_offloads()
jim19930609 May 6, 2023
e7b3921
[Lang] Migrate irpass::scalarize() after irpass::detect_read_only()
jim19930609 May 6, 2023
3c5a45e
bug fix
jim19930609 May 6, 2023
629cea0
Merge branch 'master' of github.com:taichi-dev/taichi into matrix_ada…
jim19930609 May 8, 2023
70f2171
bug fix
jim19930609 May 8, 2023
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
16 changes: 8 additions & 8 deletions taichi/transforms/compile_to_offloads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,6 @@ void compile_to_offloads(IRNode *ir,
print("Offloaded");
irpass::analysis::verify(ir);

if (config.real_matrix_scalarize) {
irpass::scalarize(ir);

// Remove redundant MatrixInitStmt inserted during scalarization
irpass::die(ir);
print("Scalarized");
}

// TODO: This pass may be redundant as cfg_optimization() is already called
// in full_simplify().
if (config.opt_level > 0 && config.cfg_optimization) {
Expand Down Expand Up @@ -187,6 +179,14 @@ void offload_to_executable(IRNode *ir,
print("Detect read-only accesses");
}

if (config.real_matrix_scalarize) {
irpass::scalarize(ir);

// Remove redundant MatrixInitStmt inserted during scalarization
irpass::full_simplify(ir, config, {false, /*autodiff_enabled*/ false});
print("Scalarized");
}

irpass::demote_atomics(ir, config);
print("Atomics demoted I");
irpass::analysis::verify(ir);
Expand Down
8 changes: 6 additions & 2 deletions taichi/transforms/scalarize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,8 +1049,12 @@ class ExtractLocalPointers : public BasicStmtVisitor {
Block *top_level_;

explicit ExtractLocalPointers(IRNode *root) : immediate_modifier_(root) {
TI_ASSERT(root->is<Block>());
top_level_ = root->as<Block>();
if (root->is<OffloadedStmt>()) {
top_level_ = root->as<OffloadedStmt>()->body.get();
} else {
TI_ASSERT(root->is<Block>());
top_level_ = root->as<Block>();
}
root->accept(this);
delayed_modifier_.modify_ir();
}
Expand Down