From 9e28bd7fbb1ecac04711c56713c93ec2ed3f8446 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Wed, 24 Mar 2021 16:20:08 -0700 Subject: [PATCH] Revert back to cocotb.fork --- cocotbext/axi/axi_master.py | 8 ++++---- cocotbext/axi/axi_ram.py | 4 ++-- cocotbext/axi/axil_master.py | 8 ++++---- cocotbext/axi/axil_ram.py | 4 ++-- cocotbext/axi/axis.py | 4 ++-- cocotbext/axi/reset.py | 2 +- cocotbext/axi/stream.py | 4 ++-- tests/axi/test_axi.py | 4 ++-- tests/axil/test_axil.py | 4 ++-- tests/axis/test_axis.py | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cocotbext/axi/axi_master.py b/cocotbext/axi/axi_master.py index f3724c0..01b1f56 100644 --- a/cocotbext/axi/axi_master.py +++ b/cocotbext/axi/axi_master.py @@ -243,9 +243,9 @@ class AxiMasterWrite(Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) + self._process_write_cr = cocotb.fork(self._process_write()) if self._process_write_resp_cr is None: - self._process_write_resp_cr = cocotb.scheduler.start_soon(self._process_write_resp()) + self._process_write_resp_cr = cocotb.fork(self._process_write_resp()) async def _process_write(self): while True: @@ -591,9 +591,9 @@ class AxiMasterRead(Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) + self._process_read_cr = cocotb.fork(self._process_read()) if self._process_read_resp_cr is None: - self._process_read_resp_cr = cocotb.scheduler.start_soon(self._process_read_resp()) + self._process_read_resp_cr = cocotb.fork(self._process_read_resp()) async def _process_read(self): while True: diff --git a/cocotbext/axi/axi_ram.py b/cocotbext/axi/axi_ram.py index 719dc01..ec35ee6 100644 --- a/cocotbext/axi/axi_ram.py +++ b/cocotbext/axi/axi_ram.py @@ -82,7 +82,7 @@ class AxiRamWrite(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) + self._process_write_cr = cocotb.fork(self._process_write()) async def _process_write(self): while True: @@ -201,7 +201,7 @@ class AxiRamRead(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) + self._process_read_cr = cocotb.fork(self._process_read()) async def _process_read(self): while True: diff --git a/cocotbext/axi/axil_master.py b/cocotbext/axi/axil_master.py index c7e7fac..8abe825 100644 --- a/cocotbext/axi/axil_master.py +++ b/cocotbext/axi/axil_master.py @@ -179,9 +179,9 @@ class AxiLiteMasterWrite(Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) + self._process_write_cr = cocotb.fork(self._process_write()) if self._process_write_resp_cr is None: - self._process_write_resp_cr = cocotb.scheduler.start_soon(self._process_write_resp()) + self._process_write_resp_cr = cocotb.fork(self._process_write_resp()) async def _process_write(self): while True: @@ -396,9 +396,9 @@ class AxiLiteMasterRead(Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) + self._process_read_cr = cocotb.fork(self._process_read()) if self._process_read_resp_cr is None: - self._process_read_resp_cr = cocotb.scheduler.start_soon(self._process_read_resp()) + self._process_read_resp_cr = cocotb.fork(self._process_read_resp()) async def _process_read(self): while True: diff --git a/cocotbext/axi/axil_ram.py b/cocotbext/axi/axil_ram.py index 933e7f0..c50ff76 100644 --- a/cocotbext/axi/axil_ram.py +++ b/cocotbext/axi/axil_ram.py @@ -79,7 +79,7 @@ class AxiLiteRamWrite(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_write_cr is None: - self._process_write_cr = cocotb.scheduler.start_soon(self._process_write()) + self._process_write_cr = cocotb.fork(self._process_write()) async def _process_write(self): while True: @@ -156,7 +156,7 @@ class AxiLiteRamRead(Memory, Reset): else: self.log.info("Reset de-asserted") if self._process_read_cr is None: - self._process_read_cr = cocotb.scheduler.start_soon(self._process_read()) + self._process_read_cr = cocotb.fork(self._process_read()) async def _process_read(self): while True: diff --git a/cocotbext/axi/axis.py b/cocotbext/axi/axis.py index bb663cc..ae70bdc 100644 --- a/cocotbext/axi/axis.py +++ b/cocotbext/axi/axis.py @@ -378,7 +378,7 @@ class AxiStreamBase(Reset): else: self.log.info("Reset de-asserted") if self._run_cr is None: - self._run_cr = cocotb.scheduler.start_soon(self._run()) + self._run_cr = cocotb.fork(self._run()) async def _run(self): raise NotImplementedError() @@ -400,7 +400,7 @@ class AxiStreamPause: self._pause_generator = generator if self._pause_generator is not None: - self._pause_cr = cocotb.scheduler.start_soon(self._run_pause()) + self._pause_cr = cocotb.fork(self._run_pause()) def clear_pause_generator(self): self.set_pause_generator(None) diff --git a/cocotbext/axi/reset.py b/cocotbext/axi/reset.py index b0f0cb5..dca90aa 100644 --- a/cocotbext/axi/reset.py +++ b/cocotbext/axi/reset.py @@ -33,7 +33,7 @@ class Reset: self._reset_state = True if reset_signal is not None: - cocotb.scheduler.start_soon(self._run_reset(reset_signal, bool(active_level))) + cocotb.fork(self._run_reset(reset_signal, bool(active_level))) self._update_reset() diff --git a/cocotbext/axi/stream.py b/cocotbext/axi/stream.py index 7dafd3a..8d2c51e 100644 --- a/cocotbext/axi/stream.py +++ b/cocotbext/axi/stream.py @@ -153,7 +153,7 @@ class StreamBase(Reset): else: self.log.info("Reset de-asserted") if self._run_cr is None: - self._run_cr = cocotb.scheduler.start_soon(self._run()) + self._run_cr = cocotb.fork(self._run()) async def _run(self): raise NotImplementedError() @@ -175,7 +175,7 @@ class StreamPause: self._pause_generator = generator if self._pause_generator is not None: - self._pause_cr = cocotb.scheduler.start_soon(self._run_pause()) + self._pause_cr = cocotb.fork(self._run_pause()) def clear_pause_generator(self): self.set_pause_generator(None) diff --git a/tests/axi/test_axi.py b/tests/axi/test_axi.py index 21d4825..82b14cc 100644 --- a/tests/axi/test_axi.py +++ b/tests/axi/test_axi.py @@ -45,7 +45,7 @@ class TB: self.log = logging.getLogger("cocotb.tb") self.log.setLevel(logging.DEBUG) - cocotb.scheduler.start_soon(Clock(dut.clk, 2, units="ns").start()) + cocotb.fork(Clock(dut.clk, 2, units="ns").start()) self.axi_master = AxiMaster(AxiBus.from_prefix(dut, "axi"), dut.clk, dut.rst) self.axi_ram = AxiRam(AxiBus.from_prefix(dut, "axi"), dut.clk, dut.rst, size=2**16) @@ -283,7 +283,7 @@ async def run_stress_test(dut, idle_inserter=None, backpressure_inserter=None): workers = [] for k in range(16): - workers.append(cocotb.scheduler.start_soon(worker(tb.axi_master, k*0x1000, 0x1000, count=16))) + workers.append(cocotb.fork(worker(tb.axi_master, k*0x1000, 0x1000, count=16))) while workers: await workers.pop(0).join() diff --git a/tests/axil/test_axil.py b/tests/axil/test_axil.py index d8c44a8..022041d 100644 --- a/tests/axil/test_axil.py +++ b/tests/axil/test_axil.py @@ -45,7 +45,7 @@ class TB: self.log = logging.getLogger("cocotb.tb") self.log.setLevel(logging.DEBUG) - cocotb.scheduler.start_soon(Clock(dut.clk, 2, units="ns").start()) + cocotb.fork(Clock(dut.clk, 2, units="ns").start()) self.axil_master = AxiLiteMaster(AxiLiteBus.from_prefix(dut, "axil"), dut.clk, dut.rst) self.axil_ram = AxiLiteRam(AxiLiteBus.from_prefix(dut, "axil"), dut.clk, dut.rst, size=2**16) @@ -272,7 +272,7 @@ async def run_stress_test(dut, idle_inserter=None, backpressure_inserter=None): workers = [] for k in range(16): - workers.append(cocotb.scheduler.start_soon(worker(tb.axil_master, k*0x1000, 0x1000, count=16))) + workers.append(cocotb.fork(worker(tb.axil_master, k*0x1000, 0x1000, count=16))) while workers: await workers.pop(0).join() diff --git a/tests/axis/test_axis.py b/tests/axis/test_axis.py index 4772342..b11b69d 100644 --- a/tests/axis/test_axis.py +++ b/tests/axis/test_axis.py @@ -45,7 +45,7 @@ class TB: self.log = logging.getLogger("cocotb.tb") self.log.setLevel(logging.DEBUG) - cocotb.scheduler.start_soon(Clock(dut.clk, 2, units="ns").start()) + cocotb.fork(Clock(dut.clk, 2, units="ns").start()) self.source = AxiStreamSource(AxiStreamBus.from_prefix(dut, "axis"), dut.clk, dut.rst) self.sink = AxiStreamSink(AxiStreamBus.from_prefix(dut, "axis"), dut.clk, dut.rst)