VeniVidiVici
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests: Cleanup some .cpp paths. No test functional change indended.

This commit is contained in:
Wilson Snyder 2025-04-25 20:57:11 -04:00
parent dd6cd3decb
commit abc46db3c0
21 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test_regress/t/t_assert_ctl_arg_noinl.py
View File

@ -11,12 +11,13 @@ import vltest_bootstrap
test.scenarios('vlt')
test.top_filename = "t_assert_ctl_arg.v"
test.pli_filename = "t/t_assert_ctl_arg.cpp"
test.compile(make_top_shell=False,
make_main=False,
verilator_flags2=[
"--assert", "--timing", "--coverage-user", "--exe",
test.t_dir + "/t_assert_ctl_arg.cpp", "-fno-inline"
"--assert", "--timing", "--coverage-user", "--exe", test.pli_filename,
"-fno-inline"
],
nc_flags2=["+nccovoverwrite", "+nccoverage+all", "+nccovtest+" + test.name])

2
test_regress/t/t_compiler_include_dpi.py
View File

@ -15,7 +15,7 @@ test.top_filename = "t/t_compiler_include_dpi.v"
test.compile(v_flags2=["t/t_compiler_include_dpi.cpp"],
verilator_flags2=[
"-Wall -Wno-DECLFILENAME --compiler-include",
test.t_dir + "/t_compiler_include_dpi.h --output-split 0"
test.t_dir + "/t_compiler_include_dpi.h", "--output-split 0"
])
test.execute()

2
test_regress/t/t_compiler_include_dpi_split.py
View File

@ -15,7 +15,7 @@ test.top_filename = "t/t_compiler_include_dpi.v"
test.compile(v_flags2=["t/t_compiler_include_dpi.cpp"],
verilator_flags2=[
"-Wall -Wno-DECLFILENAME --compiler-include",
test.t_dir + "/t_compiler_include_dpi.h --output-split 1"
test.t_dir + "/t_compiler_include_dpi.h", "--output-split 1"
])
test.execute()

3
test_regress/t/t_dpi_var_vlt.py
View File

@ -11,6 +11,7 @@ import vltest_bootstrap
test.scenarios('simulator')
test.top_filename = "t/t_dpi_var.v"
test.pli_filename = "t/t_dpi_var.cpp"
out_filename = test.obj_dir + "/V" + test.name + ".tree.json"
@ -18,7 +19,7 @@ test.compile(make_top_shell=False,
make_main=False,
verilator_flags2=[
"--no-json-edit-nums", "--exe --no-l2name", test.t_dir + "/t_dpi_var.vlt",
test.t_dir + "/t_dpi_var.cpp"
test.pli_filename
])
if test.vlt_all:

3
test_regress/t/t_opt_const_dfg.py
View File

@ -11,8 +11,9 @@ import vltest_bootstrap
test.scenarios('simulator')
test.top_filename = "t/t_opt_const.v"
test.pli_filename = "t/t_opt_const.cpp"
test.compile(verilator_flags2=["-Wno-UNOPTTHREADS", "--stats", test.t_dir + "/t_opt_const.cpp"])
test.compile(verilator_flags2=["-Wno-UNOPTTHREADS", "--stats", test.pli_filename])
test.execute()

2
test_regress/t/t_opt_const_no_expand.py
View File

@ -13,7 +13,7 @@ test.scenarios('simulator')
test.top_filename = "t/t_opt_const.v"
test.compile(verilator_flags2=[
"-Wno-UNOPTTHREADS", "-fno-dfg", "-fno-expand", "--stats", test.t_dir + "/t_opt_const.cpp"
"-Wno-UNOPTTHREADS", "-fno-dfg", "-fno-expand", "--stats", "t/t_opt_const.cpp"
])
test.execute()

2
test_regress/t/t_trace_noflag_bad.py
View File

@ -14,7 +14,7 @@ test.scenarios('vlt')
test.compile(
# We need to list verilated_vcd_c.cpp because without --trace Verilator
# won't build it itself automatically.
verilator_flags2=["--cc --exe", test.t_dir + "/" + test.name + "_c.cpp verilated_vcd_c.cpp"],
verilator_flags2=["--cc --exe", "t/" + test.name + "_c.cpp", "verilated_vcd_c.cpp"],
make_top_shell=False,
make_main=False)

3
test_regress/t/t_trace_two_dump_cc.py
View File

