feat: remove deploy instruction from venom

tests/unit/compiler/venom/test_duplicate_operands.py

@@ -18,10 +18,10 @@ def test_duplicate_operands():
     ctx = IRFunction()
     bb = ctx.get_basic_block()
     op = bb.append_instruction("store", 10)
-    sum = bb.append_instruction("add", op, op)
-    bb.append_instruction("mul", sum, op)
+    sum_ = bb.append_instruction("add", op, op)
+    bb.append_instruction("mul", sum_, op)
     bb.append_instruction("stop")
 
-    asm = generate_assembly_experimental(ctx, OptimizationLevel.CODESIZE)
+    asm = generate_assembly_experimental(ctx, optimize=OptimizationLevel.CODESIZE)
 
     assert asm == ["PUSH1", 10, "DUP1", "DUP1", "DUP1", "ADD", "MUL", "STOP", "REVERT"]

tests/unit/compiler/venom/test_multi_entry_block.py

@@ -41,7 +41,7 @@ def test_multi_entry_block_1():
     finish_bb = ctx.get_basic_block(finish_label.value)
     cfg_in = list(finish_bb.cfg_in.keys())
     assert cfg_in[0].label.value == "target", "Should contain target"
-    assert cfg_in[1].label.value == "finish_split_global", "Should contain finish_split_global"
+    assert cfg_in[1].label.value == "finish_split___global", "Should contain finish_split___global"
     assert cfg_in[2].label.value == "finish_split_block_1", "Should contain finish_split_block_1"
 
 
@@ -93,7 +93,7 @@ def test_multi_entry_block_2():
     finish_bb = ctx.get_basic_block(finish_label.value)
     cfg_in = list(finish_bb.cfg_in.keys())
     assert cfg_in[0].label.value == "target", "Should contain target"
-    assert cfg_in[1].label.value == "finish_split_global", "Should contain finish_split_global"
+    assert cfg_in[1].label.value == "finish_split___global", "Should contain finish_split___global"
     assert cfg_in[2].label.value == "finish_split_block_1", "Should contain finish_split_block_1"
 
 
@@ -134,5 +134,5 @@ def test_multi_entry_block_with_dynamic_jump():
     finish_bb = ctx.get_basic_block(finish_label.value)
     cfg_in = list(finish_bb.cfg_in.keys())
     assert cfg_in[0].label.value == "target", "Should contain target"
-    assert cfg_in[1].label.value == "finish_split_global", "Should contain finish_split_global"
+    assert cfg_in[1].label.value == "finish_split___global", "Should contain finish_split___global"
     assert cfg_in[2].label.value == "finish_split_block_1", "Should contain finish_split_block_1"

vyper/compiler/phases.py

@@ -181,13 +181,9 @@ def global_ctx(self) -> ModuleT:
     @cached_property
     def _ir_output(self):
         # fetch both deployment and runtime IR
