Change in Makefile. Now in every single error, the CI will stop

bc6bcba1 · kblantos · 9bdb08cd · bc6bcba1 · bc6bcba1 · bc6bcba1
Commit bc6bcba1 authored Sep 06, 2022 by kblantos
74 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,6 @@ vhdl_cores_simulation:
  script:
    - /entrypoint.sh
    - cd testbench/
-    - git submodule init && git submodule update
    - make
 #  artifacts:
 #    paths:

--- a/testbench/axi/axi4lite32_axi4full64_bridge/run.sh
+++ b/testbench/axi/axi4lite32_axi4full64_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/axi/axi4lite_axi4full_bridge/run.sh
+++ b/testbench/axi/axi4lite_axi4full_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/axi/axi4lite_wb_bridge/run.sh
+++ b/testbench/axi/axi4lite_wb_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/axi/z7_axi_gpio_expander/run.sh
+++ b/testbench/axi/z7_axi_gpio_expander/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_arbitrated_mux/run.sh
+++ b/testbench/common/gc_arbitrated_mux/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_async_counter_diff/run.sh
+++ b/testbench/common/gc_async_counter_diff/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_async_signals_input_stage/run.sh
+++ b/testbench/common/gc_async_signals_input_stage/run.sh
@@ -3,30 +3,37 @@
 #This is a simple script to run simulations in GHDL
 
 TB=tb_gc_async_signals_input_stage
- 
+
+echo "******************************************************************************************"
 echo "Running simulation for $TB"
+echo "******************************************************************************************"

+echo ""
 echo "**************************TEST CASE 1 *****************************************************"
 echo "Number of input signals = 1, extended clock cycles = 0, cycles that filter out glitches = 0"
-ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=1 -gg_extended_pulse_width=0 -gg_dglitch_filter_len=0
+ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=1 -gg_extended_pulse_width=0 -gg_dglitch_filter_len=0 
+echo""

 echo "**************************TEST CASE 2 *****************************************************"
 echo "Number of input signals = 1, extended clock cycles = 0, cycles that filter out glitches = 1"
 ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=1 -gg_extended_pulse_width=0 -gg_dglitch_filter_len=1
+echo ""

 echo "**************************TEST CASE 3 *****************************************************"
 echo "Number of input signals = 2, extended clock cycles = 2, cycles that filter out glitches = 2"
 ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=2 -gg_extended_pulse_width=2 -gg_dglitch_filter_len=2
+echo ""

 echo "**************************TEST CASE 4 *****************************************************"
 echo "Number of input signals = 2, extended clock cycles = 2, cycles that filter out glitches = 4"
 ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=2 -gg_extended_pulse_width=2 -gg_dglitch_filter_len=4
+echo ""

 echo "**************************TEST CASE 5 *****************************************************"
 echo "Number of input signals = 4, extended clock cycles = 4, cycles that filter out glitches = 6"
 ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=4 -gg_extended_pulse_width=4 -gg_dglitch_filter_len=6
+echo ""

 echo "**************************TEST CASE 6 *****************************************************"
 echo "Number of input signals = 8, extended clock cycles = 8, cycles that filter out glitches = 10"
 ghdl -r --std=08 -frelaxed-rules $TB -gg_seed=$RANDOM -gg_signal_num=8 -gg_extended_pulse_width=8 -gg_dglitch_filter_len=10
-                                                                                                      
--- a/testbench/common/gc_async_signals_input_stage/tb_gc_async_signals_input_stage.vhd
+++ b/testbench/common/gc_async_signals_input_stage/tb_gc_async_signals_input_stage.vhd
@@ -130,8 +130,8 @@ begin
      ncycles := ncycles + 1;
    end loop;
    report "Number of Simulation cycles = " & to_string(ncycles);
+    stop <= true;
    report "Test PASS!";
-    stop <= TRUE;
    wait;
  end process stim;

@@ -153,32 +153,38 @@ begin

    check_signals_p1 : process 
    begin
-      wait until rising_edge(tb_clk_i) and tb_rst_n_i = '1';
-      wait until rising_edge(tb_signals_o(i));
-      wait for 2*C_CLK_PERIOD; 
-      assert (tb_signals_p1_o(i) = '1')
+      while not stop loop
+        wait until rising_edge(tb_clk_i) and tb_rst_n_i = '1';
+        wait until rising_edge(tb_signals_o(i));
+        wait for 2*C_CLK_PERIOD; 
+        assert (tb_signals_p1_o(i) = '1')
        report "Wrong value for single-clock output" severity failure;
