cocotb 1.9.2__cp310-cp310-win32.whl → 2.0.0rc2__cp310-cp310-win32.whl

cocotb_tools/config.py

@@ -0,0 +1,241 @@
+#!/usr/bin/env python
+# Copyright cocotb contributors
+# Copyright (c) 2013 Potential Ventures Ltd
+# Copyright (c) 2013 SolarFlare Communications Inc
+# Licensed under the Revised BSD License, see LICENSE for details.
+# SPDX-License-Identifier: BSD-3-Clause
+
+"""
+Module for querying the cocotb configuration
+
+This module provides information in module global variables and through a
+``main()`` function that is used in the cocotb-config script.
+
+Global variables:
+    share_dir: str, path where the cocotb data is stored
+    makefiles_dir: str, path where the cocotb makefiles are installed
+    libs_dir: str, path where the cocotb interface libraries are located
+"""
+
+import argparse
+import os
+import sys
+import textwrap
+from pathlib import Path
+
+import find_libpython
+
+import cocotb_tools
+
+base_tools_dir = Path(cocotb_tools.__file__).parent.resolve()
+base_cocotb_dir = (base_tools_dir.parent / "cocotb").resolve()
+if not (base_cocotb_dir.exists() and (base_cocotb_dir / "libs").exists()):
+    import cocotb
+
+    base_cocotb_dir = Path(cocotb.__file__).parent.resolve()
+
+share_dir = base_cocotb_dir.joinpath("share")
+libs_dir = base_cocotb_dir.joinpath("libs")
+makefiles_dir = base_tools_dir.joinpath("makefiles")
+
+
+def _get_version() -> str:
+    import cocotb  # noqa: PLC0415
+
+    return cocotb.__version__
+
+
+def _help_vars_text() -> str:
+    if "dev" in _get_version():
+        doclink = "https://docs.cocotb.org/en/development/library_reference.html"
+    else:
+        doclink = f"https://docs.cocotb.org/en/v{_get_version()}/library_reference.html"
+
+    # NOTE: make sure to keep "helpmsg" aligned with docs/source/library_reference.rst
+    helpmsg = textwrap.dedent(
+        """\
+        The following variables are environment variables:
+
+        cocotb
+        ------
+        COCOTB_TOPLEVEL           Instance in the hierarchy to use as the DUT
+        COCOTB_RANDOM_SEED        Random seed, to recreate a previous test stimulus
+        COCOTB_ANSI_OUTPUT        Force cocotb to print or not print in color
+        COCOTB_REDUCED_LOG_FMT    Display log lines shorter
+        COCOTB_ATTACH             Pause time value in seconds before the simulator start
+        COCOTB_ENABLE_PROFILING   Performance analysis of the Python portion of cocotb
+        COCOTB_LOG_LEVEL          Default logging level (default INFO)
+        COCOTB_RESOLVE_X          How to resolve X, Z, U, W, - on integer conversion
+        LIBPYTHON_LOC             Absolute path to libpython
+
+        Regression Manager
+        ------------------
+        COCOTB_PDB_ON_EXCEPTION   Drop into the Python debugger (pdb) on exception
+        COCOTB_TEST_MODULES       Module(s) to search for test functions (comma-separated)
+        COCOTB_TESTCASE           Test function(s) to run (comma-separated list)
+        COCOTB_RESULTS_FILE       File name for xUnit XML tests results
+        COCOTB_USER_COVERAGE      Collect Python user coverage (HDL for some simulators)
+        COVERAGE_RCFILE           Configuration for user code coverage
+
+        GPI
+        ---
+        GPI_EXTRA                       Extra libraries to load at runtime (comma-separated)
+
+        Scheduler
+        ---------
+        COCOTB_SCHEDULER_DEBUG         Enable additional output of coroutine scheduler
+        COCOTB_TRUST_INERTIAL_WRITES   Trust inertial writes rather than mock them using scheduler
+
+        For details, see {}"""
+    ).format(doclink)
+    return helpmsg
+
+
+def lib_name(interface: str, simulator: str) -> str:
+    """
+    Return the name of interface library for given interface (VPI/VHPI/FLI) and simulator.
+    """
+
+    interface_name = interface.lower()
+    supported_interfaces = ["vpi", "vhpi", "fli"]
+    if interface_name not in supported_interfaces:
+        raise ValueError(
+            "Wrong interface used. Supported: " + ", ".join(supported_interfaces)
+        )
+
+    simulator_name = simulator.lower()
+    supported_sims = [
+        "icarus",
+        "questa",
+        "modelsim",
+        "ius",
+        "xcelium",
+        "vcs",
+        "ghdl",
+        "riviera",
+        "activehdl",
+        "cvc",
+        "nvc",
+        "dsim",
+    ]
+    if simulator not in supported_sims:
+        raise ValueError(
+            "Wrong simulator name. Supported: " + ", ".join(supported_sims)
+        )
+
+    if simulator_name in ["questa", "cvc"]:
+        library_name = "modelsim"
+    elif simulator_name == "xcelium":
+        library_name = "ius"
+    elif simulator_name in ["riviera", "activehdl"]:
+        library_name = "aldec"
+    else:
+        library_name = simulator_name
+
+    if library_name == "icarus":
+        lib_ext = ""
+    elif os.name == "nt":
+        lib_ext = ".dll"
+    else:
+        lib_ext = ".so"
+
+    # check if compiled with msvc
+    if (libs_dir / "cocotb.dll").is_file():
+        lib_prefix = ""
+    else:
+        lib_prefix = "lib"
+
+    return lib_prefix + "cocotb" + interface_name + "_" + library_name + lib_ext
+
+
+def lib_name_path(interface: str, simulator: str) -> Path:
+    """
+    Return the absolute path of interface library for given interface (VPI/VHPI/FLI) and simulator
+    """
+    return libs_dir / lib_name(interface, simulator)
+
+
+def _get_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter)
+
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument(
+        "--share",
+        action="store_true",
+        help="Print the path to cocotb's share directory",
+    )
+    group.add_argument(
+        "--makefiles",
+        action="store_true",
+        help="Print the path to cocotb's makefile directory",
+    )
+    group.add_argument(
+        "--python-bin",
+        action="store_true",
+        help="Print the path to the Python executable associated with the environment that cocotb is installed in.",
+    )
+    group.add_argument(
+        "--help-vars",
+        action="store_true",
+        help="Print help about supported Makefile variables",
+    )
+    group.add_argument(
+        "--libpython",
+        action="store_true",
+        help="Print the absolute path to the libpython associated with the current Python installation",
+    )
+    group.add_argument(
+        "--lib-dir",
+        action="store_true",
+        help="Print the absolute path to the interface libraries location",
+    )
+    group.add_argument(
+        "--lib-name",
+        help="Print the name of interface library for given interface (VPI/VHPI/FLI) and simulator",
+        nargs=2,
+        metavar=("INTERFACE", "SIMULATOR"),
+    )
+    group.add_argument(
+        "--lib-name-path",
+        help="Print the absolute path of interface library for given interface (VPI/VHPI/FLI) and simulator",
+        nargs=2,
+        metavar=("INTERFACE", "SIMULATOR"),
+    )
+    group.add_argument(
+        "--version",
+        action="store_true",
+        help="Print the version of cocotb",
+    )
+
+    return parser
+
+
+def main() -> None:
+    parser = _get_parser()
+    args = parser.parse_args()
+
+    if args.share:
+        print(share_dir.as_posix())
+    elif args.makefiles:
+        print(makefiles_dir.as_posix())
+    elif args.python_bin:
+        print(Path(sys.executable).as_posix())
+    elif args.help_vars:
+        print(_help_vars_text())
+    elif args.libpython:
+        libpython_path = find_libpython.find_libpython()
+        if libpython_path is None:
+            sys.exit(1)
+        print(Path(libpython_path).as_posix())
+    elif args.lib_dir:
+        print(libs_dir.as_posix())
+    elif args.lib_name:
+        print(lib_name(*args.lib_name))
+    elif args.lib_name_path:
+        print(lib_name_path(*args.lib_name_path).as_posix())
+    elif args.version:
+        print(_get_version())
+
+
+if __name__ == "__main__":
+    main()

