Skip to content

GitLab

Commit 99be551d authored by Martin Jeřábek's avatar Martin Jeřábek
Browse files

feature tests: stage 1

parent 005dd4bf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 595 additions and 679 deletions
test/feature/feature_env.vhd deleted 100644 → 0
View file @ 005dd4bf
This diff is collapsed.
test/feature/pkg_feature_exec_dispatch.vhd 0 → 100644
View file @ 99be551d
Library ieee;
USE IEEE.std_logic_1164.all;
USE IEEE.numeric_std.ALL;
USE ieee.math_real.ALL;
use work.CANconstants.all;
USE work.CANtestLib.All;
USE work.randomLib.All;
package pkg_feature_exec_dispath is
--Procedure for processing the feature tests!
procedure exec_feature_test(
--Common test parameters
signal test_name : in string;
variable outcome : inout boolean;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
--Additional signals for tests
--Pretty much everything can be read out of stat bus...
signal mem_bus_1 : inout Avalon_mem_type;
signal mem_bus_2 : inout Avalon_mem_type;
signal int_1 : in std_logic;
signal int_2 : in std_logic;
signal bus_level : in std_logic;
signal drv_bus_1 : in std_logic_vector(1023 downto 0);
signal drv_bus_2 : in std_logic_vector(1023 downto 0);
signal stat_bus_1 : in std_logic_vector(511 downto 0);
signal stat_bus_2 : in std_logic_vector(511 downto 0);
signal bl_inject : inout std_logic;
signal bl_force : inout boolean
);
end package;
test/feature/tb_feature.vhd 0 → 100644
View file @ 99be551d
--------------------------------------------------------------------------------
--
-- CTU CAN FD IP Core
-- Copyright (C) 2015-2018 Ondrej Ille <ondrej.ille@gmail.com>
--
-- Project advisors and co-authors:
-- Jiri Novak <jnovak@fel.cvut.cz>
-- Pavel Pisa <pisa@cmp.felk.cvut.cz>
-- Martin Jerabek <jerabma7@fel.cvut.cz>
-- Department of Measurement (http://meas.fel.cvut.cz/)
-- Faculty of Electrical Engineering (http://www.fel.cvut.cz)
-- Czech Technical University (http://www.cvut.cz/)
--
-- Permission is hereby granted, free of charge, to any person obtaining a copy
-- of this VHDL component and associated documentation files (the "Component"),
-- to deal in the Component without restriction, including without limitation
-- the rights to use, copy, modify, merge, publish, distribute, sublicense,
-- and/or sell copies of the Component, and to permit persons to whom the
-- Component is furnished to do so, subject to the following conditions:
--
-- The above copyright notice and this permission notice shall be included in
-- all copies or substantial portions of the Component.
--
-- THE COMPONENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-- AUTHORS OR COPYRIGHTHOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE COMPONENT OR THE USE OR OTHER DEALINGS
-- IN THE COMPONENT.
--
-- The CAN protocol is developed by Robert Bosch GmbH and protected by patents.
-- Anybody who wants to implement this IP core on silicon has to obtain a CAN
-- protocol license from Bosch.
--
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- Purpose:
-- Main environment for feature tests
--
--------------------------------------------------------------------------------
-- Revision History:
-- 20.6.2016 Created file
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- Test implementation
--------------------------------------------------------------------------------
Library ieee;
USE IEEE.std_logic_1164.all;
USE IEEE.numeric_std.ALL;
USE ieee.math_real.ALL;
use work.CANconstants.all;
use work.CANcomponents.ALL;
USE work.CANtestLib.All;
USE work.randomLib.All;
USE work.pkg_feature_exec_dispath.All;
use work.ID_transfer.all;
package feature_test_pkg is
constant NINST : natural := 2;
type instance_inputs_t is record
drv_bus : std_logic_vector(1023 downto 0);
stat_bus : std_logic_vector(511 downto 0);
irq : std_logic;
end record;
type instance_outputs_t is record
hw_reset : std_logic;
end record;
type instance_inputs_arr_t is array (1 to NINST) of instance_inputs_t;
type instance_outputs_arr_t is array (1 to NINST) of instance_outputs_t;
type mem_bus_arr_t is array (1 to NINST) of Avalon_mem_type;
end package;
Library ieee;
USE IEEE.std_logic_1164.all;
USE IEEE.numeric_std.ALL;
USE ieee.math_real.ALL;
use work.CANconstants.all;
use work.CANcomponents.ALL;
USE work.CANtestLib.All;
USE work.randomLib.All;
USE work.pkg_feature_exec_dispath.All;
use work.ID_transfer.all;
use work.feature_test_pkg.all;
--------------------------------------------------------------------------------
-- Test enity for feature tests. Additional signals representing two memory
-- buses are present to connect two DUTs of feature tests!
--------------------------------------------------------------------------------
entity CAN_feature_test is
port (
-- Input trigger, test starts running when true
signal run : in boolean;
-- Number of iterations that test should do
signal iterations : in natural;
-- Logging level, severity which should be shown
signal log_level : in log_lvl_type;
-- Test behaviour when error occurs: Quit, or Go on
signal error_beh : in err_beh_type;
-- Error tolerance, error counter should not
-- exceed this value in order for the test to pass
signal error_tol : in natural;
-- Status of the test
signal status : out test_status_type;
-- Amount of errors which appeared in the test
signal errors : out natural;
-- Memory access buses
signal mem_bus : inout mem_bus_arr_t;
-- Bus level injected value and whether it should be forced on bus
signal bl_inject : in std_logic;
signal bl_force : in boolean;
-- Internal signals; TODO: direction
signal iteration_done : out boolean := false;
signal hw_reset_on_new_test : in boolean := true;
signal iin : in instance_inputs_arr_t;
signal iout : out instance_outputs_arr_t;
signal rand_ctr : in natural range 0 to RAND_POOL_SIZE;
--CAN bus signals
signal bus_level : in std_logic := RECESSIVE;
--Test name to be loaded by the TCL script from TCL test FIFO
--Note that string always have to have fixed length
signal test_name : in string (1 to 20) := strtolen(20, "overload")
);
-- Internal test signals
signal error_ctr : natural := 0;
signal loop_ctr : natural := 0;
signal exit_imm : boolean := false;
end entity;
-- TODO: split implementation and wrapper
architecture feature_env_test of CAN_feature_test is
type instance_signals_t is record
tr_del_sr : std_logic_vector(255 downto 0);
tr_del : natural;
clk_sys : std_logic;
res_n : std_logic;
int : std_logic;
CAN_tx : std_logic;
CAN_rx : std_logic;
time_quanta_clk : std_logic;--Time Quantum clocks possible to be used for synchronisation
timestamp : std_logic_vector(63 downto 0);
data_in : std_logic_vector(31 downto 0);
data_out : std_logic_vector(31 downto 0);
adress : std_logic_vector(23 downto 0);
scs : std_logic; --Chip select
srd : std_logic; --Serial read
swr : std_logic; --Serial write
sbe : std_logic_vector(3 downto 0); --Byte enable
end record;
type instance_signals_arr_t is array(1 to NINST) of instance_signals_t;
signal p : instance_signals_arr_t := (others => (
tr_del_sr => (others => RECESSIVE),
tr_del => 20,
clk_sys => '0',
res_n => '0',
int => '0',
CAN_tx => RECESSIVE,
CAN_rx => RECESSIVE,
time_quanta_clk => '0',
timestamp => (OTHERS=>'0'),
data_in => (OTHERS=>'0'),
data_out => (OTHERS=>'0'),
adress => (OTHERS=>'0'),
scs => '0',
srd => '0',
swr => '0',
sbe => (OTHERS => '1')
));
begin
g_inst: for i in 1 to 2 generate
iout(i).hw_reset <= p(i).res_n;
CAN_inst: CAN_top_level
generic map(
use_logger => true,
rx_buffer_size => 64,
use_sync => true,
ID => i,
logger_size => 16
)
port map(
clk_sys => p(i).clk_sys,
res_n => p(i).res_n,
data_in => p(i).data_in,
data_out => p(i).data_out,
adress => p(i).adress,
scs => p(i).scs,
srd => p(i).srd,
swr => p(i).swr,
sbe => p(i).sbe,
int => p(i).int,
CAN_tx => p(i).CAN_tx,
CAN_rx => p(i).CAN_rx,
time_quanta_clk => p(i).time_quanta_clk,
timestamp => p(i).timestamp
);
-------------------------------------------------
--Connect individual bus signals of memory buses
-------------------------------------------------
mem_bus(i).clk_sys <= p(i).clk_sys;
p(i).data_in <= mem_bus(i).data_in;
p(i).adress <= mem_bus(i).address;
p(i).scs <= mem_bus(i).scs;
p(i).swr <= mem_bus(i).swr;
p(i).srd <= mem_bus(i).srd;
mem_bus(i).data_out <= p(i).data_out;
---------------------------------
--Transceiver and bus realization
---------------------------------
tr_proc:process
begin
wait until falling_edge(p(i).clk_sys);
p(i).tr_del_sr <= p(i).tr_del_sr(254 downto 0) & p(i).CAN_tx;
end process;
p(i).CAN_rx <= bus_level;
---------------------------------
--Clock generation
---------------------------------
clock_gen:process
constant period : natural := f100_Mhz;
constant duty : natural := 50;
constant epsilon : natural := 0;
begin
generate_clock(period, duty, epsilon, p(i).clk_sys);
p(i).timestamp <= std_logic_vector(unsigned(p(i).timestamp)+1);
end process;
end generate;
bus_level <= p(1).tr_del_sr(p(1).tr_del) AND p(2).tr_del_sr(p(2).tr_del) when bl_force=false else
bl_inject;
---------------------------------
--Test process listening to the
-- higher hierarchy wrapper!
---------------------------------
test_proc:process
begin
status <= waiting;
loop_ctr <= 0;
wait until run=true;
if hw_reset_on_new_test then
log("HW Restart of feature test environment started!",info_l,log_level);
wait for 5 ns;
reset_test(p(1).res_n, status, run, error_ctr);
reset_test(p(2).res_n, status, run, error_ctr);
log("HW Restart of feature test environment finished",info_l,log_level);
end if;
--Status is restarted no matter the HW reset
status <= running;
print_test_info(iterations, log_level, error_beh, error_tol);
-------------------------------
--Main loop of the test
-------------------------------
while (loop_ctr<iterations or exit_imm)
loop
log("Starting loop nr " & integer'image(loop_ctr), info_l, log_level);
--Wait on signal from higher level wrapper to move to the next iteration
wait until iteration_done = true;
loop_ctr <= loop_ctr + 1;
end loop;
status <= passed;
wait until run = false;
end process;
end architecture;
Library ieee;
USE IEEE.std_logic_1164.all;
USE IEEE.numeric_std.ALL;
USE ieee.math_real.ALL;
use work.CANconstants.all;
USE work.CANtestLib.All;
USE work.randomLib.All;
use work.feature_test_pkg.all;
entity tb_feature is
generic (
runner_cfg : string := runner_cfg_default;
iterations : natural := 1;
log_level : log_lvl_type := info_l;
-- Test behaviour when error occurs: Quit, or Go on
error_beh : err_beh_type := quit;
-- Error tolerance, error counter should not exceed this value
-- in order for the test to pass
error_tol : natural := 0;
-- Timeout in simulation time. 0 means no limit
timeout : string := "0 ms";
hw_reset_on_new_test : boolean := true;
test_name : string
);
end entity;
-----------------------------------------------------------------------------------------------------------------
-- Test wrapper and control signals generator
-----------------------------------------------------------------------------------------------------------------
architecture tb of tb_feature is
signal run : boolean; -- Input trigger, test starts running when true -- exceed this value in order for the test to pass
signal status_int : test_status_type; -- Status of the test
signal errors : natural; -- Amount of errors which appeared in the test
constant mem_bus_init : Avalon_mem_type := (
scs => '0',
swr => '0',
srd => '0',
address => (OTHERS =>'0'),
data_in => (OTHERS =>'0'),
clk_sys => '0',
data_out => (OTHERS =>'0'),
sbe => x"0"
);
procedure restart_mem_bus(
signal mem_bus : out Avalon_mem_type
) is begin
mem_bus.scs <= '0';
mem_bus.swr <= '0';
mem_bus.srd <= '0';
mem_bus.address <= (OTHERS =>'0');
mem_bus.data_in <= (OTHERS =>'0');
mem_bus.clk_sys <= 'Z';
mem_bus.data_out <= (OTHERS =>'Z');
mem_bus.sbe <= x"F";
end procedure;
--Additional signals definitions
signal error_ctr : natural := 0;
signal exit_imm : boolean := false;
signal bl_inject : std_logic := RECESSIVE;
signal bl_force : boolean := false;
-- test internal signals
signal iteration_done : boolean;
signal mem_bus : mem_bus_arr_t := (OTHERS => mem_bus_init);
signal iin : instance_inputs_arr_t;
signal iout : instance_outputs_arr_t;
signal bus_level : std_logic;
signal rand_ctr : natural range 0 to RAND_POOL_SIZE;
constant padded_test_name : string(1 to 20) := strtolen(20, test_name);
begin
--In this test wrapper generics are directly connected to the signals
-- of test entity
test_comp: entity work.CAN_feature_test
port map(
run => run,
iterations => iterations,
log_level => log_level,
error_beh => error_beh,
error_tol => error_tol,
status => status_int,
errors => errors,
mem_bus => mem_bus,
bl_inject => bl_inject,
bl_force => bl_force,
iteration_done => iteration_done,
hw_reset_on_new_test => hw_reset_on_new_test,
test_name => padded_test_name,
iout => iout,
iin => iin,
--Internal signals of CAN controllers
bus_level => bus_level,
rand_ctr => rand_ctr
);
---------------------------------------
---------------------------------------
--Starts the test and lets it run
---------------------------------------
---------------------------------------
test:process
variable outcome : boolean := false;
constant ID_1 : natural range 0 to 15 := 1;
constant ID_2 : natural range 0 to 15 := 2;
begin
test_runner_setup(runner, runner_cfg);
--Set the process to run and wait until it comes out of reset
iteration_done <= false;
run <= true;
error_ctr <= 0;
restart_mem_bus(mem_bus(1));
restart_mem_bus(mem_bus(2));
wait for 10 ns;
wait until iout(1).hw_reset = '1' and iout(2).hw_reset = '1';
wait for 10 ns;
--Execute the controllers configuration
CAN_turn_controller(true, ID_1, mem_bus(1));
CAN_turn_controller(true, ID_2, mem_bus(2));
--Set default retransmitt limit to 0
-- Failed frames are not retransmited
-- by default!!!
CAN_enable_retr_limit(true, 0, ID_1, mem_bus(1));
CAN_enable_retr_limit(true, 0, ID_2, mem_bus(2));
-------------------------------------------------
-- Main test loop
-------------------------------------------------
while test_suite loop
iteration_done <= false;
exec_feature_test(test_name, outcome, rand_ctr,
mem_bus(1), mem_bus(2),
iout(1).irq, iout(2).irq,
bus_level,
iout(1).drv_bus, iout(2).drv_bus,
iout(1).stat_bus, iout(2).stat_bus,
bl_inject, bl_force);
if outcome = false then
process_error(error_ctr, error_beh, exit_imm);
end if;
wait for 200 ns;
iteration_done <= true;
wait for 10 ns;
end loop;
run <= false;
test_runner_cleanup(runner, error_ctr > error_tol);
end process;
watchdog: if time'value(timeout) > 0 ns generate
test_runner_watchdog(runner, time'value(timeout));
end generate;
end architecture;
test/lib/CANtestLib.vhd
View file @ 99be551d
......@@ -3573,61 +3573,6 @@ entity CAN_test is
end entity;
Library ieee;
USE IEEE.std_logic_1164.all;
USE IEEE.numeric_std.ALL;
USE ieee.math_real.ALL;
USE work.randomLib.All;
use work.CANconstants.all;
USE work.CANtestLib.All;
--------------------------------------------------------------------------------
-- Test enity for feature tests. Additional signals representing two memory
-- buses are present to connect two DUTs of feature tests!
--------------------------------------------------------------------------------
entity CAN_feature_test is
port (
-- Input trigger, test starts running when true
signal run : in boolean;
-- Number of iterations that test should do
signal iterations : in natural;
-- Logging level, severity which should be shown
signal log_level : in log_lvl_type;
-- Test behaviour when error occurs: Quit, or Go on
signal error_beh : in err_beh_type;
-- Error tolerance, error counter should not
-- exceed this value in order for the test to pass
signal error_tol : in natural;
-- Status of the test
signal status : out test_status_type;
-- Amount of errors which appeared in the test
signal errors : out natural;
-- Memory access buses
signal mem_bus_1 : inout Avalon_mem_type;
signal mem_bus_2 : inout Avalon_mem_type;
-- Bus level injected value and whether it should be forced on bus
signal bl_inject : in std_logic;
signal bl_force : in boolean
);
-- Internal test signals
signal error_ctr : natural := 0;
signal loop_ctr : natural := 0;
signal exit_imm : boolean := false;
signal rand_ctr : natural range 0 to 3800 := 0;
end entity;
USE work.CANtestLib.All;
--------------------------------------------------------------------------------
......
test/testfw/__init__.py
View file @ 99be551d
......@@ -99,7 +99,7 @@ def test(obj, config, vunit_args):
# check for unknown tests
all_benches = lib.get_test_benches('*')
unknown_tests = [tb for tb in all_benches if not re.match('tb_.*?_unit_test|tb_sanity', tb.name)]
unknown_tests = [tb for tb in all_benches if not re.match('tb_.*?_unit_test|tb_sanity|tb_feature', tb.name)]
if len(unknown_tests):
log.warn('Unknown tests (defaults will be used): {}'.format(', '.join(tb.name for tb in unknown_tests)))
......
test/testfw/data/pkg_feature_exec_dispath-body.vhd 0 → 100644
View file @ 99be551d
Library ieee;
library vunit_lib;
library work;
context vunit_lib.vunit_context;
USE IEEE.std_logic_1164.all;
USE IEEE.numeric_std.ALL;
USE ieee.math_real.ALL;
use work.CANconstants.all;
USE work.CANtestLib.All;
USE work.randomLib.All;
--Testbench packages
{% for test in tests %}
use work.{{ test }}_feature.All;
{% endfor %}
package body pkg_feature_exec_dispath is
--Procedure for processing the feature tests!
procedure exec_feature_test(
--Common test parameters
signal test_name : in string;
variable outcome : inout boolean;
signal rand_ctr : inout natural range 0 to RAND_POOL_SIZE;
--Additional signals for tests
--Pretty much everything can be read out of stat bus...