Update rng.hpp

KRM7 · Sep 16, 2024 · 13ed247 · 13ed247
1 parent a12b17a
commit 13ed247
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -17,7 +17,7 @@ jobs:
             {
               cxx: $(brew --prefix llvm@15)/bin/clang++,
               pkgs: llvm@15 gcc@11,
-              extra-flags: "-femulated-tls -stdlib=libstdc++ -stdlib++-isystem $(brew --prefix gcc@11)/include/c++/11 -cxx-isystem $(brew --prefix gcc@11)/include/c++/11/aarch64-apple-darwin23",
+              extra-flags: "-femulated-tls -stdlib=libstdc++ -stdlib++-isystem $(brew --prefix gcc@11)/include/c++/11 -cxx-isystem $(brew --prefix gcc@11)/include/c++/11/aarch64-apple-darwin23 -fsanitize=address -g -fno-omit-frame-pointer",
               linker-flags: "-L$(brew --prefix gcc@11)/lib/gcc/11"
             }
         ]

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -9,13 +9,16 @@ jobs:
       fail-fast: false
       matrix:
         build-type: [ Release, RelWithDebInfo ]
-        platform: [ x64 ]
+        platform: [ x64, Win32 ]
         generator: [ "Visual Studio 17 2022" ]
         compiler: [ 
             { name: msvc, toolset: v143 }, 
             { name: clang, toolset: ClangCL }
         ]
         build-shared: [ "ON", "OFF" ]
+        exclude:
+          - platform: Win32
+            build-type: Release
 
     defaults:
       run:

diff --git a/src/utility/rng.hpp b/src/utility/rng.hpp
@@ -480,14 +480,14 @@ namespace gapp::rng
         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 select_many = std::cmp_greater_equal(count, size_t(0.6 * range_len));
+        //const bool huge_range = std::cmp_greater_equal(range_len, 65536);
 
-        if (huge_range) [[unlikely]] return rng::sampleUniqueSet(lbound, ubound, count);
+        if (std::cmp_greater_equal(range_len, 65536)) return rng::sampleUniqueSet(lbound, ubound, count);
 
         small_vector<IntType> numbers(count);
 
-        thread_local detail::dynamic_bitset is_selected;
+        /*thread_local */detail::dynamic_bitset is_selected;
         is_selected.resize(range_len);
         is_selected.fill(select_many);
 

diff --git a/src/utility/small_vector.hpp b/src/utility/small_vector.hpp
@@ -302,18 +302,17 @@ namespace gapp::detail
     struct small_vector_buffer
     {
     public:
-        constexpr small_vector_buffer() noexcept {};    // NOLINT(*default)
-        constexpr ~small_vector_buffer() noexcept {};   // NOLINT(*default)
+        small_vector_buffer() = default;
 
-        constexpr auto begin() noexcept { return std::begin(data_); }
-        constexpr auto begin() const noexcept { return std::begin(data_); }
+        auto begin() noexcept { return std::launder(reinterpret_cast<T*>(&data_)); }
+        auto begin() const noexcept { return std::launder(reinterpret_cast<const T*>(&data_)); }
 
-        constexpr auto end() noexcept { return std::end(data_); }
-        constexpr auto end() const noexcept { return std::end(data_); }
+        auto end() noexcept { return begin() + Size; }
+        auto end() const noexcept { return begin() + Size; }
 
-        constexpr std::size_t size() const noexcept { return std::size(data_); }
+        constexpr std::size_t size() const noexcept { return Size; }
     private:
-        union { char dummy_ = {}; T data_[Size]; }; // NOLINT(*arrays)
+        alignas(T) unsigned char data_[Size * sizeof(T)] = {}; // NOLINT(*arrays)
     };
 
 
@@ -890,10 +889,7 @@ namespace gapp
         }
 
     private:
-        static constexpr std::size_t alignment = std::max(alignof(T), detail::cache_line_size);
-
-        alignas(alignment)
-        GAPP_NO_UNIQUE_ADDRESS detail::small_vector_buffer<T, Size> buffer_;
+        detail::small_vector_buffer<T, Size> buffer_;
         pointer first_      = nullptr;
         pointer last_       = nullptr;
         pointer last_alloc_ = nullptr;

diff --git a/test/unit/small_vector.cpp b/test/unit/small_vector.cpp
@@ -97,7 +97,6 @@ TEST_CASE("small_vector_size", "[object_layout][!mayfail]") // fails under clang
     STATIC_REQUIRE(std::is_standard_layout_v<small_vector<int>>);
 
     CHECK(sizeof(small_vector<int>) == detail::cache_line_size);
-    CHECK(alignof(small_vector<int>) == detail::cache_line_size);
 }