{cocotb → cocotb_tools}/ipython_support.py

@@ -1,11 +1,18 @@
 # Copyright cocotb contributors
 # Licensed under the Revised BSD License, see LICENSE for details.
 # SPDX-License-Identifier: BSD-3-Clause
+from typing import Any, Dict, TypeVar
+
 import IPython
 from IPython.terminal.ipapp import load_default_config
-from IPython.terminal.prompts import Prompts, Token
+from IPython.terminal.prompts import Prompts
+from pygments.token import Token
 
 import cocotb
+from cocotb.task import bridge
+from cocotb.utils import get_sim_time
+
+T = TypeVar("T")
 
 
 class SimTimePrompt(Prompts):
@@ -13,24 +20,18 @@ class SimTimePrompt(Prompts):
 
     _show_time = 1
 
-    def in_prompt_tokens(self, cli=None):
+    def in_prompt_tokens(self):
         tokens = super().in_prompt_tokens()
         if self._show_time == self.shell.execution_count:
             tokens = [
-                (Token.Comment, f"sim time: {cocotb.utils.get_sim_time()}"),
+                (Token.Comment, f"sim time: {get_sim_time()}"),
                 (Token.Text, "\n"),
-            ] + tokens
+                *tokens,
+            ]
         return tokens
 
 
