Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
path = submodules/sv-bugpoint
url = https://github.com/antmicro/sv-bugpoint
shallow = true
[submodule "submodules/uvm"]
path = submodules/uvm
url = https://github.com/chipsalliance/uvm-verilator.git
shallow = false
[submodule "submodules/wbuart32"]
path = submodules/wbuart32
url = https://github.com/ZipCPU/wbuart32.git
Expand All @@ -50,3 +46,13 @@
path = submodules/libfst
url = https://github.com/gtkwave/libfst.git
shallow = true
[submodule "submodules/uvm-2017-1.0-vlt"]
path = submodules/uvm-2017-1.0-vlt
url = https://github.com/chipsalliance/uvm-verilator.git
branch = uvm-2017-1.0-vlt
shallow = true
[submodule "submodules/uvm-2020-3.1-vlt"]
path = submodules/uvm-2020-3.1-vlt
url = https://github.com/chipsalliance/uvm-verilator.git
branch = uvm-2020-3.1-vlt
shallow = true
1 change: 1 addition & 0 deletions submodules/uvm-2017-1.0-vlt
Submodule uvm-2017-1.0-vlt added at 5a37ba
10 changes: 1 addition & 9 deletions t/t_uvm_hello_v2017_1_0_dpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,10 @@
test.scenarios('vlt')
test.top_filename = "t/t_uvm_hello.v"

uvm_git = os.path.abspath(test.t_dir + "/../submodules/uvm")
uvm_root = os.path.abspath(test.obj_dir + "/uvm-worktree")
uvm_root = os.path.abspath(test.t_dir + "/../submodules/uvm-2017-1.0-vlt")

test.pli_filename = uvm_root + "/src/dpi/uvm_dpi.cc"

if not os.path.exists(uvm_root):
test.run(cmd=[
"cd " + uvm_git +
" && git worktree prune && git worktree add --detach " + uvm_root +
" origin/uvm-2017-1.0-vlt"
])

## Test

test.compile(verilator_flags2=[
Expand Down
10 changes: 1 addition & 9 deletions t/t_uvm_hello_v2017_1_0_nodpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@
test.scenarios('vlt')
test.top_filename = "t/t_uvm_hello.v"

uvm_git = os.path.abspath(test.t_dir + "/../submodules/uvm")
uvm_root = os.path.abspath(test.obj_dir + "/uvm-worktree")

if not os.path.exists(uvm_root):
test.run(cmd=[
"cd " + uvm_git +
" && git worktree prune && git worktree add --detach " + uvm_root +
" origin/uvm-2017-1.0-vlt"
])
uvm_root = os.path.abspath(test.t_dir + "/../submodules/uvm-2017-1.0-vlt")

## Make uvm_pkg_all

Expand Down
10 changes: 1 addition & 9 deletions t/t_uvm_hello_v2020_3_1_dpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,10 @@
test.scenarios('vlt')
test.top_filename = "t/t_uvm_hello.v"

uvm_git = os.path.abspath(test.t_dir + "/../submodules/uvm")
uvm_root = os.path.abspath(test.obj_dir + "/uvm-worktree")
uvm_root = os.path.abspath(test.t_dir + "/../submodules/uvm-2020-3.1-vlt")

test.pli_filename = uvm_root + "/src/dpi/uvm_dpi.cc"

if not os.path.exists(uvm_root):
test.run(cmd=[
"cd " + uvm_git +
" && git worktree prune && git worktree add --detach " + uvm_root +
" origin/uvm-2020-3.1-vlt"
])

## Test

test.compile(verilator_flags2=[
Expand Down
10 changes: 1 addition & 9 deletions t/t_uvm_hello_v2020_3_1_nodpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@
test.scenarios('vlt')
test.top_filename = "t/t_uvm_hello.v"

uvm_git = os.path.abspath(test.t_dir + "/../submodules/uvm")
uvm_root = os.path.abspath(test.obj_dir + "/uvm-worktree")

if not os.path.exists(uvm_root):
test.run(cmd=[
"cd " + uvm_git +
" && git worktree prune && git worktree add --detach " + uvm_root +
" origin/uvm-2020-3.1-vlt"
])
uvm_root = os.path.abspath(test.t_dir + "/../submodules/uvm-2020-3.1-vlt")

## Make uvm_pkg_all

Expand Down