Skip to content

Commit 0365594

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][ABI-Break] Remove ABI replacements (#6562)
1 parent 9829897 commit 0365594

File tree

4 files changed

+6
-80
lines changed

4 files changed

+6
-80
lines changed

‎sycl/source/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ function(add_sycl_rt_library LIB_NAME)
6666
target_compile_options(${LIB_OBJ_NAME} PUBLIC
6767
-fvisibility=hidden -fvisibility-inlines-hidden)
6868
set(linker_script "${CMAKE_CURRENT_SOURCE_DIR}/ld-version-script.txt")
69-
set(abi_linker_script "${CMAKE_CURRENT_SOURCE_DIR}/abi_replacements_linux.txt")
70-
target_link_libraries(
71-
${LIB_NAME} PRIVATE "-Wl,${abi_linker_script}")
72-
set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${abi_linker_script})
7369
target_link_libraries(
7470
${LIB_NAME} PRIVATE "-Wl,--version-script=${linker_script}")
7571
set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${linker_script})
@@ -190,7 +186,6 @@ set(SYCL_SOURCES
190186
"esimd_emulator_device_interface.cpp"
191187
"$<$<PLATFORM_ID:Windows>:detail/windows_pi.cpp>"
192188
"$<$<OR:$<PLATFORM_ID:Linux>,$<PLATFORM_ID:Darwin>>:detail/posix_pi.cpp>"
193-
"$<$<PLATFORM_ID:Windows>:abi_replacements_windows.cpp>"
194189
)
195190

196191
if (MSVC)

‎sycl/source/abi_replacements_linux.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
_ZN2cl4sycl10level_zero10make_queueERKNS0_7contextEmb = _ZN2cl4sycl3ext6oneapi10level_zero10make_queueERKNS0_7contextEmb;
2-
_ZN2cl4sycl10level_zero10make_queueERKNS0_7contextEm = _ZN2cl4sycl3ext6oneapi10level_zero10make_queueERKNS0_7contextEm;
3-
_ZN2cl4sycl10level_zero12make_programERKNS0_7contextEm = _ZN2cl4sycl3ext6oneapi10level_zero12make_programERKNS0_7contextEm;
4-
_ZN2cl4sycl10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS3_EEmb = _ZN2cl4sycl3ext6oneapi10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS5_EEmb;
5-
_ZN2cl4sycl10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS3_EEm = _ZN2cl4sycl3ext6oneapi10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS5_EEm;
6-
_ZN2cl4sycl10level_zero11make_deviceERKNS0_8platformEm = _ZN2cl4sycl3ext6oneapi10level_zero11make_deviceERKNS0_8platformEm;
7-
_ZN2cl4sycl10level_zero10make_eventERKNS0_7contextEmb = _ZN2cl4sycl3ext6oneapi10level_zero10make_eventERKNS0_7contextEmb;
8-
_ZN2cl4sycl10level_zero13make_platformEm = _ZN2cl4sycl3ext6oneapi10level_zero13make_platformEm;
9-
_ZN2cl4sycl5INTEL15online_compilerILNS1_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EEEEES6_IhSaIhEERKSC_DpRKT_ = _ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_;
10-
_ZN2cl4sycl5INTEL15online_compilerILNS1_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EEEEES6_IhSaIhEERKSC_DpRKT_ = _ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_;
11-
_ZN2cl4sycl3ext5intel15online_compilerILNS2_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISD_EEEEES7_IhSaIhEERKSD_DpRKT_ = _ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_;
12-
_ZN2cl4sycl3ext5intel15online_compilerILNS2_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISD_EEEEES7_IhSaIhEERKSD_DpRKT_ = _ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_;
1+
README: Empty linker scripts aren't supported in older GNU ld, so the support
2+
was removed from CMakeLists.txt. If you need to re-enable abi_replacemnts,
3+
please update CmakeLists.txt

