Test some jump scenarios + baseline; log resource utilization[

Author: codygunton

tests/zkevm/test_worst_compute.py

@@ -104,3 +104,207 @@ def test_worst_keccak(
         post={},
         blocks=[Block(txs=[tx])],
     )
+
+
+@pytest.mark.zkevm
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "gas_limit",
+    [36_000_000],
+)
+def run_jump_analysis_test(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_limit: int,
+    opcodes_pattern,
+    iteration_gas_cost: int,
+    description: str = "Opcode test",
+):
+    """
+    Generate test for worst-case compute scenario for a given opcode pattern.
+    """
+    env = Environment(gas_limit=gas_limit)
+
+    # Intrinsic gas cost is paid once
+    intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
+    available_gas = gas_limit - intrinsic_gas_calculator()
+
+    # Each iteration adds the bytes of the opcode pattern
+    bytes_per_iter = len(opcodes_pattern)
+
+    # Calculate max iterations based on code size and gas constraints
+    max_iters_by_size = MAX_CODE_SIZE // bytes_per_iter
+    max_iters_by_gas = (
+        available_gas // iteration_gas_cost if iteration_gas_cost > 0 else float("inf")
+    )
+    num_iters = min(max_iters_by_size, max_iters_by_gas)
+
+    # Create code with repeated pattern by concatenating the pattern num_iters times
+    code = opcodes_pattern * num_iters
+
+    # Calculate utilization percentages
+    code_size_pct = (len(code) / MAX_CODE_SIZE) * 100
+    gas_used = num_iters * iteration_gas_cost
+    gas_pct = (gas_used / available_gas) * 100 if available_gas > 0 else None
+
+    # Only write to the summary file if this is the first time we've seen this description
+    # This prevents duplication because tests are run for multiple blockchain test implementations
+    if description not in LOGGED_DESCRIPTIONS:
+        with open(SUMMARY_FILE, "a") as f:
+            # Format bytecode and gas info with aligned parentheses
+            bytecode_values = f"{len(code)}/{MAX_CODE_SIZE}"
+            gas_values = f"{gas_used}/{available_gas}"
+            
+            # Align the parentheses by padding the values section
+            f.write(f"{description:<30} {bytecode_values:>15} ({code_size_pct:6.2f}%)  {gas_values:>20} ({gas_pct:6.2f}%)  {bytes_per_iter:>4}  {num_iters:>10}\n")
+            
+        LOGGED_DESCRIPTIONS.add(description)
+    
+    if len(code) > MAX_CODE_SIZE:
+        # Must never happen, but keep it as a sanity check.
+        raise ValueError(f"Code size {len(code)} exceeds maximum code size {MAX_CODE_SIZE}")
+
+    code_address = pre.deploy_contract(code=code)
+
+    tx = Transaction(
+        to=code_address,
+        gas_limit=gas_limit,
+        gas_price=10,
+        sender=pre.fund_eoa(),
+        data=[],
+        value=0,
+    )
+
+    return blockchain_test(
+        env=env,
+        pre=pre,
+        post={},
+        blocks=[Block(txs=[tx])],
+    )
+
+
+@pytest.mark.zkevm
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "gas_limit",
+    [
+        36_000_000,
+    ],
+)
+def test_jumpdest_only(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_limit: int,
+):
+    """Test with only JUMPDEST opcodes"""
+    gsc = fork.gas_costs()
+    iteration_gas_cost = gsc.G_JUMPDEST
+
+    # Use Op.JUMPDEST instead of raw bytes
+    opcodes_pattern = Op.JUMPDEST
+
+    run_jump_analysis_test(
+        blockchain_test=blockchain_test,
+        pre=pre,
+        fork=fork,
+        gas_limit=gas_limit,
+        opcodes_pattern=opcodes_pattern,
+        iteration_gas_cost=iteration_gas_cost,
+        description="JUMPDEST only",
+    )
+
+
+@pytest.mark.zkevm
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "gas_limit",
+    [
+        36_000_000,
+    ],
+)
+def test_jumpdest_jump(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_limit: int,
+):
+    """Test with JUMPDEST and JUMP opcodes"""
+    gsc = fork.gas_costs()
+    iteration_gas_cost = gsc.G_JUMPDEST + gsc.G_MID
+
+    # Use Op.JUMPDEST + Op.JUMP instead of raw bytes
+    opcodes_pattern = Op.JUMPDEST + Op.JUMP
+
+    run_jump_analysis_test(
+        blockchain_test=blockchain_test,
+        pre=pre,
+        fork=fork,
+        gas_limit=gas_limit,
+        opcodes_pattern=opcodes_pattern,
+        iteration_gas_cost=iteration_gas_cost,
+        description="JUMPDEST + JUMP",
+    )
+
+
+@pytest.mark.zkevm
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "gas_limit",
+    [
+        36_000_000,
+    ],
+)
+def test_jumpdest_push0_pop_jump(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_limit: int,
+):
+    """Test with JUMPDEST, PUSH0, POP, and JUMP opcodes"""
+    gsc = fork.gas_costs()
+    iteration_gas_cost = gsc.G_JUMPDEST + gsc.G_VERY_LOW + gsc.G_BASE + gsc.G_MID
+
+    # Use Op.JUMPDEST + Op.PUSH0 + Op.POP + Op.JUMP instead of raw bytes
+    opcodes_pattern = Op.JUMPDEST + Op.PUSH0 + Op.POP + Op.JUMP
+
+    run_jump_analysis_test(
+        blockchain_test=blockchain_test,
+        pre=pre,
+        fork=fork,
+        gas_limit=gas_limit,
+        opcodes_pattern=opcodes_pattern,
+        iteration_gas_cost=iteration_gas_cost,
+        description="JUMPDEST + PUSH0 + POP + JUMP",
+    )
+
+
+@pytest.mark.zkevm
+@pytest.mark.valid_from("Cancun")
+@pytest.mark.parametrize(
+    "gas_limit",
+    [36_000_000],
+)
+def test_push0_pop_no_jump(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    fork: Fork,
+    gas_limit: int,
+):
+    """Test with just PUSH0 and POP opcodes"""
+    gsc = fork.gas_costs()
+    iteration_gas_cost = gsc.G_VERY_LOW + gsc.G_BASE
+
+    # Use Op.PUSH0 + Op.POP instead of raw bytes
+    opcodes_pattern = Op.PUSH0 + Op.POP
+
+    run_jump_analysis_test(
+        blockchain_test=blockchain_test,
+        pre=pre,
+        fork=fork,
+        gas_limit=gas_limit,
+        opcodes_pattern=opcodes_pattern,
+        iteration_gas_cost=iteration_gas_cost,
+        description="PUSH0 + POP",
+    )

tests/zkevm/utilization_summary.log

@@ -0,0 +1,8 @@
+===== UTILIZATION SUMMARY =====
+
+TEST PATTERN                                  BYTECODE                         GAS        SIZE  ITERATIONS
+----------------------------------------------------------------------------------------------------
+JUMPDEST only                      24576/24576 (100.00%)        24576/35979000 (  0.07%)     1       24576
+JUMPDEST + JUMP                    24576/24576 (100.00%)       110592/35979000 (  0.31%)     2       12288
+JUMPDEST + PUSH0 + POP + JUMP      24576/24576 (100.00%)        86016/35979000 (  0.24%)     4        6144
+PUSH0 + POP                        24576/24576 (100.00%)        61440/35979000 (  0.17%)     2       12288