+      end loop;
    end process;     

    -- Checking that signals_pn is '1' on rising or falling edge (depending the conf.)
    gen_with_pulse_extender : if g_extended_pulse_width>1 generate
      check_signals_pn : process
      begin
-        wait until (tb_signals_o(i) = '1');
-        wait for g_extended_pulse_width*C_CLK_PERIOD;
-        assert (tb_signals_pn_o(i) = '1')
+        while not stop loop
+          wait until (tb_signals_o(i) = '1');
+          wait for g_extended_pulse_width*C_CLK_PERIOD;
+          assert (tb_signals_pn_o(i) = '1')
          report "Wrong value for multi-clock output" severity failure;
+        end loop;
      end process;
    end generate gen_with_pulse_extender;
    
      -- Value of signals_p1 and signals_pn is the same, except that pn is extended
      check_same_value : process
      begin
-        wait until rising_edge(tb_clk_i) and tb_rst_n_i = '1';
-        wait until rising_edge(tb_signals_o(i));
-        wait for 2*C_CLK_PERIOD;
-        assert (tb_signals_p1_o(i) = tb_signals_pn_o(i))
+        while not stop loop
+          wait until rising_edge(tb_clk_i) and tb_rst_n_i = '1';
+          wait until rising_edge(tb_signals_o(i));
+          wait for 2*C_CLK_PERIOD;
+          assert (tb_signals_p1_o(i) = tb_signals_pn_o(i))
          report "different output pulses" severity failure;
+        end loop;
      end process;

  end generate gen_signals;

--- a/testbench/common/gc_bicolor_led_ctrl/run.sh
+++ b/testbench/common/gc_bicolor_led_ctrl/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL
 #In case we need to see waveforms, type --wave=waveform.ghw

--- a/testbench/common/gc_big_adder/run.sh
+++ b/testbench/common/gc_big_adder/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL
 #In case we need to see waveforms, type --wave=waveform.ghw

--- a/testbench/common/gc_comparator/run.sh
+++ b/testbench/common/gc_comparator/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_delay_gen/run.sh
+++ b/testbench/common/gc_delay_gen/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_delay_line/run.sh
+++ b/testbench/common/gc_delay_line/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL
 #In case we need to see waveforms, type --wave=waveform.ghw

--- a/testbench/common/gc_ds182x_readout/run.sh
+++ b/testbench/common/gc_ds182x_readout/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_dual_pi_controller/run.sh
+++ b/testbench/common/gc_dual_pi_controller/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_dyn_extend_pulse/run.sh
+++ b/testbench/common/gc_dyn_extend_pulse/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_dyn_glitch_filt/run.sh
+++ b/testbench/common/gc_dyn_glitch_filt/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_edge_detect/run.sh
+++ b/testbench/common/gc_edge_detect/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_extend_pulse/run.sh
+++ b/testbench/common/gc_extend_pulse/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_frequency_meter/run.sh
+++ b/testbench/common/gc_frequency_meter/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_fsm_watchdog/run.sh
+++ b/testbench/common/gc_fsm_watchdog/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_glitch_filt/run.sh
+++ b/testbench/common/gc_glitch_filt/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_i2c_slave/run.sh
+++ b/testbench/common/gc_i2c_slave/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_moving_average/run.sh
+++ b/testbench/common/gc_moving_average/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL
 #In case we need to see waveforms, type --wave=waveform.ghw

--- a/testbench/common/gc_multichannel_frequency_meter/run.sh
+++ b/testbench/common/gc_multichannel_frequency_meter/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_negedge/run.sh
+++ b/testbench/common/gc_negedge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_posedge/run.sh
+++ b/testbench/common/gc_posedge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_prio_encoder/run.sh
+++ b/testbench/common/gc_prio_encoder/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL
 

--- a/testbench/common/gc_pulse_synchronizer/run.sh
+++ b/testbench/common/gc_pulse_synchronizer/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_reset/run.sh
+++ b/testbench/common/gc_reset/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_reset_multi_aasd/run.sh
+++ b/testbench/common/gc_reset_multi_aasd/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_rr_arbiter/run.sh
+++ b/testbench/common/gc_rr_arbiter/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL
 

--- a/testbench/common/gc_serial_dac/run.sh
+++ b/testbench/common/gc_serial_dac/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_simple_spi_master/run.sh
+++ b/testbench/common/gc_simple_spi_master/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_single_reset_gen/run.sh
+++ b/testbench/common/gc_single_reset_gen/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_sync/run.sh
+++ b/testbench/common/gc_sync/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_sync_ffs/run.sh
+++ b/testbench/common/gc_sync_ffs/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/common/gc_sync_register/run.sh
+++ b/testbench/common/gc_sync_register/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL
 

