Merge branch '167-data-length-code-test' into 'master'

Resolve "Data length code test"

Closes #167

See merge request illeondr/CAN_FD_IP_Core!131

test/feature/data_length_code_feature_tb.vhd

+--------------------------------------------------------------------------------
+--
+-- 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:
+--  Data length Code feature test. Verifies functionality of maximal DLC equal
+--  to 8 for CAN 2.0 frames.
+--
+--  Test sequence:
+--    1. Generate CAN 2.0 Frame and set DLC higher than 8. Set higher data
+--       bytes accordingly!
+--    2. Send the CAN Frame via Node 1.
+--    3. Verify that frame received by Node 2, has the same DLC, but is has
+--       received only 8 bytes of Data!
+--------------------------------------------------------------------------------
+-- Revision History:
+--    14.7.2018   Created file
+--------------------------------------------------------------------------------
+
+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.pkg_feature_exec_dispath.all;
+
+use work.CAN_FD_register_map.all;
+use work.CAN_FD_frame_format.all;
+
+package data_length_code_feature is
+    procedure data_length_code_feature_exec(
+        variable    o               : out    feature_outputs_t;
+        signal      so              : out    feature_signal_outputs_t;
+        signal      rand_ctr        : inout  natural range 0 to RAND_POOL_SIZE;
+        signal      iout            : in     instance_outputs_arr_t;
+        signal      mem_bus         : inout  mem_bus_arr_t;
+        signal      bus_level       : in     std_logic
+    );
+end package;
+
+
+package body data_length_code_feature is
+    procedure data_length_code_feature_exec(
+        variable    o               : out    feature_outputs_t;
+        signal      so              : out    feature_signal_outputs_t;
+        signal      rand_ctr        : inout  natural range 0 to RAND_POOL_SIZE;
+        signal      iout            : in     instance_outputs_arr_t;
+        signal      mem_bus         : inout  mem_bus_arr_t;
+        signal      bus_level       : in     std_logic
+    ) is
+        constant ID_1               :        natural := 1;
+        constant ID_2               :        natural := 2;
+        variable CAN_frame          :        SW_CAN_frame_type;
+        variable CAN_frame_2        :        SW_CAN_frame_type  := 
+                    (0, (OTHERS => (OTHERS => '0')), "0000", 0, '0', '0',
+                     '0', '0', '0', (OTHERS => '0'), 0);
+        variable frame_sent         :        boolean;
+    begin
+        o.outcome := true;
+
+        ------------------------------------------------------------------------
+        -- Generate CAN Frame and force CAN 2.0 and DLC higher than 8! This
+        -- DLC will be transmitted in DLC bits, but only 8 bytes of data
+        -- should be transmitted!
+        ------------------------------------------------------------------------
+        CAN_generate_frame(rand_ctr, CAN_frame);
+        rand_logic_vect_v(rand_ctr, CAN_frame.dlc, 0.5);
+        CAN_frame.dlc(3) := '1';
+        CAN_frame.rtr := NO_RTR_FRAME;
+        CAN_frame.frame_format := NORMAL_CAN;
+        decode_dlc(CAN_frame.dlc, CAN_frame.data_length);
+        for i in 0 to CAN_frame.data_length - 1 loop
+            rand_logic_vect_v(rand_ctr, CAN_frame.data(i), 0.5);
+        end loop;
+
+        ------------------------------------------------------------------------
+        -- Send frame by Node 1
+        ------------------------------------------------------------------------
+        CAN_send_frame(CAN_frame, 1, ID_1, mem_bus(1), frame_sent);
+        CAN_wait_frame_sent(ID_1, mem_bus(1));
+        wait for 500 ns;
+
+        ------------------------------------------------------------------------
+        -- Read frame by Node 2. Received DLC should be matching the transmitted
+        -- DLC, but only 8 bytes of data should be received (int_dlc was forced
+        -- to 8!). Thus RWCNT field should be 5!
+        ------------------------------------------------------------------------
+        CAN_read_frame(CAN_frame_2, ID_2, mem_bus(2));
+        if (CAN_frame_2.rwcnt /= 5 or 
+            CAN_frame_2.dlc /= CAN_frame.dlc)
+        then
+            o.outcome := false;
+            CAN_print_frame(CAN_frame_2, info_l);
+            report "Invalid DLC received!" severity error;
+        end if;
+
+        for i in 8 to 63 loop
+            if (CAN_frame_2.data(i) /= "00000000") then
+                report "Byte index " & integer'image(i) & " not zero!"
+                    severity error;
+            end if;
+        end loop;
+
+  end procedure;
+
+end package body;

test/feature/rtr_pref_feature.vhd → test/feature/rtr_pref_feature_tb.vhd

@@ -80,7 +80,7 @@ package rtr_pref_feature is
         variable    o               : out    feature_outputs_t;
         signal      so              : out    feature_signal_outputs_t;
         signal      rand_ctr        : inout  natural range 0 to RAND_POOL_SIZE;
-        signal      iout            : in     instance_inputs_arr_t;
+        signal      iout            : in     instance_outputs_arr_t;
         signal      mem_bus         : inout  mem_bus_arr_t;
         signal      bus_level       : in     std_logic
     );
