Skip to content

Commit 63705e9

Browse files
[SYCL] Remove some OSUtil::* funcs from ABI (#20694)
Removing unused `OSUtil::*` ABI entry points since we are in the breaking window. Co-authored-by: Steffen Larsen <steffen.larsen@intel.com>
1 parent 02d8168 commit 63705e9

File tree

6 files changed

+3
-29
lines changed

6 files changed

+3
-29
lines changed

sycl/include/sycl/detail/os_util.hpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,9 @@ namespace detail {
4444

4545
/// Groups the OS-dependent services.
4646
class __SYCL_EXPORT OSUtil {
47-
#if !defined(__INTEL_PREVIEW_BREAKING_CHANGES)
48-
#ifdef _WIN32
49-
// Access control is part of the mangling on Windows, have to preserve this
50-
// for backward ABI compatibility.
51-
public:
52-
#endif
53-
/// Returns a directory component of a path.
54-
static std::string getDirName(const char *Path);
55-
#endif
56-
5747
public:
5848
/// Returns an absolute path to a directory where the object was found.
59-
#if defined(__INTEL_PREVIEW_BREAKING_CHANGES)
6049
__SYCL_DLL_LOCAL
61-
#endif
6250
static std::string getCurrentDSODir();
6351

6452
#ifdef __SYCL_RT_OS_WINDOWS

sycl/source/detail/os_util.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ namespace sycl {
5858
inline namespace _V1 {
5959
namespace detail {
6060

61-
#if defined(__INTEL_PREVIEW_BREAKING_CHANGES)
62-
[[maybe_unused]] static std::string getDirName(const char *Path)
63-
#else
64-
std::string OSUtil::getDirName(const char *Path)
65-
#endif
66-
{
61+
[[maybe_unused]] static std::string getDirName(const char *Path) {
6762
return fs::path(Path).parent_path().string();
6863
}
6964

sycl/test/abi/sycl_abi_neutrality_test.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
// https://github.com/intel/llvm/pull/16178
2323
// CHECK:_ZN4sycl3_V13ext5intel12experimental9pipe_base13get_pipe_nameB5cxx11EPKv
2424
//
25-
// https://github.com/intel/llvm/pull/16177
26-
// CHECK:_ZN4sycl3_V16detail6OSUtil10getDirNameB5cxx11EPKc
27-
// CHECK:_ZN4sycl3_V16detail6OSUtil16getCurrentDSODirB5cxx11Ev
28-
//
2925
// https://github.com/intel/llvm/pull/16176
3026
// CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_6deviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
3127
// CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_8platformERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE

sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,11 +3356,9 @@ _ZN4sycl3_V16detail35sampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_
33563356
_ZN4sycl3_V16detail36addHostUnsampledImageAccessorAndWaitEPNS1_30UnsampledImageAccessorImplHostE
33573357
_ZN4sycl3_V16detail36get_empty_interop_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EE
33583358
_ZN4sycl3_V16detail37unsampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_12image_targetEENS0_6access4modeEPKvjRKNS1_13code_locationE
3359-
_ZN4sycl3_V16detail6OSUtil10getDirNameB5cxx11EPKc
33603359
_ZN4sycl3_V16detail6OSUtil11alignedFreeEPv
33613360
_ZN4sycl3_V16detail6OSUtil12alignedAllocEmm
33623361
_ZN4sycl3_V16detail6OSUtil12getOSMemSizeEv
3363-
_ZN4sycl3_V16detail6OSUtil16getCurrentDSODirB5cxx11Ev
33643362
_ZN4sycl3_V16detail6OSUtil7makeDirEPKc
33653363
_ZN4sycl3_V16detail9join_implERKSt6vectorISt10shared_ptrINS1_18kernel_bundle_implEESaIS5_EENS0_12bundle_stateE
33663364
_ZN4sycl3_V16detail9link_implEPKNS0_13kernel_bundleILNS0_12bundle_stateE1EEEmRKSt6vectorINS0_6deviceESaIS8_EEb

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4033,7 +4033,6 @@
40334033
?getDeviceBackend@handler@_V1@sycl@@AEBA?AW4backend@23@XZ
40344034
?getDeviceFromHandler@detail@_V1@sycl@@YA?AVdevice@23@AEAVhandler@23@@Z
40354035
?getDeviceKernelInfo@detail@_V1@sycl@@YAAEAVDeviceKernelInfo@123@AEBUCompileTimeKernelInfoTy@compile_time_kernel_info_v1@123@@Z
4036-
?getDirName@OSUtil@detail@_V1@sycl@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBD@Z
40374036
?getElemSize@AccessorBaseHost@detail@_V1@sycl@@QEBAIXZ
40384037
?getElementSize@LocalAccessorBaseHost@detail@_V1@sycl@@QEAAHXZ
40394038
?getElementSize@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBAHXZ

sycl/unittests/misc/OsUtils.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ bool isSameDir(const char* LHS, const char* RHS) {
5454
class OsUtilsTest : public ::testing::Test {
5555
};
5656

57-
// This test fails with preview breaking changes enabled.
58-
// Failure tracker: https://github.com/intel/llvm/issues/19626
59-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
6057
TEST_F(OsUtilsTest, getCurrentDSODir) {
58+
// Failure tracker: https://github.com/intel/llvm/issues/19626
59+
GTEST_SKIP() << "Skipping test due to failure tracked in issue #19626";
6160
std::string DSODir = sycl::detail::OSUtil::getCurrentDSODir();
6261
ASSERT_TRUE(isSameDir(DSODir.c_str(), SYCL_LIB_DIR)) <<
6362
"expected: " << SYCL_LIB_DIR << ", got: " << DSODir;
6463
}
65-
#endif

0 commit comments

Comments
 (0)