mload is actually cheaper than jump

Author: Amxx

contracts/utils/Base58.sol

@@ -65,23 +65,11 @@ library Base58 {
         // Assembly is ~50% cheaper for buffers of size 32.
         assembly ("memory-safe") {
             function clzBytes(ptr, length) -> i {
-                let chunk
                 for {
                     i := 0
-                } lt(i, length) {
+                } and(iszero(shr(248, mload(add(ptr, i)))), lt(i, length)) {
                     i := add(i, 1)
-                } {
-                    // Every 32 bytes, load a new chunk
-                    if iszero(mod(i, 0x20)) {
-                        chunk := mload(add(ptr, i))
-                    }
-                    // If the first byte of the chunk is not zero, break
-                    if shr(248, chunk) {
-                        break
-                    }
-                    // Shift chunk
-                    chunk := shl(8, chunk)
-                }
+                } {}
             }
 
             encoded := mload(0x40)

contracts/utils/Bytes.sol

@@ -79,28 +79,14 @@ library Bytes {
      * @dev Count number of occurrences of `search` in `buffer`, starting from position `offset`.
      */
     function countConsecutive(bytes memory buffer, uint256 offset, bytes1 search) internal pure returns (uint256 i) {
-        uint256 length = buffer.length;
-        if (offset > length) return 0;
-
+        uint256 length = Math.saturatingSub(buffer.length, offset);
         assembly ("memory-safe") {
-            let chunk
-            let end := sub(length, offset)
             for {
+                let ptr := add(add(buffer, 0x20), offset)
                 i := 0
-            } lt(i, end) {
+            } and(iszero(shr(248, xor(mload(add(ptr, i)), search))), lt(i, length)) {
                 i := add(i, 1)
-            } {
-                // every 32 bytes, load a new chunk
-                if iszero(mod(i, 0x20)) {
-                    chunk := mload(add(buffer, add(0x20, add(offset, i))))
-                }
-                // if the first byte of the chunk does not match the search element, exit
-                if shr(248, xor(chunk, search)) {
-                    break
-                }
-                // shift chunk
-                chunk := shl(8, chunk)
-            }
+            } {}
         }
     }