From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 23 May 2020 13:14:54 +0000 (-0700)
Subject: Add UNLIKELY to first 3 branches in adler32 variants.
X-Git-Tag: 1.9.9-b1~225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00b1a86f91052ed99f3467ab0f00e53d5f5f4ea0;p=thirdparty%2Fzlib-ng.git

Add UNLIKELY to first 3 branches in adler32 variants.
---

diff --git a/adler32.c b/adler32.c
index 2cd51bb0..30d88863 100644
--- a/adler32.c
+++ b/adler32.c
@@ -27,15 +27,15 @@ uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len) {
     adler &= 0xffff;
 
     /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
+    if (UNLIKELY(len == 1))
         return adler32_len_1(adler, buf, sum2);
 
     /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == NULL)
+    if (UNLIKELY(buf == NULL))
         return 1L;
 
     /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
+    if (UNLIKELY(len < 16))
         return adler32_len_16(adler, buf, len, sum2);
 
     /* do length NMAX blocks -- requires just one modulo operation */
diff --git a/arch/x86/adler32_avx.c b/arch/x86/adler32_avx.c
index 69d8a11c..d316f195 100644
--- a/arch/x86/adler32_avx.c
+++ b/arch/x86/adler32_avx.c
@@ -25,15 +25,15 @@ uint32_t adler32_avx2(uint32_t adler, const unsigned char *buf, size_t len) {
     adler &= 0xffff;
 
     /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
+    if (UNLIKELY(len == 1))
         return adler32_len_1(adler, buf, sum2);
 
     /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == NULL)
+    if (UNLIKELY(buf == NULL))
         return 1L;
 
     /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
+    if (UNLIKELY(len < 16))
         return adler32_len_16(adler, buf, len, sum2);
 
     uint32_t ALIGNED_(32) s1[8], s2[8];
diff --git a/arch/x86/adler32_ssse3.c b/arch/x86/adler32_ssse3.c
index 45638e4f..5c7a466e 100644
--- a/arch/x86/adler32_ssse3.c
+++ b/arch/x86/adler32_ssse3.c
@@ -25,15 +25,15 @@ uint32_t adler32_ssse3(uint32_t adler, const unsigned char *buf, size_t len) {
     adler &= 0xffff;
 
     /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
+    if (UNLIKELY(len == 1))
         return adler32_len_1(adler, buf, sum2);
 
     /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == NULL)
+    if (UNLIKELY(buf == NULL))
         return 1L;
 
     /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
+    if (UNLIKELY(len < 16))
         return adler32_len_16(adler, buf, len, sum2);
 
     uint32_t ALIGNED_(16) s1[4], s2[4];