[SYCL][ABI-BREAK] Remove sycl::program class

sycl/include/sycl/backend/opencl.hpp

@@ -22,10 +22,6 @@ namespace opencl {
 __SYCL_EXPORT platform make_platform(pi_native_handle NativeHandle);
 __SYCL_EXPORT device make_device(pi_native_handle NativeHandle);
 __SYCL_EXPORT context make_context(pi_native_handle NativeHandle);
-#ifdef __SYCL_INTERNAL_API
-__SYCL_EXPORT program make_program(const context &Context,
-                                   pi_native_handle NativeHandle);
-#endif
 __SYCL_EXPORT queue make_queue(const context &Context,
                                pi_native_handle InteropHandle);
 
@@ -53,17 +49,6 @@ T make(typename detail::interop<backend::opencl, T>::type Interop) {
   return make_context(detail::pi::cast<pi_native_handle>(Interop));
 }
 
-// Construction of SYCL program.
-#ifdef __SYCL_INTERNAL_API
-template <typename T, typename detail::enable_if_t<
-                          std::is_same<T, program>::value> * = nullptr>
-__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_program free function")
-T make(const context &Context,
-       typename detail::interop<backend::opencl, T>::type Interop) {
-  return make_program(Context, detail::pi::cast<pi_native_handle>(Interop));
-}
-#endif
-
 // Construction of SYCL queue.
 template <typename T, typename detail::enable_if_t<
                           std::is_same<T, queue>::value> * = nullptr>

sycl/include/sycl/detail/backend_traits_cuda.hpp

@@ -60,12 +60,6 @@ template <> struct interop<backend::ext_oneapi_cuda, queue> {
   using type = CUstream;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct interop<backend::ext_oneapi_cuda, program> {
-  using type = CUmodule;
-};
-#endif
-
 // TODO the interops for accessor is used in the already deprecated class
 // interop_handler and can be removed after API cleanup.
 template <typename DataT, int Dimensions, access::mode AccessMode>
@@ -127,16 +121,6 @@ template <> struct BackendReturn<backend::ext_oneapi_cuda, queue> {
   using type = CUstream;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct BackendInput<backend::ext_oneapi_cuda, program> {
-  using type = CUmodule;
-};
-
-template <> struct BackendReturn<backend::ext_oneapi_cuda, program> {
-  using type = CUmodule;
-};
-#endif
-
 } // namespace detail
 } // __SYCL_INLINE_VER_NAMESPACE(_V1)
 } // namespace sycl

sycl/include/sycl/detail/backend_traits_hip.hpp

@@ -54,12 +54,6 @@ template <> struct interop<backend::ext_oneapi_hip, queue> {
   using type = HIPstream;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct interop<backend::ext_oneapi_hip, program> {
-  using type = HIPmodule;
-};
-#endif
-
 // TODO the interops for accessor is used in the already deprecated class
 // interop_handler and can be removed after API cleanup.
 template <typename DataT, int Dimensions, access::mode AccessMode>
@@ -121,16 +115,6 @@ template <> struct BackendReturn<backend::ext_oneapi_hip, queue> {
   using type = HIPstream;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct BackendInput<backend::ext_oneapi_hip, program> {
-  using type = HIPmodule;
-};
-
-template <> struct BackendReturn<backend::ext_oneapi_hip, program> {
-  using type = HIPmodule;
-};
-#endif
-
 } // namespace detail
 } // __SYCL_INLINE_VER_NAMESPACE(_V1)
 } // namespace sycl

sycl/include/sycl/detail/backend_traits_level_zero.hpp