@ -12,6 +12,7 @@ import vltest_bootstrap
test.scenarios('vlt_all')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_cc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -25,7 +26,7 @@ test.run(
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=['-exe', '-trace', test.t_dir + "/t_trace_two_cc.cpp"],
verilator_flags2=['-exe', '-trace', test.pli_filename],
v_flags2=['+define+TEST_DUMP'])
test.execute()

3
test_regress/t/t_trace_two_dump_sc.py
View File

@ -11,6 +11,7 @@ import vltest_bootstrap
test.scenarios('simulator')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_sc.cpp"
if not test.have_sc:
test.skip("No SystemC installed")
@ -26,7 +27,7 @@ test.run(logfile=test.obj_dir + "/make_first_ALL.log",
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=['-sc', '-exe', '-trace', test.t_dir + "/t_trace_two_sc.cpp"],
verilator_flags2=['-sc', '-exe', '-trace', test.pli_filename],
v_flags2=['+define+TEST_DUMP'])
test.execute()

13
test_regress/t/t_trace_two_dumpfst_cc.py
View File

@ -12,6 +12,7 @@ import vltest_bootstrap
test.scenarios('vlt_all')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_cc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -22,13 +23,11 @@ test.compile(make_main=False,
test.run(logfile=test.obj_dir + "/make_first_ALL.log",
cmd=["make", "-C", test.obj_dir, "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"])
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=[
'-exe', '--trace-fst --trace-threads 1', '-DTEST_FST',
test.t_dir + "/t_trace_two_cc.cpp"
],
v_flags2=['+define+TEST_DUMP'])
test.compile(
make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=['-exe', '--trace-fst --trace-threads 1', '-DTEST_FST', test.pli_filename],
v_flags2=['+define+TEST_DUMP'])
test.execute()

3
test_regress/t/t_trace_two_hdr_cc.py
View File

@ -12,6 +12,7 @@ import vltest_bootstrap
test.scenarios('vlt_all')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_cc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -25,7 +26,7 @@ test.run(logfile=test.obj_dir + "/make_first_ALL.log",
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
make_flags=['CPPFLAGS_ADD=-DTEST_HDR_TRACE=1'],
verilator_flags2=['-exe', '-trace', test.t_dir + "/t_trace_two_cc.cpp"])
verilator_flags2=['-exe', '-trace', test.pli_filename])
test.execute()

3
test_regress/t/t_trace_two_hdr_sc.py
View File

@ -11,6 +11,7 @@ import vltest_bootstrap
test.scenarios('simulator')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_sc.cpp"
if not test.have_sc:
test.skip("No SystemC installed")
@ -27,7 +28,7 @@ test.run(logfile=test.obj_dir + "/make_first_ALL.log",
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
make_flags=['CPPFLAGS_ADD=-DTEST_HDR_TRACE'],
verilator_flags2=['-sc', '-exe', '-trace', test.t_dir + "/t_trace_two_sc.cpp"])
verilator_flags2=['-sc', '-exe', '-trace', test.pli_filename])
test.execute()

13
test_regress/t/t_trace_two_hdrfst_cc.py
View File

@ -12,6 +12,7 @@ import vltest_bootstrap
test.scenarios('vlt_all')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_cc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -23,13 +24,11 @@ test.run(
logfile=test.obj_dir + "/make_first_ALL.log",
cmd=["make", "-C", "" + test.obj_dir, "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"])
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
make_flags=['CPPFLAGS_ADD="-DTEST_HDR_TRACE=1 -DTEST_FST=1"'],
verilator_flags2=[
'-exe', '--trace-fst --trace-threads 1', '-DTEST_FST',
test.t_dir + "/t_trace_two_cc.cpp"
])
test.compile(
make_main=False,
top_filename='t_trace_two_a.v',
make_flags=['CPPFLAGS_ADD="-DTEST_HDR_TRACE=1 -DTEST_FST=1"'],
verilator_flags2=['-exe', '--trace-fst --trace-threads 1', '-DTEST_FST', test.pli_filename])
test.execute()

3
test_regress/t/t_trace_two_port_cc.py
View File

@ -12,6 +12,7 @@ import vltest_bootstrap
test.scenarios('vlt_all')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_cc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -24,7 +25,7 @@ test.run(logfile=test.obj_dir + "/make_first_ALL.log",
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=['-exe', '-trace', test.t_dir + "/t_trace_two_cc.cpp"],
verilator_flags2=['-exe', '-trace', test.pli_filename],
v_flags2=['+define+TEST_DUMPPORTS'])
test.execute()