‎sycl/source/abi_replacements_windows.cpp

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,3 @@
1-
#pragma comment( \
2-
linker, \
3-
"/export:?accessGlobalBuf@stream_impl@detail@sycl@cl@@QEAA?AV?$accessor@D$00$0EAC@$0HNO@$0A@V?$accessor_property_list@$$V@ONEAPI@sycl@cl@@@34@AEAVhandler@34@@Z=?accessGlobalBuf@stream_impl@detail@sycl@cl@@QEAA?AV?$accessor@D$00$0EAC@$0HNO@$0A@V?$accessor_property_list@$$V@oneapi@ext@sycl@cl@@@34@AEAVhandler@34@@Z")
4-
#pragma comment( \
5-
linker, \
6-
"/export:?accessGlobalFlushBuf@stream_impl@detail@sycl@cl@@QEAA?AV?$accessor@D$00$0EAC@$0HNO@$0A@V?$accessor_property_list@$$V@ONEAPI@sycl@cl@@@34@AEAVhandler@34@@Z=?accessGlobalFlushBuf@stream_impl@detail@sycl@cl@@QEAA?AV?$accessor@D$00$0EAC@$0HNO@$0A@V?$accessor_property_list@$$V@oneapi@ext@sycl@cl@@@34@AEAVhandler@34@@Z")
7-
#pragma comment( \
8-
linker, \
9-
"/export:?accessGlobalOffset@stream_impl@detail@sycl@cl@@QEAA?AV?$accessor@I$00$0EAF@$0HNO@$0A@V?$accessor_property_list@$$V@ONEAPI@sycl@cl@@@34@AEAVhandler@34@@Z=?accessGlobalOffset@stream_impl@detail@sycl@cl@@QEAA?AV?$accessor@I$00$0EAF@$0HNO@$0A@V?$accessor_property_list@$$V@oneapi@ext@sycl@cl@@@34@AEAVhandler@34@@Z")
10-
#pragma comment( \
11-
linker, \
12-
"/export:?make_context@level_zero@sycl@cl@@YA?AVcontext@23@AEBV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@std@@_K_N@Z=?make_context@level_zero@oneapi@ext@sycl@cl@@YA?AVcontext@45@AEBV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@std@@_K_N@Z")
13-
#pragma comment( \
14-
linker, \
15-
"/export:?make_event@level_zero@sycl@cl@@YA?AVevent@23@AEBVcontext@23@_K_N@Z=?make_event@level_zero@oneapi@ext@sycl@cl@@YA?AVevent@45@AEBVcontext@45@_K_N@Z")
16-
#pragma comment( \
17-
linker, \
18-
"/export:?make_queue@level_zero@sycl@cl@@YA?AVqueue@23@AEBVcontext@23@_K@Z=?make_queue@level_zero@oneapi@ext@sycl@cl@@YA?AVqueue@45@AEBVcontext@45@_K@Z")
19-
#pragma comment( \
20-
linker, \
21-
"/export:??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@6@@Z=??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@experimental@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@7@@Z")
22-
#pragma comment( \
23-
linker, \
24-
"/export:?make_device@level_zero@sycl@cl@@YA?AVdevice@23@AEBVplatform@23@_K@Z=?make_device@level_zero@oneapi@ext@sycl@cl@@YA?AVdevice@45@AEBVplatform@45@_K@Z")
25-
#pragma comment( \
26-
linker, \
27-
"/export:?make_platform@level_zero@sycl@cl@@YA?AVplatform@23@_K@Z=?make_platform@level_zero@oneapi@ext@sycl@cl@@YA?AVplatform@45@_K@Z")
28-
#pragma comment( \
29-
linker, \
30-
"/export:??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$0A@@INTEL@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@5@@Z=??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$0A@@experimental@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@7@@Z")
31-
#pragma comment( \
32-
linker, \
33-
"/export:?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=?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")
34-
#pragma comment( \
35-
linker, \
36-
"/export:?make_queue@level_zero@sycl@cl@@YA?AVqueue@23@AEBVcontext@23@_K_N@Z=?make_queue@level_zero@oneapi@ext@sycl@cl@@YA?AVqueue@45@AEBVcontext@45@_K_N@Z")
37-
#pragma comment( \
38-
linker, \
39-
"/export:?make_program@level_zero@sycl@cl@@YA?AVprogram@23@AEBVcontext@23@_K@Z=?make_program@level_zero@oneapi@ext@sycl@cl@@YA?AVprogram@45@AEBVcontext@45@_K@Z")
40-
#pragma comment( \
41-
linker, \
42-
"/export:??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$0A@@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@6@@Z=??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$0A@@experimental@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@7@@Z")
43-
#pragma comment( \
44-
linker, \
45-
"/export:?make_context@level_zero@sycl@cl@@YA?AVcontext@23@AEBV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@std@@_K@Z=?make_context@level_zero@oneapi@ext@sycl@cl@@YA?AVcontext@45@AEBV?$vector@Vdevice@sycl@cl@@V?$allocator@Vdevice@sycl@cl@@@std@@@std@@_K@Z")
46-
#pragma comment( \
47-
linker, \
48-
"/export:??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@INTEL@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@5@@Z=??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@experimental@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@7@@Z")
49-
#pragma comment( \
50-
linker, \
51-
"/export:?submit_barrier@queue@sycl@cl@@QEAA?AVevent@23@AEBUcode_location@detail@23@@Z=?ext_oneapi_submit_barrier@queue@sycl@cl@@QEAA?AVevent@23@AEBUcode_location@detail@23@@Z")
1+
// README: Empty linker scripts aren't supported in older GNU ld, so the support
2+
// was removed from CMakeLists.txt. If you need to re-enable abi_replacemnts,
3+
// please update CmakeLists.txt

