Skip to content
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

Remove VeeR asserts from simulation builds #4943

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Remove VeeR asserts from simulation builds #4943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcaa6a2
Remove VeeR asserts from simulation builds
robertszczepanski Sep 4, 2023
ce63d76
Bump rust for Moore tool
robertszczepanski Sep 4, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/sv-tests-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: icarus
deps: autoconf autotools-dev bison flex libfl-dev gperf
- name: moore
rust_ver: "1.60"
rust_ver: "1.61"
- name: odin
repo: odin_ii
deps: autoconf autotools-dev bison flex libfl-dev cmake pkg-config
Expand Down
16 changes: 10 additions & 6 deletions generators/veer-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ templ = """/*
:incdirs: {3}
:top_module: {4}
:tags: {5}
:timeout": 1000
:timeout: 1000
:results_group: cores
:compatible-runners: {6}
:type: {7}
Expand Down Expand Up @@ -86,8 +86,13 @@ for v in variants:
print("VeeR configuration failed!")
exit(ret.returncode)

# Setup common VeeR sources
sources = ""
# Insert common configuration header before common VeeR sources
common_defines = os.path.abspath(
os.path.join(build_dir, "common_defines.vh"))
sources += common_defines + " "

# Setup common VeeR sources
for (dirpath, dirnames, filenames) in os.walk(os.path.join(third_party_dir,
"cores", name,
"design")):
Expand All @@ -113,11 +118,10 @@ for v in variants:
extra_args += " -CFLAGS -I" + build_dir
extra_args += " -CFLAGS -I" + include_dir
extra_args += " -CFLAGS -I" + testbench_dir
extra_args += " --trace --Wno-fatal"
extra_args += " -Wno-WIDTH"

# Insert common configuration header before common VeeR sources
sources = os.path.abspath(
os.path.join(build_dir, "common_defines.vh")) + " " + sources
with open(common_defines, 'a') as cdf:
cdf.write("`undef RV_ASSERT_ON")

# Insert VeeR includes before other sources
for (dirpath, dirnames,
Expand Down