From b250dd6fc1a5d7a62b5d45ffdde9344f4f6cfc71 Mon Sep 17 00:00:00 2001 From: Dan <17553473+poname@users.noreply.github.com> Date: Thu, 5 Oct 2023 08:42:31 -0400 Subject: [PATCH 1/2] -DWITH_PARMYS=OFF for Odin only tests --- .github/workflows/test.yml | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 111b1035203..82fcb2cbf00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,22 +26,22 @@ jobs: fail-fast: false matrix: include: - - {test: "vtr_reg_nightly_test1", cores: "16", options: "", cmake: "", extra_pkgs: ""} - - {test: "vtr_reg_nightly_test1_odin", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: ""} - - {test: "vtr_reg_nightly_test2", cores: "16", options: "", cmake: "", extra_pkgs: ""} - - {test: "vtr_reg_nightly_test2_odin", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: "" } - - {test: "vtr_reg_nightly_test3", cores: "16", options: "", cmake: "", extra_pkgs: ""} - - {test: "vtr_reg_nightly_test3_odin", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: ""} - - {test: "vtr_reg_nightly_test4", cores: "16", options: "", cmake: "", extra_pkgs: "" } - - {test: "vtr_reg_nightly_test4_odin", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: "" } - - {test: "vtr_reg_nightly_test5", cores: "16", options: "", cmake: "", extra_pkgs: ""} - - {test: "vtr_reg_nightly_test6", cores: "16", options: "", cmake: "", extra_pkgs: ""} - - {test: "vtr_reg_parmys", cores: "16", options: "", cmake: "", extra_pkgs: "" } - - {test: "vtr_reg_strong", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3", extra_pkgs: "libeigen3-dev"} - - {test: "vtr_reg_strong_odin", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3 -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"} - - {test: "vtr_reg_strong_odin", cores: "16", options: "-skip_qor", cmake: "-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=ON -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"} - - {test: "vtr_reg_system_verilog", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""} - - {test: "odin_reg_strong", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test1", cores: "16", options: "", cmake: "", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test1_odin", cores: "16", options: "", cmake: "-DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test2", cores: "16", options: "", cmake: "", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test2_odin", cores: "16", options: "", cmake: "-DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: "" } + - {test: "vtr_reg_nightly_test3", cores: "16", options: "", cmake: "", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test3_odin", cores: "16", options: "", cmake: "-DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test4", cores: "16", options: "", cmake: "", extra_pkgs: "" } + - {test: "vtr_reg_nightly_test4_odin", cores: "16", options: "", cmake: "-DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: "" } + - {test: "vtr_reg_nightly_test5", cores: "16", options: "", cmake: "", extra_pkgs: ""} + - {test: "vtr_reg_nightly_test6", cores: "16", options: "", cmake: "", extra_pkgs: ""} + - {test: "vtr_reg_parmys", cores: "16", options: "", cmake: "", extra_pkgs: "" } + - {test: "vtr_reg_strong", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3", extra_pkgs: "libeigen3-dev"} + - {test: "vtr_reg_strong_odin", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3 -DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"} + - {test: "vtr_reg_strong_odin", cores: "16", options: "-skip_qor", cmake: "-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=ON -DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"} + - {test: "vtr_reg_system_verilog", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""} + - {test: "odin_reg_strong", cores: "16", options: "", cmake: "-DWITH_PARMYS=OFF -DWITH_ODIN=ON", extra_pkgs: ""} env: DEBIAN_FRONTEND: "noninteractive" @@ -178,7 +178,7 @@ jobs: }, { name: 'Basic_odin', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', + params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_basic_odin' }, { @@ -193,7 +193,7 @@ jobs: }, { name: 'Basic_odin with VTR_ENABLE_DEBUG_LOGGING', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_ODIN=on', + params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_basic_odin' }, { @@ -203,12 +203,12 @@ jobs: }, { name: 'Strong_odin', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', + params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_strong_odin' }, { name: 'Valgrind Memory', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', + params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_valgrind_small' } ] @@ -258,7 +258,7 @@ jobs: include: [ { name: 'Basic', - params: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', + params: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', suite: 'vtr_reg_basic_odin' } #- { name: 'Strong', suite: 'vtr_reg_strong' } # SKIP Too long to run on GitHub Actions (max 6h) @@ -326,7 +326,7 @@ jobs: - name: Test env: - CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on' + CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on' BUILD_TYPE: debug run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" From 501f3bdc6d14e4ac34905612262b880faf9447e9 Mon Sep 17 00:00:00 2001 From: Dan <17553473+poname@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:43:06 -0400 Subject: [PATCH 2/2] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82fcb2cbf00..7416d3f5476 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -208,7 +208,7 @@ jobs: }, { name: 'Valgrind Memory', - params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on', + params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on', suite: 'vtr_reg_valgrind_small' } ]