Skip to content

[UR] Uplift tag to bring urProgramCreateWithBinary change #15637

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

Closed
wants to merge 1 commit into from
Closed

[UR] Uplift tag to bring urProgramCreateWithBinary change #15637

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
4 changes: 2 additions & 2 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,14 @@ if(SYCL_UR_USE_FETCH_CONTENT)
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
set(UNIFIED_RUNTIME_REPO "https://github.com/againull/unified-runtime")
# commit b79ebe4e98789144bcdf3832088eb6e6b5ae6967
# Merge: 7b4bc761 fbb6e862
# Author: Kenneth Benzie (Benie) <[email protected]>
# Date: Fri Oct 4 16:39:59 2024 +0100
# Merge pull request #2018 from wenju-he/L0-bindless-image-device-query
# [L0] Fix device query of bindless image support
set(UNIFIED_RUNTIME_TAG b79ebe4e98789144bcdf3832088eb6e6b5ae6967)
set(UNIFIED_RUNTIME_TAG 5b632827ea4de04fe4d4141a77c0a276f8cb2f89)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
Expand Down
3 changes: 2 additions & 1 deletion sycl/source/detail/program_manager/program_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ createBinaryProgram(const ContextImplPtr Context, const device &Device,
Properties.count = Metadata.size();
Properties.pMetadatas = Metadata.data();
Adapter->call<UrApiKind::urProgramCreateWithBinary>(
Context->getHandleRef(), UrDevice, DataLen, Data, &Properties, &Program);
Context->getHandleRef(), 1, &UrDevice, &DataLen, &Data, &Properties,
&Program);

if (BinaryStatus != UR_RESULT_SUCCESS) {
throw detail::set_ur_error(
Expand Down
3 changes: 2 additions & 1 deletion sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ ur_result_t redefinedUrProgramCreate(void *pParams) {

ur_result_t redefinedUrProgramCreateWithBinary(void *pParams) {
auto params = *static_cast<ur_program_create_with_binary_params_t *>(pParams);
redefinedUrProgramCreateCommon(*params.ppBinary);
for (uint32_t i = 0; i < *params.pnumDevices; ++i)
redefinedUrProgramCreateCommon(*params.pppBinaries[i]);
return UR_RESULT_SUCCESS;
}

Expand Down
2 changes: 1 addition & 1 deletion sycl/unittests/helpers/RuntimeLinkingCommon.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static ur_result_t redefined_urProgramCreateWithIL(void *pParams) {

static ur_result_t redefined_urProgramCreateWithBinary(void *pParams) {
auto Params = *static_cast<ur_program_create_with_binary_params_t *>(pParams);
auto *Magic = reinterpret_cast<const unsigned char *>(*Params.ppBinary);
auto *Magic = reinterpret_cast<const unsigned char *>(*Params.pppBinaries[0]);
ur_program_handle_t *res = *Params.pphProgram;
*res = mock::createDummyHandle<ur_program_handle_t>(sizeof(unsigned));
reinterpret_cast<mock::dummy_handle_t>(*res)->setDataAs<unsigned>(*Magic);
Expand Down
5 changes: 3 additions & 2 deletions sycl/unittests/program_manager/CompileTarget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,9 @@ static ur_result_t redefinedDeviceGet(void *pParams) {
std::vector<std::string> createWithBinaryLog;
static ur_result_t redefinedProgramCreateWithBinary(void *pParams) {
auto params = *static_cast<ur_program_create_with_binary_params_t *>(pParams);
createWithBinaryLog.push_back(
reinterpret_cast<const char *>(*params.ppBinary));
for (uint32_t i = 0; i < *params.pnumDevices; ++i)
createWithBinaryLog.push_back(
reinterpret_cast<const char *>(*params.pppBinaries[i]));
return UR_RESULT_SUCCESS;
}

Expand Down
Loading