[SYCL][ABI-break] Update sycl::exception to be SYCL2020 compliant (#9210)

SYCL2020 requires `sycl::exception` to virtually inherit from
`std::exception`, which is an ABI-breaking change. Additionally, this PR
removes two constructors that are not used anymore.

---------

Signed-off-by: Maronas, Marcos <[email protected]>

Author: maarquitos14

sycl/CMakeLists.txt

@@ -36,7 +36,7 @@ set(SYCL_MAJOR_VERSION 7)
 set(SYCL_MINOR_VERSION 0)
 set(SYCL_PATCH_VERSION 0)
 
-set(SYCL_DEV_ABI_VERSION 0)
+set(SYCL_DEV_ABI_VERSION 1)
 if (SYCL_ADD_DEV_VERSION_POSTFIX)
   set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
 endif()

sycl/include/sycl/exception.hpp

@@ -61,11 +61,12 @@ class __SYCL_EXPORT SYCLCategory : public std::error_category {
 // Derive from std::exception so uncaught exceptions are printed in c++ default
 // exception handler.
 /// \ingroup sycl_api
-class __SYCL_EXPORT exception : public std::exception {
+class __SYCL_EXPORT exception : public virtual std::exception {
 public:
   __SYCL2020_DEPRECATED("The version of an exception constructor which takes "
                         "no arguments is deprecated.")
   exception() = default;
+  virtual ~exception();
 
   exception(std::error_code, const char *Msg);
 
@@ -105,16 +106,6 @@ class __SYCL_EXPORT exception : public std::exception {
   std::error_code MErrC = make_error_code(sycl::errc::invalid);
 
 protected:
-  // these two constructors are no longer used. Kept for ABI compatability.
-  exception(const char *Msg, const pi_int32 PIErr,
-            std::shared_ptr<context> Context = nullptr)
-      : exception(std::string(Msg), PIErr, Context) {}
-  exception(const std::string &Msg, const pi_int32 PIErr,
-            std::shared_ptr<context> Context = nullptr)
-      : MMsg(std::make_shared<std::string>(Msg + " " +
-                                           detail::codeToString(PIErr))),
-        MPIErr(PIErr), MContext(Context) {}
-
   // base constructors used by SYCL 1.2.1 exception subclasses
   exception(std::error_code ec, const char *Msg, const pi_int32 PIErr,
             std::shared_ptr<context> Context = nullptr)

sycl/source/exception.cpp

@@ -65,6 +65,8 @@ exception::exception(std::error_code EC, std::shared_ptr<context> SharedPtrCtx,
   detail::GlobalHandler::instance().TraceEventXPTI(MMsg->c_str());
 }
 
+exception::~exception() {}
+
 const std::error_code &exception::code() const noexcept { return MErrC; }
 
 const std::error_category &exception::category() const noexcept {

sycl/test/abi/sycl_symbols_linux.dump

@@ -4050,6 +4050,9 @@ _ZN4sycl3_V19exceptionC2ESt10error_codeSt10shared_ptrINS0_7contextEERKNSt7__cxx1
 _ZN4sycl3_V19exceptionC2EiRKNSt3_V214error_categoryE
 _ZN4sycl3_V19exceptionC2EiRKNSt3_V214error_categoryEPKc
 _ZN4sycl3_V19exceptionC2EiRKNSt3_V214error_categoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
+_ZN4sycl3_V19exceptionD0Ev
+_ZN4sycl3_V19exceptionD1Ev
+_ZN4sycl3_V19exceptionD2Ev
 _ZN4sycl3_V19kernel_idC1EPKc
 _ZN4sycl3_V19kernel_idC2EPKc
 _ZNK4sycl3_V112cpu_selectorclERKNS0_6deviceE

sycl/test/abi/sycl_symbols_windows.dump

@@ -458,12 +458,9 @@
 ??0event@_V1@sycl@@QEAA@PEAU_cl_event@@AEBVcontext@12@@Z
 ??0event@_V1@sycl@@QEAA@XZ
 ??0exception@_V1@sycl@@IEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z
-??0exception@_V1@sycl@@IEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HV?$shared_ptr@Vcontext@_V1@sycl@@@4@@Z
-??0exception@_V1@sycl@@IEAA@PEBDHV?$shared_ptr@Vcontext@_V1@sycl@@@std@@@Z
 ??0exception@_V1@sycl@@IEAA@Verror_code@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@HV?$shared_ptr@Vcontext@_V1@sycl@@@4@@Z
 ??0exception@_V1@sycl@@IEAA@Verror_code@std@@PEBDHV?$shared_ptr@Vcontext@_V1@sycl@@@4@@Z
 ??0exception@_V1@sycl@@IEAA@Verror_code@std@@V?$shared_ptr@Vcontext@_V1@sycl@@@4@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@@Z
-??0exception@_V1@sycl@@QEAA@$$QEAV012@@Z
 ??0exception@_V1@sycl@@QEAA@AEBV012@@Z
 ??0exception@_V1@sycl@@QEAA@HAEBVerror_category@std@@@Z
 ??0exception@_V1@sycl@@QEAA@HAEBVerror_category@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@4@@Z
@@ -661,7 +658,6 @@
 ??4device_selector@_V1@sycl@@QEAAAEAV012@AEBV012@@Z
 ??4event@_V1@sycl@@QEAAAEAV012@$$QEAV012@@Z
 ??4event@_V1@sycl@@QEAAAEAV012@AEBV012@@Z
-??4exception@_V1@sycl@@QEAAAEAV012@$$QEAV012@@Z
 ??4exception@_V1@sycl@@QEAAAEAV012@AEBV012@@Z
 ??4exception_list@_V1@sycl@@QEAAAEAV012@$$QEAV012@@Z
 ??4exception_list@_V1@sycl@@QEAAAEAV012@AEBV012@@Z
@@ -747,6 +743,8 @@
 ??_7gpu_selector@_V1@sycl@@6B@
 ??_7host_selector@_V1@sycl@@6B@
 ??_7image_impl@detail@_V1@sycl@@6B@
+??_8exception@_V1@sycl@@7B@
+??_Dexception@_V1@sycl@@QEAAXXZ
 ??_Fcontext@_V1@sycl@@QEAAXXZ
 ??_Fqueue@_V1@sycl@@QEAAXXZ
 ?Clear@exception_list@_V1@sycl@@AEAAXXZ