Drop thrusts diagnostic suppression warnings (NVIDIA#2392)

* Drop thrusts diagnostic suppression warnings We have global suppression warnings for CCCL, so use them * Avoid warning of possible loss of data when casting to index type
Artem-B · Sep 16, 2024 · 4088134 · 4088134
1 parent 684cf8e
commit 4088134
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 135 deletions.
diff --git a/thrust/testing/binary_search.cu b/thrust/testing/binary_search.cu
@@ -5,7 +5,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 //////////////////////
 // Scalar Functions //
@@ -263,7 +264,7 @@ void TestScalarEqualRangeDispatchImplicit()
 }
 DECLARE_UNITTEST(TestScalarEqualRangeDispatchImplicit);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
 
 void TestBoundsWithBigIndexesHelper(int magnitude)
 {

diff --git a/thrust/testing/counting_iterator.cu b/thrust/testing/counting_iterator.cu
@@ -10,7 +10,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 // ensure that we properly support thrust::counting_iterator from cuda::std
 void test_iterator_traits()
@@ -245,4 +246,4 @@ void TestCountingIteratorDifference()
 }
 DECLARE_UNITTEST(TestCountingIteratorDifference);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/testing/dereference.cu b/thrust/testing/dereference.cu
@@ -6,7 +6,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 template <typename Iterator1, typename Iterator2>
 #if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
@@ -106,4 +107,4 @@ void TestDeviceDereferenceTransformedCountingIterator()
 }
 DECLARE_UNITTEST(TestDeviceDereferenceTransformedCountingIterator);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/testing/fill.cu b/thrust/testing/fill.cu
@@ -7,7 +7,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 template <class Vector>
 void TestFillSimple()
@@ -446,4 +447,4 @@ void TestFillNDispatchImplicit()
 }
 DECLARE_UNITTEST(TestFillNDispatchImplicit);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/testing/for_each.cu b/thrust/testing/for_each.cu
@@ -9,7 +9,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 template <typename T>
 class mark_present_for_each
@@ -354,7 +355,7 @@ void TestForEachNWithLargeTypes()
 }
 DECLARE_UNITTEST(TestForEachNWithLargeTypes);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
 
 struct only_set_when_expected
 {

diff --git a/thrust/testing/functional.cu b/thrust/testing/functional.cu
@@ -6,7 +6,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
@@ -366,4 +367,4 @@ DECLARE_VECTOR_UNITTEST(TestNot2);
 
 #endif // Weird GCC11 failure case
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/testing/gather.cu b/thrust/testing/gather.cu
@@ -9,7 +9,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 template <class Vector>
 void TestGatherSimple()
@@ -361,4 +362,4 @@ void TestGatherCountingIterator()
 }
 DECLARE_INTEGRAL_VECTOR_UNITTEST(TestGatherCountingIterator);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/testing/generate.cu b/thrust/testing/generate.cu
@@ -4,7 +4,8 @@
 
 #include <unittest/unittest.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 template <typename T>
 struct return_value
@@ -219,4 +220,4 @@ void TestGenerateTuple()
 };
 DECLARE_UNITTEST(TestGenerateTuple);
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/testing/random.cu b/thrust/testing/random.cu
@@ -670,7 +670,8 @@ void TestRanlux48Unequal()
 }
 DECLARE_UNITTEST(TestRanlux48Unequal);
 
-THRUST_DISABLE_MSVC_WARNING_BEGIN(4305) // truncation warning
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4305) // truncation warning
 template <typename Distribution, typename Validator>
 void ValidateDistributionCharacteristic()
 {
@@ -732,7 +733,7 @@ void ValidateDistributionCharacteristic()
 
   ASSERT_EQUAL(true, d[0]);
 }
-THRUST_DISABLE_MSVC_WARNING_END(4305)
+_CCCL_DIAG_POP
 
 template <typename Distribution>
 void TestDistributionSaveRestore()

