From c0cf842eb21a8eb000c6d89b78d63b237e32066d Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Thu, 9 Jul 2026 20:13:44 -0700 Subject: [PATCH] ivtest: Move parameter omit tests to JSON The parameter_omit tests have different expectations depending on whether the regression is run in the default Verilog mode or with force SystemVerilog. The old list files modelled this by registering the same tests in both regress-vlg.list and regress-fsv.list. Move the tests to JSON descriptors. Use the existing force-sv override for the forms that are valid SystemVerilog, and keep the implicit type cases as CE in both modes. This also runs the tests through the additional configurations supported by vvp_reg.py, providing better coverage in CI. Signed-off-by: Lars-Peter Clausen --- ivtest/regress-fsv.list | 3 --- ivtest/regress-vlg.list | 6 ------ ivtest/regress-vvp.list | 6 ++++++ ivtest/vvp_tests/parameter_omit1.json | 7 +++++++ ivtest/vvp_tests/parameter_omit2.json | 7 +++++++ ivtest/vvp_tests/parameter_omit3.json | 7 +++++++ ivtest/vvp_tests/parameter_omit_invalid1.json | 4 ++++ ivtest/vvp_tests/parameter_omit_invalid2.json | 4 ++++ ivtest/vvp_tests/parameter_omit_invalid3.json | 4 ++++ 9 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 ivtest/vvp_tests/parameter_omit1.json create mode 100644 ivtest/vvp_tests/parameter_omit2.json create mode 100644 ivtest/vvp_tests/parameter_omit3.json create mode 100644 ivtest/vvp_tests/parameter_omit_invalid1.json create mode 100644 ivtest/vvp_tests/parameter_omit_invalid2.json create mode 100644 ivtest/vvp_tests/parameter_omit_invalid3.json diff --git a/ivtest/regress-fsv.list b/ivtest/regress-fsv.list index afe656c74..462c5ded3 100644 --- a/ivtest/regress-fsv.list +++ b/ivtest/regress-fsv.list @@ -84,9 +84,6 @@ module_input_port_list_def normal ivltests module_input_port_type normal ivltests parameter_in_generate1 normal ivltests parameter_no_default normal ivltests -parameter_omit1 normal ivltests -parameter_omit2 normal ivltests -parameter_omit3 normal ivltests pr3015421 CE ivltests gold=pr3015421-fsv.gold resetall normal,-Wtimescale ivltests gold=resetall-fsv.gold scope2b normal ivltests diff --git a/ivtest/regress-vlg.list b/ivtest/regress-vlg.list index 55fbc8cc5..a2a1f86ed 100644 --- a/ivtest/regress-vlg.list +++ b/ivtest/regress-vlg.list @@ -761,12 +761,6 @@ param_times normal ivltests # param has multiplication. parameter_1bit normal ivltests parameter_in_generate1 CE ivltests parameter_no_default CE ivltests -parameter_omit1 CE ivltests -parameter_omit2 CE ivltests -parameter_omit3 CE ivltests -parameter_omit_invalid1 CE ivltests -parameter_omit_invalid2 CE ivltests -parameter_omit_invalid3 CE ivltests parameter_override_invalid1 CE ivltests parameter_override_invalid2 CE ivltests parameter_override_invalid3 CE ivltests diff --git a/ivtest/regress-vvp.list b/ivtest/regress-vvp.list index e8d021038..86489f83a 100644 --- a/ivtest/regress-vvp.list +++ b/ivtest/regress-vvp.list @@ -371,6 +371,12 @@ sv_net_array_decl_assign vvp_tests/sv_net_array_decl_assign.json sv_net_decl_assign vvp_tests/sv_net_decl_assign.json sv_package_lifetime vvp_tests/sv_package_lifetime.json sv_package_lifetime_fail vvp_tests/sv_package_lifetime_fail.json +parameter_omit1 vvp_tests/parameter_omit1.json +parameter_omit2 vvp_tests/parameter_omit2.json +parameter_omit3 vvp_tests/parameter_omit3.json +parameter_omit_invalid1 vvp_tests/parameter_omit_invalid1.json +parameter_omit_invalid2 vvp_tests/parameter_omit_invalid2.json +parameter_omit_invalid3 vvp_tests/parameter_omit_invalid3.json sv_parameter_type vvp_tests/sv_parameter_type.json sv_partsel_var_negative_packed vvp_tests/sv_partsel_var_negative_packed.json sv_queue_ap_method vvp_tests/sv_queue_ap_method.json diff --git a/ivtest/vvp_tests/parameter_omit1.json b/ivtest/vvp_tests/parameter_omit1.json new file mode 100644 index 000000000..3dd77e1cd --- /dev/null +++ b/ivtest/vvp_tests/parameter_omit1.json @@ -0,0 +1,7 @@ +{ + "type" : "CE", + "source" : "parameter_omit1.v", + "force-sv" : { + "type" : "normal" + } +} diff --git a/ivtest/vvp_tests/parameter_omit2.json b/ivtest/vvp_tests/parameter_omit2.json new file mode 100644 index 000000000..cb09ba0c4 --- /dev/null +++ b/ivtest/vvp_tests/parameter_omit2.json @@ -0,0 +1,7 @@ +{ + "type" : "CE", + "source" : "parameter_omit2.v", + "force-sv" : { + "type" : "normal" + } +} diff --git a/ivtest/vvp_tests/parameter_omit3.json b/ivtest/vvp_tests/parameter_omit3.json new file mode 100644 index 000000000..9970cd8d1 --- /dev/null +++ b/ivtest/vvp_tests/parameter_omit3.json @@ -0,0 +1,7 @@ +{ + "type" : "CE", + "source" : "parameter_omit3.v", + "force-sv" : { + "type" : "normal" + } +} diff --git a/ivtest/vvp_tests/parameter_omit_invalid1.json b/ivtest/vvp_tests/parameter_omit_invalid1.json new file mode 100644 index 000000000..d906a0c44 --- /dev/null +++ b/ivtest/vvp_tests/parameter_omit_invalid1.json @@ -0,0 +1,4 @@ +{ + "type" : "CE", + "source" : "parameter_omit_invalid1.v" +} diff --git a/ivtest/vvp_tests/parameter_omit_invalid2.json b/ivtest/vvp_tests/parameter_omit_invalid2.json new file mode 100644 index 000000000..a3205e5ad --- /dev/null +++ b/ivtest/vvp_tests/parameter_omit_invalid2.json @@ -0,0 +1,4 @@ +{ + "type" : "CE", + "source" : "parameter_omit_invalid2.v" +} diff --git a/ivtest/vvp_tests/parameter_omit_invalid3.json b/ivtest/vvp_tests/parameter_omit_invalid3.json new file mode 100644 index 000000000..106baed2c --- /dev/null +++ b/ivtest/vvp_tests/parameter_omit_invalid3.json @@ -0,0 +1,4 @@ +{ + "type" : "CE", + "source" : "parameter_omit_invalid3.v" +}