Apply consistent use of UNLIKLEY across adler32 variants

diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index f215d9b87983425237902a430e2d9eab02742ac9..74054c0c3982dfe8d321689bea774612bf466649 100644 (file)
--- a/arch/arm/adler32_neon.c
+++ b/arch/arm/adler32_neon.c
@@ -271,15 +271,15 @@ static Z_FORCEINLINE uint32_t adler32_copy_impl(uint32_t adler, uint8_t *dst, co
     adler &= 0xffff;
 
     /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
+    if (UNLIKELY(len == 1))
         return adler32_copy_len_1(adler, dst, src, sum2, COPY);
 
     /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (src == NULL)
+    if (UNLIKELY(src == NULL))
         return 1L;
 
     /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
+    if (UNLIKELY(len < 16))
         return adler32_copy_len_16(adler, dst, src, len, sum2, COPY);
 
     uint32_t pair[2];

diff --git a/arch/loongarch/adler32_lasx.c b/arch/loongarch/adler32_lasx.c
index bdcc32422802c2332d5e14f89b9471b23a6d86a3..57b053ebfcce996249b3e72ac0b60047a5b2a7ec 100644 (file)
--- a/arch/loongarch/adler32_lasx.c
+++ b/arch/loongarch/adler32_lasx.c
@@ -35,8 +35,8 @@ extern uint32_t adler32_copy_lsx(uint32_t adler, uint8_t *dst, const uint8_t *sr
 extern uint32_t adler32_lsx(uint32_t adler, const uint8_t *src, size_t len);
 
 static inline uint32_t adler32_copy_impl(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len, const int COPY) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
+    if (UNLIKELY(src == NULL)) return 1L;
+    if (UNLIKELY(len == 0)) return adler;
 
     uint32_t adler0, adler1;
     adler1 = (adler >> 16) & 0xffff;

diff --git a/arch/loongarch/adler32_lsx.c b/arch/loongarch/adler32_lsx.c
index 8031ea9fc09928271a3a234babe08d378fb90995..5978523fb3974433af610f20eb4a24890c3a33fc 100644 (file)
--- a/arch/loongarch/adler32_lsx.c
+++ b/arch/loongarch/adler32_lsx.c
@@ -30,8 +30,8 @@ static inline uint32_t hsum(__m128i x) {
 }
 
 static inline uint32_t adler32_copy_impl(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len, const int COPY) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
+    if (UNLIKELY(src == NULL)) return 1L;
+    if (UNLIKELY(len == 0)) return adler;
 
     uint32_t adler0, adler1;
     adler1 = (adler >> 16) & 0xffff;

diff --git a/arch/riscv/adler32_rvv.c b/arch/riscv/adler32_rvv.c
index d7e8c8b128cace6b4baa47c98d303f61deddc542..41a754ce673fd0d02b4e86c41f1ec0a235e717a8 100644 (file)
--- a/arch/riscv/adler32_rvv.c
+++ b/arch/riscv/adler32_rvv.c
@@ -18,15 +18,15 @@ static inline uint32_t adler32_copy_impl(uint32_t adler, uint8_t* restrict dst,
     adler &= 0xffff;
 
     /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
+    if (UNLIKELY(len == 1))
         return adler32_copy_len_1(adler, dst, src, sum2, COPY);
 
     /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (src == NULL)
+    if (UNLIKELY(src == NULL))
         return 1L;
 
     /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
+    if (UNLIKELY(len < 16))
         return adler32_copy_len_16(adler, dst, src, len, sum2, COPY);
 
     size_t left = len;

diff --git a/arch/x86/adler32_avx2.c b/arch/x86/adler32_avx2.c
index a2168e5e3e09721d9c644e82904e053d49c35e3f..c714bbd49cf103920325c371945539ffcbd07d5d 100644 (file)
--- a/arch/x86/adler32_avx2.c
+++ b/arch/x86/adler32_avx2.c
@@ -19,8 +19,8 @@ extern uint32_t adler32_copy_sse42(uint32_t adler, uint8_t *dst, const uint8_t *
 extern uint32_t adler32_ssse3(uint32_t adler, const uint8_t *src, size_t len);
 
 static inline uint32_t adler32_copy_impl(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len, const int COPY) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
+    if (UNLIKELY(src == NULL)) return 1L;
+    if (UNLIKELY(len == 0)) return adler;
 
     uint32_t adler0, adler1;
     adler1 = (adler >> 16) & 0xffff;

diff --git a/arch/x86/adler32_avx512.c b/arch/x86/adler32_avx512.c
index 88d3a80b6e38654126a0b726cc67015e61111267..5254f2dba62ee84c51fe2d4d572f9230f2e4b62a 100644 (file)
--- a/arch/x86/adler32_avx512.c
+++ b/arch/x86/adler32_avx512.c
@@ -16,8 +16,8 @@
 #include "adler32_avx512_p.h"
 
 static inline uint32_t adler32_copy_impl(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len, const int COPY) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
+    if (UNLIKELY(src == NULL)) return 1L;
+    if (UNLIKELY(len == 0)) return adler;
 
     uint32_t adler0, adler1;
     adler1 = (adler >> 16) & 0xffff;

diff --git a/arch/x86/adler32_avx512_vnni.c b/arch/x86/adler32_avx512_vnni.c
index 2ab73bc3ca170185e0c1e2175db7c79cbebfaaf9..68b72ca15c311de0bf9c65105e6d68b49909971b 100644 (file)
--- a/arch/x86/adler32_avx512_vnni.c
+++ b/arch/x86/adler32_avx512_vnni.c
@@ -18,8 +18,8 @@
 #include "adler32_avx2_p.h"
 
 Z_INTERNAL uint32_t adler32_avx512_vnni(uint32_t adler, const uint8_t *src, size_t len) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
+    if (UNLIKELY(src == NULL)) return 1L;
+    if (UNLIKELY(len == 0)) return adler;
 
     uint32_t adler0, adler1;
     adler1 = (adler >> 16) & 0xffff;
@@ -110,8 +110,8 @@ rem_peel:
 }
 
 Z_INTERNAL uint32_t adler32_copy_avx512_vnni(uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len) {
-    if (src == NULL) return 1L;
-    if (len == 0) return adler;
+    if (UNLIKELY(src == NULL)) return 1L;
+    if (UNLIKELY(len == 0)) return adler;
 
     uint32_t adler0, adler1;
     adler1 = (adler >> 16) & 0xffff;

diff --git a/arch/x86/adler32_sse42.c b/arch/x86/adler32_sse42.c
index f3e79cd15ae9a4ebd3471d5df79c29751e0d92ff..e9178488663f91f43113bfcde02a5c22a097448c 100644 (file)
--- a/arch/x86/adler32_sse42.c
+++ b/arch/x86/adler32_sse42.c
@@ -19,7 +19,7 @@ Z_INTERNAL uint32_t adler32_copy_sse42(uint32_t adler, uint8_t *dst, const uint8
     adler0 = adler & 0xffff;
 
 rem_peel:
-    if (len < 16)
+    if (UNLIKELY(len < 16))
        return adler32_copy_len_16(adler0, dst, src, len, adler1, 1);
 
     __m128i vbuf, vbuf_0;