From cbe2deed0e18b0b766e49d70f53a03764815187d Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Thu, 13 Mar 2025 13:15:33 +0000 Subject: [PATCH] Replace gtkwave with libfst submodule --- .gitmodules | 6 +++--- submodules/gtkwave | 1 - submodules/libfst | 1 + t/{t_gtkwave_diff.py => t_libfst_diff.py} | 15 +++++++-------- 4 files changed, 11 insertions(+), 12 deletions(-) delete mode 160000 submodules/gtkwave create mode 160000 submodules/libfst rename t/{t_gtkwave_diff.py => t_libfst_diff.py} (68%) diff --git a/.gitmodules b/.gitmodules index 5499f6e..4ab53a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,9 +25,6 @@ [submodule "submodules/example-systemverilog"] path = submodules/example-systemverilog url = https://github.com/verilator/example-systemverilog.git -[submodule "submodules/gtkwave"] - path = submodules/gtkwave - url = https://github.com/gtkwave/gtkwave.git [submodule "submodules/sv-bugpoint"] path = submodules/sv-bugpoint url = https://github.com/antmicro/sv-bugpoint @@ -37,3 +34,6 @@ [submodule "submodules/wbuart32"] path = submodules/wbuart32 url = https://github.com/ZipCPU/wbuart32.git +[submodule "submodules/libfst"] + path = submodules/libfst + url = https://github.com/gtkwave/libfst.git diff --git a/submodules/gtkwave b/submodules/gtkwave deleted file mode 160000 index 4435a9e..0000000 --- a/submodules/gtkwave +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4435a9ef89892757eaf703085606f10040da6bfe diff --git a/submodules/libfst b/submodules/libfst new file mode 160000 index 0000000..93e45e6 --- /dev/null +++ b/submodules/libfst @@ -0,0 +1 @@ +Subproject commit 93e45e6c2010964cc57e2be4bbb0129e393085c8 diff --git a/t/t_gtkwave_diff.py b/t/t_libfst_diff.py similarity index 68% rename from t/t_gtkwave_diff.py rename to t/t_libfst_diff.py index 2ce5996..44f15a3 100755 --- a/t/t_gtkwave_diff.py +++ b/t/t_libfst_diff.py @@ -27,15 +27,14 @@ def check(a, b, basename): test.skip("Skipping due to no VERILATOR_TEST_UPSTREAM") print(os.getcwd) -g = "submodules/gtkwave" +g = "submodules/libfst" v = os.environ['VERILATOR_ROOT'] -check(g + "/src/helpers", v + "/include/gtkwave", "wavealloca.h") -check(g + "/lib/libfst", v + "/include/gtkwave", "fastlz.h") -check(g + "/lib/libfst", v + "/include/gtkwave", "fastlz.c") -check(g + "/lib/libfst", v + "/include/gtkwave", "fstapi.h") -check(g + "/lib/libfst", v + "/include/gtkwave", "fstapi.c") -check(g + "/lib/libfst", v + "/include/gtkwave", "lz4.h") -check(g + "/lib/libfst", v + "/include/gtkwave", "lz4.c") +check(g + "/src", v + "/include/gtkwave", "fastlz.h") +check(g + "/src", v + "/include/gtkwave", "fastlz.c") +check(g + "/src", v + "/include/gtkwave", "fstapi.h") +check(g + "/src", v + "/include/gtkwave", "fstapi.c") +check(g + "/src", v + "/include/gtkwave", "lz4.h") +check(g + "/src", v + "/include/gtkwave", "lz4.c") test.passes()