sim.pysim: use "bench" as a top level root for testbench signals.

Fixes #561.

diff --git a/nmigen/sim/pysim.py b/nmigen/sim/pysim.py
index cc3d9483854ed0722201156335a43e16f2757df3..c3c40efacea4aa132577cc80a0539f68ff35ee1c 100644 (file)
--- a/nmigen/sim/pysim.py
+++ b/nmigen/sim/pysim.py
@@ -19,7 +19,7 @@ class _NameExtractor:
     def __init__(self):
         self.names = SignalDict()
 
-    def __call__(self, fragment, *, hierarchy=("top",)):
+    def __call__(self, fragment, *, hierarchy=("bench", "top",)):
         def add_signal_name(signal):
             hierarchical_signal_name = (*hierarchy, signal.name)
             if signal not in self.names:
@@ -74,7 +74,7 @@ class _VCDWriter:
         trace_names = SignalDict()
         for trace in traces:
             if trace not in signal_names:
-                trace_names[trace] = {("top", trace.name)}
+                trace_names[trace] = {('bench', trace.name)}
             self.traces.append(trace)
 
         if self.vcd_writer is None:

diff --git a/tests/test_sim.py b/tests/test_sim.py
index 94b1141a2951a2253e520c2ac3aa0000ba4fddc6..7a72cca2f7bd98b99353f831ad7abb8e570bfaad 100644 (file)
--- a/tests/test_sim.py
+++ b/tests/test_sim.py
@@ -849,7 +849,7 @@ class SimulatorRegressionTestCase(FHDLTestCase):
                 pass
         sim = Simulator(dut)
         with self.assertRaisesRegex(NameError,
-                r"^Signal 'top\.name with space_state' contains a whitespace character$"):
+                r"^Signal 'bench\.top\.name with space_state' contains a whitespace character$"):
             with open(os.path.devnull, "w") as f:
                 with sim.write_vcd(f):
                     sim.run()