@@ -67,12 +67,6 @@ template <> struct interop<backend::ext_oneapi_level_zero, platform> {
   using type = ze_driver_handle_t;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct interop<backend::ext_oneapi_level_zero, program> {
-  using type = ze_module_handle_t;
-};
-#endif
-
 // TODO the interops for accessor is used in the already deprecated class
 // interop_handler and can be removed after API cleanup.
 template <typename DataT, int Dimensions, access::mode AccessMode>
@@ -220,16 +214,6 @@ template <> struct BackendReturn<backend::ext_oneapi_level_zero, platform> {
   using type = ze_driver_handle_t;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct BackendInput<backend::ext_oneapi_level_zero, program> {
-  using type = ze_module_handle_t;
-};
-
-template <> struct BackendReturn<backend::ext_oneapi_level_zero, program> {
-  using type = ze_module_handle_t;
-};
-#endif
-
 template <bundle_state State>
 struct BackendInput<backend::ext_oneapi_level_zero, kernel_bundle<State>> {
   struct type {

sycl/include/sycl/detail/backend_traits_opencl.hpp

@@ -50,12 +50,6 @@ template <> struct interop<backend::opencl, platform> {
   using type = cl_platform_id;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct interop<backend::opencl, program> {
-  using type = cl_program;
-};
-#endif
-
 // TODO the interops for accessor is used in the already deprecated class
 // interop_handler and can be removed after API cleanup.
 template <typename DataT, int Dimensions, access::mode AccessMode>
@@ -134,16 +128,6 @@ template <> struct BackendReturn<backend::opencl, platform> {
   using type = cl_platform_id;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct BackendInput<backend::opencl, program> {
-  using type = cl_program;
-};
-
-template <> struct BackendReturn<backend::opencl, program> {
-  using type = cl_program;
-};
-#endif
-
 template <bundle_state State>
 struct BackendInput<backend::opencl, kernel_bundle<State>> {
   using type = cl_program;

sycl/include/sycl/ext/oneapi/backend/level_zero.hpp

@@ -9,7 +9,6 @@
 #pragma once
 
 #include <sycl/backend.hpp>
-#include <sycl/program.hpp>
 
 #include <vector>
 
@@ -27,10 +26,6 @@ __SYCL_EXPORT device make_device(const platform &Platform,
 __SYCL_EXPORT context make_context(const std::vector<device> &DeviceList,
                                    pi_native_handle NativeHandle,
                                    bool keep_ownership = false);
-#ifdef __SYCL_INTERNAL_API
-__SYCL_EXPORT program make_program(const context &Context,
-                                   pi_native_handle NativeHandle);
-#endif
 __SYCL_DEPRECATED("Use make_queue with device parameter")
 __SYCL_EXPORT queue make_queue(const context &Context,
                                pi_native_handle InteropHandle,
@@ -82,18 +77,6 @@ T make(const std::vector<device> &DeviceList,
                       Ownership == ownership::keep);
 }
 
-// Construction of SYCL program.
-#ifdef __SYCL_INTERNAL_API
-template <typename T, typename sycl::detail::enable_if_t<
-                          std::is_same<T, program>::value> * = nullptr>
-__SYCL_DEPRECATED("Use SYCL 2020 sycl::make_kernel_bundle free function")
-T make(const context &Context,
-       typename sycl::detail::interop<backend::ext_oneapi_level_zero, T>::type
-           Interop) {
-  return make_program(Context, reinterpret_cast<pi_native_handle>(Interop));
-}
-#endif
-
 // Construction of SYCL queue.
 template <typename T, typename sycl::detail::enable_if_t<
                           std::is_same<T, queue>::value> * = nullptr>

sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp

@@ -59,12 +59,6 @@ template <> struct interop<backend::ext_oneapi_cuda, platform> {
   using type = std::vector<CUdevice>;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct interop<backend::ext_oneapi_cuda, program> {
-  using type = CUmodule;
-};
-#endif
-
 template <typename DataT, int Dimensions, typename AllocatorT>
 struct BackendInput<backend::ext_oneapi_cuda,
                     buffer<DataT, Dimensions, AllocatorT>> {
@@ -117,16 +111,6 @@ template <> struct BackendReturn<backend::ext_oneapi_cuda, platform> {
   using type = std::vector<CUdevice>;
 };
 
-#ifdef __SYCL_INTERNAL_API
-template <> struct BackendInput<backend::ext_oneapi_cuda, program> {
-  using type = CUmodule;
-};
-
-template <> struct BackendReturn<backend::ext_oneapi_cuda, program> {
-  using type = CUmodule;
-};
-#endif
-
 template <> struct InteropFeatureSupportMap<backend::ext_oneapi_cuda> {
   static constexpr bool MakePlatform = false;
   static constexpr bool MakeDevice = true;

sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp

@@ -21,7 +21,6 @@
 
 namespace sycl {
 __SYCL_INLINE_VER_NAMESPACE(_V1) {
-class program;
 
 namespace ext {
 namespace oneapi {
@@ -47,7 +46,6 @@ class __SYCL2020_DEPRECATED(
 #else
   char padding[sizeof(T)];
 #endif // __SYCL_DEVICE_ONLY__
-  friend class sycl::program;
 
 public:
   template <typename V = T>

sycl/include/sycl/info/info_desc.hpp

@@ -15,9 +15,6 @@
 namespace sycl {
 __SYCL_INLINE_VER_NAMESPACE(_V1) {
 
-#ifdef __SYCL_INTERNAL_API
-class program;
-#endif
 class device;
 class platform;
 class kernel_id;
@@ -179,15 +176,6 @@ namespace event_profiling {
 } // namespace event_profiling
 #undef __SYCL_PARAM_TRAITS_SPEC
 
-// Deprecated program class information desctiptors
-#ifdef __SYCL_INTERNAL_API
-enum class program : pi_uint32 {
-  context = PI_PROGRAM_INFO_CONTEXT,
-  devices = PI_PROGRAM_INFO_DEVICES,
-  reference_count = PI_PROGRAM_INFO_REFERENCE_COUNT
-};
-#endif
-
 // Provide an alias to the return type for each of the info parameters
 template <typename T, T param> class param_traits {};
 
@@ -198,11 +186,6 @@ template <typename T, T param> struct compatibility_param_traits {};
   public:                                                                      \
     using return_type = ret_type;                                              \
   };
-
-#ifdef __SYCL_INTERNAL_API
-#include <sycl/info/program_traits.def>
-#endif
-
 #undef __SYCL_PARAM_TRAITS_SPEC
 
 } // namespace info

sycl/include/sycl/info/kernel_traits.def

@@ -3,6 +3,3 @@ __SYCL_PARAM_TRAITS_SPEC(kernel, attributes, std::string, PI_KERNEL_INFO_ATTRIBU
 __SYCL_PARAM_TRAITS_SPEC(kernel, function_name, std::string, PI_KERNEL_INFO_FUNCTION_NAME)
 __SYCL_PARAM_TRAITS_SPEC(kernel, reference_count, uint32_t, PI_KERNEL_INFO_REFERENCE_COUNT)
 __SYCL_PARAM_TRAITS_SPEC(kernel, context, sycl::context, PI_KERNEL_INFO_CONTEXT)
-#ifdef __SYCL_INTERNAL_API
-__SYCL_PARAM_TRAITS_SPEC(kernel, program, sycl::program, PI_KERNEL_INFO_ATTRIBUTES)
-#endif