diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 7a08b84322f02..6408a74388b14 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -28,7 +28,7 @@ include(SYCLUtils) set(SYCL_MAJOR_VERSION 5) set(SYCL_MINOR_VERSION 7) set(SYCL_PATCH_VERSION 0) -set(SYCL_DEV_ABI_VERSION 3) +set(SYCL_DEV_ABI_VERSION 4) if (SYCL_ADD_DEV_VERSION_POSTFIX) set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}") endif() diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index 853720e3362db..3543827263f5c 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -402,13 +402,6 @@ class __SYCL_EXPORT handler { PI_ERROR_INVALID_OPERATION); } - /// Extracts and prepares kernel arguments from the lambda using integration - /// header. - /// TODO replace with the version below once ABI breaking changes are allowed. - void - extractArgsAndReqsFromLambda(char *LambdaPtr, size_t KernelArgsNum, - const detail::kernel_param_desc_t *KernelArgs); - /// Extracts and prepares kernel arguments from the lambda using integration /// header. void @@ -419,11 +412,6 @@ class __SYCL_EXPORT handler { /// Extracts and prepares kernel arguments set via set_arg(s). void extractArgsAndReqs(); - /// TODO replace with the version below once ABI breaking changes are allowed. - void processArg(void *Ptr, const detail::kernel_param_kind_t &Kind, - const int Size, const size_t Index, size_t &IndexShift, - bool IsKernelCreatedFromSource); - void processArg(void *Ptr, const detail::kernel_param_kind_t &Kind, const int Size, const size_t Index, size_t &IndexShift, bool IsKernelCreatedFromSource, bool IsESIMD); @@ -791,20 +779,6 @@ class __SYCL_EXPORT handler { return true; } - // TODO: Delete these functions when ABI breaking changes are allowed. - // Currently these functions are unused but they are static members of - // the exported class 'handler' and has got into sycl library some time ago - // and must stay there for a while. - static id<1> getDelinearizedIndex(const range<1> Range, const size_t Index) { - return detail::getDelinearizedId(Range, Index); - } - static id<2> getDelinearizedIndex(const range<2> Range, const size_t Index) { - return detail::getDelinearizedId(Range, Index); - } - static id<3> getDelinearizedIndex(const range<3> Range, const size_t Index) { - return detail::getDelinearizedId(Range, Index); - } - /// Handles some special cases of the copy operation from one accessor /// to another accessor. Returns true if the copy is handled here. /// diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp index 1e9617ffae8d4..3557166893fcb 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -458,14 +458,6 @@ static void addArgsForGlobalAccessor(detail::Requirement *AccImpl, size_t Index, } } -// TODO remove this one once ABI breaking changes are allowed. -void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind, - const int Size, const size_t Index, size_t &IndexShift, - bool IsKernelCreatedFromSource) { - processArg(Ptr, Kind, Size, Index, IndexShift, IsKernelCreatedFromSource, - false); -} - void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind, const int Size, const size_t Index, size_t &IndexShift, bool IsKernelCreatedFromSource, bool IsESIMD) { @@ -634,13 +626,6 @@ void handler::extractArgsAndReqs() { } } -// TODO remove once ABI breaking changes are allowed -void handler::extractArgsAndReqsFromLambda( - char *LambdaPtr, size_t KernelArgsNum, - const detail::kernel_param_desc_t *KernelArgs) { - extractArgsAndReqsFromLambda(LambdaPtr, KernelArgsNum, KernelArgs, false); -} - void handler::extractArgsAndReqsFromLambda( char *LambdaPtr, size_t KernelArgsNum, const detail::kernel_param_desc_t *KernelArgs, bool IsESIMD) { diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index 71ec4fb275a1b..5ee662fb57a13 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3992,7 +3992,6 @@ _ZN2cl4sycl7contextC2ESt10shared_ptrINS0_6detail12context_implEE _ZN2cl4sycl7handler10depends_onENS0_5eventE _ZN2cl4sycl7handler10depends_onERKSt6vectorINS0_5eventESaIS3_EE _ZN2cl4sycl7handler10mem_adviseEPKvmi -_ZN2cl4sycl7handler10processArgEPvRKNS0_6detail19kernel_param_kind_tEimRmb _ZN2cl4sycl7handler10processArgEPvRKNS0_6detail19kernel_param_kind_tEimRmbb _ZN2cl4sycl7handler12addReductionERKSt10shared_ptrIKvE _ZN2cl4sycl7handler13getKernelNameB5cxx11Ev @@ -4006,7 +4005,6 @@ _ZN2cl4sycl7handler20setStateSpecConstSetEv _ZN2cl4sycl7handler22setHandlerKernelBundleERKSt10shared_ptrINS0_6detail18kernel_bundle_implEE _ZN2cl4sycl7handler22verifyUsedKernelBundleERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE _ZN2cl4sycl7handler24GetRangeRoundingSettingsERmS2_S2_ -_ZN2cl4sycl7handler28extractArgsAndReqsFromLambdaEPcmPKNS0_6detail19kernel_param_desc_tE _ZN2cl4sycl7handler28extractArgsAndReqsFromLambdaEPcmPKNS0_6detail19kernel_param_desc_tEb _ZN2cl4sycl7handler28setStateExplicitKernelBundleEv _ZN2cl4sycl7handler6memcpyEPvPKvm diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index dba915d2b9164..7681902beb9d7 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -1850,7 +1850,6 @@ ?ext_oneapi_submit_barrier@queue@sycl@cl@@QEAA?AVevent@23@AEBUcode_location@detail@23@@Z ?ext_oneapi_submit_barrier@queue@sycl@cl@@QEAA?AVevent@23@AEBV?$vector@Vevent@sycl@cl@@V?$allocator@Vevent@sycl@cl@@@std@@@std@@AEBUcode_location@detail@23@@Z ?extractArgsAndReqs@handler@sycl@cl@@AEAAXXZ -?extractArgsAndReqsFromLambda@handler@sycl@cl@@AEAAXPEAD_KPEBUkernel_param_desc_t@detail@23@@Z ?extractArgsAndReqsFromLambda@handler@sycl@cl@@AEAAXPEAD_KPEBUkernel_param_desc_t@detail@23@_N@Z ?fabs@__host_std@cl@@YA?AV?$vec@M$00@sycl@2@V342@@Z ?fabs@__host_std@cl@@YA?AV?$vec@M$01@sycl@2@V342@@Z @@ -2147,9 +2146,6 @@ ?getChannelType@?$image_impl@$01@detail@sycl@cl@@QEBA?AW4image_channel_type@34@XZ ?getChannelType@?$image_impl@$02@detail@sycl@cl@@QEBA?AW4image_channel_type@34@XZ ?getCurrentDSODir@OSUtil@detail@sycl@cl@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ -?getDelinearizedIndex@handler@sycl@cl@@CA?AV?$id@$00@23@V?$range@$00@23@_K@Z -?getDelinearizedIndex@handler@sycl@cl@@CA?AV?$id@$01@23@V?$range@$01@23@_K@Z -?getDelinearizedIndex@handler@sycl@cl@@CA?AV?$id@$02@23@V?$range@$02@23@_K@Z ?getDeviceFromHandler@detail@sycl@cl@@YA?AVdevice@23@AEAVhandler@23@@Z ?getDeviceFunctionPointerImpl@detail@sycl@cl@@YA_KAEAVdevice@23@AEAVprogram@23@PEBD@Z ?getDevices@?$image_impl@$00@detail@sycl@cl@@AEAA?AV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@std@@V?$shared_ptr@Vcontext_impl@detail@sycl@cl@@@6@@Z @@ -3118,7 +3114,6 @@ ?prefetch@queue@sycl@cl@@QEAA?AVevent@23@PEBX_KV423@@Z ?prefetch_usm@MemoryManager@detail@sycl@cl@@SAXPEAXV?$shared_ptr@Vqueue_impl@detail@sycl@cl@@@std@@_KV?$vector@PEAU_pi_event@@V?$allocator@PEAU_pi_event@@@std@@@6@PEAPEAU_pi_event@@@Z ?processArg@handler@sycl@cl@@AEAAXPEAXAEBW4kernel_param_kind_t@detail@23@H_KAEA_K_N4@Z -?processArg@handler@sycl@cl@@AEAAXPEAXAEBW4kernel_param_kind_t@detail@23@H_KAEA_K_N@Z ?radians@__host_std@cl@@YA?AV?$vec@M$00@sycl@2@V342@@Z ?radians@__host_std@cl@@YA?AV?$vec@M$01@sycl@2@V342@@Z ?radians@__host_std@cl@@YA?AV?$vec@M$02@sycl@2@V342@@Z