‎sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3611,14 +3611,6 @@ _ZN2cl10__host_std9u_sub_satEhh
36113611
_ZN2cl10__host_std9u_sub_satEjj
36123612
_ZN2cl10__host_std9u_sub_satEmm
36133613
_ZN2cl10__host_std9u_sub_satEtt
3614-
_ZN2cl4sycl10level_zero10make_eventERKNS0_7contextEmb
3615-
_ZN2cl4sycl10level_zero10make_queueERKNS0_7contextEm
3616-
_ZN2cl4sycl10level_zero10make_queueERKNS0_7contextEmb
3617-
_ZN2cl4sycl10level_zero11make_deviceERKNS0_8platformEm
3618-
_ZN2cl4sycl10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS3_EEm
3619-
_ZN2cl4sycl10level_zero12make_contextERKSt6vectorINS0_6deviceESaIS3_EEmb
3620-
_ZN2cl4sycl10level_zero12make_programERKNS0_7contextEm
3621-
_ZN2cl4sycl10level_zero13make_platformEm
36223614
_ZN2cl4sycl11malloc_hostEmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE
36233615
_ZN2cl4sycl11malloc_hostEmRKNS0_5queueERKNS0_6detail13code_locationE
36243616
_ZN2cl4sycl11malloc_hostEmRKNS0_7contextERKNS0_13property_listERKNS0_6detail13code_locationE
@@ -3657,8 +3649,6 @@ _ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextERKNS0_13propert
36573649
_ZN2cl4sycl20aligned_alloc_sharedEmmRKNS0_6deviceERKNS0_7contextERKNS0_6detail13code_locationE
36583650
_ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_
36593651
_ZN2cl4sycl3ext5intel12experimental15online_compilerILNS3_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISE_EEEEES8_IhSaIhEERKSE_DpRKT_
3660-
_ZN2cl4sycl3ext5intel15online_compilerILNS2_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISD_EEEEES7_IhSaIhEERKSD_DpRKT_
3661-
_ZN2cl4sycl3ext5intel15online_compilerILNS2_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISD_EEEEES7_IhSaIhEERKSD_DpRKT_
36623652
_ZN2cl4sycl3ext6oneapi10level_zero10make_eventERKNS0_7contextEmb
36633653
_ZN2cl4sycl3ext6oneapi10level_zero10make_queueERKNS0_7contextERKNS0_6deviceEmb
36643654
_ZN2cl4sycl3ext6oneapi10level_zero10make_queueERKNS0_7contextEm
@@ -3675,8 +3665,6 @@ _ZN2cl4sycl3ext6oneapi6detail17reduComputeWGSizeEmmRm
36753665
_ZN2cl4sycl3ext6oneapi6detail33reduGetMaxNumConcurrentWorkGroupsESt10shared_ptrINS0_6detail10queue_implEE
36763666
_ZN2cl4sycl4freeEPvRKNS0_5queueERKNS0_6detail13code_locationE
36773667
_ZN2cl4sycl4freeEPvRKNS0_7contextERKNS0_6detail13code_locationE
3678-
_ZN2cl4sycl5INTEL15online_compilerILNS1_15source_languageE0EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EEEEES6_IhSaIhEERKSC_DpRKT_
3679-
_ZN2cl4sycl5INTEL15online_compilerILNS1_15source_languageE1EE7compileIJSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EEEEES6_IhSaIhEERKSC_DpRKT_
36803668
_ZN2cl4sycl5event13get_wait_listEv
36813669
_ZN2cl4sycl5event14wait_and_throwERKSt6vectorIS1_SaIS1_EE
36823670
_ZN2cl4sycl5event14wait_and_throwEv

0 commit comments

Comments
 (0)