Skip to content

External library support for Riviera-PRO #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TroySharples wants to merge 7 commits into
base: master
Choose a base branch
from
Open

External library support for Riviera-PRO #258

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24243f3
Added support for invoking the GUI for Riviera
TroySharples Dec 5, 2023
fa7b0e5
Fixed the test from running immediately in GUI-mode
TroySharples Dec 6, 2023
8688f78
Update simulator.py
TroySharples Dec 6, 2023
404e56e
Merge branch 'themperek:master' into master
TroySharples Jul 24, 2024
25d9f48
Added option to define external libraries to Riviera PRO
TroySharples Jul 24, 2024
c57d087
Switched order of simulator arguments
TroySharples Jul 24, 2024
5aa04bc
Fixed typo in simulator.py introduced in first commit
TroySharples Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cocotb_test/simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def __init__(
timescale=None,
gui=False,
simulation_args=None,
external_libraries=None,
**kwargs,
):

Expand Down Expand Up @@ -101,6 +102,10 @@ def __init__(
vhdl_sources = []
self.vhdl_sources = self.get_abs_paths(vhdl_sources)

if external_libraries is None:
external_libraries = []
self.external_libraries = self.get_abs_paths(external_libraries)

if includes is None:
includes = []

Expand Down Expand Up @@ -931,6 +936,9 @@ def build_command(self):

do_script += f"alib {as_tcl_value(self.rtl_library)} \n"

for path in self.external_libraries:
do_script += f"alib {as_tcl_value(path)} \n"

if self.vhdl_sources:
compile_args = self.compile_args + self.vhdl_compile_args
do_script += "acom -work {RTL_LIBRARY} {EXTRA_ARGS} {VHDL_SOURCES}\n".format(
Expand Down