-        nodes = generate_ir_nodes(
+        return generate_ir_nodes(
             self.global_ctx, self.settings.optimize, self.settings.experimental_codegen
         )
-        if self.settings.experimental_codegen:
-            return [generate_ir(nodes[0]), generate_ir(nodes[1])]
-        else:
-            return nodes
 
     @property
     def ir_nodes(self) -> IRnode:
@@ -208,21 +204,27 @@ def function_signatures(self) -> dict[str, ContractFunctionT]:
         fs = self.vyper_module_folded.get_children(vy_ast.FunctionDef)
         return {f.name: f._metadata["func_type"] for f in fs}
 
+    @cached_property
+    def venom_functions(self):
+        return generate_ir(self.ir_nodes, self.settings.optimize)
+
     @cached_property
     def assembly(self) -> list:
         if self.settings.experimental_codegen:
+            deploy_code, runtime_code = self.venom_functions
+            assert self.settings.optimize is not None  # mypy hint
             return generate_assembly_experimental(
-                self.ir_nodes, self.settings.optimize  # type: ignore
+                runtime_code, deploy_code=deploy_code, optimize=self.settings.optimize
             )
         else:
             return generate_assembly(self.ir_nodes, self.settings.optimize)
 
     @cached_property
     def assembly_runtime(self) -> list:
         if self.settings.experimental_codegen:
-            return generate_assembly_experimental(
-                self.ir_runtime, self.settings.optimize  # type: ignore
-            )
+            _, runtime_code = self.venom_functions
+            assert self.settings.optimize is not None  # mypy hint
+            return generate_assembly_experimental(runtime_code, optimize=self.settings.optimize)
         else:
             return generate_assembly(self.ir_runtime, self.settings.optimize)
 

vyper/venom/__init__.py

@@ -1,7 +1,7 @@
 # maybe rename this `main.py` or `venom.py`
 # (can have an `__init__.py` which exposes the API).
 
-from typing import Optional
+from typing import Any, Optional
 
 from vyper.codegen.ir_node import IRnode
 from vyper.compiler.settings import OptimizationLevel
@@ -17,19 +17,26 @@
 from vyper.venom.passes.dft import DFTPass
 from vyper.venom.venom_to_assembly import VenomCompiler
 
+DEFAULT_OPT_LEVEL = OptimizationLevel.default()
+
 
 def generate_assembly_experimental(
-    ctx: IRFunction, optimize: Optional[OptimizationLevel] = None
+    runtime_code: IRFunction,
+    deploy_code: Optional[IRFunction] = None,
+    optimize: OptimizationLevel = DEFAULT_OPT_LEVEL,
 ) -> list[str]:
-    compiler = VenomCompiler(ctx)
-    return compiler.generate_evm(optimize is OptimizationLevel.NONE)
+    # note: VenomCompiler is sensitive to the order of these!
+    if deploy_code is not None:
+        functions = [deploy_code, runtime_code]
+    else:
+        functions = [runtime_code]
 
+    compiler = VenomCompiler(functions)
+    return compiler.generate_evm(optimize == OptimizationLevel.NONE)
 
-def generate_ir(ir: IRnode, optimize: Optional[OptimizationLevel] = None) -> IRFunction:
-    # Convert "old" IR to "new" IR
-    ctx = convert_ir_basicblock(ir)
 
-    # Run passes on "new" IR
+def _run_passes(ctx: IRFunction, optimize: OptimizationLevel) -> None:
+    # Run passes on Venom IR
     # TODO: Add support for optimization levels
     while True:
         changes = 0
@@ -53,4 +60,12 @@ def generate_ir(ir: IRnode, optimize: Optional[OptimizationLevel] = None) -> IRF
         if changes == 0:
             break
 
-    return ctx
+
+def generate_ir(ir: IRnode, optimize: OptimizationLevel) -> tuple[IRFunction, IRFunction]:
+    # Convert "old" IR to "new" IR
+    ctx, ctx_runtime = convert_ir_basicblock(ir)
+
+    _run_passes(ctx, optimize)
+    _run_passes(ctx_runtime, optimize)
+
+    return ctx, ctx_runtime

vyper/venom/analysis.py

@@ -19,27 +19,6 @@ def calculate_cfg(ctx: IRFunction) -> None:
         bb.cfg_out = OrderedSet()
         bb.out_vars = OrderedSet()
 
-    # TODO: This is a hack to support the old IR format where `deploy` is
-    # an instruction. in the future we should have two entry points, one
-    # for the initcode and one for the runtime code.
-    deploy_bb = None
-    after_deploy_bb = None
-    for i, bb in enumerate(ctx.basic_blocks):
-        if bb.instructions[0].opcode == "deploy":
-            deploy_bb = bb
-            after_deploy_bb = ctx.basic_blocks[i + 1]
-            break
-
-    if deploy_bb is not None:
-        assert after_deploy_bb is not None, "No block after deploy block"
-        entry_block = after_deploy_bb
-        has_constructor = ctx.basic_blocks[0].instructions[0].opcode != "deploy"
-        if has_constructor:
-            deploy_bb.add_cfg_in(ctx.basic_blocks[0])
-            entry_block.add_cfg_in(deploy_bb)
-    else:
-        entry_block = ctx.basic_blocks[0]
-
     for bb in ctx.basic_blocks:
         assert len(bb.instructions) > 0, "Basic block should not be empty"
         last_inst = bb.instructions[-1]

vyper/venom/basicblock.py

@@ -4,7 +4,7 @@
 from vyper.utils import OrderedSet
 
 # instructions which can terminate a basic block
-BB_TERMINATORS = frozenset(["jmp", "djmp", "jnz", "ret", "return", "revert", "deploy", "stop"])
+BB_TERMINATORS = frozenset(["jmp", "djmp", "jnz", "ret", "return", "revert", "stop"])
 
 VOLATILE_INSTRUCTIONS = frozenset(
     [
@@ -33,7 +33,6 @@
 
 NO_OUTPUT_INSTRUCTIONS = frozenset(
     [
-        "deploy",
         "mstore",
         "sstore",
         "dstore",
@@ -56,9 +55,7 @@
     ]
 )
 
-CFG_ALTERING_INSTRUCTIONS = frozenset(
-    ["jmp", "djmp", "jnz", "call", "staticcall", "invoke", "deploy"]
-)
+CFG_ALTERING_INSTRUCTIONS = frozenset(["jmp", "djmp", "jnz", "call", "staticcall", "invoke"])
 
 if TYPE_CHECKING:
     from vyper.venom.function import IRFunction
@@ -273,7 +270,7 @@ def _ir_operand_from_value(val: Any) -> IROperand:
     if isinstance(val, IROperand):
         return val
 
-    assert isinstance(val, int)
+    assert isinstance(val, int), val
     return IRLiteral(val)
 
 

vyper/venom/function.py

@@ -9,7 +9,7 @@
     MemType,
 )
 
-GLOBAL_LABEL = IRLabel("global")
+GLOBAL_LABEL = IRLabel("__global")
 
 
 class IRFunction:
@@ -18,7 +18,10 @@ class IRFunction:
     """
 
     name: IRLabel  # symbol name
+    entry_points: list[IRLabel]  # entry points
     args: list
+    ctor_mem_size: Optional[int]
+    immutables_len: Optional[int]
     basic_blocks: list[IRBasicBlock]
     data_segment: list[IRInstruction]
     last_label: int
@@ -28,14 +31,30 @@ def __init__(self, name: IRLabel = None) -> None:
         if name is None:
             name = GLOBAL_LABEL
         self.name = name
+        self.entry_points = []
         self.args = []
+        self.ctor_mem_size = None
+        self.immutables_len = None
         self.basic_blocks = []
         self.data_segment = []
         self.last_label = 0
         self.last_variable = 0
 
+        self.add_entry_point(name)
         self.append_basic_block(IRBasicBlock(name, self))
 
+    def add_entry_point(self, label: IRLabel) -> None:
+        """
+        Add entry point.
+        """
+        self.entry_points.append(label)
+
+    def remove_entry_point(self, label: IRLabel) -> None:
+        """
+        Remove entry point.
+        """
+        self.entry_points.remove(label)
+
     def append_basic_block(self, bb: IRBasicBlock) -> IRBasicBlock:
         """
         Append basic block to function.
@@ -91,7 +110,7 @@ def remove_unreachable_blocks(self) -> int:
         removed = 0
         new_basic_blocks = []
         for bb in self.basic_blocks:
-            if not bb.is_reachable and bb.label.value != "global":
+            if not bb.is_reachable and bb.label not in self.entry_points:
                 removed += 1
             else:
                 new_basic_blocks.append(bb)
@@ -119,16 +138,10 @@ def normalized(self) -> bool:
             if len(bb.cfg_in) <= 1:
                 continue
 
-            # Check if there is a conditional jump at the end
+            # Check if there is a branching jump at the end
             # of one of the predecessors
-            #
-            # TODO: this check could be:
-            #  `if len(in_bb.cfg_out) > 1: return False`
-            # but the cfg is currently not calculated "correctly" for
-            # the special deploy instruction.
             for in_bb in bb.cfg_in:
-                jump_inst = in_bb.instructions[-1]
-                if jump_inst.opcode in ("jnz", "djmp"):
+                if len(in_bb.cfg_out) > 1:
                     return False
 
         # The function is normalized

vyper/venom/ir_node_to_venom.py

@@ -87,19 +87,35 @@ def _get_symbols_common(a: dict, b: dict) -> dict:
     return ret
 
 
-def convert_ir_basicblock(ir: IRnode) -> IRFunction:
-    global_function = IRFunction()
-    _convert_ir_basicblock(global_function, ir, {}, OrderedSet(), {})
+def _findIRnode(ir: IRnode, value: str) -> Optional[IRnode]:
+    if ir.value == value:
+        return ir
+    for arg in ir.args:
+        if isinstance(arg, IRnode):
+            ret = _findIRnode(arg, value)
+            if ret is not None:
+                return ret
+    return None
+
+
+def convert_ir_basicblock(ir: IRnode) -> tuple[IRFunction, IRFunction]:
+    deploy_ir = _findIRnode(ir, "deploy")
+    assert deploy_ir is not None
+
+    deploy_venom = IRFunction()
+    _convert_ir_basicblock(deploy_venom, ir, {}, OrderedSet(), {})
+    deploy_venom.get_basic_block().append_instruction("stop")
 
-    for i, bb in enumerate(global_function.basic_blocks):
-        if not bb.is_terminated and i < len(global_function.basic_blocks) - 1:
-            bb.append_instruction("jmp", global_function.basic_blocks[i + 1].label)
+    runtime_ir = deploy_ir.args[1]
+    runtime_venom = IRFunction()
+    _convert_ir_basicblock(runtime_venom, runtime_ir, {}, OrderedSet(), {})
 
-    revert_bb = IRBasicBlock(IRLabel("__revert"), global_function)
-    revert_bb = global_function.append_basic_block(revert_bb)
-    revert_bb.append_instruction("revert", 0, 0)
+    # Connect unterminated blocks to the next with a jump
+    for i, bb in enumerate(runtime_venom.basic_blocks):
+        if not bb.is_terminated and i < len(runtime_venom.basic_blocks) - 1:
+            bb.append_instruction("jmp", runtime_venom.basic_blocks[i + 1].label)
 
-    return global_function
+    return deploy_venom, runtime_venom
 
 
 def _convert_binary_op(
@@ -279,20 +295,9 @@ def _convert_ir_basicblock(ctx, ir, symbols, variables, allocated_variables):
     elif ir.value in ["pass", "stop", "return"]:
         pass
     elif ir.value == "deploy":
-        memsize = ir.args[0].value
-        ir_runtime = ir.args[1]
-        padding = ir.args[2].value
-        assert isinstance(memsize, int), "non-int memsize"
-        assert isinstance(padding, int), "non-int padding"
-
-        runtimeLabel = ctx.get_next_label()
-
-        ctx.get_basic_block().append_instruction("deploy", memsize, runtimeLabel, padding)
-
-        bb = IRBasicBlock(runtimeLabel, ctx)
-        ctx.append_basic_block(bb)
-
-        _convert_ir_basicblock(ctx, ir_runtime, symbols, variables, allocated_variables)
+        ctx.ctor_mem_size = ir.args[0].value
+        ctx.immutables_len = ir.args[2].value
+        return None
     elif ir.value == "seq":
         func_t = ir.passthrough_metadata.get("func_t", None)
         if ir.is_self_call:

vyper/venom/passes/normalization.py

@@ -14,13 +14,11 @@ class NormalizationPass(IRPass):
     changes = 0
 
     def _split_basic_block(self, bb: IRBasicBlock) -> None:
-        # Iterate over the predecessors of the basic block
+        # Iterate over the predecessors to this basic block
         for in_bb in list(bb.cfg_in):
-            jump_inst = in_bb.instructions[-1]
             assert bb in in_bb.cfg_out
-
-            # Handle branching
-            if jump_inst.opcode in ("jnz", "djmp"):
+            # Handle branching in the predecessor bb
+            if len(in_bb.cfg_out) > 1:
                 self._insert_split_basicblock(bb, in_bb)
                 self.changes += 1
                 break