diff --git a/sycl/include/sycl/detail/os_util.hpp b/sycl/include/sycl/detail/os_util.hpp index 6dc084573cc5f..5fa8e02f1bb7d 100644 --- a/sycl/include/sycl/detail/os_util.hpp +++ b/sycl/include/sycl/detail/os_util.hpp @@ -44,21 +44,9 @@ namespace detail { /// Groups the OS-dependent services. class __SYCL_EXPORT OSUtil { -#if !defined(__INTEL_PREVIEW_BREAKING_CHANGES) -#ifdef _WIN32 - // Access control is part of the mangling on Windows, have to preserve this - // for backward ABI compatibility. -public: -#endif - /// Returns a directory component of a path. - static std::string getDirName(const char *Path); -#endif - public: /// Returns an absolute path to a directory where the object was found. -#if defined(__INTEL_PREVIEW_BREAKING_CHANGES) __SYCL_DLL_LOCAL -#endif static std::string getCurrentDSODir(); #ifdef __SYCL_RT_OS_WINDOWS diff --git a/sycl/source/detail/os_util.cpp b/sycl/source/detail/os_util.cpp index 30cef251e11a2..754b68191ebaa 100644 --- a/sycl/source/detail/os_util.cpp +++ b/sycl/source/detail/os_util.cpp @@ -58,12 +58,7 @@ namespace sycl { inline namespace _V1 { namespace detail { -#if defined(__INTEL_PREVIEW_BREAKING_CHANGES) -[[maybe_unused]] static std::string getDirName(const char *Path) -#else -std::string OSUtil::getDirName(const char *Path) -#endif -{ +[[maybe_unused]] static std::string getDirName(const char *Path) { return fs::path(Path).parent_path().string(); } diff --git a/sycl/test/abi/sycl_abi_neutrality_test.cpp b/sycl/test/abi/sycl_abi_neutrality_test.cpp index d1a4a8df9bd6c..6e24a69173b13 100644 --- a/sycl/test/abi/sycl_abi_neutrality_test.cpp +++ b/sycl/test/abi/sycl_abi_neutrality_test.cpp @@ -22,10 +22,6 @@ // https://github.com/intel/llvm/pull/16178 // CHECK:_ZN4sycl3_V13ext5intel12experimental9pipe_base13get_pipe_nameB5cxx11EPKv // -// https://github.com/intel/llvm/pull/16177 -// CHECK:_ZN4sycl3_V16detail6OSUtil10getDirNameB5cxx11EPKc -// CHECK:_ZN4sycl3_V16detail6OSUtil16getCurrentDSODirB5cxx11Ev -// // https://github.com/intel/llvm/pull/16176 // CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_6deviceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE // CHECK:_ZN4sycl3_V16opencl13has_extensionERKNS0_8platformERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE diff --git a/sycl/test/abi/sycl_symbols_linux.dump b/sycl/test/abi/sycl_symbols_linux.dump index e42759431d374..0d36f0e32fedf 100644 --- a/sycl/test/abi/sycl_symbols_linux.dump +++ b/sycl/test/abi/sycl_symbols_linux.dump @@ -3378,11 +3378,9 @@ _ZN4sycl3_V16detail35sampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_ _ZN4sycl3_V16detail36addHostUnsampledImageAccessorAndWaitEPNS1_30UnsampledImageAccessorImplHostE _ZN4sycl3_V16detail36get_empty_interop_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EE _ZN4sycl3_V16detail37unsampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_12image_targetEENS0_6access4modeEPKvjRKNS1_13code_locationE -_ZN4sycl3_V16detail6OSUtil10getDirNameB5cxx11EPKc _ZN4sycl3_V16detail6OSUtil11alignedFreeEPv _ZN4sycl3_V16detail6OSUtil12alignedAllocEmm _ZN4sycl3_V16detail6OSUtil12getOSMemSizeEv -_ZN4sycl3_V16detail6OSUtil16getCurrentDSODirB5cxx11Ev _ZN4sycl3_V16detail6OSUtil7makeDirEPKc _ZN4sycl3_V16detail9join_implERKSt6vectorISt10shared_ptrINS1_18kernel_bundle_implEESaIS5_EENS0_12bundle_stateE _ZN4sycl3_V16detail9link_implERKSt6vectorINS0_13kernel_bundleILNS0_12bundle_stateE1EEESaIS5_EERKS2_INS0_6deviceESaISA_EERKNS0_13property_listE diff --git a/sycl/test/abi/sycl_symbols_windows.dump b/sycl/test/abi/sycl_symbols_windows.dump index 1db98f1b5cf9d..9092ce88f1168 100644 --- a/sycl/test/abi/sycl_symbols_windows.dump +++ b/sycl/test/abi/sycl_symbols_windows.dump @@ -4069,11 +4069,9 @@ ?getCommandGraph@handler@_V1@sycl@@AEBA?AV?$shared_ptr@Vgraph_impl@detail@experimental@oneapi@ext@_V1@sycl@@@std@@XZ ?getContextImpl@handler@_V1@sycl@@AEBAAEAVcontext_impl@detail@23@XZ ?getContextImplPtr@handler@_V1@sycl@@AEBAAEBV?$shared_ptr@Vcontext_impl@detail@_V1@sycl@@@std@@XZ -?getCurrentDSODir@OSUtil@detail@_V1@sycl@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ ?getDeviceBackend@handler@_V1@sycl@@AEBA?AW4backend@23@XZ ?getDeviceFromHandler@detail@_V1@sycl@@YA?AVdevice@23@AEAVhandler@23@@Z ?getDeviceKernelInfo@detail@_V1@sycl@@YAAEAVDeviceKernelInfo@123@AEBUCompileTimeKernelInfoTy@compile_time_kernel_info_v1@123@@Z -?getDirName@OSUtil@detail@_V1@sycl@@SA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBD@Z ?getElemSize@AccessorBaseHost@detail@_V1@sycl@@QEBAIXZ ?getElementSize@LocalAccessorBaseHost@detail@_V1@sycl@@QEAAHXZ ?getElementSize@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBAHXZ diff --git a/sycl/unittests/misc/OsUtils.cpp b/sycl/unittests/misc/OsUtils.cpp index 3eef558e0963a..b8bbad661d0b9 100644 --- a/sycl/unittests/misc/OsUtils.cpp +++ b/sycl/unittests/misc/OsUtils.cpp @@ -54,12 +54,10 @@ bool isSameDir(const char* LHS, const char* RHS) { class OsUtilsTest : public ::testing::Test { }; -// This test fails with preview breaking changes enabled. -// Failure tracker: https://github.com/intel/llvm/issues/19626 -#ifndef __INTEL_PREVIEW_BREAKING_CHANGES TEST_F(OsUtilsTest, getCurrentDSODir) { + // Failure tracker: https://github.com/intel/llvm/issues/19626 + GTEST_SKIP() << "Skipping test due to failure tracked in issue #19626"; std::string DSODir = sycl::detail::OSUtil::getCurrentDSODir(); ASSERT_TRUE(isSameDir(DSODir.c_str(), SYCL_LIB_DIR)) << "expected: " << SYCL_LIB_DIR << ", got: " << DSODir; } -#endif