Skip to content

[XPU] fix memory reserved record when xpu malloc and free #67828

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
merged 1 commit into from
Aug 30, 2024
Merged

[XPU] fix memory reserved record when xpu malloc and free #67828

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
6 changes: 3 additions & 3 deletions paddle/phi/backends/xpu/xpu_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ struct XPUContext::Impl {
void Wait() {
backends::xpu::XPUDeviceGuard guard(place_.GetDeviceId());
PD_CHECK(context_ != nullptr, "the xpu context is nullptr.");
xpu_wait(context_->xpu_stream);
PADDLE_ENFORCE_XRE_SUCCESS(xpu_wait(context_->xpu_stream));
xpu::Context* ctx_t = GetXdlCtx();
if (ctx_t) {
PD_CHECK(ctx_t != nullptr, "the xpu context is nullptr.");
xpu_wait(ctx_t->xpu_stream);
PADDLE_ENFORCE_XRE_SUCCESS(xpu_wait(ctx_t->xpu_stream));
}

ClearStashedMemory();
Expand Down Expand Up @@ -220,7 +220,7 @@ struct XPUContext::Impl {
void SetXContext(xpu::Context* context) {
if (context_ != nullptr) {
backends::xpu::XPUDeviceGuard guard(place_.GetDeviceId());
xpu_wait(context_->xpu_stream);
PADDLE_ENFORCE_XRE_SUCCESS(xpu_wait(context_->xpu_stream));
if (context_->xpu_stream != nullptr && stream_owned_) {
xpu_stream_destroy(context_->xpu_stream);
stream_owned_ = false;
Expand Down
3 changes: 3 additions & 0 deletions paddle/phi/core/platform/device/xpu/xpu_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "paddle/phi/backends/xpu/xpu_header.h"
#include "paddle/phi/backends/xpu/xpu_info.h"
#include "paddle/phi/common/place.h"
#include "paddle/phi/core/memory/memory.h"
#include "paddle/phi/core/platform/device/device_wrapper.h"
#include "paddle/phi/core/platform/device_context.h"
#include "paddle/phi/core/platform/lock_guard_ptr.h"
Expand Down Expand Up @@ -162,6 +163,7 @@ class RecordedXPUMallocHelper {
auto result = xpu_malloc(ptr, size);
if (result == XPU_SUCCESS) {
cur_size_.fetch_add(size);
DEVICE_MEMORY_STAT_UPDATE(Reserved, dev_id_, size);
return result;
} else {
RaiseNonOutOfMemoryError(result);
Expand All @@ -183,6 +185,7 @@ class RecordedXPUMallocHelper {
dev_ctx->Wait();
xpu_free(ptr);
cur_size_.fetch_sub(size);
DEVICE_MEMORY_STAT_UPDATE(Reserved, dev_id_, -size);
}

inline bool NeedRecord() const { return limit_size_ != 0; }
Expand Down