Skip to content

[XPU] fix xpu memory leak bug for arm arch, test=develop, test=xpu #8010

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

Merged
zhupengyang merged 1 commit into from
Dec 20, 2021
Merged

[XPU] fix xpu memory leak bug for arm arch, test=develop, test=xpu #8010

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion lite/backends/xpu/target_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ void TargetWrapperXPU::FreeL3Cache() {
}

// xpu context
LITE_THREAD_LOCAL xdnn::Context* TargetWrapperXPU::tls_raw_ctx_{nullptr};
LITE_THREAD_LOCAL std::shared_ptr<xdnn::Context> TargetWrapperXPU::tls_raw_ctx_{
nullptr};
// multi encoder config
LITE_THREAD_LOCAL std::string
TargetWrapperXPU::multi_encoder_precision; // NOLINT
Expand Down
10 changes: 5 additions & 5 deletions lite/backends/xpu/target_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ class TargetWrapper<TARGET(kXPU)> {
static XPUScratchPadGuard MallocScratchPad(size_t size);

static xdnn::Context* GetRawContext() {
if (tls_raw_ctx_ == nullptr) {
tls_raw_ctx_ = xdnn::create_context();
CHECK(tls_raw_ctx_);
if (tls_raw_ctx_.get() == nullptr) {
tls_raw_ctx_.reset(xdnn::create_context(), xdnn::destroy_context);
CHECK(tls_raw_ctx_.get());
if (l3_planner_ == nullptr) {
l3_planner_ = new XPUL3Planner;
}
Expand Down Expand Up @@ -121,7 +121,7 @@ class TargetWrapper<TARGET(kXPU)> {
}
}
}
return tls_raw_ctx_;
return tls_raw_ctx_.get();
}
static void MallocL3Cache(
const std::vector<std::vector<int64_t>>& query_shape);
Expand Down Expand Up @@ -161,7 +161,7 @@ class TargetWrapper<TARGET(kXPU)> {
void* l3_ptr,
size_t l3_size,
const std::vector<std::vector<int64_t>>& query_shape);
static LITE_THREAD_LOCAL xdnn::Context* tls_raw_ctx_;
static LITE_THREAD_LOCAL std::shared_ptr<xdnn::Context> tls_raw_ctx_;
static LITE_THREAD_LOCAL void* local_l3_ptr_;
static void* shared_l3_ptr_;
static std::mutex mutex_l3_;
Expand Down