[SYCL][ABI-Break] Hide some exported symbols (#14615)

Both `get_pi_error` and `set_pi_error` are only called from the library
and therefore there is no need for them to be exported.

This patch is essentially a by-product of #14145 and it is done to
simplify that change, i.e. PI plugins removal should not be ABI-breaking
by itself, we just need to cleanup some of our exported symbols.

Author: AlexeySachkov

sycl/include/sycl/exception.hpp

@@ -67,9 +67,8 @@ class __SYCL_EXPORT SYCLCategory : public std::error_category {
 };
 
 // Forward declare to declare as a friend in sycl::excepton.
-__SYCL_EXPORT pi_int32 get_pi_error(const exception &e);
-// TODO: Should it be exported at all?
-__SYCL_EXPORT exception set_pi_error(exception &&e, pi_int32 pi_err);
+pi_int32 get_pi_error(const exception &e);
+exception set_pi_error(exception &&e, pi_int32 pi_err);
 } // namespace detail
 
 // Derive from std::exception so uncaught exceptions are printed in c++ default
@@ -140,16 +139,29 @@ class __SYCL_EXPORT exception : public virtual std::exception {
   exception(std::error_code Ec, std::shared_ptr<context> SharedPtrCtx,
             const char *WhatArg);
 
-  friend __SYCL_EXPORT pi_int32 detail::get_pi_error(const exception &);
+  friend pi_int32 detail::get_pi_error(const exception &);
   // To be used like this:
   //   throw/return detail::set_pi_error(exception(...), some_pi_error);
   // *only* when such a error is coming from the PI/UR level. Otherwise it
   // *should be left unset/default-initialized and exception should be thrown
   // as-is using public ctors.
-  friend __SYCL_EXPORT exception detail::set_pi_error(exception &&e,
-                                                      pi_int32 pi_err);
+  friend exception detail::set_pi_error(exception &&e, pi_int32 pi_err);
 };
 
+namespace detail {
+// Even though at the moment those functions are only used in library and not
+// in headers, they were put here in case we will need them to implement some
+// of OpenCL (and other backends) interop APIs to query native backend error
+// from an exception.
+// And we don't want them to be part of our library ABI, because of future
+// underlying changes (PI -> UR -> Offload).
+inline pi_int32 get_pi_error(const exception &e) { return e.MPIErr; }
+inline exception set_pi_error(exception &&e, pi_int32 pi_err) {
+  e.MPIErr = pi_err;
+  return std::move(e);
+}
+} // namespace detail
+
 } // namespace _V1
 } // namespace sycl
 

sycl/source/exception.cpp

@@ -66,12 +66,6 @@ std::error_code make_error_code(sycl::errc Err) noexcept {
 }
 
 namespace detail {
-pi_int32 get_pi_error(const exception &e) { return e.MPIErr; }
-exception set_pi_error(exception &&e, pi_int32 pi_err) {
-  e.MPIErr = pi_err;
-  return std::move(e);
-}
-
 __SYCL_EXPORT const char *stringifyErrorCode(pi_int32 error) {
   switch (error) {
 #define _PI_ERRC(NAME, VAL)                                                    \

sycl/test-e2e/KernelAndProgram/build-log.cpp

@@ -1,5 +1,6 @@
 // for CUDA and HIP the failure happens at compile time, not during runtime
 // UNSUPPORTED: cuda || hip || ze_debug
+// TODO: rewrite this into a unit-test
 
 // RUN: %{build} -DGPU -o %t_gpu.out
 // RUN: %{build} -o %t.out
@@ -46,7 +47,6 @@ void test() {
     std::cerr << Msg << std::endl;
     assert(e.code() == sycl::errc::build &&
            "Caught exception was not a compilation error");
-    assert(sycl::detail::get_pi_error(e) == PI_ERROR_BUILD_PROGRAM_FAILURE);
   } catch (...) {
     assert(false && "Caught exception was not a compilation error");
   }

sycl/test/abi/sycl_symbols_linux.dump

@@ -3218,10 +3218,8 @@ _ZN4sycl3_V16detail12buffer_plainC2ERKSt8functionIFvPvEEmmRKNS0_13property_listE
 _ZN4sycl3_V16detail12buffer_plainC2EmRKNS0_7contextESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS7_EEbRKNS0_5eventE
 _ZN4sycl3_V16detail12buffer_plainC2EmmRKNS0_13property_listESt10unique_ptrINS1_19SYCLMemObjAllocatorESt14default_deleteIS7_EE
 _ZN4sycl3_V16detail12compile_implERKNS0_13kernel_bundleILNS0_12bundle_stateE0EEERKSt6vectorINS0_6deviceESaIS8_EERKNS0_13property_listE
-_ZN4sycl3_V16detail12get_pi_errorERKNS0_9exceptionE
 _ZN4sycl3_V16detail12isOutOfRangeENS0_3vecIiLi4EEENS0_15addressing_modeENS0_5rangeILi3EEE
 _ZN4sycl3_V16detail12make_contextEmRKSt8functionIFvNS0_14exception_listEEENS0_7backendEbRKSt6vectorINS0_6deviceESaISA_EE
-_ZN4sycl3_V16detail12set_pi_errorEONS0_9exceptionEi
 _ZN4sycl3_V16detail13host_pipe_map3addEPKvPKc
 _ZN4sycl3_V16detail13lgamma_r_implENS1_9half_impl4halfEPi
 _ZN4sycl3_V16detail13lgamma_r_implEdPi

sycl/test/abi/sycl_symbols_windows.dump

@@ -4028,7 +4028,6 @@
 ?get_node_from_event@node@experimental@oneapi@ext@_V1@sycl@@SA?AV123456@Vevent@56@@Z
 ?get_nodes@modifiable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@QEBA?AV?$vector@Vnode@experimental@oneapi@ext@_V1@sycl@@V?$allocator@Vnode@experimental@oneapi@ext@_V1@sycl@@@std@@@std@@XZ
 ?get_num_channels@image_mem@experimental@oneapi@ext@_V1@sycl@@QEBAIXZ
-?get_pi_error@detail@_V1@sycl@@YAHAEBVexception@23@@Z
 ?get_pipe_name@pipe_base@experimental@intel@ext@_V1@sycl@@KA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@PEBX@Z
 ?get_pitch@image_plain@detail@_V1@sycl@@IEBA?AV?$range@$01@34@XZ
 ?get_platform@context@_V1@sycl@@QEBA?AVplatform@23@XZ
@@ -4229,7 +4228,6 @@
 ?set_flag@stream@_V1@sycl@@AEBAXI@Z
 ?set_flag@stream@_V1@sycl@@AEBAXII@Z
 ?set_manipulator@stream@_V1@sycl@@AEBAXW4stream_manipulator@23@@Z
-?set_pi_error@detail@_V1@sycl@@YA?AVexception@23@$$QEAV423@H@Z
 ?set_specialization_constant_impl@kernel_bundle_plain@detail@_V1@sycl@@IEAAXPEBDPEAX_K@Z
 ?set_write_back@buffer_plain@detail@_V1@sycl@@IEAAX_N@Z
 ?set_write_back@image_plain@detail@_V1@sycl@@IEAAX_N@Z