Update to latest libprimesieve

kimwalisch · Sep 13, 2023 · 66c71bd · 66c71bd
1 parent 63c4706
commit 66c71bd
Show file tree

Hide file tree

Showing 34 changed files with 178 additions and 172 deletions.
diff --git a/lib/primesieve/include/primesieve/CountPrintPrimes.hpp b/lib/primesieve/include/primesieve/CountPrintPrimes.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  CountPrintPrimes.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -13,7 +13,7 @@
 #include "Erat.hpp"
 #include "MemoryPool.hpp"
 #include "macros.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 #include "PrimeSieve.hpp"
 
 #include <stdint.h>
@@ -34,7 +34,7 @@ class CountPrintPrimes : public Erat
 private:
   uint64_t low_ = 0;
   /// Count lookup tables for prime k-tuplets
-  pod_vector<uint8_t> kCounts_[6];
+  Vector<uint8_t> kCounts_[6];
   counts_t& counts_;
   /// Reference to the associated PrimeSieve object
   PrimeSieve& ps_;

diff --git a/lib/primesieve/include/primesieve/CpuInfo.hpp b/lib/primesieve/include/primesieve/CpuInfo.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  CpuInfo.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -10,7 +10,7 @@
 #ifndef CPUINFO_HPP
 #define CPUINFO_HPP
 
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 
 #include <cstddef>
 #include <string>
@@ -43,8 +43,8 @@ class CpuInfo
 private:
   void init();
   std::size_t logicalCpuCores_;
-  pod_array<std::size_t, 4> cacheSizes_;
-  pod_array<std::size_t, 4> cacheSharing_;
+  Array<std::size_t, 4> cacheSizes_;
+  Array<std::size_t, 4> cacheSharing_;
   std::string error_;
 };
 

diff --git a/lib/primesieve/include/primesieve/Erat.hpp b/lib/primesieve/include/primesieve/Erat.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  Erat.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -16,7 +16,7 @@
 #include "EratBig.hpp"
 #include "macros.hpp"
 #include "intrinsics.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 
 #include <stdint.h>
 
@@ -46,7 +46,7 @@ class Erat
   /// Upper bound of the current segment
   uint64_t segmentHigh_ = 0;
   /// Sieve of Eratosthenes array
-  pod_vector<uint8_t> sieve_;
+  Vector<uint8_t> sieve_;
   Erat() = default;
   Erat(uint64_t, uint64_t);
   void init(uint64_t, uint64_t, uint64_t, PreSieve&, MemoryPool& memoryPool);

diff --git a/lib/primesieve/include/primesieve/EratBig.hpp b/lib/primesieve/include/primesieve/EratBig.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  EratBig.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -12,7 +12,7 @@
 
 #include "Bucket.hpp"
 #include "macros.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 #include "Wheel.hpp"
 
 #include <stdint.h>
@@ -29,14 +29,14 @@ class EratBig : public Wheel210_t
 {
 public:
   void init(uint64_t, uint64_t, uint64_t, MemoryPool&);
-  NOINLINE void crossOff(pod_vector<uint8_t>& sieve);
+  NOINLINE void crossOff(Vector<uint8_t>& sieve);
   bool hasSievingPrimes() const { return !buckets_.empty(); }
 private:
   uint64_t maxPrime_ = 0;
   uint64_t log2SieveSize_ = 0;
   uint64_t moduloSieveSize_ = 0;
   MemoryPool* memoryPool_ = nullptr;
-  pod_vector<SievingPrime*> buckets_;
+  Vector<SievingPrime*> buckets_;
   void storeSievingPrime(uint64_t, uint64_t, uint64_t);
   NOINLINE void crossOff(uint8_t* sieve, SievingPrime* prime, SievingPrime* end);
 };

diff --git a/lib/primesieve/include/primesieve/EratMedium.hpp b/lib/primesieve/include/primesieve/EratMedium.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  EratMedium.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -12,7 +12,7 @@
 
 #include "Bucket.hpp"
 #include "macros.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 #include "Wheel.hpp"
 
 #include <stdint.h>
@@ -30,12 +30,12 @@ class EratMedium : public Wheel30_t
 public:
   void init(uint64_t, uint64_t, MemoryPool&);
   bool hasSievingPrimes() const { return !buckets_.empty(); }
-  NOINLINE void crossOff(pod_vector<uint8_t>& sieve);
+  NOINLINE void crossOff(Vector<uint8_t>& sieve);
 private:
   uint64_t maxPrime_ = 0;
   MemoryPool* memoryPool_ = nullptr;
