Get rid of if_unlikely()

kimwalisch · Jul 11, 2024 · 5f54093 · 5f54093
1 parent 9100e57
commit 5f54093
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/include/PiTable.hpp b/include/PiTable.hpp
@@ -46,7 +46,7 @@ class PiTable : public BitSieve240
   {
     ASSERT(x <= max_x_);
 
-    if_unlikely(x < pi_tiny_.size())
+    if (x < pi_tiny_.size())
       return pi_tiny_[x];
 
     uint64_t count = pi_[x / 240].count;
@@ -58,7 +58,7 @@ class PiTable : public BitSieve240
   /// Get number of primes <= x
   static int64_t pi_cache(uint64_t x)
   {
-    if_unlikely(x < pi_tiny_.size())
+    if (x < pi_tiny_.size())
       return pi_tiny_[x];
 
     uint64_t count = pi_cache_[x / 240].count;

diff --git a/include/SegmentedPiTable.hpp b/include/SegmentedPiTable.hpp
@@ -74,7 +74,7 @@ class SegmentedPiTable : public BitSieve240
     ASSERT(x >= low_);
     ASSERT(x < high_);
 
-    if_unlikely(x < pi_tiny_.size())
+    if (x < pi_tiny_.size())
       return pi_tiny_[x];
 
     x -= low_;

diff --git a/include/popcnt.hpp b/include/popcnt.hpp
@@ -53,7 +53,7 @@ ALWAYS_INLINE uint64_t popcnt64(uint64_t x)
 {
   // On my AMD EPYC 7642 CPU using GCC 12 this runtime
   // check incurs an overall overhead of about 1%.
-  if_likely(cpu_supports_popcnt)
+  if (cpu_supports_popcnt)
   {
     __asm__("popcnt %1, %0" : "=r"(x) : "r"(x));
     return x;
@@ -89,7 +89,7 @@ NOINLINE uint64_t popcnt64_bitwise(uint64_t x)
 
 ALWAYS_INLINE uint64_t popcnt64(uint64_t x)
 {
-  if_likely(cpu_supports_popcnt)
+  if (cpu_supports_popcnt)
   {
     uint32_t x0 = uint32_t(x);
     uint32_t x1 = uint32_t(x >> 32);
@@ -166,7 +166,7 @@ NOINLINE uint64_t popcnt64_bitwise(uint64_t x)
 
 ALWAYS_INLINE uint64_t popcnt64(uint64_t x)
 {
-  if_likely(cpu_supports_popcnt)
+  if (cpu_supports_popcnt)
     return __popcnt64(x);
   else
     return popcnt64_bitwise(x);
@@ -237,7 +237,7 @@ NOINLINE uint64_t popcnt64_bitwise(uint64_t x)
 
 ALWAYS_INLINE uint64_t popcnt64(uint64_t x)
 {
-  if_likely(cpu_supports_popcnt)
+  if (cpu_supports_popcnt)
     return __popcnt(uint32_t(x)) +
            __popcnt(uint32_t(x >> 32));
   else