patch: remove required_bits and pow function

SGSSGene · Aug 27, 2024 · 7c1b0ee · 7c1b0ee
1 parent 5fc059f
commit 7c1b0ee
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 107 deletions.
diff --git a/src/fmindex-collection/occtable/EPRV8.h b/src/fmindex-collection/occtable/EPRV8.h
@@ -5,7 +5,6 @@
 
 #include "../builtins.h"
 #include "concepts.h"
-#include "utils.h"
 
 #include <algorithm>
 #include <array>
@@ -29,11 +28,6 @@ struct Bitvector {
     size_t bitct{size_t(std::ceil(std::log2(sigma)))};
     size_t bvct{size_t(std::exp2(bitct))};
 
-    // number of full length bitvectors needed `2^bitct ≥ TSigma`
-//    static constexpr auto bitct = required_bits(TSigma-1);
-    // next full power of 2
-//    static constexpr auto bvct  = pow(2, bitct);
-
     struct InBitsView {
         uint64_t const* bits;
         size_t const bitct;

diff --git a/src/fmindex-collection/occtable/utils.h b/src/fmindex-collection/occtable/utils.h
diff --git a/src/fmindex-collection/rankvector/DenseEPRV6.h b/src/fmindex-collection/rankvector/DenseEPRV6.h
@@ -5,8 +5,8 @@
 
 #include "../DenseVector.h"
 #include "concepts.h"
-#include "utils.h"
 
+#include <bit>
 #include <bitset>
 #include <vector>
 
@@ -16,9 +16,9 @@ template <size_t TSigma>
 struct DenseEPRV6 {
 
     // number of full length bitvectors needed `2^bitct ≥ TSigma`
-    static constexpr auto bitct = required_bits(TSigma-1);
+    static constexpr auto bitct = std::bit_width(TSigma-1);
     // next full power of 2
-    static constexpr auto bvct  = pow(2, bitct);
+    static constexpr auto bvct  = std::bit_ceil(TSigma);
 
     struct InBits {
         std::array<uint64_t, bitct> bits{};

diff --git a/src/fmindex-collection/rankvector/EPRV3.h b/src/fmindex-collection/rankvector/EPRV3.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "concepts.h"
-#include "utils.h"
 
+#include <bit>
 #include <bitset>
 #include <cassert>
 #include <vector>
@@ -18,9 +18,9 @@ struct EPRV3 {
     static constexpr size_t Sigma = TSigma;
 
     // number of full length bitvectors needed `2^bitct ≥ TSigma`
-    static constexpr auto bitct = required_bits(TSigma-1);
+    static constexpr auto bitct = std::bit_width(TSigma-1);
     // next full power of 2
-    static constexpr auto bvct  = pow(2, bitct);
+    static constexpr auto bvct  = std::bit_ceil(TSigma);
 
     struct Block {
         std::array<block_t, TSigma> blocks{};

diff --git a/src/fmindex-collection/rankvector/EPRV4.h b/src/fmindex-collection/rankvector/EPRV4.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include "concepts.h"
-#include "utils.h"
 #include "EPRV3.h"
 
+#include <bit>
 #include <vector>
 
 namespace fmindex_collection::rankvector {
@@ -17,9 +17,9 @@ struct EPRV4 {
     static constexpr size_t Sigma = TSigma;
 
     // number of full length bitvectors needed `2^bitct ≥ TSigma`
-    static constexpr auto bitct = required_bits(TSigma-1);
+    static constexpr auto bitct = std::bit_width(TSigma-1);
     // next full power of 2
-    static constexpr auto bvct  = pow(2, bitct);
+    static constexpr auto bvct  = std::bit_ceil(TSigma);
 
     using InBits = typename EPRV3<TSigma>::InBits;
 

diff --git a/src/fmindex-collection/rankvector/EPRV5.h b/src/fmindex-collection/rankvector/EPRV5.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include "concepts.h"
-#include "utils.h"
 #include "EPRV3.h"
 
+#include <bit>
 #include <vector>
 
 namespace fmindex_collection::rankvector {
@@ -17,9 +17,9 @@ struct EPRV5 {
     static constexpr size_t Sigma = TSigma;
 
     // number of full length bitvectors needed `2^bitct ≥ TSigma`
-    static constexpr auto bitct = required_bits(TSigma-1);
+    static constexpr auto bitct = std::bit_width(TSigma-1);
     // next full power of 2
-    static constexpr auto bvct  = pow(2, bitct);
+    static constexpr auto bvct  = std::bit_ceil(TSigma);
 
     using InBits = typename EPRV3<TSigma>::InBits;
 

diff --git a/src/fmindex-collection/rankvector/InterleavedEPR.h b/src/fmindex-collection/rankvector/InterleavedEPR.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "concepts.h"
-#include "utils.h"
 
 #include <bitset>
 #include <cassert>
@@ -18,10 +17,10 @@ struct InterleavedEPR {
     static constexpr size_t Sigma = TSigma;
 
     // number of full length bitvectors needed `2^bitct ≥ TSigma`
-    static constexpr auto bitct = required_bits(TSigma-1);
+    static constexpr auto bitct = std::bit_width(TSigma-1);
 
     // next full power of 2
-    static constexpr auto bvct  = pow(2, bitct);
+    static constexpr auto bvct  = std::bit_ceil(TSigma);
 
     // To select a char at the even/uneven position
     static constexpr uint64_t maskEven = []() {

diff --git a/src/fmindex-collection/rankvector/InterleavedEPRV2.h b/src/fmindex-collection/rankvector/InterleavedEPRV2.h
@@ -5,8 +5,8 @@
 
 #include "../builtins.h"
 #include "concepts.h"
-#include "utils.h"
 
+#include <bit>
 #include <bitset>
 #include <cassert>
 #include <cstdint>
@@ -55,7 +55,7 @@ struct InterleavedEPRV2 {
     }
 
     // number of full length bitvectors needed `2^sigma_bits ≥ TSigma`
-    static constexpr auto sigma_bits = required_bits(TSigma-1);
+    static constexpr auto sigma_bits = std::bit_width(TSigma-1);
 
     struct alignas(TAlignment) Block {
         std::array<block_t, TSigma> blocks{};

diff --git a/src/fmindex-collection/rankvector/InterleavedEPRV7.h b/src/fmindex-collection/rankvector/InterleavedEPRV7.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "concepts.h"
-#include "utils.h"
 
+#include <bit>
 #include <bitset>
 #include <cassert>
 #include <vector>
@@ -18,7 +18,7 @@ struct InterleavedEPRV7 {
     static constexpr size_t Sigma = TSigma;
 
     // number of full length bitvectors needed `2^bitct ≥ TSigma`
-    static constexpr auto bitct = required_bits(TSigma-1);
+    static constexpr auto bitct = std::bit_width(TSigma-1);
 
     #pragma pack(push, 1)
     struct InBits {

diff --git a/src/fmindex-collection/rankvector/Wavelet.h b/src/fmindex-collection/rankvector/Wavelet.h
@@ -7,10 +7,10 @@
 #include "../bitvector/Bitvector.h"
 #include "../bitvector/PrunedBitvector.h"
 #include "concepts.h"
-#include "utils.h"
 
 #include <algorithm>
 #include <array>
+#include <bit>
 #include <bitset>
 #include <cassert>
 #include <cstdint>
@@ -28,8 +28,8 @@ template <size_t TSigma, BitVector_c Bitvector = ::fmindex_collection::bitvector
 struct Wavelet {
     static constexpr size_t Sigma = TSigma;
 
-    static constexpr auto bits = required_bits(TSigma-1);
-    static constexpr auto bvct = pow(2, bits);
+    static constexpr auto bits = std::bit_width(TSigma-1);
+    static constexpr auto bvct = std::bit_ceil(TSigma);
 
     std::array<Bitvector, bvct> bitvector;
     size_t                      totalLength;

diff --git a/src/fmindex-collection/rankvector/Wavelet2.h b/src/fmindex-collection/rankvector/Wavelet2.h
@@ -6,10 +6,10 @@
 #include "../builtins.h"
 #include "../bitvector/Bitvector.h"
 #include "concepts.h"
-#include "utils.h"
 
 #include <algorithm>
 #include <array>
+#include <bit>
 #include <bitset>
 #include <cassert>
 #include <cstdint>
@@ -27,8 +27,8 @@ template <size_t TSigma, BitVector_c Bitvector = ::fmindex_collection::bitvector
 struct Wavelet2 {
     static constexpr size_t Sigma = TSigma;
 
-    static constexpr auto bits = required_bits(TSigma-1);
-    static constexpr auto bvct = pow(2, bits);
+    static constexpr auto bits = std::bit_width(TSigma-1);
+    static constexpr auto bvct = std::bit_ceil(TSigma);
 
     std::array<Bitvector, bvct> bitvector;
     size_t                      totalLength;
@@ -134,7 +134,7 @@ struct Wavelet2 {
         if (nbr == 1) return 0;
         if (nbr == 2) return 1;
 
-        auto bits = required_bits(nbr-1);
+        auto bits = std::bit_width(nbr-1);
         auto leftNbr = pow(2, bits-1);
         auto rightNbr = nbr-leftNbr;
         auto cl = divide(leftNbr);
@@ -155,8 +155,8 @@ struct Wavelet2 {
             auto res = std::vector<std::tuple<uint8_t, uint8_t>>{};
             auto bit = (symb >> (bits-Depth)) & 1;
 
-            constexpr auto bits = required_bits(Sigma-1);
-            constexpr auto leftNbr = pow(2, bits-1);
+            constexpr auto bits = std::bit_width(Sigma-1);
+            constexpr auto leftNbr = std::bit_ceil(Sigma-1);
             constexpr auto rightNbr = Sigma - leftNbr;
             if (symb < leftNbr) {
                 assert(bit == 0);

diff --git a/src/fmindex-collection/rankvector/utils.h b/src/fmindex-collection/rankvector/utils.h