Skip to content

Revert "sycl:remove redundant memcopy in function ggml_backend_sycl_buffer_set_tensor" #12812

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
NeoZhangJianyu merged 4 commits into from
Apr 8, 2025
Merged

Revert "sycl:remove redundant memcopy in function ggml_backend_sycl_buffer_set_tensor" #12812

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
564a05d
Revert "sycl: remove redundant memcopy in function ggml_backend_sycl_…
NeoZhangJianyu Apr 8, 2025
d271172
Update ggml/src/ggml-sycl/ggml-sycl.cpp
NeoZhangJianyu Apr 8, 2025
76f2ed3
Update ggml/src/ggml-sycl/ggml-sycl.cpp
NeoZhangJianyu Apr 8, 2025
e9e1882
rm tail space
NeoZhangJianyu Apr 8, 2025
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
7 changes: 6 additions & 1 deletion ggml/src/ggml-sycl/ggml-sycl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,14 @@ static void ggml_backend_sycl_buffer_set_tensor(ggml_backend_buffer_t buffer,
auto stream = &(dpct::dev_mgr::instance().get_device(ctx->device).default_queue());
SYCL_CHECK(
CHECK_TRY_ERROR(dpct::dev_mgr::instance().get_device(ctx->device).queues_wait_and_throw()));
// Note: Use host buffer to save the data from mmap(), then copy to device. It's workaround for mmap() issue on PVC GPU.
// This function will be called during load model from disk. Use memory buffer replace dynamic won't save more time and brings potential memory leak risk here.
char* host_buf = (char*)malloc(size);
memcpy(host_buf, data, size);
SYCL_CHECK(
CHECK_TRY_ERROR((*stream).memcpy((char *)tensor->data + offset, data, size)
CHECK_TRY_ERROR((*stream).memcpy((char *)tensor->data + offset, host_buf, size)
.wait()));
free(host_buf);
}
catch (sycl::exception const &exc) {
std::cerr << exc.what() << "Exception caught at file:" << __FILE__
Expand Down
Loading