Merge pull request #16122 from Saw-mon-and-Natalie/EIP-7939-CLZ

clonker · web-flow · commit 728ecd674d87 · 2025-10-16T12:56:46.000+02:00
EIP-7939 CLZ for Osaka
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.31 (unreleased)
 
 Language Features:
+* Yul: Introduce builtin `clz(x)` for counting the number of leading zero bits in a 256-bit word.
 
 Compiler Features:
 * ethdebug: Experimental support for instructions and source locations under EOF.
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
@@ -300,7 +300,7 @@ YulHex: 'hex';
 YulEVMBuiltin:
 	'stop' | 'add' | 'sub' | 'mul' | 'div' | 'sdiv' | 'mod' | 'smod' | 'exp' | 'not'
 	| 'lt' | 'gt' | 'slt' | 'sgt' | 'eq' | 'iszero' | 'and' | 'or' | 'xor' | 'byte'
-	| 'shl' | 'shr' | 'sar' | 'addmod' | 'mulmod' | 'signextend' | 'keccak256'
+	| 'shl' | 'shr' | 'sar' | 'clz' | 'addmod' | 'mulmod' | 'signextend' | 'keccak256'
 	| 'pop' | 'mload' | 'mstore' | 'mstore8' | 'sload' | 'sstore' | 'tload' | 'tstore'| 'msize' | 'gas'
 	| 'address' | 'balance' | 'selfbalance' | 'caller' | 'callvalue' | 'calldataload'
 	| 'calldatasize' | 'calldatacopy' | 'extcodesize' | 'extcodecopy' | 'returndatasize'
diff --git a/docs/yul.rst b/docs/yul.rst
@@ -752,8 +752,8 @@ This document does not want to be a full description of the Ethereum virtual mac
 Please refer to a different document if you are interested in the precise semantics.
 
 Opcodes marked with ``-`` do not return a result and all others return exactly one value.
-Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L``, ``P`` and ``N`` are present since Frontier,
-Homestead, Byzantium, Constantinople, Istanbul, London, Paris or Cancun respectively.
+Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L``, ``P``, ``N`` and ``O`` are present since
+Frontier, Homestead, Byzantium, Constantinople, Istanbul, London, Paris, Cancun or Osaka respectively.
 
 In the following, ``mem[a...b)`` signifies the bytes of memory starting at position ``a`` up to
 but not including position ``b``, ``storage[p]`` signifies the storage contents at slot ``p``, and
@@ -812,6 +812,8 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | sar(x, y)               |     | C | signed arithmetic shift right y by x bits                       |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| clz(x)                  |     | O | number of leading zero bits of x, 256 if x == 0                 |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | addmod(x, y, m)         |     | F | (x + y) % m with arbitrary precision arithmetic, 0 if m == 0    |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | mulmod(x, y, m)         |     | F | (x * y) % m with arbitrary precision arithmetic, 0 if m == 0    |
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
@@ -51,6 +51,7 @@ std::map<std::string, Instruction, std::less<>> const solidity::evmasm::c_instru
 	{ "SHL", Instruction::SHL },
 	{ "SHR", Instruction::SHR },
 	{ "SAR", Instruction::SAR },
+	{ "CLZ", Instruction::CLZ },
 	{ "ADDMOD", Instruction::ADDMOD },
 	{ "MULMOD", Instruction::MULMOD },
 	{ "SIGNEXTEND", Instruction::SIGNEXTEND },
@@ -219,6 +220,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{Instruction::SHL,            {"SHL",             0,  2,   1,  false,      Tier::VeryLow}},
 	{Instruction::SHR,            {"SHR",             0,  2,   1,  false,      Tier::VeryLow}},
 	{Instruction::SAR,            {"SAR",             0,  2,   1,  false,      Tier::VeryLow}},
+	{Instruction::CLZ,            {"CLZ",             0,  1,   1,  false,      Tier::Low}},
 	{Instruction::ADDMOD,         {"ADDMOD",          0,  3,   1,  false,      Tier::Mid}},
 	{Instruction::MULMOD,         {"MULMOD",          0,  3,   1,  false,      Tier::Mid}},
 	{Instruction::SIGNEXTEND,     {"SIGNEXTEND",      0,  2,   1,  false,      Tier::Low}},
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
@@ -61,6 +61,7 @@ enum class Instruction: uint8_t
 	SHL,                      ///< bitwise SHL operation
 	SHR,                      ///< bitwise SHR operation
 	SAR,                      ///< bitwise SAR operation
