Change UVM to submodule branch scheme (#9)

Author: wsnyder

.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

submodules/uvm-2017-1.0-vlt

@@ -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=[

submodules/uvm submodules/uvm-2020-3.1-vltsubmodules/uvm renamed to submodules/uvm-2020-3.1-vlt

@@ -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
 

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-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=[

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-2020-3.1-vlt"
-    ])
+uvm_root = os.path.abspath(test.t_dir + "/../submodules/uvm-2020-3.1-vlt")
 
 ## Make uvm_pkg_all