rename extension

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/doc/extensions/supported/sycl_ext_intel_device_info.md

@@ -366,23 +366,23 @@ The extension supports this query in version 4 and later.
 
 | Device Descriptors | Return Type | Description |
 | ------------------ | ----------- | ----------- |
-| info\:\:device\:\:ext\_intel\_device\_info\_free\_memory | uint64\_t| Returns the memory avialble on the device in units of bytes.|
+| info\:\:device\:\:ext\_intel\_free\_memory | uint64\_t| Returns the memory avialble on the device in units of bytes.|
 
 
 ## Aspects ##
 
-A new aspect, ext\_intel\_device_\_info\_free\_memory, will be added.
+A new aspect, ext\_intel\_free\_memory, will be added.
 
 
 ## Error Condition ##
 
-An invalid object runtime error will be thrown if the device does not support aspect\:\:ext\_intel\_device_\_info\_free\_memory.
+An invalid object runtime error will be thrown if the device does not support aspect\:\:ext\_intel\_free\_memory.
 
 
 ## Example Usage ##
 
 Then the free device memory  can be obtained using the standard get\_info() interface.
 
-    if (dev.has(aspect::ext_intel_device_info_free_memory)) {
-      auto FreeMemory = dev.get_info<info::device::ext_intel_device_info_free_memory>();
+    if (dev.has(aspect::ext_intel_free_memory)) {
+      auto FreeMemory = dev.get_info<info::device::ext_intel_free_memory>();
     }

sycl/include/sycl/aspects.hpp

@@ -51,7 +51,7 @@ enum class aspect {
   ext_intel_gpu_hw_threads_per_eu = 33,
   ext_oneapi_cuda_async_barrier = 34,
   ext_oneapi_bfloat16 = 35,
-  ext_intel_device_info_free_memory = 36,
+  ext_intel_free_memory = 36,
 };
 
 } // __SYCL_INLINE_VER_NAMESPACE(_V1)

sycl/include/sycl/info/device_traits.def

@@ -209,7 +209,7 @@ __SYCL_PARAM_TRAITS_SPEC(device, ext_oneapi_srgb, bool,
                          PI_DEVICE_INFO_IMAGE_SRGB)
 __SYCL_PARAM_TRAITS_SPEC(device, ext_intel_device_info_uuid, detail::uuid_type,
                          PI_DEVICE_INFO_UUID)
-__SYCL_PARAM_TRAITS_SPEC(device, ext_intel_device_info_free_memory, pi_uint64,
+__SYCL_PARAM_TRAITS_SPEC(device, ext_intel_free_memory, pi_uint64,
                          PI_EXT_INTEL_DEVICE_INFO_FREE_MEMORY)
 __SYCL_PARAM_TRAITS_SPEC(device, ext_oneapi_max_global_work_groups, size_t,
                          PI_EXT_ONEAPI_DEVICE_INFO_MAX_GLOBAL_WORK_GROUPS)

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -3141,12 +3141,11 @@ pi_result piDeviceGetInfo(pi_device Device, pi_device_info ParamName,
     std::vector<zes_mem_handle_t> MemHandles(MemCount);
     ZE_CALL(zesDeviceEnumMemoryModules,
             (ZeDevice, &MemCount, MemHandles.data()));
-    printf("# = %d\n", MemCount);
+
     for (auto &ZesMemHandle : MemHandles) {
       ZesStruct<zes_mem_state_t> ZeMemState;
       ZE_CALL(zesMemoryGetState, (ZesMemHandle, &ZeMemState));
       FreeMemory += ZeMemState.free;
-      printf("## += %lld\n", ZeMemState.free);
     }
     return ReturnValue(FreeMemory);
   }

sycl/source/detail/device_impl.cpp

@@ -347,7 +347,7 @@ bool device_impl::has(aspect Aspect) const {
                MDevice, PI_DEVICE_INFO_GPU_HW_THREADS_PER_EU,
                sizeof(pi_device_type), &device_type,
                &return_size) == PI_SUCCESS;
-  case aspect::ext_intel_device_info_free_memory:
+  case aspect::ext_intel_free_memory:
     return getPlugin().call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
                MDevice, PI_EXT_INTEL_DEVICE_INFO_FREE_MEMORY,
                sizeof(pi_device_type), &device_type,

sycl/source/detail/device_info.hpp

@@ -1363,7 +1363,7 @@ get_device_info_host<info::device::ext_intel_device_info_uuid>() {
 
 template <>
 inline uint64_t
-get_device_info_host<info::device::ext_intel_device_info_free_memory>() {
+get_device_info_host<info::device::ext_intel_free_memory>() {
   throw runtime_error(
       "Obtaining the device free memory is not supported on HOST device",
       PI_ERROR_INVALID_DEVICE);

sycl/unittests/kernel-and-program/DeviceInfo.cpp

@@ -108,14 +108,14 @@ TEST_F(DeviceInfoTest, GetDeviceFreeMemory) {
 
   device Dev = Ctx.get_devices()[0];
 
-  if (!Dev.has(aspect::ext_intel_device_info_free_memory)) {
+  if (!Dev.has(aspect::ext_intel_free_memory)) {
     std::clog << "This test is only for the devices with "
-                 "ext_intel_device_info_free_memory extension support.\n";
+                 "ext_intel_free_memory extension support.\n";
     return;
   }
 
   auto FreeMemory =
-      Dev.get_info<info::device::ext_intel_device_info_free_memory>();
+      Dev.get_info<info::device::ext_intel_free_memory>();
 
   EXPECT_EQ(TestContext->FreeMemoryInfoCalled, true)
       << "Expect piDeviceGetInfo to be "