diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/tb_lofar2_unb2b_sdp_station_xsub_one_xst_offload.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/tb_lofar2_unb2b_sdp_station_xsub_one_xst_offload.vhd index 3c1ec3c57f7102adf17207bad48df86644ed92be..05b91fc9efadab22b6a5bbf99d4f01814e062405 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/tb_lofar2_unb2b_sdp_station_xsub_one_xst_offload.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/revisions/lofar2_unb2b_sdp_station_xsub_one/tb_lofar2_unb2b_sdp_station_xsub_one_xst_offload.vhd @@ -71,7 +71,7 @@ ARCHITECTURE tb OF tb_lofar2_unb2b_sdp_station_xsub_one_xst_offload IS CONSTANT c_tb_clk_period : TIME := 100 ps; -- use fast tb_clk to speed up M&C - CONSTANT c_nof_block_per_sync : NATURAL := 16; -- long enough to stream out udp data + CONSTANT c_nof_block_per_sync : NATURAL := 8*16; -- long enough to stream out udp data CONSTANT c_nof_clk_per_sync : NATURAL := c_nof_block_per_sync*c_sdp_N_fft; CONSTANT c_pps_period : NATURAL := c_nof_clk_per_sync; CONSTANT c_wpfb_sim : t_wpfb := func_wpfb_set_nof_block_per_sync(c_sdp_wpfb_subbands, c_nof_block_per_sync); @@ -79,6 +79,8 @@ ARCHITECTURE tb OF tb_lofar2_unb2b_sdp_station_xsub_one_xst_offload IS -- MM CONSTANT c_mm_file_reg_bsn_source_v2 : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_BSN_SOURCE_V2"; + CONSTANT c_mm_file_reg_crosslets_info : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_CROSSLETS_INFO"; + CONSTANT c_mm_file_reg_nof_crosslets : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_NOF_CROSSLETS"; CONSTANT c_mm_file_reg_stat_enable_xst : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_STAT_ENABLE_XST"; CONSTANT c_mm_file_reg_bsn_sync_scheduler_xsub : STRING := mmf_unb_file_prefix(c_unb_nr, c_node_nr) & "REG_BSN_SYNC_SCHEDULER_XSUB"; @@ -221,6 +223,19 @@ BEGIN WAIT FOR 1 us; pps_rst <= '0'; + ---------------------------------------------------------------------------- + -- Crosslets Info + ---------------------------------------------------------------------------- + mmf_mm_bus_wr(c_mm_file_reg_nof_crosslets, 0, 7, tb_clk); -- nof crosslets offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 0, 0, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 1, 1, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 2, 2, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 3, 3, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 4, 4, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 5, 5, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 6, 6, tb_clk); -- offset + mmf_mm_bus_wr(c_mm_file_reg_crosslets_info, 15, 7, tb_clk); -- stepsize + ---------------------------------------------------------------------------- -- Enable xsub ---------------------------------------------------------------------------- @@ -249,16 +264,16 @@ BEGIN ------------------------------------------------------------------------- -- Verify proper DUT 1GbE offload output using Ethernet packet statistics ------------------------------------------------------------------------- - u_eth_statistics : ENTITY eth_lib.eth_statistics - GENERIC MAP ( - g_runtime_nof_packets => c_eth_check_nof_packets, - g_runtime_timeout => c_eth_runtime_timeout, - g_check_nof_valid => TRUE, - g_check_nof_valid_ref => c_eth_check_nof_valid - ) - PORT MAP ( - eth_serial_in => eth_txp(0), - tb_end => eth_done - ); +-- u_eth_statistics : ENTITY eth_lib.eth_statistics +-- GENERIC MAP ( +-- g_runtime_nof_packets => c_eth_check_nof_packets, +-- g_runtime_timeout => c_eth_runtime_timeout, +-- g_check_nof_valid => TRUE, +-- g_check_nof_valid_ref => c_eth_check_nof_valid +-- ) +-- PORT MAP ( +-- eth_serial_in => eth_txp(0), +-- tb_end => eth_done +-- ); END tb; diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd index 4096edca0155055493049fae3e62864dba5ab5d2..1cf8f2d16ef84f2aaa5a4cb31ae35ef44100b90c 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station_pkg.vhd @@ -45,7 +45,7 @@ PACKAGE lofar2_unb2c_sdp_station_pkg IS CONSTANT c_bf : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, TRUE, FALSE, FALSE, 0); CONSTANT c_xsub_one : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, TRUE, FALSE, 1); CONSTANT c_xsub_ring : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, FALSE, TRUE, TRUE, 9); - CONSTANT c_full : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, TRUE, TRUE, FALSE, 1); + CONSTANT c_full : t_lofar2_unb2c_sdp_station_config := (FALSE, TRUE, TRUE, TRUE, TRUE, 9); -- Function to select the revision configuration. FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2c_sdp_station_config;