Give unique names to CRTL-generated modules

test_power_decoder.py now passes.

diff --git a/src/openpower/decoder/test/_pyrtl.py b/src/openpower/decoder/test/_pyrtl.py
index 2a241fd02db43859edc5ca9761dc4f6010389ec6..47bf570eea017b6cc0858aefea1aedb95bfa9a49 100644 (file)
--- a/src/openpower/decoder/test/_pyrtl.py
+++ b/src/openpower/decoder/test/_pyrtl.py
@@ -457,11 +457,6 @@ class _FragmentCompiler:
             code += "#include \"common.h\"\n"
             code += emitter.flush()
 
-            try:
-                os.mkdir("crtl")
-            except FileExistsError:
-                pass
-
             file = open(f"crtl/{domain_process.name}.c", "w")
             file.write(code)
             file.close()

diff --git a/src/openpower/decoder/test/pysim.py b/src/openpower/decoder/test/pysim.py
index 914dd8e5a4f7f99e4af252b62d91a65e54f83f5c..9021ad2ad1830a27ae42ec39f98683c2b6f71d3b 100644 (file)
--- a/src/openpower/decoder/test/pysim.py
+++ b/src/openpower/decoder/test/pysim.py
@@ -10,6 +10,8 @@ from openpower.decoder.test._pyrtl import _FragmentCompiler
 from nmigen.sim._pycoro import PyCoroProcess
 from nmigen.sim._pyclock import PyClockProcess
 
+import os
+import shutil
 import importlib
 from cffi import FFI
 
@@ -287,12 +289,24 @@ class _PySimulation:
         self.crtl.clear_pending()
         return converged
 
+
 class PySimEngine(BaseEngine):
+    _crtl_counter = 1
+
     def __init__(self, fragment):
         self._state = _PySimulation()
         self._timeline = self._state.timeline
 
         self._fragment = fragment
+
+        if PySimEngine._crtl_counter == 1:
+            shutil.rmtree("crtl", True)
+
+        try:
+            os.mkdir("crtl")
+        except FileExistsError:
+            pass
+
         self._processes = _FragmentCompiler(self._state)(self._fragment)
 
         cdef_file = open("crtl_template.h")
@@ -315,13 +329,18 @@ class PySimEngine(BaseEngine):
 
         ffibuilder = FFI()
         ffibuilder.cdef(cdef)
-        ffibuilder.set_source("crtl.crtl",
+        ffibuilder.set_source(f"crtl.crtl{PySimEngine._crtl_counter}",
                               cdef,
                               sources=["crtl/common.c"]
                                       + [f"crtl/{process.name}.c" for process in self._processes])
         ffibuilder.compile(verbose=True)
+        
+        self._state.crtl = importlib.import_module(f"crtl.crtl{PySimEngine._crtl_counter}").lib
+
+        # Use a counter to generate unique names for modules, because Python won't reload C
+        # extension modules.
+        PySimEngine._crtl_counter += 1
 
-        self._state.crtl = importlib.import_module(f"crtl.crtl").lib
         for process in self._processes:
             process.crtl = self._state.crtl
             process.run = getattr(process.crtl, f"run_{process.name}")