3
test_regress/t/t_trace_two_port_sc.py
View File

@ -15,6 +15,7 @@ if not test.have_sc:
test.skip("No SystemC installed")
top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_sc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -27,7 +28,7 @@ test.run(logfile=test.obj_dir + "/make_first_ALL.log",
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=['-sc', '-exe', '-trace', test.t_dir + "/t_trace_two_sc.cpp"],
verilator_flags2=['-sc', '-exe', '-trace', test.pli_filename],
v_flags2=['+define+TEST_DUMPPORTS'])
test.execute()

13
test_regress/t/t_trace_two_portfst_cc.py
View File

@ -12,6 +12,7 @@ import vltest_bootstrap
test.scenarios('vlt_all')
test.top_filename = "t_trace_two_a.v"
test.pli_filename = "t/t_trace_two_cc.cpp"
test.compile(make_main=False,
verilator_make_gmake=False,
@ -23,13 +24,11 @@ test.run(
logfile=test.obj_dir + "/make_first_ALL.log",
cmd=["make", "-C", "" + test.obj_dir, "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"])
test.compile(make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=[
'-exe', '--trace-fst --trace-threads 1', '-DTEST_FST',
test.t_dir + "/t_trace_two_cc.cpp"
],
v_flags2=['+define+TEST_DUMPPORTS'])
test.compile(
make_main=False,
top_filename='t_trace_two_a.v',
verilator_flags2=['-exe', '--trace-fst --trace-threads 1', '-DTEST_FST', test.pli_filename],
v_flags2=['+define+TEST_DUMPPORTS'])
test.execute()

4
test_regress/t/t_verilated_threaded.py
View File

@ -17,8 +17,8 @@ root = ".."
test.compile(
# Can't use --coverage and --savable together, so cheat and compile inline
verilator_flags2=[
"--cc --coverage-toggle --coverage-line --coverage-user --trace-vcd --vpi " + root +
"/include/verilated_save.cpp",
"--cc --coverage-toggle --coverage-line --coverage-user --trace-vcd --vpi",
root + "/include/verilated_save.cpp",
("--timing" if test.have_coroutines else "--no-timing -Wno-STMTDLY")
],
threads=1)

3
test_regress/t/t_vpi_dump.py
View File

@ -16,8 +16,7 @@ test.compile(make_top_shell=False,
make_pli=True,
iv_flags2=["-g2005-sv"],
verilator_flags2=[
"--exe --vpi --public-flat-rw --no-l2name", test.pli_filename,
test.t_dir + "/TestVpiMain.cpp"
"--exe --vpi --public-flat-rw --no-l2name", test.pli_filename, "t/TestVpiMain.cpp"
],
make_flags=['CPPFLAGS_ADD=-DVL_NO_LEGACY'])

3
test_regress/t/t_vpi_dump_missing_scopes.py
View File

@ -17,8 +17,7 @@ test.compile(make_top_shell=False,
make_pli=True,
iv_flags2=["-g2005-sv"],
verilator_flags2=[
"--exe --vpi --public-flat-rw --no-l2name", test.pli_filename,
test.t_dir + "/TestVpiMain.cpp"
"--exe --vpi --public-flat-rw --no-l2name", test.pli_filename, "t/TestVpiMain.cpp"
],
make_flags=['CPPFLAGS_ADD=-DVL_NO_LEGACY'])

2
test_regress/t/t_vpi_dump_no_inline.py
View File

@ -20,7 +20,7 @@ test.compile(make_top_shell=False,
iv_flags2=["-g2005-sv"],
verilator_flags2=[
"--exe --vpi --public-flat-rw --no-l2name --fno-inline", test.pli_filename,
test.t_dir + "/TestVpiMain.cpp"
"t/TestVpiMain.cpp"
],
make_flags=['CPPFLAGS_ADD=-DVL_NO_LEGACY'])

3
test_regress/t/t_vpi_get_public_rw_switch.py
View File

@ -18,8 +18,7 @@ test.compile(make_top_shell=False,
make_main=False,
make_pli=True,
verilator_flags2=[
"--exe --vpi --public-flat-rw --prefix Vt_vpi_get --no-l2name",
test.t_dir + "/t_vpi_get.cpp"
"--exe --vpi --public-flat-rw --prefix Vt_vpi_get --no-l2name", test.pli_filename
],
iv_flags2=["-g2005-sv -D USE_VPI_NOT_DPI"],
v_flags2=["+define+USE_VPI_NOT_DPI"])