-def _runner(shell, x):
-    """Handler for async functions"""
-    ret = cocotb.scheduler._queue_function(x)
-    shell.prompts._show_time = shell.execution_count
-    return ret
-
-
-async def embed(user_ns: dict = {}):
+async def embed(user_ns: Dict[str, Any] = {}) -> None:
     """
     Start an IPython shell in the current coroutine.
 
@@ -46,22 +47,28 @@ async def embed(user_ns: dict = {}):
             Passing ``locals()`` is often a good idea.
             ``cocotb`` will automatically be included.
 
-    Notes:
-
+    .. note::
         If your simulator does not provide an appropriate ``stdin``, you may
         find you cannot type in the resulting shell. Using simulators in batch
         or non-GUI mode may resolve this. This feature is experimental, and
         not all simulators are supported.
     """
     # ensure cocotb is in the namespace, for convenience
-    default_ns = dict(cocotb=cocotb)
+    default_ns = {"cocotb": cocotb}
     default_ns.update(user_ns)
 
+    def _runner(x):
+        """Handler for async functions"""
+        nonlocal shell
+        ret = cocotb._scheduler_inst._queue_function(x)
+        shell.prompts._show_time = shell.execution_count
+        return ret
+
     # build the config to enable `await`
     c = load_default_config()
-    c.TerminalInteractiveShell.loop_runner = lambda x: _runner(shell, x)
+    c.TerminalInteractiveShell.loop_runner = _runner
     c.TerminalInteractiveShell.autoawait = True
-    # Python3 checks SQLite DB accesses to ensure process ID matches the one that opened the DB and is not propogated
+    # Python3 checks SQLite DB accesses to ensure process ID matches the one that opened the DB and is not propagated
     # because we launch IPython in a different process, this will cause unnecessary warnings, so disable the PID check
     c.HistoryAccessor.connection_options = {"check_same_thread": False}
     # create a shell with access to the dut, and cocotb pre-imported
@@ -74,19 +81,19 @@ async def embed(user_ns: dict = {}):
     shell.prompts = SimTimePrompt(shell)
 
     # start the shell in a background thread
-    @cocotb.external
-    def run_shell():
+    @bridge
+    def run_shell() -> None:
         shell()
 
     await run_shell()
 
 
 @cocotb.test()
-async def run_ipython(dut):
+async def run_ipython(dut: Any) -> None:
     """A test that launches an interactive Python shell.
 
-    Do not call this directly - use this as ``make MODULE=cocotb.ipython_support``.
+    Do not call this directly - use this as ``make COCOTB_TEST_MODULES=cocotb.ipython_support``.
 
     Within the shell, a global ``dut`` variable pointing to the design will be present.
     """
-    await embed(user_ns=dict(dut=dut))
+    await embed(user_ns={"dut": dut})

cocotb_tools/makefiles/Makefile.deprecations

