[SYCL] Rename usm_system_allocator to usm_system_allocations

sycl/include/CL/sycl/aspects.hpp

@@ -30,7 +30,9 @@ enum class aspect {
   usm_host_allocations = 14,
   usm_shared_allocations = 15,
   usm_restricted_shared_allocations = 16,
-  usm_system_allocator = 17,
+  usm_system_allocations = 17,
+  usm_system_allocator __SYCL2020_DEPRECATED(
+      "use usm_system_allocations instead") = usm_system_allocations,
   ext_intel_pci_address = 18,
   ext_intel_gpu_eu_count = 19,
   ext_intel_gpu_eu_simd_width = 20,

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

@@ -85,7 +85,7 @@ __SYCL_PARAM_TRAITS_SPEC(device, usm_device_allocations, bool)
 __SYCL_PARAM_TRAITS_SPEC(device, usm_host_allocations, bool)
 __SYCL_PARAM_TRAITS_SPEC(device, usm_shared_allocations, bool)
 __SYCL_PARAM_TRAITS_SPEC(device, usm_restricted_shared_allocations, bool)
-__SYCL_PARAM_TRAITS_SPEC(device, usm_system_allocator, bool)
+__SYCL_PARAM_TRAITS_SPEC(device, usm_system_allocations, bool)
 __SYCL_PARAM_TRAITS_SPEC(device, ext_intel_pci_address, std::string)
 __SYCL_PARAM_TRAITS_SPEC(device, ext_intel_gpu_eu_count, pi_uint32)
 __SYCL_PARAM_TRAITS_SPEC(device, ext_intel_gpu_eu_simd_width, pi_uint32)

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

@@ -133,7 +133,10 @@ enum class device : cl_device_info {
   usm_host_allocations = PI_USM_HOST_SUPPORT,
   usm_shared_allocations = PI_USM_SINGLE_SHARED_SUPPORT,
   usm_restricted_shared_allocations = PI_USM_CROSS_SHARED_SUPPORT,
-  usm_system_allocator = PI_USM_SYSTEM_SHARED_SUPPORT,
+  usm_system_allocations = PI_USM_SYSTEM_SHARED_SUPPORT,
+  usm_system_allocator __SYCL2020_DEPRECATED(
+      "use usm_system_allocations instead") = usm_system_allocations,
+
   // intel extensions
   ext_intel_pci_address = PI_DEVICE_INFO_PCI_ADDRESS,
   ext_intel_gpu_eu_count = PI_DEVICE_INFO_GPU_EU_COUNT,

sycl/source/detail/device_impl.cpp

@@ -269,8 +269,8 @@ bool device_impl::has(aspect Aspect) const {
             PI_USM_ATOMIC_ACCESS);
   case aspect::usm_restricted_shared_allocations:
     return get_info<info::device::usm_restricted_shared_allocations>();
-  case aspect::usm_system_allocator:
-    return get_info<info::device::usm_system_allocator>();
+  case aspect::usm_system_allocations:
+    return get_info<info::device::usm_system_allocations>();
   case aspect::ext_intel_pci_address:
     return getPlugin().call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
                MDevice, PI_DEVICE_INFO_PCI_ADDRESS, sizeof(pi_device_type),

sycl/source/detail/device_info.hpp

@@ -966,7 +966,7 @@ get_device_info_host<info::device::usm_restricted_shared_allocations>() {
 }
 
 template <>
-inline bool get_device_info_host<info::device::usm_system_allocator>() {
+inline bool get_device_info_host<info::device::usm_system_allocations>() {
   return true;
 }
 
@@ -1032,11 +1032,11 @@ struct get_device_info<bool, info::device::usm_restricted_shared_allocations> {
 };
 
 // Specialization for system usm query
-template <> struct get_device_info<bool, info::device::usm_system_allocator> {
+template <> struct get_device_info<bool, info::device::usm_system_allocations> {
   static bool get(RT::PiDevice dev, const plugin &Plugin) {
     pi_usm_capabilities caps;
     pi_result Err = Plugin.call_nocheck<PiApiKind::piDeviceGetInfo>(
-        dev, pi::cast<RT::PiDeviceInfo>(info::device::usm_system_allocator),
+        dev, pi::cast<RT::PiDeviceInfo>(info::device::usm_system_allocations),
         sizeof(pi_usm_capabilities), &caps, nullptr);
     return (Err != PI_SUCCESS) ? false : (caps & PI_USM_ACCESS);
   }

sycl/test/on-device/basic_tests/aspects.cpp

@@ -93,6 +93,9 @@ int main() {
     if (plt.has(aspect::usm_system_allocator)) {
       std::cout << "  USM system allocator" << std::endl;
     }
+    if (plt.has(aspect::usm_system_allocations)) {
+      std::cout << "  USM system allocations" << std::endl;
+    }
   }
   std::cout << "Passed." << std::endl;
   return 0;