+	CLZ,                      ///< count of leading zeros in binary representation
 
 	KECCAK256 = 0x20,         ///< compute KECCAK-256 hash
 
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
@@ -98,6 +98,7 @@ struct EVMBuiltins
 	static auto constexpr SHL = PatternGenerator<Instruction::SHL>{};
 	static auto constexpr SHR = PatternGenerator<Instruction::SHR>{};
 	static auto constexpr SAR = PatternGenerator<Instruction::SAR>{};
+	static auto constexpr CLZ = PatternGenerator<Instruction::CLZ>{};
 	static auto constexpr ADDMOD = PatternGenerator<Instruction::ADDMOD>{};
 	static auto constexpr MULMOD = PatternGenerator<Instruction::MULMOD>{};
 	static auto constexpr SIGNEXTEND = PatternGenerator<Instruction::SIGNEXTEND>{};
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
@@ -42,6 +42,8 @@ bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersi
 	case Instruction::SHR:
 	case Instruction::SAR:
 		return hasBitwiseShifting();
+	case Instruction::CLZ:
+		return hasCLZ();
 	case Instruction::CREATE2:
 		return !_eofVersion.has_value() && hasCreate2();
 	case Instruction::EXTCODEHASH:
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
@@ -133,6 +133,7 @@ class EVMVersion
 	bool supportsReturndata() const { return *this >= byzantium(); }
 	bool hasStaticCall() const { return *this >= byzantium(); }
 	bool hasBitwiseShifting() const { return *this >= constantinople(); }
+	bool hasCLZ() const { return *this >= osaka(); }
 	bool hasCreate2() const { return *this >= constantinople(); }
 	bool hasExtCodeHash() const { return *this >= constantinople(); }
 	bool hasChainID() const { return *this >= istanbul(); }
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
@@ -834,6 +834,8 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 		errorForVM(7458_error, "only available for Constantinople-compatible");
 	else if (_instr == evmasm::Instruction::SAR && !m_evmVersion.hasBitwiseShifting())
 		errorForVM(2054_error, "only available for Constantinople-compatible");
+	else if (_instr == evmasm::Instruction::CLZ && !m_evmVersion.hasCLZ())
+		errorForVM(4948_error, "only available for Osaka-compatible");
 	else if (_instr == evmasm::Instruction::CREATE2 && !m_evmVersion.hasCreate2())
 		errorForVM(6166_error, "only available for Constantinople-compatible");
 	else if (_instr == evmasm::Instruction::EXTCODEHASH && !m_evmVersion.hasExtCodeHash())
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
@@ -132,6 +132,12 @@ std::set<std::string, std::less<>> createReservedIdentifiers(langutil::EVMVersio
 			_evmVersion < langutil::EVMVersion::cancun() &&
 			(_instr == evmasm::Instruction::TSTORE || _instr == evmasm::Instruction::TLOAD);
 	};
