Skip to content

Commit a66e352

Browse files
committed
[UR] Pull in change to make multi device compile extension core.
1 parent 435845b commit a66e352

File tree

2 files changed

+10
-28
lines changed

2 files changed

+10
-28
lines changed

Diff for: sycl/plugins/unified_runtime/CMakeLists.txt

+2-8
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,8 @@ endif()
5656
if(SYCL_PI_UR_USE_FETCH_CONTENT)
5757
include(FetchContent)
5858

59-
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime")
60-
# commit 3225b822b5d8cbfa85d7fc1bd5a5bf96e5bb8c1a
61-
# Merge: edb281f3 5fc41099
62-
# Author: Kenneth Benzie (Benie) <[email protected]>
63-
# Date: Tue Jan 30 12:31:44 2024 +0000
64-
# Merge pull request #1168 from Seanst98/sean/unique-addr-mode-per-dim-adapters
65-
# [Bindless][CUDA] Unique addressing modes per dimension
66-
set(UNIFIED_RUNTIME_TAG 3225b822b5d8cbfa85d7fc1bd5a5bf96e5bb8c1a)
59+
set(UNIFIED_RUNTIME_REPO "https://github.com/aarongreig/unified-runtime")
60+
set(UNIFIED_RUNTIME_TAG aaron/makeDeviceCompileExtCore)
6761

6862
if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
6963
set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")

Diff for: sycl/plugins/unified_runtime/pi2ur.hpp

+8-20
Original file line numberDiff line numberDiff line change
@@ -1999,14 +1999,10 @@ piProgramLink(pi_context Context, pi_uint32 NumDevices,
19991999
auto UrDevices = reinterpret_cast<ur_device_handle_t *>(
20002000
const_cast<pi_device *>(DeviceList));
20012001

2002-
auto urResult =
2003-
urProgramLinkExp(UrContext, NumDevices, UrDevices, NumInputPrograms,
2004-
UrInputPrograms, Options, UrProgram);
2005-
if (urResult == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
2006-
urResult = urProgramLink(UrContext, NumInputPrograms, UrInputPrograms,
2007-
Options, UrProgram);
2008-
}
2009-
return ur2piResult(urResult);
2002+
HANDLE_ERRORS(urProgramLink(UrContext, NumDevices, UrDevices,
2003+
NumInputPrograms, UrInputPrograms, Options,
2004+
UrProgram));
2005+
return PI_SUCCESS;
20102006
}
20112007

20122008
inline pi_result piProgramCompile(
@@ -2038,12 +2034,8 @@ inline pi_result piProgramCompile(
20382034
auto UrDevices = reinterpret_cast<ur_device_handle_t *>(
20392035
const_cast<pi_device *>(DeviceList));
20402036

2041-
auto urResult =
2042-
urProgramCompileExp(UrProgram, NumDevices, UrDevices, Options);
2043-
if (urResult == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
2044-
urResult = urProgramCompile(UrContext, UrProgram, Options);
2045-
}
2046-
return ur2piResult(urResult);
2037+
HANDLE_ERRORS(urProgramCompile(UrProgram, NumDevices, UrDevices, Options));
2038+
return PI_SUCCESS;
20472039
}
20482040

20492041
inline pi_result
@@ -2068,12 +2060,8 @@ piProgramBuild(pi_program Program, pi_uint32 NumDevices,
20682060

20692061
auto UrDevices = reinterpret_cast<ur_device_handle_t *>(
20702062
const_cast<pi_device *>(DeviceList));
2071-
2072-
auto urResult = urProgramBuildExp(UrProgram, NumDevices, UrDevices, Options);
2073-
if (urResult == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
2074-
urResult = urProgramBuild(UrContext, UrProgram, Options);
2075-
}
2076-
return ur2piResult(urResult);
2063+
HANDLE_ERRORS(urProgramBuild(UrProgram, NumDevices, UrDevices, Options));
2064+
return PI_SUCCESS;
20772065
}
20782066

20792067
inline pi_result piextProgramSetSpecializationConstant(pi_program Program,

0 commit comments

Comments
 (0)