Update rng.hpp

KRM7 · Sep 15, 2024 · c08c71a · c08c71a
1 parent a12b17a
commit c08c71a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,7 +13,7 @@ jobs:
             { cxx: g++-11, pkgs: gcc@11, extra-flags: "-undefined dynamic_lookup -Wno-psabi -Wno-nonnull" },
             { cxx: g++-12, pkgs: gcc@12, extra-flags: "-undefined dynamic_lookup -Wno-psabi -Wno-nonnull" },
             { cxx: g++-13, pkgs: gcc@13, extra-flags: "-undefined dynamic_lookup -Wno-psabi -Wno-nonnull" },
-            { cxx: g++-14, pkgs: gcc@14, extra-flags: "-undefined dynamic_lookup -Wno-psabi -Wno-nonnull" },
+            { cxx: g++-14, pkgs: gcc@14 llvm@15, extra-flags: "-undefined dynamic_lookup -Wno-psabi -Wno-nonnull -fsanitize=undefined -g -fno-omit-frame-pointer" },
             {
               cxx: $(brew --prefix llvm@15)/bin/clang++,
               pkgs: llvm@15 gcc@11,

diff --git a/src/utility/rng.hpp b/src/utility/rng.hpp
@@ -29,6 +29,8 @@
 #include <cstddef>
 #include <concepts>
 
+#include <iostream>
+
 
 #ifndef GAPP_SEED
 #   define GAPP_SEED 0x3da99432ab975d26LL
@@ -457,6 +459,8 @@ namespace gapp::rng
     template<std::integral IntType>
     GAPP_NOINLINE small_vector<IntType> sampleUniqueSet(IntType lbound, IntType ubound, size_t count)
     {
+        std::cout << "sampleUniqueSet\n";
+
         std::unordered_set<IntType> selected(count);
         small_vector<IntType> numbers(count);
 
@@ -477,20 +481,29 @@ namespace gapp::rng
     {
         const size_t range_len = detail::range_length(lbound, ubound);
 
+        std::cout << "Sample unique lbound: " << lbound << ", ubound: " << ubound << ", count: " << count << "\n";
+
         GAPP_ASSERT(ubound >= lbound);
         GAPP_ASSERT(range_len >= count);
 
         const bool select_many = (count > 0.6 * range_len);
-        const bool huge_range  = (range_len >= 65536);
+        const bool huge_range  = (range_len >= 65536_sz);
+
+        std::cout << "Range len: " << range_len << ", huge_range: " << huge_range << "\n";
+        std::cout << "select many: " << select_many << "\n";
 
         if (huge_range) [[unlikely]] return rng::sampleUniqueSet(lbound, ubound, count);
 
+        std::cout << "Sample unique small\n";
+
         small_vector<IntType> numbers(count);
 
         thread_local detail::dynamic_bitset is_selected;
         is_selected.resize(range_len);
         is_selected.fill(select_many);
 
+        std::cout << "Allocated\n";
+
         if (!select_many)
         {
             IntType limit = ubound - detail::promoted_t<IntType>(count);