@@ -0,0 +1,27 @@
+# Copyright cocotb contributors
+# Licensed under the Revised BSD License, see LICENSE for details.
+# SPDX-License-Identifier: BSD-3-Clause
+
+ifdef VERILATOR_TRACE
+    $(warning VERILATOR_TRACE is deprecated, see the "Simulator Support" section in the documentation.)
+endif
+
+ifeq ($(SIM_LOWERCASE),aldec)
+    $(warning Using SIM=aldec is deprecated, please use SIM=riviera instead.)
+    SIM_LOWERCASE := riviera
+endif
+
+# Use this function to warn users about deprecated environment variables
+deprecate = $(if $($(1)),$(if $(filter $($(2)),$($(1))),$($(2)),$(warning Using $(1) is deprecated, please use $(2) instead.)$($(1))),$($(2)))
+
+ifneq ($(COCOTB_TOPLEVEL),$(TOPLEVEL))
+ifneq ($(TOPLEVEL),)
+    COCOTB_TOPLEVEL := $(TOPLEVEL)
+endif
+endif
+
+ifneq ($(COCOTB_USER_COVERAGE),$(COVERAGE))
+ifneq ($(COVERAGE),)
+    COCOTB_USER_COVERAGE := $(COVERAGE)
+endif
+endif

{cocotb/share → cocotb_tools}/makefiles/Makefile.inc

@@ -1,31 +1,8 @@
-###############################################################################
+# Copyright cocotb contributors
 # Copyright (c) 2013 Potential Ventures Ltd
 # Copyright (c) 2013 SolarFlare Communications Inc
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Potential Ventures Ltd,
-#       SolarFlare Communications Inc nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL POTENTIAL VENTURES LTD BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-##############################################################################
+# Licensed under the Revised BSD License, see LICENSE for details.
+# SPDX-License-Identifier: BSD-3-Clause
 
 # Common makefile included by everything
 
@@ -42,13 +19,6 @@ sim:
 # Make sure to use bash for the pipefail option used in many simulator Makefiles
 SHELL := bash
 
-# Directory containing the cocotb Python module
-COCOTB_PY_DIR := $(shell cocotb-config --prefix)
-
-# Directory containing all support files required to build cocotb-based
-# simulations: Makefile fragments, and the simulator libraries.
-COCOTB_SHARE_DIR := $(COCOTB_PY_DIR)/cocotb/share
-
 OS=$(shell uname)
 ifneq (, $(findstring MINGW, $(OS)))
     OS := Msys
@@ -57,28 +27,18 @@ else ifneq (, $(findstring MSYS, $(OS)))
 endif
 export OS
 
-# Detects if Python is running in a virtual environment
-# https://docs.python.org/3/library/venv.html
-IS_VENV=$(shell $(shell cocotb-config --python-bin) -c 'import sys; print(sys.prefix != sys.base_prefix)')
+export PYGPI_PYTHON_BIN := $(shell $(PYTHON_BIN) -m cocotb_tools.config --python-bin)
 
-# this ensures we use the same python as the one cocotb was installed into
-PYTHON_BIN ?= $(shell cocotb-config --python-bin)
+# Directory containing the cocotb Makefiles
+COCOTB_MAKEFILES_DIR := $(shell $(PYTHON_BIN) -m cocotb_tools.config --makefiles)
 
-include $(COCOTB_SHARE_DIR)/makefiles/Makefile.deprecations
-
-LIB_DIR=$(COCOTB_PY_DIR)/cocotb/libs
+include $(COCOTB_MAKEFILES_DIR)/Makefile.deprecations
 
 PYTHON_ARCH := $(shell $(PYTHON_BIN) -c 'from platform import architecture; print(architecture()[0])')
 ifeq ($(filter $(PYTHON_ARCH),64bit 32bit),)
     $(error Unknown Python architecture: $(PYTHON_ARCH))
 endif
 
-# Changing PYTHONHOME confuses virtual environments, so only set it when not using a venv
-ifeq ($(IS_VENV),False)
-    # Set PYTHONHOME to properly populate sys.path in embedded python interpreter
-    export PYTHONHOME := $(shell $(PYTHON_BIN) -c 'import sys; print(sys.prefix)')
-endif
-
 ifeq ($(OS),Msys)
     to_tcl_path = $(shell cygpath -m $(1) )
 else
