Merge pull request #1017 from steveicarus/steveicarus/ivtest-test-conversion-20231029
ivtest: reformat some regression tests
This commit is contained in:
Stephen Williams
GitHub
commit
58dcf39db3
|
|
@ -1,3 +0,0 @@
|
|||
1 2 3 4
|
||||
4 3 2 1
|
||||
8 7 6 5
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
0
|
||||
1
|
||||
0
|
||||
3
|
||||
0
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
0 0 x x 10
|
||||
1 0 4 4 10
|
||||
5 0 4 4 20
|
||||
6 0 5 5 20
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Implicit real: -1
|
||||
Implicit integer: -1
|
||||
Unsigned: 255
|
||||
Signed: -1
|
||||
Real: -1
|
||||
Real time: -1
|
||||
Integer: -1
|
||||
Time: 18446744073709551615
|
||||
|
|
@ -1 +0,0 @@
|
|||
rval1=1 rval2=2 rtval=1
|
||||
|
|
@ -1 +0,0 @@
|
|||
3 -3
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
-3 3
|
||||
-4 4
|
||||
-6 6
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
0 0 0
|
||||
2 4611686018427387904 2
|
||||
|
|
@ -134,7 +134,6 @@ pr1793749 normal ivltests gold=pr1793749.gold
|
|||
pr1793749b normal ivltests gold=pr1793749b.gold
|
||||
pr1861212b normal ivltests gold=pr1861212.gold
|
||||
pr1864110c normal ivltests gold=pr1864110c.gold
|
||||
pr1864115 normal ivltests gold=pr1864115.gold
|
||||
pr2806449 normal ivltests
|
||||
pr2877555 normal ivltests
|
||||
real4 normal ivltests
|
||||
|
|
@ -220,15 +219,11 @@ pr1528093 normal ivltests
|
|||
# wire real
|
||||
br_gh456 normal,-g2012 ivltests
|
||||
ca_64delay normal ivltests gold=ca_64delay.gold
|
||||
ca_time_real normal ivltests gold=ca_time_real.gold
|
||||
ca_var_delay normal ivltests
|
||||
cast_real_signed normal ivltests
|
||||
cast_real_unsigned normal ivltests
|
||||
delayed_sfunc normal,-gspecify ivltests gold=delayed_sfunc.gold
|
||||
module_port_shortreal normal,-g2005-sv ivltests # shortreal
|
||||
pr1861212c normal ivltests gold=pr1861212.gold
|
||||
pr1864110a normal ivltests gold=pr1864110a.gold
|
||||
pr1864110b normal ivltests gold=pr1864110b.gold
|
||||
pr1873372 normal ivltests gold=pr1873372.gold
|
||||
pr1880003 normal ivltests
|
||||
pr1898293 normal ivltests
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
# This test list contains tests that give different results when iverilog
|
||||
# is run without the -gstrict-expr-width option or vvp is run without the
|
||||
# -compatible option.
|
||||
|
||||
#
|
||||
# Copyright (c) 1999-2014 Guy Hutchison (ghutchis@pacbell.net)
|
||||
#
|
||||
# This source code is free software; you can redistribute it
|
||||
# and/or modify it in source code form under the terms of the GNU
|
||||
# General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
#
|
||||
# Format of the file
|
||||
#
|
||||
# testname testtype directory
|
||||
#
|
||||
# The <testname> is the verilog file name minus an extension.
|
||||
#
|
||||
# The <testtype> can be one of the following:
|
||||
#
|
||||
# normal: Normal results expected, i.e it should compile and execute
|
||||
# producing at least a single line with PASSED.
|
||||
#
|
||||
# CO: Compile Only - Compile the file to the default output type.
|
||||
#
|
||||
# CN: Compile Null - Compile with the null target. Similar to CO.
|
||||
#
|
||||
# CE: Compile with Errors - We EXPECT errors - we're checking
|
||||
# illegal syntax
|
||||
#
|
||||
# RE: Runtime with Errors - We EXPECT errors - we're checking
|
||||
# illegal syntax
|
||||
#
|
||||
# EF: Expected Fail - We EXPECT this test to fail - only use
|
||||
# with older versions of Icarus.
|
||||
#
|
||||
# TE: Translation Error - We EXPECT the translated code to fail -
|
||||
# only supported in the vlog95 checker.
|
||||
#
|
||||
# NI: Not implemented. Only use for version specific tests.
|
||||
#
|
||||
# <directory> is where the <testname>.v file is located.
|
||||
#
|
||||
# An optional fourth and fifth argument can be supplied.
|
||||
#
|
||||
# The fourth argument may be one of the following.
|
||||
#
|
||||
# modulename - Defines the top level module
|
||||
# gold=filename - Compare a gold file against the
|
||||
# generated log file.
|
||||
# unordered=filename - Compare a gold file against the
|
||||
# generated log file, allowing for lines
|
||||
# to appear in any order
|
||||
# diff=filename1:filename2:skip_ln - Compare the two files for equality.
|
||||
# Skip the first <skip_ln> lines or none.
|
||||
#
|
||||
# If a <modulename> is given you can supply a fifth argument for the
|
||||
# gold or diff commands.
|
||||
#
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Differences when vvp is run without -compatible
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Different output when real numbers are displayed without a format specifier.
|
||||
br_gh383d normal,-g2012 ivltests gold=br_gh383d-ivl.gold
|
||||
ca_time_real normal ivltests gold=ca_time_real-ivl.gold
|
||||
delayed_sfunc normal,-gspecify ivltests gold=delayed_sfunc-ivl.gold
|
||||
localparam_type normal ivltests gold=parameter_type-ivl.gold
|
||||
parameter_type normal ivltests gold=parameter_type-ivl.gold
|
||||
pr1701890 normal ivltests gold=pr1701890-ivl.gold
|
||||
pr1864110a normal ivltests gold=pr1864110a-ivl.gold
|
||||
pr1864110b normal ivltests gold=pr1864110b-ivl.gold
|
||||
pr1864115 normal ivltests gold=pr1864115-ivl.gold
|
||||
|
|
@ -67,8 +67,6 @@
|
|||
# gold or diff commands.
|
||||
#
|
||||
|
||||
always4A CE,-g2005-sv ivltests
|
||||
always4B CE,-g2005-sv ivltests
|
||||
always_comb normal,-g2005-sv ivltests
|
||||
always_comb_fail CE,-g2005-sv ivltests
|
||||
always_comb_fail3 CE,-g2005-sv ivltests
|
||||
|
|
@ -979,10 +977,6 @@ pull371b normal,-g2012 ivltests
|
|||
|
||||
br_gh175 normal,-g2012 ivltests
|
||||
br_gh307 normal,-g2012 ivltests
|
||||
br_gh383a normal,-g2012 ivltests gold=br_gh383a.gold
|
||||
br_gh383b normal,-g2012 ivltests gold=br_gh383b.gold
|
||||
br_gh383c normal,-g2012 ivltests gold=br_gh383c.gold
|
||||
br_gh383d normal,-g2012 ivltests gold=br_gh383d.gold
|
||||
br_gh390a CE,-g2012 ivltests
|
||||
br_gh390b normal,-g2012 ivltests gold=br_gh390b.gold
|
||||
br_gh412 normal,-g2012 ivltests
|
||||
|
|
|
|||
|
|
@ -123,10 +123,6 @@ br971 NI ivltests
|
|||
br_gh72b_fail NI ivltests
|
||||
br_gh175 NI ivltests
|
||||
br_gh307 NI ivltests
|
||||
br_gh383a NI ivltests
|
||||
br_gh383b NI ivltests
|
||||
br_gh383c NI ivltests
|
||||
br_gh383d NI ivltests
|
||||
br_gh390a NI ivltests
|
||||
br_gh390b NI ivltests
|
||||
br_gh412 NI ivltests
|
||||
|
|
|
|||
|
|
@ -633,7 +633,6 @@ lh_varindx normal ivltests
|
|||
lh_varindx2 normal ivltests
|
||||
lh_varindx4 normal ivltests
|
||||
lh_varindx5 normal ivltests
|
||||
localparam_type normal ivltests gold=parameter_type.gold
|
||||
long_div normal ivltests gold=long_div.gold
|
||||
macro2 normal ivltests
|
||||
macro_args CO,-yivltests ivltests
|
||||
|
|
@ -749,7 +748,6 @@ param_test3 normal ivltests gold=param_test3.gold # PR#293
|
|||
param_test4 normal ivltests
|
||||
param_times normal ivltests # param has multiplication.
|
||||
parameter_1bit normal ivltests
|
||||
parameter_type normal ivltests gold=parameter_type.gold
|
||||
parameter_in_generate1 CE ivltests
|
||||
parameter_no_default CE ivltests
|
||||
parameter_omit1 CE ivltests
|
||||
|
|
@ -1014,7 +1012,6 @@ pr1699519 normal ivltests gold=pr1699519.gold
|
|||
pr1701855 normal ivltests gold=pr1701855.gold
|
||||
pr1701855b normal ivltests gold=pr1701855b.gold
|
||||
pr1701889 normal ivltests gold=pr1701889.gold
|
||||
pr1701890 normal ivltests gold=pr1701890.gold
|
||||
pr1701921 normal ivltests
|
||||
pr1702593 normal ivltests gold=pr1702593.gold
|
||||
pr1703120 normal ivltests gold=pr1703120.gold
|
||||
|
|
|
|||
|
|
@ -122,7 +122,6 @@ array_lval_select6 CE ivltests # Also net arrays
|
|||
br_gh156 CE ivltests
|
||||
br_gh456 CE,-g2009,-pallowsigned=1 ivltests
|
||||
ca_64delay CE ivltests # Also net arrays
|
||||
ca_time_real CE ivltests
|
||||
ca_var_delay CE ivltests
|
||||
cast_real CE,-pallowsigned=1 ivltests
|
||||
cast_real_signed CE,-pallowsigned=1 ivltests
|
||||
|
|
@ -132,7 +131,6 @@ sv_cast_integer2 normal,-g2005-sv,-pallowsigned=1 ivltests
|
|||
sv_cast_packed_struct normal,-g2005-sv,-pallowsigned=1 ivltests
|
||||
sv_cast_string CE ivltests
|
||||
clog2 CE ivltests # Also big int
|
||||
delayed_sfunc CE ivltests
|
||||
implicit_cast4 CE,-g2009,-pallowsigned=1 ivltests
|
||||
implicit_cast5 CE,-g2009,-pallowsigned=1 ivltests
|
||||
implicit_cast6 CE,-g2009,-pallowsigned=1 ivltests
|
||||
|
|
@ -140,10 +138,7 @@ implicit_cast12 CE,-g2009,-pallowsigned=1 ivltests
|
|||
implicit_cast13 CE,-g2009,-pallowsigned=1 ivltests
|
||||
module_port_shortreal CE,-g2005-sv ivltests
|
||||
pr1861212c CE ivltests
|
||||
pr1864110a CE ivltests
|
||||
pr1864110b CE ivltests
|
||||
pr1864110c CE ivltests
|
||||
pr1864115 CE ivltests
|
||||
pr1873372 CE ivltests
|
||||
pr1880003 CE ivltests
|
||||
pr1898293 CE ivltests
|
||||
|
|
@ -334,10 +329,6 @@ br_gh164b CE,-g2009,-pallowsigned=1 ivltests
|
|||
br_gh164c CE,-g2009,-pallowsigned=1 ivltests
|
||||
br_gh164d CE,-g2009,-pallowsigned=1 ivltests
|
||||
br_gh164e CE,-g2009,-pallowsigned=1 ivltests
|
||||
br_gh383a CE,-g2012, ivltests
|
||||
br_gh383b CE,-g2012, ivltests
|
||||
br_gh383c CE,-g2012,-pallowsigned=1 ivltests
|
||||
br_gh383d CE,-g2012,-pallowsigned=1 ivltests
|
||||
br_gh460 CE,-g2012 ivltests
|
||||
br_ml20191221 CE,-g2009,-pallowsigned=1 ivltests
|
||||
sv_assign_pattern_cast CE,-g2005-sv,-pallowsigned=1 ivltests
|
||||
|
|
@ -501,8 +492,6 @@ sv_var_init1 EF,-g2009 ivltests
|
|||
sv_var_init2 TE,-g2009 ivltests
|
||||
|
||||
# No support for these SystemVerilog features
|
||||
always4A CE,-g2009 ivltests # join_any
|
||||
always4B CE,-g2009 ivltests # join_none
|
||||
br936 CE,-g2009,-pallowsigned=1 ivltests # join_any
|
||||
br_gh165 CE,-g2009 ivltests # join_*
|
||||
br_gh368 CE,-g2009 ivltests # join_*
|
||||
|
|
@ -829,8 +818,6 @@ format RE ivltests gold=format-vlog95.gold
|
|||
fread-error RE ivltests gold=fread-error-vlog95.gold
|
||||
fscanf_u_warn normal ivltests gold=fscanf_u_warn-vlog95.gold
|
||||
fscanf_z_warn normal ivltests gold=fscanf_z_warn-vlog95.gold
|
||||
localparam_type normal ivltests gold=parameter_type-vlog95.gold
|
||||
parameter_type normal ivltests gold=parameter_type-vlog95.gold
|
||||
mem1 normal ivltests gold=mem1-vlog95.gold
|
||||
pic normal contrib gold=pic-vlog95.gold
|
||||
pr910 normal ivltests gold=pr910-vlog95.gold
|
||||
|
|
|
|||
|
|
@ -2,12 +2,19 @@
|
|||
# Test list files are a list of test names and the json that
|
||||
# describes the test.
|
||||
|
||||
always4A vvp_tests/always4A.json
|
||||
always4B vvp_tests/always4B.json
|
||||
array_packed_write_read vvp_tests/array_packed_write_read.json
|
||||
bits4 vvp_tests/bits4.json
|
||||
bitsel11 vvp_tests/bitsel11.json
|
||||
br_gh13a vvp_tests/br_gh13a.json
|
||||
br_gh13a-vlog95 vvp_tests/br_gh13a-vlog95.json
|
||||
br_gh383a vvp_tests/br_gh383a.json
|
||||
br_gh383b vvp_tests/br_gh383b.json
|
||||
br_gh383c vvp_tests/br_gh383c.json
|
||||
br_gh383d vvp_tests/br_gh383d.json
|
||||
br_gh939 vvp_tests/br_gh939.json
|
||||
ca_time_real` vvp_tests/ca_time_real.json
|
||||
case1 vvp_tests/case1.json
|
||||
case2 vvp_tests/case2.json
|
||||
case2-S vvp_tests/case2-S.json
|
||||
|
|
@ -18,6 +25,7 @@ constfunc17 vvp_tests/constfunc17.json
|
|||
constfunc18 vvp_tests/constfunc18.json
|
||||
constfunc19 vvp_tests/constfunc19.json
|
||||
constfunc20 vvp_tests/constfunc20.json
|
||||
delayed_sfunc vvp_tests/delayed_sfunc.json
|
||||
dffsynth vvp_tests/dffsynth.json
|
||||
dffsynth-S vvp_tests/dffsynth-S.json
|
||||
dffsynth2 vvp_tests/dffsynth2.json
|
||||
|
|
@ -32,6 +40,8 @@ dffsynth10 vvp_tests/dffsynth10.json
|
|||
dffsynth11 vvp_tests/dffsynth11.json
|
||||
dumpfile vvp_tests/dumpfile.json
|
||||
final3 vvp_tests/final3.json
|
||||
localparam_type vvp_tests/localparam_type.json
|
||||
localparam_type-vlog95 vvp_tests/localparam_type-vlog95.json
|
||||
macro_str_esc vvp_tests/macro_str_esc.json
|
||||
memsynth1 vvp_tests/memsynth1.json
|
||||
module_ordered_list1 vvp_tests/module_ordered_list1.json
|
||||
|
|
@ -40,8 +50,14 @@ module_port_array1 vvp_tests/module_port_array1.json
|
|||
module_port_array_init1 vvp_tests/module_port_array_init1.json
|
||||
param-width vvp_tests/param-width.json
|
||||
param-width-vlog95 vvp_tests/param-width-vlog95.json
|
||||
parameter_type vvp_tests/parameter_type.json
|
||||
parameter_type-vlog95 vvp_tests/parameter_type-vlog95.json
|
||||
pr1388974 vvp_tests/pr1388974.json
|
||||
pr1388974-vlog95 vvp_tests/pr1388974-vlog95.json
|
||||
pr1701890 vvp_tests/pr1701890.json
|
||||
pr1864110a vvp_tests/pr1864110a.json
|
||||
pr1864110b vvp_tests/pr1864110b.json
|
||||
pr1864115 vvp_tests/pr1864115.json
|
||||
pr903 vvp_tests/pr903.json
|
||||
pr903-vlog95 vvp_tests/pr903-vlog95.json
|
||||
pv_wr_fn_vec2 vvp_tests/pv_wr_fn_vec2.json
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ if ($#ARGV != -1) {
|
|||
}
|
||||
&read_regression_list("regress-vlog95.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-v$ver.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-ivl2.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-ivl1.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-vlg.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-vams.list", $ver, $force_sv, "");
|
||||
|
|
|
|||
|
|
@ -52,9 +52,6 @@ if ($#ARGV != -1) {
|
|||
&read_regression_list("regress-fsv.list", $ver, $force_sv, "");
|
||||
}
|
||||
&read_regression_list("regress-v$ver.list", $ver, $force_sv, "");
|
||||
if ($strict == 0) {
|
||||
&read_regression_list("regress-ivl2.list", $ver, $force_sv, "");
|
||||
}
|
||||
&read_regression_list("regress-ivl1.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-vlg.list", $ver, $force_sv, "");
|
||||
&read_regression_list("regress-vams.list", $ver, $force_sv, "");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "CE",
|
||||
"source" : "always4A.v",
|
||||
"iverilog-args" : [ "-g2005-sv" ]
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "CE",
|
||||
"source" : "always4B.v",
|
||||
"iverilog-args" : [ "-g2005-sv" ]
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "br_gh383a.v",
|
||||
"iverilog-args" : [ "-g2012" ],
|
||||
"gold" : "br_gh383a"
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "br_gh383b.v",
|
||||
"iverilog-args" : [ "-g2012" ],
|
||||
"gold" : "br_gh383a"
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "br_gh383c.v",
|
||||
"iverilog-args" : [ "-g2012" ],
|
||||
"gold" : "br_gh383c"
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "br_gh383d.v",
|
||||
"iverilog-args" : [ "-g2012" ],
|
||||
"gold" : "br_gh383d"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "ca_time_real.v",
|
||||
"gold" : "ca_time_real"
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "delayed_sfunc.v",
|
||||
"gold" : "delayed_sfunc",
|
||||
"iverilog-args" : [ "-gspecify" ]
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal-vlog95",
|
||||
"source" : "localparam_type.v",
|
||||
"gold" : "parameter_type-vlog95"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "localparam_type.v",
|
||||
"gold" : "parameter_type"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal-vlog95",
|
||||
"source" : "parameter_type.v",
|
||||
"gold" : "parameter_type-vlog95"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "parameter_type.v",
|
||||
"gold" : "parameter_type"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "pr1701890.v",
|
||||
"gold" : "pr1701890"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "pr1864110a.v",
|
||||
"gold" : "pr1864110a"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "pr1864110b.v",
|
||||
"gold" : "pr1864110b"
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"type" : "normal",
|
||||
"source" : "pr1864115.v",
|
||||
"gold" : "pr1864115"
|
||||
}
|
||||
Loading…
Reference in New Issue