diff --git a/sycl/doc/extensions/supported/sycl_ext_intel_mem_channel_property.asciidoc b/sycl/doc/extensions/supported/sycl_ext_intel_mem_channel_property.asciidoc index a69f4bf6b6879..af58846d51f68 100644 --- a/sycl/doc/extensions/supported/sycl_ext_intel_mem_channel_property.asciidoc +++ b/sycl/doc/extensions/supported/sycl_ext_intel_mem_channel_property.asciidoc @@ -96,7 +96,7 @@ enum class aspect { host, cpu, ... - usm_system_allocator, + usm_system_allocations, ext_intel_mem_channel }; diff --git a/sycl/include/sycl/info/aspects_deprecated.def b/sycl/include/sycl/info/aspects_deprecated.def index 55fb1c6b522b2..eb4aea6fda9d0 100644 --- a/sycl/include/sycl/info/aspects_deprecated.def +++ b/sycl/include/sycl/info/aspects_deprecated.def @@ -1,6 +1,5 @@ __SYCL_ASPECT_DEPRECATED(int64_base_atomics, 7, "use atomic64 instead") __SYCL_ASPECT_DEPRECATED(int64_extended_atomics, 8, "use atomic64 instead") // Special macro for aspects that don't have own token -__SYCL_ASPECT_DEPRECATED_ALIAS(usm_system_allocator, usm_system_allocations, "use usm_system_allocations instead") __SYCL_ASPECT_DEPRECATED(usm_restricted_shared_allocations, 16, "deprecated in SYCL 2020") __SYCL_ASPECT_DEPRECATED(host, 0, "removed in SYCL 2020, 'host' device has been removed") diff --git a/sycl/include/sycl/info/device_traits.def b/sycl/include/sycl/info/device_traits.def index 170f6d42c6177..dc50c5e920502 100644 --- a/sycl/include/sycl/info/device_traits.def +++ b/sycl/include/sycl/info/device_traits.def @@ -190,11 +190,11 @@ __SYCL_PARAM_TRAITS_SPEC(device, usm_restricted_shared_allocations, bool, PI_USM_CROSS_SHARED_SUPPORT) __SYCL_PARAM_TRAITS_SPEC(device, usm_system_allocations, bool, PI_USM_SYSTEM_SHARED_SUPPORT) -__SYCL_PARAM_TRAITS_SPEC(device, image_max_array_size, size_t, - PI_DEVICE_INFO_IMAGE_MAX_ARRAY_SIZE) -// To be dropped (no alternatives) __SYCL_PARAM_TRAITS_SPEC(device, opencl_c_version, std::string, PI_DEVICE_INFO_OPENCL_C_VERSION) +// To be dropped (no alternatives) +__SYCL_PARAM_TRAITS_SPEC(device, image_max_array_size, size_t, + PI_DEVICE_INFO_IMAGE_MAX_ARRAY_SIZE) // Extensions __SYCL_PARAM_TRAITS_SPEC(device, sub_group_independent_forward_progress, bool, PI_DEVICE_INFO_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS) diff --git a/sycl/include/sycl/info/device_traits_deprecated.def b/sycl/include/sycl/info/device_traits_deprecated.def index b1ca176709cab..c6bca52be336e 100644 --- a/sycl/include/sycl/info/device_traits_deprecated.def +++ b/sycl/include/sycl/info/device_traits_deprecated.def @@ -17,7 +17,8 @@ __SYCL_PARAM_TRAITS_DEPRECATED(printf_buffer_size,"deprecated in SYCL 2020") __SYCL_PARAM_TRAITS_DEPRECATED(preferred_interop_user_sync,"deprecated in SYCL 2020") // Deprecated and not part of SYCL 2020 spec -__SYCL_PARAM_TRAITS_DEPRECATED(usm_system_allocator,"use info::device::usm_system_allocations instead") +__SYCL_PARAM_TRAITS_DEPRECATED(image_max_array_size,"support for image arrays has been removed in SYCL 2020") +__SYCL_PARAM_TRAITS_DEPRECATED(opencl_c_version,"use device::get_backend_info instead") //TODO:Remove when possible __SYCL_PARAM_TRAITS_DEPRECATED(ext_intel_pci_address,"use ext::intel::info::device::pci_address instead") diff --git a/sycl/test-e2e/Regression/host_unified_memory.cpp b/sycl/test-e2e/Regression/host_unified_memory.cpp index a679111611d29..17aec715810df 100644 --- a/sycl/test-e2e/Regression/host_unified_memory.cpp +++ b/sycl/test-e2e/Regression/host_unified_memory.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -13,12 +14,7 @@ static buffer *inBufP = nullptr; int main(int argc, char *argv[]) { queue Q; - auto BE = - (bool)(Q.get_device() - .template get_info() - .empty()) - ? "L0" - : "OpenCL"; + auto BE = (Q.get_device().get_backend() != backend::opencl) ? "L0" : "OpenCL"; device dev = Q.get_device(); size_t max_compute_units = dev.get_info(); printf("Device: %s max_compute_units %zu, Backend: %s\n", diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp index 98fd788441a95..4c7fd5a574303 100644 --- a/sycl/test/warnings/sycl_2020_deprecations.cpp +++ b/sycl/test/warnings/sycl_2020_deprecations.cpp @@ -168,8 +168,10 @@ int main() { using PBS = sycl::info::device::printf_buffer_size; // expected-warning@+1{{'preferred_interop_user_sync' is deprecated: deprecated in SYCL 2020}} using PIUS = sycl::info::device::preferred_interop_user_sync; - // expected-warning@+1{{'usm_system_allocator' is deprecated: use info::device::usm_system_allocations instead}} - using USA = sycl::info::device::usm_system_allocator; + // expected-warning@+1{{'image_max_array_size' is deprecated: support for image arrays has been removed in SYCL 2020}} + using IMAS = sycl::info::device::image_max_array_size; + // expected-warning@+1{{'opencl_c_version' is deprecated: use device::get_backend_info instead}} + using OCV = sycl::info::device::opencl_c_version; // expected-warning@+1{{'extensions' is deprecated: deprecated in SYCL 2020, use device::get_info() with info::device::aspects instead}} using PE = sycl::info::platform::extensions;