make aspect oneapi extension

Author: aidan.belton

sycl/include/CL/sycl/aspects.hpp

@@ -49,7 +49,7 @@ enum class aspect {
   ext_oneapi_native_assert = 31,
   host_debuggable = 32,
   ext_intel_gpu_hw_threads_per_eu = 33,
-  bf16 = 34
+  ext_oneapi_bfloat16 = 34,
 };
 
 } // namespace sycl

sycl/include/CL/sycl/info/device_traits.def

@@ -27,7 +27,7 @@ __SYCL_PARAM_TRAITS_SPEC(device, atomic_memory_order_capabilities,
                          std::vector<cl::sycl::memory_order>)
 __SYCL_PARAM_TRAITS_SPEC(device, atomic_memory_scope_capabilities,
                          std::vector<cl::sycl::memory_scope>)
-__SYCL_PARAM_TRAITS_SPEC(device, bf16, bool)
+__SYCL_PARAM_TRAITS_SPEC(device, ext_oneapi_bfloat16, bool)
 __SYCL_PARAM_TRAITS_SPEC(device, max_read_image_args, pi_uint32)
 __SYCL_PARAM_TRAITS_SPEC(device, max_write_image_args, pi_uint32)
 __SYCL_PARAM_TRAITS_SPEC(device, image2d_max_width, size_t)

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

@@ -175,7 +175,7 @@ enum class device : cl_device_info {
   ext_oneapi_max_work_groups_3d = PI_EXT_ONEAPI_DEVICE_INFO_MAX_WORK_GROUPS_3D,
   atomic_memory_scope_capabilities =
       PI_DEVICE_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES,
-  bf16 = PI_DEVICE_INFO_BF16
+  ext_oneapi_bfloat16 = PI_EXT_ONEAPI_DEVICE_INFO_BFLOAT16
 };
 
 enum class device_type : pi_uint64 {

sycl/plugins/cuda/pi_cuda.cpp

@@ -1173,15 +1173,16 @@ pi_result cuda_piDeviceGetInfo(pi_device device, pi_device_info param_name,
     return getInfo(param_value_size, param_value, param_value_size_ret,
                    capabilities);
   }
-  case PI_DEVICE_INFO_BF16: {
+  case PI_EXT_ONEAPI_DEVICE_INFO_BFLOAT16: {
     int major = 0;
     cl::sycl::detail::pi::assertion(
         cuDeviceGetAttribute(&major,
                              CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR,
                              device->get()) == CUDA_SUCCESS);
 
-    bool bf16 = (major >= 8) ? true : false;
-    return getInfo(param_value_size, param_value, param_value_size_ret, bf16);
+    bool bfloat16 = (major >= 8) ? true : false;
+    return getInfo(param_value_size, param_value, param_value_size_ret,
+                   bfloat16);
   }
   case PI_DEVICE_INFO_SUB_GROUP_SIZES_INTEL: {
     // NVIDIA devices only support one sub-group size (the warp size)

sycl/plugins/hip/pi_hip.cpp

@@ -1669,7 +1669,7 @@ pi_result hip_piDeviceGetInfo(pi_device device, pi_device_info param_name,
   case PI_DEVICE_INFO_GPU_EU_COUNT_PER_SUBSLICE:
   case PI_DEVICE_INFO_GPU_HW_THREADS_PER_EU:
   case PI_DEVICE_INFO_MAX_MEM_BANDWIDTH:
-  case PI_DEVICE_INFO_BF16:
+  case PI_EXT_ONEAPI_DEVICE_INFO_BFLOAT16:
     return PI_INVALID_VALUE;
 
   default:

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -2892,7 +2892,7 @@ pi_result piDeviceGetInfo(pi_device Device, pi_device_info ParamName,
   case PI_DEVICE_INFO_MAX_MEM_BANDWIDTH:
     // currently not supported in level zero runtime
     return PI_INVALID_VALUE;
-  case PI_DEVICE_INFO_BF16:
+  case PI_EXT_ONEAPI_DEVICE_INFO_BFLOAT16:
     return PI_INVALID_VALUE;
 
   // TODO: Implement.

sycl/source/detail/device_impl.cpp

@@ -276,8 +276,8 @@ bool device_impl::has(aspect Aspect) const {
     return has_extension("cl_khr_fp16");
   case aspect::fp64:
     return has_extension("cl_khr_fp64");
-  case aspect::bf16:
-    return get_info<info::device::bf16>();
+  case aspect::ext_oneapi_bfloat16:
+    return get_info<info::device::ext_oneapi_bfloat16>();
   case aspect::int64_base_atomics:
     return has_extension("cl_khr_int64_base_atomics");
   case aspect::int64_extended_atomics:

sycl/source/detail/device_info.hpp

@@ -265,14 +265,14 @@ struct get_device_info<std::vector<memory_scope>,
 };
 
 // Specialization for bf16
-template <> struct get_device_info<bool, info::device::bf16> {
+template <> struct get_device_info<bool, info::device::ext_oneapi_bfloat16> {
   static bool get(RT::PiDevice dev, const plugin &Plugin) {
 
     bool result = false;
 
     RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piDeviceGetInfo>(
-        dev, pi::cast<RT::PiDeviceInfo>(info::device::bf16), sizeof(result),
-        &result, nullptr);
+        dev, pi::cast<RT::PiDeviceInfo>(info::device::ext_oneapi_bfloat16),
+        sizeof(result), &result, nullptr);
     if (Err != PI_SUCCESS) {
       return false;
     }
@@ -785,7 +785,8 @@ get_device_info_host<info::device::atomic_memory_scope_capabilities>() {
           memory_scope::work_group, memory_scope::device, memory_scope::system};
 }
 
-template <> inline bool get_device_info_host<info::device::bf16>() {
+template <>
+inline bool get_device_info_host<info::device::ext_oneapi_bfloat16>() {
   return false;
 }