Addressed feedback on review for improved shuffle

NVIDIA · Nov 14, 2021 · 6a18e8b · 6a18e8b
1 parent 7cb68d7
commit 6a18e8b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 255 deletions.
diff --git a/internal/benchmark/bench.cu b/internal/benchmark/bench.cu
@@ -992,15 +992,13 @@ void run_core_primitives_experiments_for_type()
     , RegularTrials
   >::run_experiment();
 
-#if THRUST_CPP_DIALECT >= 2011
   experiment_driver<
       shuffle_tester
     , ElementMetaType
     , Elements / sizeof(typename ElementMetaType::type)
     , BaselineTrials
     , RegularTrials
   >::run_experiment();
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/testing/shuffle.cu b/testing/shuffle.cu
@@ -1,6 +1,5 @@
 #include <thrust/detail/config.h>
 
-#if THRUST_CPP_DIALECT >= 2011
 #include <map>
 #include <limits>
 #include <thrust/random.h>
@@ -601,4 +600,3 @@ void TestShuffleEvenDistribution() {
   }
 }
 DECLARE_INTEGRAL_VECTOR_UNITTEST(TestShuffleEvenDistribution);
-#endif
diff --git a/testing/shuffle_mmd.cu b/testing/shuffle_mmd.cu
diff --git a/thrust/system/detail/generic/shuffle.inl b/thrust/system/detail/generic/shuffle.inl
@@ -83,7 +83,7 @@ class feistel_bijection {
 
   // Find the nearest power of two
   constexpr static __host__ __device__ std::uint64_t get_cipher_bits(std::uint64_t m) {
-    if (m == 0) return 0;
+    if (m <= 16) return 4;
     std::uint64_t i = 0;
     m--;
     while (m != 0) {