@@ -92,7 +92,7 @@ package body rtr_pref_feature is
         variable    o               : out    feature_outputs_t;
         signal      so              : out    feature_signal_outputs_t;
         signal      rand_ctr        : inout  natural range 0 to RAND_POOL_SIZE;
-        signal      iout            : in     instance_inputs_arr_t;
+        signal      iout            : in     instance_outputs_arr_t;
         signal      mem_bus         : inout  mem_bus_arr_t;
         signal      bus_level       : in     std_logic
     ) is
@@ -107,7 +107,7 @@ package body rtr_pref_feature is
                                                 false, false, false, false,
                                                 false, false, false);
     begin
-        outcome := true;
+        o.outcome := true;
 
         ------------------------------------------------------------------------
         -- Part 1
@@ -123,31 +123,31 @@ package body rtr_pref_feature is
         -- Set the RTR preferred behaviour to send the DLC all zeroes..
         ------------------------------------------------------------------------
         mode.rtr_pref := true;
-        set_core_mode(mode, ID_2, mem_bus_2);
-        set_core_mode(mode, ID_1, mem_bus_1);
+        set_core_mode(mode, ID_2, mem_bus(2));
+        set_core_mode(mode, ID_1, mem_bus(1));
 
         ------------------------------------------------------------------------
         -- Restart the content of the Node 2 RX Buffer
         ------------------------------------------------------------------------
         command.release_rec_buffer := true;
-        give_controller_command(command, ID_2, mem_bus_2);
+        give_controller_command(command, ID_2, mem_bus(2));
         command.release_rec_buffer := false;
 
         ------------------------------------------------------------------------
         -- Insert the frame for transmittion and wait until it was sent
         ------------------------------------------------------------------------
-        CAN_send_frame(tx_frame, 1, ID_1, mem_bus_1, frame_sent);
+        CAN_send_frame(tx_frame, 1, ID_1, mem_bus(1), frame_sent);
         if (not frame_sent) then
-            outcome := false;
+            o.outcome := false;
         end if;
-        CAN_wait_frame_sent(ID_2, mem_bus_2);
+        CAN_wait_frame_sent(ID_2, mem_bus(2));
 
         ------------------------------------------------------------------------
         -- Check that recieved DLC is zero
         ------------------------------------------------------------------------
-        CAN_read_frame(rx_frame, ID_2, mem_bus_2);
+        CAN_read_frame(rx_frame, ID_2, mem_bus(2));
         if (rx_frame.dlc /= x"0") then
-            outcome := false;
+            o.outcome := false;
         end if;
 
 
@@ -158,31 +158,31 @@ package body rtr_pref_feature is
         -- Set the RTR preferred behaviour to send the original DLC
         ------------------------------------------------------------------------
         mode.rtr_pref := false;
-        set_core_mode(mode, ID_2, mem_bus_2);
-        set_core_mode(mode, ID_1, mem_bus_1);
+        set_core_mode(mode, ID_2, mem_bus(2));
+        set_core_mode(mode, ID_1, mem_bus(1));
 
         ------------------------------------------------------------------------
         -- Restart the content of the Node 2 RX Buffer
         ------------------------------------------------------------------------
         command.release_rec_buffer := true;
-        give_controller_command(command, ID_2, mem_bus_2);
+        give_controller_command(command, ID_2, mem_bus(2));
         command.release_rec_buffer := false;
 
         ------------------------------------------------------------------------
         -- Insert the frame for transmittion and wait until recieved
         ------------------------------------------------------------------------
-        CAN_send_frame(tx_frame, 1, ID_1, mem_bus_1, frame_sent);
+        CAN_send_frame(tx_frame, 1, ID_1, mem_bus(1), frame_sent);
         if (not frame_sent) then
-            outcome := false;
+            o.outcome := false;
         end if;
-        CAN_wait_frame_sent(ID_2, mem_bus_2);
+        CAN_wait_frame_sent(ID_2, mem_bus(2));
 
         ------------------------------------------------------------------------
         -- Check that recieved DLC is matching transmitted DLC
         ------------------------------------------------------------------------
-        CAN_read_frame(rx_frame, ID_2, mem_bus_2);
+        CAN_read_frame(rx_frame, ID_2, mem_bus(2));
         if (rx_frame.dlc /= tx_frame.dlc) then
-            outcome := false;
+            o.outcome := false;
         end if;
 
   end procedure;

test/lib/CANtestLib.vhd

@@ -2486,10 +2486,10 @@ package body CANtestLib is
 
         rand_real_v(rand_ctr, rand_value);
 
-		------------------------------------------------------------------------
+        ------------------------------------------------------------------------
         -- We generate only valid frame combinations to avoid problems...
         -- FD frames has no RTR frame, neither the RTR field!
-		------------------------------------------------------------------------
+        ------------------------------------------------------------------------
         if (frame.frame_format = FD_CAN) then
             frame.rtr := NO_RTR_FRAME;
         end if;

test/tests_fast.yml

@@ -60,6 +60,8 @@ feature:
         tx_arb_time_tran:
         timestamp_options:
         byte_enable:
+        rtr_pref:
+        data_length_code:
 reference:
     default:
         <<: *default

test/tests_nightly.yml

@@ -89,6 +89,8 @@ feature:
         tx_arb_time_tran:
         timestamp_options:
         byte_enable:
+        rtr_pref:
+        data_length_code:
 sanity:
     default:
         <<: *default