--- a/testbench/common/gc_sync_word_rd/run.sh
+++ b/testbench/common/gc_sync_word_rd/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL
 

--- a/testbench/common/gc_sync_word_wr/run.sh
+++ b/testbench/common/gc_sync_word_wr/run.sh
-#!/bin/bash
+#!/bin/bash -e
 
 #This is a simple script to run simulations in GHDL


--- a/testbench/common/gc_word_packer/run.sh
+++ b/testbench/common/gc_word_packer/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/altera/gc_shiftreg/run.sh
+++ b/testbench/genrams/altera/gc_shiftreg/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/common/inferred_async_fifo/run.sh
+++ b/testbench/genrams/common/inferred_async_fifo/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/genrams/common/inferred_async_fifo_dual_rst/run.sh
+++ b/testbench/genrams/common/inferred_async_fifo_dual_rst/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/common/inferred_sync_fifo/run.sh
+++ b/testbench/genrams/common/inferred_sync_fifo/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/genrams/generic/generic_async_fifo/run.sh
+++ b/testbench/genrams/generic/generic_async_fifo/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/generic/generic_async_fifo_dual_rst/run.sh
+++ b/testbench/genrams/generic/generic_async_fifo_dual_rst/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/generic/generic_sync_fifo/run.sh
+++ b/testbench/genrams/generic/generic_sync_fifo/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/xilinx/gc_shiftreg/run.sh
+++ b/testbench/genrams/xilinx/gc_shiftreg/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/genrams/xilinx/generic_dpram/run.sh
+++ b/testbench/genrams/xilinx/generic_dpram/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/xilinx/generic_dpram_dualclock/run.sh
+++ b/testbench/genrams/xilinx/generic_dpram_dualclock/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/genrams/xilinx/generic_dpram_sameclock/run.sh
+++ b/testbench/genrams/xilinx/generic_dpram_sameclock/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/genrams/xilinx/generic_dpram_split/run.sh
+++ b/testbench/genrams/xilinx/generic_dpram_split/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/genrams/xilinx/generic_simple_dpram/run.sh
+++ b/testbench/genrams/xilinx/generic_simple_dpram/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/genrams/xilinx/generic_spram/run.sh
+++ b/testbench/genrams/xilinx/generic_spram/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb16_to_wb32/run.sh
+++ b/testbench/wishbone/wb16_to_wb32/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_async_bridge/run.sh
+++ b/testbench/wishbone/wb_async_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_axi4lite_bridge/run.sh
+++ b/testbench/wishbone/wb_axi4lite_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_clock_crossing/xwb_clock_bridge/run.sh
+++ b/testbench/wishbone/wb_clock_crossing/xwb_clock_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_clock_crossing/xwb_clock_crossing/run.sh
+++ b/testbench/wishbone/wb_clock_crossing/xwb_clock_crossing/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_crossbar/sdb_rom/run.sh
+++ b/testbench/wishbone/wb_crossbar/sdb_rom/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_crossbar/xwb_crossbar/run.sh
+++ b/testbench/wishbone/wb_crossbar/xwb_crossbar/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_dpram/xwb_dpram/run.sh
+++ b/testbench/wishbone/wb_dpram/xwb_dpram/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_i2c_bridge/run.sh
+++ b/testbench/wishbone/wb_i2c_bridge/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_indirect/run.sh
+++ b/testbench/wishbone/wb_indirect/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_metadata/run.sh
+++ b/testbench/wishbone/wb_metadata/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_register/wb_skidpad/run.sh
+++ b/testbench/wishbone/wb_register/wb_skidpad/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations in GHDL


--- a/testbench/wishbone/wb_register/xwb_register/run.sh
+++ b/testbench/wishbone/wb_register/xwb_register/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_register/xwb_register_link/run.sh
+++ b/testbench/wishbone/wb_register/xwb_register_link/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_remapper/run.sh
+++ b/testbench/wishbone/wb_remapper/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_simple_timer/run.sh
+++ b/testbench/wishbone/wb_simple_timer/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL

--- a/testbench/wishbone/wb_slave_adapter/run.sh
+++ b/testbench/wishbone/wb_slave_adapter/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a script to run multiple simulations in Modelsim


--- a/testbench/wishbone/wb_split/run.sh
+++ b/testbench/wishbone/wb_split/run.sh
-#!/bin/bash
+#!/bin/bash -e

 #This is a simple script to run simulations
 #in GHDL