+	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
+	// clz for VMs before osaka.
+	auto clzException = [&](evmasm::Instruction _instr) -> bool
+	{
+		return _instr == evmasm::Instruction::CLZ && !_evmVersion.hasCLZ();
+	};
 
 	auto eofIdentifiersException = [&](evmasm::Instruction _instr) -> bool
 	{
@@ -154,6 +160,7 @@ std::set<std::string, std::less<>> createReservedIdentifiers(langutil::EVMVersio
 			!blobBaseFeeException(instr.second) &&
 			!mcopyException(instr.second) &&
 			!transientStorageException(instr.second) &&
+			!clzException(instr.second) &&
 			!eofIdentifiersException(instr.second)
 		)
 			reserved.emplace(name);
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
@@ -131,6 +131,8 @@ done < <(
       # Skipping a test with "let blobhash := ..."
       grep -v -E 'inlineAssembly/blobhash_pre_cancun.sol' |
       grep -v -E 'inlineAssembly/blobhash_pre_cancun_not_reserved.sol' |
+      # Skipping a test with "let clz := ..."
+      grep -v -E 'inlineAssembly/clz_pre_osaka.sol' |
       # Skipping tests with "let tstore/tload := ..."
       grep -v -E 'inlineAssembly/tload_tstore_not_reserved_before_cancun.sol' |
       # Skipping license error, unrelated to the grammar
diff --git a/test/libsolidity/semanticTests/inlineAssembly/clz.sol b/test/libsolidity/semanticTests/inlineAssembly/clz.sol
@@ -0,0 +1,25 @@
+contract C {
+    function f() public view returns (bytes32 ret) {
+        assembly {
+            ret := clz(0)
+        }
+    }
+
+    function g() public view returns (bytes32 ret) {
+        assembly {
+            ret := clz(1)
+        }
+    }
+
+    function h() public view returns (bytes32 ret) {
+        assembly {
+            ret := clz(0x4000000000000000000000000000000000000000000000000000000000000000)
+        }
+    }
+}
+// ====
+// EVMVersion: >=osaka
+// ----
+// f() -> 256
+// g() -> 255
+// h() -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/clz_pre_osaka.sol b/test/libsolidity/semanticTests/inlineAssembly/clz_pre_osaka.sol
@@ -0,0 +1,21 @@
+contract C {
+    function f() public pure returns (uint ret) {
+        assembly {
+            let clz := 1
+            ret := clz
+        }
+    }
+    function g() public pure returns (uint ret) {
+        assembly {
+            function clz() -> r {
+                r := 1000
+            }
+            ret := clz()
+        }
+    }
+}
+// ====
+// EVMVersion: <osaka
+// ----
+// f() -> 1
+// g() -> 1000
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/clz.sol b/test/libsolidity/syntaxTests/inlineAssembly/clz.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f(uint256 x) public pure returns (bytes32 ret) {
+        assembly {
+            ret := clz(x)
+        }
+    }
+}
+// ====
+// EVMVersion: >=osaka
+// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/clz_pre_osaka.sol b/test/libsolidity/syntaxTests/inlineAssembly/clz_pre_osaka.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f(uint256 x) public pure returns (bytes32 ret) {
+        assembly {
+            ret := clz(x)
+        }
+    }
+}
+// ====
+// EVMVersion: =prague
+// ----
+// TypeError 4948: (113-116): The "clz" instruction is only available for Osaka-compatible VMs (you are currently compiling for "prague").
+// DeclarationError 8678: (106-119): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/clz_reserved_osaka.sol b/test/libsolidity/syntaxTests/inlineAssembly/clz_reserved_osaka.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public pure returns (uint ret) {
+        assembly {
+            function clz() -> r {
+                r := 1000
+            }
+            ret := clz()
+        }
+    }
+}
+// ====
+// EVMVersion: >=osaka
+// ----
+// ParserError 5568: (103-106): Cannot use builtin function name "clz" as identifier name.
diff --git a/test/libyul/yulInterpreterTests/clz.yul b/test/libyul/yulInterpreterTests/clz.yul
@@ -0,0 +1,15 @@
+{
+    sstore(0, clz(0))
+    sstore(1, clz(1))
+    sstore(2, clz(0xff))
+}
+// ====
+// EVMVersion: >=osaka
+// ----
+// Trace:
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000100
+//   0000000000000000000000000000000000000000000000000000000000000001: 00000000000000000000000000000000000000000000000000000000000000ff
+//   0000000000000000000000000000000000000000000000000000000000000002: 00000000000000000000000000000000000000000000000000000000000000f8
+// Transient storage dump:
diff --git a/test/libyul/yulSyntaxTests/clz.yul b/test/libyul/yulSyntaxTests/clz.yul
@@ -0,0 +1,16 @@
+{
+    {
+        let clz := 1
+    }
+
+    {
+        function clz() {}
+        clz()
+    }
+}
+
+// ====
+// EVMVersion: >=osaka
+// ----
+// ParserError 5568: (20-23): Cannot use builtin function name "clz" as identifier name.
+// ParserError 5568: (59-62): Cannot use builtin function name "clz" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/clz_pre_osaka.yul b/test/libyul/yulSyntaxTests/clz_pre_osaka.yul
@@ -0,0 +1,14 @@
+{
+    {
+        let clz := 1
+    }
+
+    {
+        function clz() {}
+        clz()
+    }
+}
+
+// ====
+// EVMVersion: <osaka
+// ----
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -181,6 +181,8 @@ u256 EVMInstructionInterpreter::eval(
 			return v;
 		}
 	}
+	case Instruction::CLZ:
+		return arg[0] == 0 ? 256 : 255 - msb(arg[0]);
 	case Instruction::ADDMOD:
 		return arg[2] == 0 ? 0 : u256((u512(arg[0]) + u512(arg[1])) % arg[2]);
 	case Instruction::MULMOD:
