Skip to content

[UR][L0] Add support for passing device list to urProgramBuild/Link/Compile #11464

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 5 commits into from
Nov 22, 2023
Merged

[UR][L0] Add support for passing device list to urProgramBuild/Link/Compile #11464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55a872f
[UR][L0] Add support for passing device list to urProgramBuild/Link/C…
nrspruit Oct 6, 2023
9fdd381
[UR] Bump tag to ce152a64deae5fd69b5a7cebb0a8ec119b59a19a
kbenzie Nov 21, 2023
724a890
Merge remote-tracking branch 'origin/sycl' into fixprogrambuild_updated
kbenzie Nov 21, 2023
2786851
[UR] Bump tag to 71957e849435169b43e51a42025afeeb63d7508b
kbenzie Nov 21, 2023
41d8206
Ensure PI_SUCCESS is returned on success
kbenzie Nov 21, 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
12 changes: 6 additions & 6 deletions sycl/plugins/unified_runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
include(FetchContent)

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit 04799e735a7ddd0839568b25bf03fa8f77160b7d
# Merge: 534071e5 4cf02cb9
# commit 71957e849435169b43e51a42025afeeb63d7508b
# Merge: ce152a64 e001b98d
# Author: Kenneth Benzie (Benie) <[email protected]>
# Date: Mon Nov 20 10:24:50 2023 +0000
# Merge pull request #1048 from callumfare/opencl_fix_urMemBufferCreate_leak
# [OpenCL] Fix memory leak and coverity issue with struct-to-array casts
set(UNIFIED_RUNTIME_TAG 04799e735a7ddd0839568b25bf03fa8f77160b7d)
# Date: Tue Nov 21 16:41:08 2023 +0000
# Merge pull request #1100 from kbenzie/benie/fixup-multi-device-compile
# [CUDA][HIP][OpenCL][NATIVECPU] Fix multi-device compile
set(UNIFIED_RUNTIME_TAG 71957e849435169b43e51a42025afeeb63d7508b)

if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")
Expand Down
32 changes: 25 additions & 7 deletions sycl/plugins/unified_runtime/pi2ur.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,10 +1985,17 @@ piProgramLink(pi_context Context, pi_uint32 NumDevices,
ur_program_handle_t *UrProgram =
reinterpret_cast<ur_program_handle_t *>(RetProgram);

HANDLE_ERRORS(urProgramLink(UrContext, NumInputPrograms, UrInputPrograms,
Options, UrProgram));
auto UrDevices = reinterpret_cast<ur_device_handle_t *>(
const_cast<pi_device *>(DeviceList));

return PI_SUCCESS;
auto urResult =
urProgramLinkExp(UrContext, NumDevices, UrDevices, NumInputPrograms,
UrInputPrograms, Options, UrProgram);
if (urResult == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
urResult = urProgramLink(UrContext, NumInputPrograms, UrInputPrograms,
Options, UrProgram);
}
return ur2piResult(urResult);
}

inline pi_result piProgramCompile(
Expand Down Expand Up @@ -2017,9 +2024,15 @@ inline pi_result piProgramCompile(
HANDLE_ERRORS(urProgramGetInfo(UrProgram, PropName, sizeof(&UrContext),
&UrContext, nullptr));

HANDLE_ERRORS(urProgramCompile(UrContext, UrProgram, Options));
auto UrDevices = reinterpret_cast<ur_device_handle_t *>(
const_cast<pi_device *>(DeviceList));

return PI_SUCCESS;
auto urResult =
urProgramCompileExp(UrProgram, NumDevices, UrDevices, Options);
if (urResult == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
urResult = urProgramCompile(UrContext, UrProgram, Options);
}
return ur2piResult(urResult);
}

inline pi_result
Expand Down Expand Up @@ -2050,9 +2063,14 @@ piProgramBuild(pi_program Program, pi_uint32 NumDevices,
HANDLE_ERRORS(urProgramGetInfo(UrProgram, PropName, sizeof(&UrContext),
&UrContext, nullptr));

HANDLE_ERRORS(urProgramBuild(UrContext, UrProgram, Options));
auto UrDevices = reinterpret_cast<ur_device_handle_t *>(
const_cast<pi_device *>(DeviceList));

return PI_SUCCESS;
auto urResult = urProgramBuildExp(UrProgram, NumDevices, UrDevices, Options);
if (urResult == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
urResult = urProgramBuild(UrContext, UrProgram, Options);
}
return ur2piResult(urResult);
}

inline pi_result piextProgramSetSpecializationConstant(pi_program Program,
Expand Down