Restore MSVC build

* Also add cross-platform deprecation ignore * And fix a few warnings
celerity · Dec 15, 2023 · ddf1502 · ddf1502
1 parent cd229ad
commit ddf1502
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 64 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,8 @@ function(set_simsycl_target_options target)
     set_target_properties(${target} PROPERTIES CXX_STANDARD 20)
     set_target_properties(${target} PROPERTIES CXX_STANDARD_REQUIRED ON)
     target_compile_options(${target} PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/W4>
+        # 4180 is a false positive in MSVC in group_operation_impl -- "fixing" it actually breaks the code
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /wd4180>
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic $<$<CONFIG:Debug>:-fsanitize=address>>
     )
     target_link_options(${target} PRIVATE

diff --git a/include/simsycl/detail/preprocessor.hh b/include/simsycl/detail/preprocessor.hh
@@ -0,0 +1,13 @@
+#pragma once
+
+// it is frequently necessary to use deprecated functionality to implment deprecated functionality
+// this macro is used to suppress warnings in these cases, in a cross-platform way
+
+#if defined(_MSC_VER)
+#define SIMSYCL_START_IGNORING_DEPRECATIONS __pragma(warning(push)) __pragma(warning(disable : 4996))
+#define SIMSYCL_STOP_IGNORING_DEPRECATIONS __pragma(warning(pop))
+#else
+#define SIMSYCL_START_IGNORING_DEPRECATIONS                                                                            \
+    _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#define SIMSYCL_STOP_IGNORING_DEPRECATIONS _Pragma("GCC diagnostic pop")
+#endif
diff --git a/include/simsycl/sycl/accessor.hh b/include/simsycl/sycl/accessor.hh
@@ -15,10 +15,8 @@
 #include <iterator>
 #include <limits>
 
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // access::placeholder, access_mode::atomic
-
+// access::placeholder, access_mode::atomic
+SIMSYCL_START_IGNORING_DEPRECATIONS
 
 namespace simsycl::detail {
 
@@ -930,9 +928,6 @@ class host_accessor<DataT, 0, AccessMode> : public simsycl::detail::property_int
 
     bool empty() const noexcept { return false; }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // access_mode::atomic
-
     operator reference() const
         requires(AccessMode != access_mode::atomic)
     {
@@ -956,8 +951,6 @@ class host_accessor<DataT, 0, AccessMode> : public simsycl::detail::property_int
         return *this;
     }
 
-#pragma GCC diagnostic pop
-
     std::add_pointer_t<value_type> get_pointer() const noexcept {
         SIMSYCL_CHECK(m_buffer != nullptr);
         return m_buffer;
@@ -985,6 +978,6 @@ class host_accessor<DataT, 0, AccessMode> : public simsycl::detail::property_int
     DataT *m_buffer = nullptr;
 };
 
-#pragma GCC diagnostic pop
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 } // namespace simsycl::sycl
diff --git a/include/simsycl/sycl/buffer.hh b/include/simsycl/sycl/buffer.hh
@@ -206,8 +206,7 @@ class buffer final
         return accessor<T, Dimensions, Mode, Targ>(*this, command_group_handler, access_range, access_offset);
     }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    SIMSYCL_START_IGNORING_DEPRECATIONS
 
     template<access_mode Mode>
     [[deprecated]] accessor<T, Dimensions, Mode, target::host_buffer> get_access() {
@@ -220,7 +219,7 @@ class buffer final
         accessor<T, Dimensions, Mode, target::host_buffer>(*this, access_range, access_offset);
     }
 