@@ -90,6 +50,11 @@ define check_for_results_file
     @test -f $(COCOTB_RESULTS_FILE) || (echo "ERROR: $(COCOTB_RESULTS_FILE) was not written by the simulation!" >&2 && exit 1)
 endef
 
+# Check that the COCOTB_RESULTS_FILE was created and has no failures
+define check_results
+    @$(PYTHON_BIN) -m cocotb_tools.check_results $(COCOTB_RESULTS_FILE)
+endef
+
 SIM_BUILD ?= sim_build
 export SIM_BUILD
 
@@ -99,13 +64,6 @@ COCOTB_HDL_TIMEPRECISION ?= 1ps
 
 export COCOTB_RESULTS_FILE
 
-# Depend on all Python from the cocotb package. This triggers a
-# recompilation of the simulation if cocotb is updated.
-CUSTOM_SIM_DEPS += $(shell $(PYTHON_BIN) -c 'import glob; print(" ".join(glob.glob("$(COCOTB_PY_DIR)/cocotb/*.py")))')
-
-# This triggers a recompilation of the simulation if cocotb library is updated.
-CUSTOM_SIM_DEPS += $(shell $(PYTHON_BIN) -c 'import glob; print(" ".join(glob.glob("$(LIB_DIR)/*")))')
-
 
 $(SIM_BUILD):
 	mkdir -p $@
@@ -144,7 +102,7 @@ ifndef LIBPYTHON_LOC
 
 # get the path to libpython and the return code from the script
 # adapted from https://stackoverflow.com/a/24658961/6614127
-FIND_LIBPYTHON_RES := $(shell cocotb-config --libpython; echo $$?)
+FIND_LIBPYTHON_RES := $(shell $(PYTHON_BIN) -m cocotb_tools.config --libpython; echo $$?)
 FIND_LIBPYTHON_RC := $(lastword $(FIND_LIBPYTHON_RES))
 LIBPYTHON_LOC := $(strip $(subst $(FIND_LIBPYTHON_RC)QQQQ,,$(FIND_LIBPYTHON_RES)QQQQ))
 
@@ -171,6 +129,70 @@ define check_lib_order
   fi;
 endef
 
+# NOTE: if the following simulator list is modified, update the sentence
+# "This flag is enabled by default for the GHDL, NVC and Verilator simulators."
+# in docs/source/building.rst accordingly.
+ifneq ($(filter $(SIM),nvc ghdl verilator),)
+  COCOTB_TRUST_INERTIAL_WRITES ?= 1
+else
+  COCOTB_TRUST_INERTIAL_WRITES ?= 0
+endif
+
+export COCOTB_TRUST_INERTIAL_WRITES
+
+
+# Universal
+clean::
+	@$(RM) -rf $(SIM_BUILD)
+	@$(RM) -f $(COCOTB_RESULTS_FILE)
+
+
+# Active-HDL
+clean::
+	@$(RM) -rf work
+	@$(RM) -rf wave.asdb
+
+# IUS
+clean::
+	@$(RM) -rf irun.*
+	@$(RM) -rf ncsim.*
+	@$(RM) -rf gdb_cmd_ncsim
+
+# VCS
+clean::
+	@$(RM) -rf simv.daidir
+	@$(RM) -rf cm.log
+	@$(RM) -rf ucli.key
+
+# Riviera
+clean::
+	@$(RM) -rf compile
+	@$(RM) -rf library.cfg
+	@$(RM) -rf dataset.asdb
+
+# Verilator
+clean::
+	@$(RM) -f dump.vcd
+	@$(RM) -f dump.fst
+
+# Xcelium
+clean::
+	@$(RM) -rf xrun.*
+	@$(RM) -rf xmsim.*
+	@$(RM) -rf gdb_cmd_xmsim
+	@$(RM) -f qrun*
+	@$(RM) -f visualizer.log
+	@$(RM) -f design.bin
+	@$(RM) -f qwave.db
+	@$(RM) -f transcript
+
+
+# DSim
+clean::
+	@$(RM) -rf dsim.*
+	@$(RM) -rf metrics.db
+	@$(RM) -rf file.vcd
+
 else
     $(warning Including Makefile.inc from a user makefile is a no-op and deprecated. Remove the Makefile.inc inclusion from your makefile, and only leave the Makefile.sim include.)
 endif # COCOTB_MAKEFILE_INC_INCLUDED

