From b29fa150d2823dbeea9077c918a5267b7701cf17 Mon Sep 17 00:00:00 2001 From: Stefan Palicki Date: Wed, 13 Nov 2024 09:56:14 -0800 Subject: [PATCH] common: remove support for SyCL older than 2020 --- src/gpu/intel/sycl/compat.cpp | 12 +----------- src/graph/utils/sycl_check.hpp | 16 +++------------- src/xpu/sycl/compat.hpp | 16 ---------------- src/xpu/sycl/utils.hpp | 14 ++------------ tests/benchdnn/dnnl_common.cpp | 4 ---- tests/benchdnn/dnnl_memory.cpp | 5 ----- 6 files changed, 6 insertions(+), 61 deletions(-) diff --git a/src/gpu/intel/sycl/compat.cpp b/src/gpu/intel/sycl/compat.cpp index 173bd21c22f..ce921c50156 100644 --- a/src/gpu/intel/sycl/compat.cpp +++ b/src/gpu/intel/sycl/compat.cpp @@ -96,16 +96,8 @@ status_t make_kernel(std::unique_ptr<::sycl::kernel> &sycl_kernel, uint64_t init_extensions(const ::sycl::device &dev) { uint64_t extensions = 0; -#if DNNL_USE_SYCL121_API -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - constexpr auto base_atomics_aspect = ::sycl::aspect::int64_base_atomics; - constexpr auto extended_atomics_aspect - = ::sycl::aspect::int64_extended_atomics; -#else constexpr auto base_atomics_aspect = ::sycl::aspect::atomic64; constexpr auto extended_atomics_aspect = ::sycl::aspect::atomic64; -#endif for (uint64_t i_ext = 1; i_ext < (uint64_t)device_ext_t::last; i_ext <<= 1) { @@ -142,9 +134,7 @@ uint64_t init_extensions(const ::sycl::device &dev) { } if (is_ext_supported) extensions |= i_ext; } -#if DNNL_USE_SYCL121_API -#pragma clang diagnostic pop -#endif + return extensions; } diff --git a/src/graph/utils/sycl_check.hpp b/src/graph/utils/sycl_check.hpp index 67620a2a4d0..7d780606d94 100644 --- a/src/graph/utils/sycl_check.hpp +++ b/src/graph/utils/sycl_check.hpp @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright 2023 Intel Corporation +* Copyright 2023-2024 Intel Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,18 +26,8 @@ #error "Unsupported compiler" #endif -#if defined(__INTEL_LLVM_COMPILER) -#if (__INTEL_LLVM_COMPILER < 20230000) -#define DNNL_USE_SYCL121_API 1 -#else -#define DNNL_USE_SYCL121_API 0 -#endif -#elif defined(__LIBSYCL_MAJOR_VERSION) -#if (__LIBSYCL_MAJOR_VERSION < 6) -#define DNNL_USE_SYCL121_API 1 -#else -#define DNNL_USE_SYCL121_API 0 -#endif +#if defined(__INTEL_LLVM_COMPILER) && __INTEL_LLVM_COMPILER >= 20230000 +#elif defined(__LIBSYCL_MAJOR_VERSION) && __LIBSYCL_MAJOR_VERSION >= 6 #else #error "Unsupported compiler" #endif diff --git a/src/xpu/sycl/compat.hpp b/src/xpu/sycl/compat.hpp index fa5ebf680f8..d5ad3e0b909 100644 --- a/src/xpu/sycl/compat.hpp +++ b/src/xpu/sycl/compat.hpp @@ -58,20 +58,6 @@ inline void host_task(H &cgh, F &&f) { constexpr auto target_device = ::sycl::target::device; -#if DNNL_USE_SYCL121_API -template -using local_accessor = ::sycl::accessor; - -constexpr auto ext_intel_gpu_slices - = ::sycl::info::device::ext_intel_gpu_slices; -constexpr auto ext_intel_gpu_subslices_per_slice - = ::sycl::info::device::ext_intel_gpu_subslices_per_slice; - -const auto cpu_selector_v = ::sycl::cpu_selector {}; -const auto gpu_selector_v = ::sycl::gpu_selector {}; -#else - #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" template @@ -86,8 +72,6 @@ using ext_intel_gpu_subslices_per_slice inline const auto &cpu_selector_v = ::sycl::cpu_selector_v; inline const auto &gpu_selector_v = ::sycl::gpu_selector_v; -#endif - } // namespace compat } // namespace sycl } // namespace xpu diff --git a/src/xpu/sycl/utils.hpp b/src/xpu/sycl/utils.hpp index 29967170834..1598fadc1ad 100644 --- a/src/xpu/sycl/utils.hpp +++ b/src/xpu/sycl/utils.hpp @@ -30,18 +30,8 @@ #error "Unsupported compiler" #endif -#if defined(__INTEL_LLVM_COMPILER) -#if (__INTEL_LLVM_COMPILER < 20230000) -#define DNNL_USE_SYCL121_API 1 -#else -#define DNNL_USE_SYCL121_API 0 -#endif -#elif defined(__LIBSYCL_MAJOR_VERSION) -#if (__LIBSYCL_MAJOR_VERSION < 6) -#define DNNL_USE_SYCL121_API 1 -#else -#define DNNL_USE_SYCL121_API 0 -#endif +#if defined(__INTEL_LLVM_COMPILER) && __INTEL_LLVM_COMPILER >= 20230000 +#elif defined(__LIBSYCL_MAJOR_VERSION) && __LIBSYCL_MAJOR_VERSION >= 6 #else #error "Unsupported compiler" #endif diff --git a/tests/benchdnn/dnnl_common.cpp b/tests/benchdnn/dnnl_common.cpp index 02bead235d6..a400115cc43 100644 --- a/tests/benchdnn/dnnl_common.cpp +++ b/tests/benchdnn/dnnl_common.cpp @@ -889,11 +889,7 @@ bool is_f64_supported(const dnnl_engine_t &engine) { if (is_sycl_engine(engine)) { auto eng = dnnl::engine(engine, true); auto dev = dnnl::sycl_interop::get_device(eng); -#ifdef DNNL_SYCL_INTEROP_USE_SYCL121 - return dev.has_extension("cl_khr_fp64"); -#else return dev.has(::sycl::aspect::fp64); -#endif } #endif #if DNNL_GPU_RUNTIME == DNNL_RUNTIME_OCL diff --git a/tests/benchdnn/dnnl_memory.cpp b/tests/benchdnn/dnnl_memory.cpp index 00b9dc86581..a261ffaf14b 100644 --- a/tests/benchdnn/dnnl_memory.cpp +++ b/tests/benchdnn/dnnl_memory.cpp @@ -489,12 +489,7 @@ void dnn_mem_t::memset(int value, size_t size) const { auto &buf = *static_cast<::sycl::buffer *>( mem_handle); queue.submit([&](::sycl::handler &cgh) { -#ifdef DNNL_SYCL_INTEROP_USE_SYCL121 - constexpr auto target_device - = ::sycl::target::global_buffer; -#else constexpr auto target_device = ::sycl::target::device; -#endif ::sycl::accessor acc(buf, cgh);