Remove unneeded CL_ definition, and num_regs -> ext_num_regs

Author: joeatodd

sycl/include/CL/sycl/detail/cl.h

@@ -16,5 +16,3 @@
 
 #include <CL/cl.h>
 #include <CL/cl_ext.h>
-
-#define CL_KERNEL_NUM_REGS                  0x11BB

sycl/include/CL/sycl/detail/pi.h

@@ -347,7 +347,7 @@ typedef enum {
   PI_KERNEL_GROUP_INFO_PREFERRED_WORK_GROUP_SIZE_MULTIPLE =
       CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE,
   PI_KERNEL_GROUP_INFO_PRIVATE_MEM_SIZE = CL_KERNEL_PRIVATE_MEM_SIZE,
-  PI_KERNEL_GROUP_INFO_NUM_REGS = CL_KERNEL_NUM_REGS
+  PI_KERNEL_GROUP_INFO_NUM_REGS = 0x10112
 } _pi_kernel_group_info;
 
 typedef enum {

sycl/include/CL/sycl/info/info_desc.hpp

@@ -250,7 +250,7 @@ enum class kernel_device_specific : cl_kernel_work_group_info {
   preferred_work_group_size_multiple =
       CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE,
   private_mem_size = CL_KERNEL_PRIVATE_MEM_SIZE,
-  num_regs = CL_KERNEL_NUM_REGS,
+  ext_num_regs = PI_KERNEL_GROUP_INFO_NUM_REGS,
   max_sub_group_size = CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE,
   max_num_sub_groups = CL_KERNEL_MAX_NUM_SUB_GROUPS,
   compile_num_sub_groups = CL_KERNEL_COMPILE_NUM_SUB_GROUPS,

sycl/include/CL/sycl/info/kernel_device_specific_traits.def

@@ -4,7 +4,7 @@ __SYCL_PARAM_TRAITS_SPEC(kernel_device_specific, global_work_size, cl::sycl::ran
 __SYCL_PARAM_TRAITS_SPEC(kernel_device_specific,
                   preferred_work_group_size_multiple, size_t)
 __SYCL_PARAM_TRAITS_SPEC(kernel_device_specific, private_mem_size, cl_ulong)
-__SYCL_PARAM_TRAITS_SPEC(kernel_device_specific, num_regs, uint32_t)
+__SYCL_PARAM_TRAITS_SPEC(kernel_device_specific, ext_num_regs, uint32_t)
 __SYCL_PARAM_TRAITS_SPEC(kernel_device_specific, work_group_size, size_t)
 __SYCL_PARAM_TRAITS_SPEC_WITH_INPUT(kernel_device_specific, max_sub_group_size,
                              uint32_t, cl::sycl::range<3>)

sycl/source/detail/kernel_info.hpp

@@ -72,7 +72,7 @@ template <>
 struct IsWorkGroupInfo<info::kernel_device_specific::private_mem_size>
     : std::true_type {};
 template <>
-struct IsWorkGroupInfo<info::kernel_device_specific::num_regs>
+struct IsWorkGroupInfo<info::kernel_device_specific::ext_num_regs>
     : std::true_type {};
 
 template <typename T, info::kernel_device_specific Param>
@@ -148,7 +148,7 @@ inline cl_ulong get_kernel_device_specific_info_host<
 
 template <>
 inline uint32_t get_kernel_device_specific_info_host<
-    info::kernel_device_specific::num_regs>(const cl::sycl::device &) {
+    info::kernel_device_specific::ext_num_regs>(const cl::sycl::device &) {
   return 0;
 }