{cocotb/share → cocotb_tools}/makefiles/Makefile.sim

@@ -1,31 +1,8 @@
-###############################################################################
+# Copyright cocotb contributors
 # Copyright (c) 2013, 2018 Potential Ventures Ltd
 # Copyright (c) 2013 SolarFlare Communications Inc
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Potential Ventures Ltd,
-#       SolarFlare Communications Inc nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL POTENTIAL VENTURES LTD BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-###############################################################################
+# Licensed under the Revised BSD License, see LICENSE for details.
+# SPDX-License-Identifier: BSD-3-Clause
 
 # This file includes an appropriate makefile depending on the SIM variable.
 
@@ -63,7 +40,7 @@ SIM_CMD_PREFIX            Prefix for simulation command invocations
 COMPILE_ARGS              Arguments to pass to compile (analysis) stage of simulation
 SIM_ARGS                  Arguments to pass to execution of compiled simulation
 EXTRA_ARGS                Arguments for compile and execute phases
-PLUSARGS                  Plusargs to pass to the simulator
+COCOTB_PLUSARGS           Plusargs to pass to the simulator
 COCOTB_HDL_TIMEUNIT       Default time unit for simulation
 COCOTB_HDL_TIMEPRECISION  Default time precision for simulation
 CUSTOM_COMPILE_DEPS       Add additional dependencies to the compilation target
@@ -80,29 +57,35 @@ define newline
 
 endef
 
+# this ensures we use the same python as the one cocotb was installed into
+# attempts to use cocotb_config entry script to get that info, falls back to "python"
+PYTHON_BIN_RES := $(shell cocotb-config --python-bin 2>>/dev/null; echo $$?)
+PYTHON_BIN_RC := $(lastword $(PYTHON_BIN_RES))
+PYTHON_BIN := $(strip $(subst $(PYTHON_BIN_RC)QQQQ,,$(PYTHON_BIN_RES)QQQQ))
+ifneq ($(PYTHON_BIN_RC),0)
+    PYTHON_BIN := python3
+endif
+
 # this cannot be a regular target because of the way Makefile.$(SIM) is included
 ifeq ($(MAKECMDGOALS),help)
     $(info $(help_targets))
     $(info $(help_makevars))
     # hack to get newlines in output, see https://stackoverflow.com/a/54539610
     # NOTE: the output of the command must not include a '%' sign, otherwise the formatting will break
-    help_envvars := $(subst %,${newline},$(shell cocotb-config --help-vars | tr \\n %))
+    help_envvars := $(subst %,${newline},$(shell $(PYTHON_BIN) -m cocotb.config --help-vars | tr \\n %))
     $(info ${help_envvars})
     # is there a cleaner way to exit here?
     $(error Stopping after printing help)
 endif
 
+include $(shell $(PYTHON_BIN) -m cocotb_tools.config --makefiles)/Makefile.inc
+
 # Default to Icarus if no simulator is defined
 SIM ?= icarus
 
 # Maintain backwards compatibility by supporting upper and lower case SIM variable
 SIM_LOWERCASE := $(shell echo $(SIM) | tr A-Z a-z)
 
-# Directory containing the cocotb Makfiles
-COCOTB_MAKEFILES_DIR := $(shell cocotb-config --makefiles)
-
-include $(COCOTB_MAKEFILES_DIR)/Makefile.deprecations
-
 HAVE_SIMULATOR = $(shell if [ -f $(COCOTB_MAKEFILES_DIR)/simulators/Makefile.$(SIM_LOWERCASE) ]; then echo 1; else echo 0; fi;)
 AVAILABLE_SIMULATORS = $(patsubst .%,%,$(suffix $(wildcard $(COCOTB_MAKEFILES_DIR)/simulators/Makefile.*)))