diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index e73b956eba41..e51f8c9eea66 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -100,13 +100,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 1baed0ba696d494a82769366f137e9ddd8af3001 - # Merge: 00ca0daa e6dc6d9a - # Author: Piotr Balcer - # Date: Wed Jul 3 13:48:27 2024 +0200 - # Merge pull request #1771 from igchor/level_zero_v2_dispatcher - # [L0] Initial version of queue dispatcher - set(UNIFIED_RUNTIME_TAG 1baed0ba696d494a82769366f137e9ddd8af3001) + # commit 0cbacd8a0844acb64091ecbb0c7d6a7df1b6160e + # Merge: 022df8ac 2f121cd8 + # Author: Kenneth Benzie (Benie) + # Date: Thu Jul 4 10:37:58 2024 +0100 + # Merge pull request #1212 from aarongreig/aaron/specMotivatedRefactors + # Batch adapter changes: spec motivated refactors + set(UNIFIED_RUNTIME_TAG 0cbacd8a0844acb64091ecbb0c7d6a7df1b6160e) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} diff --git a/sycl/plugins/unified_runtime/pi2ur.hpp b/sycl/plugins/unified_runtime/pi2ur.hpp index 3690c78d61b4..5e63a9c49e6a 100644 --- a/sycl/plugins/unified_runtime/pi2ur.hpp +++ b/sycl/plugins/unified_runtime/pi2ur.hpp @@ -122,7 +122,7 @@ static pi_result ur2piResult(ur_result_t urResult) { return PI_ERROR_INVALID_BINARY; case UR_RESULT_ERROR_INVALID_GLOBAL_NAME: return PI_ERROR_INVALID_VALUE; - case UR_RESULT_ERROR_INVALID_FUNCTION_NAME: + case UR_RESULT_ERROR_FUNCTION_ADDRESS_NOT_AVAILABLE: return PI_ERROR_FUNCTION_ADDRESS_IS_NOT_AVAILABLE; case UR_RESULT_ERROR_INVALID_GROUP_SIZE_DIMENSION: return PI_ERROR_INVALID_WORK_DIMENSION; @@ -2453,18 +2453,8 @@ inline pi_result piKernelGetInfo(pi_kernel Kernel, pi_kernel_info ParamName, break; } case PI_KERNEL_INFO_NUM_ARGS: { - size_t NumArgs = 0; - HANDLE_ERRORS(urKernelGetInfo(UrKernel, UR_KERNEL_INFO_NUM_ARGS, - sizeof(NumArgs), &NumArgs, nullptr)); - if (ParamValueSizeRet) { - *ParamValueSizeRet = sizeof(uint32_t); - } - if (ParamValue) { - if (ParamValueSize != sizeof(uint32_t)) - return PI_ERROR_INVALID_BUFFER_SIZE; - *static_cast(ParamValue) = static_cast(NumArgs); - } - return PI_SUCCESS; + UrParamName = UR_KERNEL_INFO_NUM_ARGS; + break; } case PI_KERNEL_INFO_REFERENCE_COUNT: { UrParamName = UR_KERNEL_INFO_REFERENCE_COUNT;