diff --git a/thrust/testing/unittest/testframework.cu b/thrust/testing/unittest/testframework.cu
@@ -280,10 +280,11 @@ bool UnitTestDriver::run_tests(std::vector<UnitTest*>& tests_to_run, const Argum
 {
   std::time_t start_time = std::time(0);
 
-  THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_BEGIN
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_MSVC(4800) // Forcing value to bool
   bool verbose = kwargs.count("verbose");
   bool concise = kwargs.count("concise");
-  THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_END
+  _CCCL_DIAG_POP
 
   std::vector<TestResult> test_results;
 

diff --git a/thrust/testing/vector.cu b/thrust/testing/vector.cu
@@ -272,7 +272,10 @@ void TestVectorToAndFromHostVector()
 
   ASSERT_EQUAL(v, h);
 
-  THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING(v = v);
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_CLANG("-Wself-assign")
+  v = v;
+  _CCCL_DIAG_POP
 
   ASSERT_EQUAL(v, h);
 
@@ -330,7 +333,10 @@ void TestVectorToAndFromDeviceVector()
 
   ASSERT_EQUAL(v, h);
 
-  THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING(v = v);
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_CLANG("-Wself-assign")
+  v = v;
+  _CCCL_DIAG_POP
 
   ASSERT_EQUAL(v, h);
 

diff --git a/thrust/thrust/detail/config/compiler.h b/thrust/thrust/detail/config/compiler.h
@@ -117,103 +117,3 @@
 #else
 #  define THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE THRUST_FALSE
 #endif // _OPENMP
-
-#if defined(_CCCL_COMPILER_MSVC) && !defined(__CUDA_ARCH__)
-#  define THRUST_DISABLE_MSVC_WARNING_BEGIN(x) __pragma(warning(push)) __pragma(warning(disable : x)) /**/
-#  define THRUST_DISABLE_MSVC_WARNING_END(x)   __pragma(warning(pop)) /**/
-#else
-#  define THRUST_DISABLE_MSVC_WARNING_BEGIN(x)
-#  define THRUST_DISABLE_MSVC_WARNING_END(x)
-#endif
-
-#if defined(_CCCL_COMPILER_CLANG) && !defined(__CUDA_ARCH__)
-#  define THRUST_IGNORE_CLANG_WARNING_IMPL(x)       \
-    THRUST_PP_STRINGIZE(clang diagnostic ignored x) \
-    /**/
-#  define THRUST_IGNORE_CLANG_WARNING(x)                     \
-    THRUST_IGNORE_CLANG_WARNING_IMPL(THRUST_PP_STRINGIZE(x)) \
-    /**/
-
-#  define THRUST_DISABLE_CLANG_WARNING_BEGIN(x) \
-    _Pragma("clang diagnostic push") _Pragma(THRUST_IGNORE_CLANG_WARNING(x)) /**/
-#  define THRUST_DISABLE_CLANG_WARNING_END(x) _Pragma("clang diagnostic pop") /**/
-#else
-#  define THRUST_DISABLE_CLANG_WARNING_BEGIN(x)
-#  define THRUST_DISABLE_CLANG_WARNING_END(x)
-#endif
-
-#if defined(_CCCL_COMPILER_GCC) && !defined(__CUDA_ARCH__)
-#  define THRUST_IGNORE_GCC_WARNING_IMPL(x)       \
-    THRUST_PP_STRINGIZE(GCC diagnostic ignored x) \
-    /**/
-#  define THRUST_IGNORE_GCC_WARNING(x)                     \
-    THRUST_IGNORE_GCC_WARNING_IMPL(THRUST_PP_STRINGIZE(x)) \
-    /**/
-
-#  define THRUST_DISABLE_GCC_WARNING_BEGIN(x) _Pragma("GCC diagnostic push") _Pragma(THRUST_IGNORE_GCC_WARNING(x)) /**/
-#  define THRUST_DISABLE_GCC_WARNING_END(x)   _Pragma("GCC diagnostic pop") /**/
-#else
-#  define THRUST_DISABLE_GCC_WARNING_BEGIN(x)
-#  define THRUST_DISABLE_GCC_WARNING_END(x)
-#endif
-
-#if defined(_CCCL_COMPILER_ICC) && !defined(__CUDA_ARCH__)
-#  define THRUST_DISABLE_ICC_WARNING_BEGIN(x) _CCCL_DIAG_PUSH _CCCL_DIAG_SUPPRESS_ICC(x)
-#  define THRUST_DISABLE_ICC_WARNING_END(x)   _CCCL_DIAG_POP
-#else
-#  define THRUST_DISABLE_ICC_WARNING_BEGIN(x)
-#  define THRUST_DISABLE_ICC_WARNING_END(x)
-#endif
-
-#define THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN \
-  THRUST_DISABLE_MSVC_WARNING_BEGIN(4244 4267)                  \
-  /**/
-#define THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END \
-  THRUST_DISABLE_MSVC_WARNING_END(4244 4267)                  \
-  /**/
-#define THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING(x) \
-  THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN    \
-  x;                                                         \
-  THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END      \
-  /**/
-
-#define THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_BEGIN \
-  THRUST_DISABLE_MSVC_WARNING_BEGIN(4800)                       \
-  /**/
-#define THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_END \
-  THRUST_DISABLE_MSVC_WARNING_END(4800)                       \
-  /**/
-#define THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING(x) \
-  THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_BEGIN    \
-  x;                                                         \
-  THRUST_DISABLE_MSVC_FORCING_VALUE_TO_BOOL_WARNING_END      \
-  /**/
-
-// auto-formatting splits -Wself-assign into -Wself - assign
-// clang-format off
-#define THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING_BEGIN \
-  THRUST_DISABLE_CLANG_WARNING_BEGIN(-Wself-assign)
-#define THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING_END \
-  THRUST_DISABLE_CLANG_WARNING_END(-Wself-assign)
-// clang-format on
-#define THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING(x) \
-  THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING_BEGIN    \
-  x;                                                    \
-  THRUST_DISABLE_CLANG_SELF_ASSIGNMENT_WARNING_END      \
-  /**/
-
-#define THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING_BEGIN \
-  THRUST_DISABLE_CLANG_WARNING_BEGIN(-Wreorder)                           \
-  THRUST_DISABLE_GCC_WARNING_BEGIN(-Wreorder)                             \
-  THRUST_DISABLE_ICC_WARNING_BEGIN(2407)                                  \
-  /**/
-#define THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING_END \
-  THRUST_DISABLE_CLANG_WARNING_END(-Wreorder)                           \
-  THRUST_DISABLE_GCC_WARNING_END(-Wreorder)                             \
-  THRUST_DISABLE_ICC_WARNING_END(2407)                                  \
-  /**/
-#define THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING(x) \
-  THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING_BEGIN    \
-  x;                                                                   \
-  THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING_END      \
-  /**/
diff --git a/thrust/thrust/iterator/detail/join_iterator.h b/thrust/thrust/iterator/detail/join_iterator.h
@@ -95,15 +95,16 @@ class join_iterator
   // MSVC 2013 and 2015 incorrectly warning about returning a reference to
   // a local/temporary here.
   // See goo.gl/LELTNp
-  THRUST_DISABLE_MSVC_WARNING_BEGIN(4172)
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_MSVC(4172)
 
   _CCCL_HOST_DEVICE typename super_t::reference dereference() const
   {
     size_type i = *super_t::base();
     return (i < m_n1) ? m_iter1[i] : static_cast<typename super_t::reference>(m_iter2[i]);
   } // end dereference()
 
-  THRUST_DISABLE_MSVC_WARNING_END(4172)
+  _CCCL_DIAG_POP
 
   size_type m_n1;
   RandomAccessIterator1 m_iter1;

diff --git a/thrust/thrust/iterator/discard_iterator.h b/thrust/thrust/iterator/discard_iterator.h
@@ -32,7 +32,8 @@
 #include <thrust/iterator/detail/discard_iterator_base.h>
 #include <thrust/iterator/iterator_facade.h>
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_BEGIN
+_CCCL_DIAG_PUSH
+_CCCL_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 THRUST_NAMESPACE_BEGIN
 
@@ -162,4 +163,4 @@ make_discard_iterator(discard_iterator<>::difference_type i = discard_iterator<>
 
 THRUST_NAMESPACE_END
 
-THRUST_DISABLE_MSVC_POSSIBLE_LOSS_OF_DATA_WARNING_END
+_CCCL_DIAG_POP
diff --git a/thrust/thrust/iterator/permutation_iterator.h b/thrust/thrust/iterator/permutation_iterator.h
@@ -171,15 +171,16 @@ class permutation_iterator : public thrust::detail::permutation_iterator_base<El
   // MSVC 2013 and 2015 incorrectly warning about returning a reference to
   // a local/temporary here.
   // See goo.gl/LELTNp
-  THRUST_DISABLE_MSVC_WARNING_BEGIN(4172)
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_MSVC(4172)
 
   _CCCL_EXEC_CHECK_DISABLE
   _CCCL_HOST_DEVICE typename super_t::reference dereference() const
   {
     return *(m_element_iterator + *this->base());
   }
 
-  THRUST_DISABLE_MSVC_WARNING_END(4172)
+  _CCCL_DIAG_POP
 
   // make friends for the copy constructor
   template <typename, typename>

diff --git a/thrust/thrust/iterator/transform_iterator.h b/thrust/thrust/iterator/transform_iterator.h
@@ -297,7 +297,8 @@ class transform_iterator
   // MSVC 2013 and 2015 incorrectly warning about returning a reference to
   // a local/temporary here.
   // See goo.gl/LELTNp
-  THRUST_DISABLE_MSVC_WARNING_BEGIN(4172)
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_MSVC(4172)
 
   _CCCL_EXEC_CHECK_DISABLE
   _CCCL_HOST_DEVICE typename super_t::reference dereference() const
@@ -309,7 +310,7 @@ class transform_iterator
     return m_f(x);
   }
 
-  THRUST_DISABLE_MSVC_WARNING_END(4172)
+  _CCCL_DIAG_POP
 
   // tag this as mutable per Dave Abrahams in this thread:
   // http://lists.boost.org/Archives/boost/2004/05/65332.php

diff --git a/thrust/thrust/system/cuda/detail/future.inl b/thrust/thrust/system/cuda/detail/future.inl
@@ -458,7 +458,10 @@ public:
   // address after its been moved into the new signal we're constructing.
   // NOTE: NVCC has a bug that causes it to reorder our base class initializers
   // in generated host code, which leads to -Wreorder warnings.
-  THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING_BEGIN
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_CLANG("-Wreorder")
+  _CCCL_DIAG_SUPPRESS_GCC("-Wreorder")
+  _CCCL_DIAG_SUPPRESS_ICC(2407)
   template <typename ComputeContent>
   _CCCL_HOST explicit async_addressable_value_with_keep_alives(
     unique_stream&& stream, keep_alives_type&& keep_alives, ComputeContent&& compute_content)
@@ -468,7 +471,7 @@ public:
   {
     content_ = THRUST_FWD(compute_content)(std::get<0>(this->keep_alives_));
   }
-  THRUST_DISABLE_CLANG_AND_GCC_INITIALIZER_REORDERING_WARNING_END
+  _CCCL_DIAG_POP
 
   _CCCL_HOST bool valid_content() const noexcept final override
   {