From f94c4ddbe065dd48b4f12956ad208fc22fec52b1 Mon Sep 17 00:00:00 2001 From: Matthew Schiller Date: Thu, 25 May 2023 12:14:01 -0400 Subject: [PATCH] Updating for vunit 5.0+ as per https://github.com/VUnit/vunit/issues/777 --- casper_accumulators/run.py | 2 +- casper_adder/run.py | 2 +- casper_counter/run.py | 2 +- casper_delay/run.py | 2 +- casper_fifo/run.py | 2 +- casper_filter/run.py | 2 +- casper_flow_control/run.py | 2 +- casper_multiplexer/run.py | 2 +- casper_multiplier/run.py | 2 +- casper_ram/run.py | 2 +- casper_wb_fft/run.py | 2 +- casper_wbpfb/run.py | 2 +- misc/run.py | 2 +- r2sdf_fft/run.py | 4 ++-- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/casper_accumulators/run.py b/casper_accumulators/run.py index 56bc4991..0a771504 100644 --- a/casper_accumulators/run.py +++ b/casper_accumulators/run.py @@ -4,7 +4,7 @@ import numpy as np # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = dirname(__file__) diff --git a/casper_adder/run.py b/casper_adder/run.py index 6ea06134..749f028b 100644 --- a/casper_adder/run.py +++ b/casper_adder/run.py @@ -57,7 +57,7 @@ def generate_tests(obj, direc, add_sub, inp_pipeline, out_pipeline, in_dat_w): g_a_val_min=a_v_min, g_a_val_max=a_v_max, g_b_val_min=b_v_min, g_b_val_max=b_v_max) ) -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = os.path.dirname(__file__) diff --git a/casper_counter/run.py b/casper_counter/run.py index fd16009d..9d04d3c7 100644 --- a/casper_counter/run.py +++ b/casper_counter/run.py @@ -2,7 +2,7 @@ from os.path import dirname, join # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = dirname(__file__) diff --git a/casper_delay/run.py b/casper_delay/run.py index cbf0ef56..a07b85bd 100644 --- a/casper_delay/run.py +++ b/casper_delay/run.py @@ -4,7 +4,7 @@ import numpy as np # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = dirname(__file__) diff --git a/casper_fifo/run.py b/casper_fifo/run.py index 6f72f629..8266a599 100644 --- a/casper_fifo/run.py +++ b/casper_fifo/run.py @@ -1,7 +1,7 @@ import os from vunit import VUnit -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = os.path.dirname(__file__) diff --git a/casper_filter/run.py b/casper_filter/run.py index c32c4c7a..fc1849dc 100644 --- a/casper_filter/run.py +++ b/casper_filter/run.py @@ -17,7 +17,7 @@ def manglePkg(file_name, line_number, new_line): args = cli.parse_args() # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(args = args,compile_builtins=False) +vu = VUnit.from_argv(args = args,) vu.add_vhdl_builtins() # XPM Library compile lib_xpm = vu.add_library("xpm") diff --git a/casper_flow_control/run.py b/casper_flow_control/run.py index af6381d3..2745a99e 100644 --- a/casper_flow_control/run.py +++ b/casper_flow_control/run.py @@ -3,7 +3,7 @@ import random # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = dirname(__file__) diff --git a/casper_multiplexer/run.py b/casper_multiplexer/run.py index 48cfa13b..b6b08f6a 100644 --- a/casper_multiplexer/run.py +++ b/casper_multiplexer/run.py @@ -44,7 +44,7 @@ def generate_tests(obj, g_test_nof_cycles=test_nof_cycles) ) -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = os.path.dirname(__file__) diff --git a/casper_multiplier/run.py b/casper_multiplier/run.py index f627d846..e880a3db 100644 --- a/casper_multiplier/run.py +++ b/casper_multiplier/run.py @@ -4,7 +4,7 @@ import glob from os.path import dirname # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() # Function for mult range calculations def get_ranges(dat_w,margin): diff --git a/casper_ram/run.py b/casper_ram/run.py index 781aeeff..f9f7be90 100644 --- a/casper_ram/run.py +++ b/casper_ram/run.py @@ -2,7 +2,7 @@ from os.path import dirname, join # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() script_dir = dirname(__file__) diff --git a/casper_wb_fft/run.py b/casper_wb_fft/run.py index 66a20c1f..7b96ceba 100644 --- a/casper_wb_fft/run.py +++ b/casper_wb_fft/run.py @@ -97,7 +97,7 @@ def manglePkg(file_name, line_number, new_line): args = cli.parse_args() # Create VUnit instance by parsing command line arguments -vu = = VUnit.from_argv(args = args,compile_builtins=False) +vu = = VUnit.from_argv(args = args,) # If none of the flags are specified, run all tests. run_all = not(args.par or args.pipe or args.wide or args.bitaccurate) vu.add_vhdl_builtins() diff --git a/casper_wbpfb/run.py b/casper_wbpfb/run.py index dad6fc8e..95252708 100644 --- a/casper_wbpfb/run.py +++ b/casper_wbpfb/run.py @@ -15,7 +15,7 @@ def manglePkg(file_name, line_number, new_line): # test_to_run = sys.argv[1] # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() vu.add_vhdl_builtins() # XPM Library compile lib_xpm = vu.add_library("xpm") diff --git a/misc/run.py b/misc/run.py index 5c1bb5c2..1524b77a 100644 --- a/misc/run.py +++ b/misc/run.py @@ -4,7 +4,7 @@ import random # Create VUnit instance by parsing command line arguments -vu = VUnit.from_argv(compile_builtins=False) +vu = VUnit.from_argv() script_dir = dirname(__file__) # Create library 'common_pkg_lib' diff --git a/r2sdf_fft/run.py b/r2sdf_fft/run.py index a1b1b215..174fa2a4 100644 --- a/r2sdf_fft/run.py +++ b/r2sdf_fft/run.py @@ -8,8 +8,8 @@ cli.parser.add_argument('--twid',action = 'store_true',help = 'Run the Twiddle Tests') cli.parser.add_argument('--bitaccurate',action = 'store_true',help = 'Run the bitaccurate Tests') args = cli.parse_args() -vu = = VUnit.from_argv(args = args,compile_builtins=False) -#vu = VUnit.from_argv(argv = args,compile_builtins=False) +vu = = VUnit.from_argv(args = args,) +#vu = VUnit.from_argv(argv = args,) vu.add_vhdl_builtins() vu.add_random()