From faac2539e5668e7444e83515701b25bbf457096d Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Tue, 11 Nov 2025 20:27:54 -0500 Subject: [PATCH] Change UVM to submodule branch scheme --- .gitmodules | 14 ++++++++++---- submodules/uvm-2017-1.0-vlt | 1 + submodules/{uvm => uvm-2020-3.1-vlt} | 0 t/t_uvm_hello_v2017_1_0_dpi.py | 10 +--------- t/t_uvm_hello_v2017_1_0_nodpi.py | 10 +--------- t/t_uvm_hello_v2020_3_1_dpi.py | 10 +--------- t/t_uvm_hello_v2020_3_1_nodpi.py | 10 +--------- 7 files changed, 15 insertions(+), 40 deletions(-) create mode 160000 submodules/uvm-2017-1.0-vlt rename submodules/{uvm => uvm-2020-3.1-vlt} (100%) diff --git a/.gitmodules b/.gitmodules index 1994e0f..9af8d84 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 @@ -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 diff --git a/submodules/uvm-2017-1.0-vlt b/submodules/uvm-2017-1.0-vlt new file mode 160000 index 0000000..5a37baa --- /dev/null +++ b/submodules/uvm-2017-1.0-vlt @@ -0,0 +1 @@ +Subproject commit 5a37baacfed0722b523b05decc9b94fe3e9efbe4 diff --git a/submodules/uvm b/submodules/uvm-2020-3.1-vlt similarity index 100% rename from submodules/uvm rename to submodules/uvm-2020-3.1-vlt diff --git a/t/t_uvm_hello_v2017_1_0_dpi.py b/t/t_uvm_hello_v2017_1_0_dpi.py index 22a9bd1..7f6b213 100755 --- a/t/t_uvm_hello_v2017_1_0_dpi.py +++ b/t/t_uvm_hello_v2017_1_0_dpi.py @@ -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=[ diff --git a/t/t_uvm_hello_v2017_1_0_nodpi.py b/t/t_uvm_hello_v2017_1_0_nodpi.py index 142f2b5..072313e 100755 --- a/t/t_uvm_hello_v2017_1_0_nodpi.py +++ b/t/t_uvm_hello_v2017_1_0_nodpi.py @@ -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 diff --git a/t/t_uvm_hello_v2020_3_1_dpi.py b/t/t_uvm_hello_v2020_3_1_dpi.py index ca07062..b2a7003 100755 --- a/t/t_uvm_hello_v2020_3_1_dpi.py +++ b/t/t_uvm_hello_v2020_3_1_dpi.py @@ -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=[ diff --git a/t/t_uvm_hello_v2020_3_1_nodpi.py b/t/t_uvm_hello_v2020_3_1_nodpi.py index 6c103e3..e0db1dd 100755 --- a/t/t_uvm_hello_v2020_3_1_nodpi.py +++ b/t/t_uvm_hello_v2020_3_1_nodpi.py @@ -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