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

Jump to bottom

fixed the bug of reuse of reshape2's output in xpu_memory_optimize_pass #9178

Merged
merged 1 commit into from
Jun 30, 2022
Merged

fixed the bug of reuse of reshape2's output in xpu_memory_optimize_pass #9178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions lite/core/optimizer/mir/xpu_memory_optimize_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,27 +121,6 @@ void XPUMemoryOptimizePass::CollectLifeCycleByDevice(SSAGraph* graph) {
var_nodes.insert(
var_nodes.end(), op_node->outlinks.begin(), op_node->outlinks.end());
TargetType target_type;
for (auto* var_node : var_nodes) {
CHECK(var_node->IsArg());
auto& arg = var_node->AsArg();
if (arg.is_weight || arg.is_persist) continue;
std::string var_name = arg.name;
VLOG(4) << "OP VAR NAME IS " << var_name;
if (var_name.find("_xpu_max") != std::string::npos) continue;
if (invalid_var_names.count(var_name)) continue;
target_type = arg.type->target();
if (is_host(target_type)) target_type = TARGET(kHost);

if (!lifecycles[TargetToStr(target_type)].count(var_name)) {
lifecycles[TargetToStr(target_type)].emplace(
var_name, std::make_pair(max_lifecycle_, max_lifecycle_));
} else {
int cur_life = lifecycles[TargetToStr(target_type)][var_name].second;
lifecycles[TargetToStr(target_type)][var_name].second =
(std::max)(max_lifecycle_, cur_life);
}
}
++max_lifecycle_;

auto inplace_op_node = inplace_op_nodes.find(op_type);
if (inplace_op_node != inplace_op_nodes.end()) {
Expand All @@ -152,6 +131,8 @@ void XPUMemoryOptimizePass::CollectLifeCycleByDevice(SSAGraph* graph) {
if (inplace) {
auto in_arg_name = op_info->Input("X")[0];
auto out_arg_name = op_info->Output("Out")[0];
if (invalid_var_names.count(in_arg_name)) continue;
if (invalid_var_names.count(out_arg_name)) continue;
bool reuse = false;
int i = 0;
for (const auto& reuse_var_names : inpalce_reuse_var_names) {
Expand All @@ -171,6 +152,28 @@ void XPUMemoryOptimizePass::CollectLifeCycleByDevice(SSAGraph* graph) {
}
}
}

for (auto* var_node : var_nodes) {
CHECK(var_node->IsArg());
auto& arg = var_node->AsArg();
if (arg.is_weight || arg.is_persist) continue;
std::string var_name = arg.name;
VLOG(4) << "OP VAR NAME IS " << var_name;
if (var_name.find("_xpu_max") != std::string::npos) continue;
if (invalid_var_names.count(var_name)) continue;
target_type = arg.type->target();
if (is_host(target_type)) target_type = TARGET(kHost);

if (!lifecycles[TargetToStr(target_type)].count(var_name)) {
lifecycles[TargetToStr(target_type)].emplace(
var_name, std::make_pair(max_lifecycle_, max_lifecycle_));
} else {
int cur_life = lifecycles[TargetToStr(target_type)][var_name].second;
lifecycles[TargetToStr(target_type)][var_name].second =
(std::max)(max_lifecycle_, cur_life);
}
}
++max_lifecycle_;
}
}

Expand Down