-  pod_vector<SievingPrime*> buckets_;
-  pod_vector<SievingPrime*> currentBuckets_;
+  Vector<SievingPrime*> buckets_;
+  Vector<SievingPrime*> currentBuckets_;
   void storeSievingPrime(uint64_t, uint64_t, uint64_t);
   NOINLINE void crossOff_7(uint8_t*, std::size_t, Bucket*);
   NOINLINE void crossOff_11(uint8_t*, std::size_t, Bucket*);

diff --git a/lib/primesieve/include/primesieve/EratSmall.hpp b/lib/primesieve/include/primesieve/EratSmall.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  EratSmall.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -12,7 +12,7 @@
 
 #include "Bucket.hpp"
 #include "macros.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 #include "Wheel.hpp"
 
 #include <cstddef>
@@ -28,12 +28,12 @@ class EratSmall : public Wheel30_t
 {
 public:
   void init(uint64_t, uint64_t, uint64_t);
-  void crossOff(pod_vector<uint8_t>& sieve);
+  void crossOff(Vector<uint8_t>& sieve);
   bool hasSievingPrimes() const { return !primes_.empty(); }
 private:
   uint64_t maxPrime_ = 0;
   std::size_t l1CacheSize_ = 0;
-  pod_vector<SievingPrime> primes_;
+  Vector<SievingPrime> primes_;
   void storeSievingPrime(uint64_t, uint64_t, uint64_t);
   NOINLINE void crossOff(uint8_t*, std::size_t);
 };

diff --git a/lib/primesieve/include/primesieve/IteratorHelper.hpp b/lib/primesieve/include/primesieve/IteratorHelper.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file   IteratorHelper.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -13,7 +13,7 @@
 #include "PrimeGenerator.hpp"
 #include "PreSieve.hpp"
 #include "macros.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 
 #include <stdint.h>
 
@@ -26,11 +26,13 @@ struct IteratorData
   IteratorData(uint64_t stp) :
     stop(stp)
   { }
+
   ~IteratorData()
   {
     if (primeGenerator)
       primeGenerator->~PrimeGenerator();
   }
+
   void deletePrimeGenerator()
   {
     if (primeGenerator)
@@ -39,10 +41,12 @@ struct IteratorData
       primeGenerator = nullptr;
     }
   }
+
   void deletePrimes()
   {
     primes.deallocate();
   }
+
   void newPrimeGenerator(uint64_t start,
                          uint64_t stop,
                          PreSieve& preSieve)
@@ -53,11 +57,12 @@ struct IteratorData
     ASSERT(primeGenerator == nullptr);
     primeGenerator = new (primeGeneratorBuffer) PrimeGenerator(start, stop, preSieve);
   }
+
   uint64_t stop;
   uint64_t dist = 0;
   bool include_start_number = true;
   PrimeGenerator* primeGenerator = nullptr;
-  pod_vector<uint64_t> primes;
+  Vector<uint64_t> primes;
   PreSieve preSieve;
   alignas(PrimeGenerator) char primeGeneratorBuffer[sizeof(PrimeGenerator)];
 };

diff --git a/lib/primesieve/include/primesieve/MemoryPool.hpp b/lib/primesieve/include/primesieve/MemoryPool.hpp
@@ -1,7 +1,7 @@
 ///
 /// @file  MemoryPool.hpp
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -12,7 +12,7 @@
 
 #include "Bucket.hpp"
 #include "macros.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 
 namespace primesieve {
 
@@ -31,7 +31,7 @@ class MemoryPool
   /// Number of buckets to allocate
   std::size_t count_ = 0;
   /// Pointers of allocated buckets
-  pod_vector<pod_vector<char>> memory_;
+  Vector<Vector<char>> memory_;
 };
 
 } // namespace

diff --git a/lib/primesieve/include/primesieve/PreSieve.hpp b/lib/primesieve/include/primesieve/PreSieve.hpp
@@ -20,7 +20,7 @@
 ///         Pre-sieving provides a speedup of up to 30% when
 ///         sieving the primes < 10^10 using primesieve.
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -29,7 +29,7 @@
 #ifndef PRESIEVE_HPP
 #define PRESIEVE_HPP
 
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 #include <stdint.h>
 
 namespace primesieve {
@@ -38,15 +38,15 @@ class PreSieve
 {
 public:
   void init(uint64_t start, uint64_t stop);
-  void preSieve(pod_vector<uint8_t>& sieve, uint64_t segmentLow) const;
+  void preSieve(Vector<uint8_t>& sieve, uint64_t segmentLow) const;
   uint64_t getMaxPrime() const { return maxPrime_; }
 private:
   uint64_t maxPrime_ = 13;
   uint64_t totalDist_ = 0;
-  pod_array<pod_vector<uint8_t>, 8> buffers_;
+  Array<Vector<uint8_t>, 8> buffers_;
   void initBuffers();
-  static void preSieveSmall(pod_vector<uint8_t>& sieve, uint64_t segmentLow);
-  void preSieveLarge(pod_vector<uint8_t>& sieve, uint64_t segmentLow) const;
+  static void preSieveSmall(Vector<uint8_t>& sieve, uint64_t segmentLow);
+  void preSieveLarge(Vector<uint8_t>& sieve, uint64_t segmentLow) const;
 };
 
 } // namespace

