Apply LIBHAT_UNLIKELY to some scanner returns

BasedInc · Aug 1, 2024 · c4c645f · c4c645f
1 parent 1133b07
commit c4c645f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/include/libhat/Scanner.hpp b/include/libhat/Scanner.hpp
@@ -165,14 +165,14 @@ namespace hat {
                 } else {
                     i = std::find(std::execution::unseq, i, scanEnd, firstByte);
                 }
-                if (i == scanEnd) {
+                if (i == scanEnd) LIBHAT_UNLIKELY {
                     break;
                 }
                 // Compare everything after the first byte
                 auto match = std::equal(signature.begin() + 1, signature.end(), i + 1, [](auto opt, auto byte) {
                     return !opt.has_value() || *opt == byte;
                 });
-                if (match) {
+                if (match) LIBHAT_UNLIKELY {
                     return i;
                 }
             }
@@ -196,7 +196,7 @@ namespace hat {
                     auto match = std::equal(signature.begin() + 1, signature.end(), i + 1, [](auto opt, auto byte) {
                         return !opt.has_value() || *opt == byte;
                     });
-                    if (match) {
+                    if (match) LIBHAT_UNLIKELY {
                         return i;
                     }
                 }

diff --git a/src/arch/x86/AVX2.cpp b/src/arch/x86/AVX2.cpp
@@ -43,7 +43,7 @@ namespace hat::detail {
         }
 
         begin = next_boundary_align<alignment>(begin);
-        if (begin >= end) {
+        if (begin >= end) LIBHAT_UNLIKELY {
             return {};
         }
 
@@ -73,14 +73,14 @@ namespace hat::detail {
                     const auto data = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(i + 1));
                     const auto cmpToSig = _mm256_cmpeq_epi8(signatureBytes, data);
                     const auto matched = _mm256_testc_si256(cmpToSig, signatureMask);
-                    if (matched) {
+                    if (matched) LIBHAT_UNLIKELY {
                         return i;
                     }
                 } else {
                     auto match = std::equal(signature.begin() + 1, signature.end(), i + 1, [](auto opt, auto byte) {
                         return !opt.has_value() || *opt == byte;
                     });
-                    if (match) {
+                    if (match) LIBHAT_UNLIKELY {
                         return i;
                     }
                 }

diff --git a/src/arch/x86/AVX512.cpp b/src/arch/x86/AVX512.cpp
@@ -43,7 +43,7 @@ namespace hat::detail {
         }
 
         begin = next_boundary_align<alignment>(begin);
-        if (begin >= end) {
+        if (begin >= end) LIBHAT_UNLIKELY {
             return {};
         }
 
@@ -68,14 +68,14 @@ namespace hat::detail {
                 if constexpr (veccmp) {
                     const auto data = _mm512_loadu_si512(i + 1);
                     const auto invalid = _mm512_mask_cmpneq_epi8_mask(signatureMask, signatureBytes, data);
-                    if (!invalid) {
+                    if (!invalid) LIBHAT_UNLIKELY {
                         return i;
                     }
                 } else {
                     auto match = std::equal(signature.begin() + 1, signature.end(), i + 1, [](auto opt, auto byte) {
                         return !opt.has_value() || *opt == byte;
                     });
-                    if (match) {
+                    if (match) LIBHAT_UNLIKELY {
                         return i;
                     }
                 }

diff --git a/src/arch/x86/SSE.cpp b/src/arch/x86/SSE.cpp
@@ -43,7 +43,7 @@ namespace hat::detail {
         }
 
         begin = next_boundary_align<alignment>(begin);
-        if (begin >= end) {
+        if (begin >= end) LIBHAT_UNLIKELY {
             return {};
         }
 
@@ -71,14 +71,14 @@ namespace hat::detail {
                     const auto data = _mm_loadu_si128(reinterpret_cast<const __m128i*>(i + 1));
                     const auto cmpToSig = _mm_cmpeq_epi8(signatureBytes, data);
                     const auto matched = _mm_testc_si128(cmpToSig, signatureMask);
-                    if (matched) {
+                    if (matched) LIBHAT_UNLIKELY {
                         return i;
                     }
                 } else {
                     auto match = std::equal(signature.begin() + 1, signature.end(), i + 1, [](auto opt, auto byte) {
                         return !opt.has_value() || *opt == byte;
                     });
-                    if (match) {
+                    if (match) LIBHAT_UNLIKELY {
                         return i;
                     }
                 }