speed up ==, hash, <, >, <=, and >= for plain_data

[nmutil.git] / src / nmutil / sim_util.py

diff --git a/src/nmutil/sim_util.py b/src/nmutil/sim_util.py
index 018564c18b44930f0d1004429da3600a9d6450ea..d5678c2475a1730f437aa3c5c64838e92470fcaf 100644 (file)
--- a/src/nmutil/sim_util.py
+++ b/src/nmutil/sim_util.py
@@ -7,7 +7,7 @@
 from contextlib import contextmanager
 from hashlib import sha256
 
-from nmigen.hdl.ir import Fragment
+from nmigen.hdl.ir import Fragment, ClockDomain
 from nmutil.get_test_path import get_test_path
 from nmigen.sim import Simulator
 from nmigen.back.rtlil import convert
@@ -20,19 +20,26 @@ def hash_256(v):
     )
 
 
-@contextmanager
-def do_sim(test_case, dut, traces=(), ports=None):
+def write_il(test_case, dut, ports=()):
     # only elaborate once, cuz users' stupid code breaks if elaborating twice
     dut = Fragment.get(dut, platform=None)
-    sim = Simulator(dut)
+    if "sync" not in dut.domains:
+        dut.add_domains(ClockDomain("sync"))
     path = get_test_path(test_case, "sim_test_out")
     path.parent.mkdir(parents=True, exist_ok=True)
-    vcd_path = path.with_suffix(".vcd")
-    gtkw_path = path.with_suffix(".gtkw")
     il_path = path.with_suffix(".il")
+    il_path.write_text(convert(dut, ports=ports), encoding="utf-8")
+    return dut, path
+
+
+@contextmanager
+def do_sim(test_case, dut, traces=(), ports=None):
     if ports is None:
         ports = traces
-    il_path.write_text(convert(dut, ports=ports), encoding="utf-8")
+    dut, path = write_il(test_case, dut, ports)
+    sim = Simulator(dut)
+    vcd_path = path.with_suffix(".vcd")
+    gtkw_path = path.with_suffix(".gtkw")
     with sim.write_vcd(vcd_path.open("wt", encoding="utf-8"),
                        gtkw_path.open("wt", encoding="utf-8"),
                        traces=traces):