-#pragma GCC diagnostic pop
+    SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
     template<typename... Ts>
     auto get_access(Ts... args) {

diff --git a/include/simsycl/sycl/forward.hh b/include/simsycl/sycl/forward.hh
@@ -3,6 +3,8 @@
 #include "allocator.hh"
 #include "enums.hh"
 
+#include "../detail/preprocessor.hh"
+
 #include <functional>
 #include <type_traits>
 
@@ -16,15 +18,15 @@ struct system_config;
 
 namespace simsycl::sycl {
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // access::placeholder
+// access::placeholder
+SIMSYCL_START_IGNORING_DEPRECATIONS
 
 template<typename DataT, int Dimensions = 1,
     access_mode AccessMode = (std::is_const_v<DataT> ? access_mode::read : access_mode::read_write),
     target AccessTarget = target::device, access::placeholder IsPlaceholder = access::placeholder::false_t>
 class accessor;
 
-#pragma GCC diagnostic pop
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 template<typename T, access::address_space AddressSpace = access::address_space::global_space>
 class atomic;

diff --git a/include/simsycl/sycl/handler.hh b/include/simsycl/sycl/handler.hh
@@ -210,8 +210,8 @@ void parallel_for(sycl::nd_range<Dimensions> execution_range, const std::vector<
 
 namespace simsycl::sycl {
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // placeholder
+// placeholder
+SIMSYCL_START_IGNORING_DEPRECATIONS
 
 class handler {
   public:
@@ -331,7 +331,7 @@ class handler {
     template<typename T, int Dim, access_mode Mode, target Tgt, access::placeholder IsPlaceholder>
     void fill(accessor<T, Dim, Mode, Tgt, IsPlaceholder> dest, const T &src);
 
-#pragma GCC diagnostic pop
+    SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
     void use_kernel_bundle(const kernel_bundle<bundle_state::executable> &exec_bundle);
 
@@ -350,8 +350,6 @@ class handler {
     handler() = default;
 };
 
-#pragma GCC diagnostic pop
-
 } // namespace simsycl::sycl
 
 namespace simsycl::detail {

diff --git a/include/simsycl/sycl/multi_ptr.hh b/include/simsycl/sycl/multi_ptr.hh
@@ -24,8 +24,8 @@ struct remove_decoration {
 template<typename T>
 using remove_decoration_t = typename remove_decoration<T>::type;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // target::local, ...
+// target::local, ...
+SIMSYCL_START_IGNORING_DEPRECATIONS
 
 template<typename ElementType, access::address_space Space, access::decorated DecorateAddress>
 class multi_ptr {
@@ -340,6 +340,6 @@ using decorated_local_ptr = multi_ptr<ElementType, access::address_space::local_
 template<typename ElementType>
 using decorated_private_ptr = multi_ptr<ElementType, access::address_space::private_space, access::decorated::yes>;
 
-#pragma GCC diagnostic pop
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 } // namespace simsycl::sycl
diff --git a/include/simsycl/sycl/nd_item.hh b/include/simsycl/sycl/nd_item.hh
@@ -90,8 +90,7 @@ class nd_item {
         return nd_range<Dimensions>(get_global_range(), get_local_range(), m_global_item.get_offset());
     }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    SIMSYCL_START_IGNORING_DEPRECATIONS
 
     [[deprecated("offsets are deprecated in SYCL 2020")]] id<Dimensions> get_offset() const {
         return m_global_item.get_offset();
@@ -129,7 +128,7 @@ class nd_item {
     [[deprecated]] device_event async_work_group_copy(
         global_ptr<DataT> dest, local_ptr<DataT> src, size_t num_elements, size_t dest_stride) const;
 
-        #pragma GCC diagnostic pop
+    SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
     template<typename DestDataT, typename SrcDataT>
         requires(std::is_same_v<DestDataT, std::remove_const_t<SrcDataT>>)

diff --git a/include/simsycl/sycl/queue.hh b/include/simsycl/sycl/queue.hh
@@ -282,8 +282,8 @@ class queue final : public detail::reference_type<queue, detail::queue_state>,
 
     // Explicit copy functions
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // access::placeholder
+    // access::placeholder
+    SIMSYCL_START_IGNORING_DEPRECATIONS
 
     template<typename SrcT, int SrcDims, access_mode SrcMode, target SrcTgt, access::placeholder IsPlaceholder,
         typename DestT>
@@ -312,7 +312,7 @@ class queue final : public detail::reference_type<queue, detail::queue_state>,
     template<typename T, int Dims, access_mode Mode, target Tgt, access::placeholder IsPlaceholder>
     event fill(accessor<T, Dims, Mode, Tgt, IsPlaceholder> dest, const T &src);
 
-#pragma GCC diagnostic pop
+    SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
   private:
     struct internal_t {
@@ -321,8 +321,8 @@ class queue final : public detail::reference_type<queue, detail::queue_state>,
     explicit queue(internal_t /* tag */, const detail::device_selector &selector, const async_handler &async_handler,
         const property_list &prop_list);
 
-    explicit queue(internal_t /* tag */, const device &sycl_device,
-        const async_handler &async_handler, const property_list &prop_list);
+    explicit queue(internal_t /* tag */, const device &sycl_device, const async_handler &async_handler,
+        const property_list &prop_list);
 
     explicit queue(internal_t /* tag */, const context &sycl_context, const device &sycl_device,
         const async_handler &async_handler, const property_list &prop_list);

diff --git a/src/simsycl/device.cc b/src/simsycl/device.cc
@@ -2,6 +2,7 @@
 #include "simsycl/sycl/range.hh"
 #include "simsycl/system.hh"
 
+#include <iterator>
 
 namespace simsycl::detail {
 
@@ -163,13 +164,12 @@ uint64_t device::get_info<info::device::max_mem_alloc_size>() const {
     return state().config.max_mem_alloc_size;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+SIMSYCL_START_IGNORING_DEPRECATIONS
 template<>
 bool device::get_info<info::device::image_support>() const {
     return state().config.image_support;
 }
-#pragma GCC diagnostic pop
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 template<>
 uint32_t device::get_info<info::device::max_read_image_args>() const {
@@ -260,21 +260,19 @@ uint64_t device::get_info<info::device::global_mem_size>() const {
     return state().config.global_mem_size;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+SIMSYCL_START_IGNORING_DEPRECATIONS
+
 template<>
 uint64_t device::get_info<info::device::max_constant_buffer_size>() const {
     return state().config.max_constant_buffer_size;
 }
-#pragma GCC diagnostic pop
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 template<>
 uint32_t device::get_info<info::device::max_constant_args>() const {
     return state().config.max_constant_args;
 }
-#pragma GCC diagnostic pop
+
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 template<>
 info::local_mem_type device::get_info<info::device::local_mem_type>() const {
@@ -331,42 +329,34 @@ bool device::get_info<info::device::is_available>() const {
     return state().config.is_available;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+SIMSYCL_START_IGNORING_DEPRECATIONS
+
 template<>
 bool device::get_info<info::device::is_compiler_available>() const {
     return state().config.is_compiler_available;
 }
-#pragma GCC diagnostic pop
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 template<>
 bool device::get_info<info::device::is_linker_available>() const {
     return state().config.is_linker_available;
 }
-#pragma GCC diagnostic pop
 
 template<>
 std::vector<info::execution_capability> device::get_info<info::device::execution_capabilities>() const {
     return state().config.execution_capabilities;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 template<>
 bool device::get_info<info::device::queue_profiling>() const {
     return state().config.queue_profiling;
 }
-#pragma GCC diagnostic pop
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 template<>
 std::vector<std::string> device::get_info<info::device::built_in_kernels>() const {
     return state().config.built_in_kernels;
 }
-#pragma GCC diagnostic pop
+
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 template<>
 std::vector<sycl::kernel_id> device::get_info<info::device::built_in_kernel_ids>() const {
@@ -413,13 +403,12 @@ std::vector<sycl::aspect> device::get_info<info::device::aspects>() const {
     return state().config.aspects;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+SIMSYCL_START_IGNORING_DEPRECATIONS
 template<>
 std::vector<std::string> device::get_info<info::device::extensions>() const {
     return state().config.extensions;
 }
-#pragma GCC diagnostic pop
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 template<>
 size_t device::get_info<info::device::printf_buffer_size>() const {

diff --git a/src/simsycl/platform.cc b/src/simsycl/platform.cc
@@ -3,7 +3,7 @@
 #include "simsycl/system.hh"
 
 #include <algorithm>
-
+#include <iterator>
 
 namespace simsycl::detail {
 
@@ -47,13 +47,12 @@ std::string platform::get_info<info::platform::name>() const {
     return state().config.name;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+SIMSYCL_START_IGNORING_DEPRECATIONS
 template<>
 std::vector<std::string> platform::get_info<info::platform::extensions>() const {
     return state().config.extensions;
 }
-#pragma GCC diagnostic pop
+SIMSYCL_STOP_IGNORING_DEPRECATIONS
 
 bool platform::has(aspect asp) const {
     return std::all_of(

diff --git a/test/group_op_tests.cc b/test/group_op_tests.cc
@@ -89,7 +89,7 @@ TEST_CASE("Group broadcasts behave as expected", "[group_op][broadcast]") {
         sycl::queue().submit([&actual](sycl::handler &cgh) {
             cgh.parallel_for(sycl::nd_range<1>{8, 4}, [&actual](sycl::nd_item<1> it) {
                 actual[it.get_global_linear_id()]
-                    = sycl::group_broadcast(it.get_group(), 40 + it.get_global_linear_id(), 2);
+                    = sycl::group_broadcast(it.get_group(), 40 + (int)it.get_global_linear_id(), 2);
 
                 check_group_op_sequence(it.get_group(), {detail::group_operation_id::broadcast});
             });
@@ -111,7 +111,7 @@ TEST_CASE("Group broadcasts behave as expected", "[group_op][broadcast]") {
         sycl::queue().submit([&actual](sycl::handler &cgh) {
             cgh.parallel_for(sycl::nd_range<1>{8, 8}, [&actual](sycl::nd_item<1> it) {
                 actual[it.get_global_linear_id()]
-                    = sycl::group_broadcast(it.get_sub_group(), 40 + it.get_global_linear_id(), 2);
+                    = sycl::group_broadcast(it.get_sub_group(), 40 + (int)it.get_global_linear_id(), 2);
 
                 check_group_op_sequence(it.get_sub_group(), {detail::group_operation_id::broadcast});
             });

diff --git a/test/reduction_tests.cc b/test/reduction_tests.cc
@@ -46,7 +46,7 @@ TEMPLATE_TEST_CASE(
                 sycl::reduction(&max_var, sycl::maximum<>{}, sycl::property::reduction::initialize_to_identity{}),
                 [=](auto item, auto &plus, auto &mult, auto &bit_and, auto &bit_or, auto &bit_xor, auto &min,
                     auto &max) {
-                    const auto linear_id = TestType::get_linear_id(item);
+                    const int linear_id = (int)TestType::get_linear_id(item);
                     plus += linear_id;
                     mult *= 1 + linear_id;
                     bit_and &= 16 + linear_id;