diff --git a/lib/primesieve/include/primesieve/PrimeGenerator.hpp b/lib/primesieve/include/primesieve/PrimeGenerator.hpp
@@ -6,7 +6,7 @@
 ///        returns the primes. When there are no more primes left in
 ///        the vector PrimeGenerator generates new primes.
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -18,7 +18,7 @@
 #include "Erat.hpp"
 #include "MemoryPool.hpp"
 #include "SievingPrimes.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 
 #include <stdint.h>
 #include <cstddef>
@@ -31,25 +31,25 @@ class PrimeGenerator : public Erat
 {
 public:
   PrimeGenerator(uint64_t start, uint64_t stop, PreSieve& preSieve);
-  void fillPrevPrimes(pod_vector<uint64_t>& primes, std::size_t* size);
+  void fillPrevPrimes(Vector<uint64_t>& primes, std::size_t* size);
   static uint64_t maxCachedPrime();
 
 #if defined(MULTIARCH_POPCNT_BMI)
   #define MULTIARCH
   __attribute__ ((target ("popcnt,bmi")))
-  void fillNextPrimes(pod_vector<uint64_t>& primes, std::size_t* size);
+  void fillNextPrimes(Vector<uint64_t>& primes, std::size_t* size);
 #endif
 
 #if defined(MULTIARCH_AVX512)
   #define MULTIARCH
   __attribute__ ((target ("avx512f,avx512vbmi,avx512vbmi2,popcnt")))
-  void fillNextPrimes(pod_vector<uint64_t>& primes, std::size_t* size);
+  void fillNextPrimes(Vector<uint64_t>& primes, std::size_t* size);
 #endif
 
 #if defined(MULTIARCH)
   __attribute__ ((target ("default")))
 #endif
-  void fillNextPrimes(pod_vector<uint64_t>& primes, std::size_t* size);
+  void fillNextPrimes(Vector<uint64_t>& primes, std::size_t* size);
 
 private:
   bool isInit_ = false;
@@ -63,10 +63,10 @@ class PrimeGenerator : public Erat
   std::size_t getStopIdx() const;
   void initErat();
   void sieveSegment();
-  void initPrevPrimes(pod_vector<uint64_t>&, std::size_t*);
-  void initNextPrimes(pod_vector<uint64_t>&, std::size_t*);
-  bool sievePrevPrimes(pod_vector<uint64_t>&, std::size_t*);
-  bool sieveNextPrimes(pod_vector<uint64_t>&, std::size_t*);
+  void initPrevPrimes(Vector<uint64_t>&, std::size_t*);
+  void initNextPrimes(Vector<uint64_t>&, std::size_t*);
+  bool sievePrevPrimes(Vector<uint64_t>&, std::size_t*);
+  bool sieveNextPrimes(Vector<uint64_t>&, std::size_t*);
 };
 
 } // namespace

diff --git a/lib/primesieve/include/primesieve/PrimeSieve.hpp b/lib/primesieve/include/primesieve/PrimeSieve.hpp
@@ -4,7 +4,7 @@
 ///         sieving. It is used for printing and counting primes
 ///         and for computing the nth prime.
 ///
-/// Copyright (C) 2022 Kim Walisch, <kim.walisch@gmail.com>
+/// Copyright (C) 2023 Kim Walisch, <kim.walisch@gmail.com>
 ///
 /// This file is distributed under the BSD License. See the COPYING
 /// file in the top level directory.
@@ -14,13 +14,13 @@
 #define PRIMESIEVE_CLASS_HPP
 
 #include "PreSieve.hpp"
-#include "pod_vector.hpp"
+#include "Vector.hpp"
 
 #include <stdint.h>
 
 namespace primesieve {
 
-using counts_t = pod_array<uint64_t, 6>;
+using counts_t = Array<uint64_t, 6>;
 class ParallelSieve;
 
 enum