From 6227436d54bc7694d8a1cdbbeedab3ffe946af44 Mon Sep 17 00:00:00 2001 From: Wade Fife Date: Mon, 28 Feb 2022 14:54:42 -0600 Subject: [PATCH] fpga: rfnoc: Regenerate noc_shells Original-commit: 6ff8bd326b0da4d2f9e044a3df3e19b807459d25 --- lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v | 7 ++++--- .../rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v | 3 ++- lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v | 7 ++++--- lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v | 7 ++++--- lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v | 3 ++- .../blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v | 3 ++- lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v | 3 ++- .../rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v | 5 +++-- lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v | 3 ++- .../blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v | 3 ++- .../rfnoc_block_null_src_sink/noc_shell_null_src_sink.v | 3 ++- lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v | 7 ++++--- lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v | 7 ++++--- lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v | 3 ++- .../rfnoc_block_split_stream/noc_shell_split_stream.v | 3 ++- .../blocks/rfnoc_block_switchboard/noc_shell_switchboard.v | 3 ++- .../blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v | 3 ++- lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v | 3 ++- 18 files changed, 47 insertions(+), 29 deletions(-) diff --git a/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v b/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v index ae21cb3..67b2237 100644 --- a/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v +++ b/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -165,12 +166,12 @@ module noc_shell_addsub #( wire ce_rst_pulse; - pulse_synchronizer #(.MODE ("POSEDGE")) pulse_synchronizer_ce_clk ( + pulse_synchronizer #(.MODE ("POSEDGE")) pulse_synchronizer_ce ( .clk_a(rfnoc_chdr_clk), .rst_a(1'b0), .pulse_a (rfnoc_chdr_rst), .busy_a (), .clk_b(ce_clk), .pulse_b (ce_rst_pulse) ); - pulse_stretch_min #(.LENGTH(32)) pulse_stretch_min_ce_clk ( + pulse_stretch_min #(.LENGTH(32)) pulse_stretch_min_ce ( .clk(ce_clk), .rst(1'b0), .pulse_in(ce_rst_pulse), .pulse_out(ce_rst) ); diff --git a/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v b/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v index 5396228..a3a9ed1 100644 --- a/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v +++ b/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v b/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v index a487411..f4cd87a 100644 --- a/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v +++ b/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -234,7 +235,7 @@ module noc_shell_ddc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(32)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -272,7 +273,7 @@ module noc_shell_ddc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v b/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v index 5645a24..ef5231e 100644 --- a/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v +++ b/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -234,7 +235,7 @@ module noc_shell_duc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(32)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -272,7 +273,7 @@ module noc_shell_duc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v b/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v index 31c2f32..96e3dbd 100644 --- a/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v +++ b/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v b/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v index 8614f0f..a959463 100644 --- a/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v +++ b/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v b/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v index 1eecf3a..c2ff06c 100644 --- a/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v +++ b/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v b/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v index c3fd16b..6f372f0 100644 --- a/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v +++ b/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -269,7 +270,7 @@ module noc_shell_keep_one_in_n #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v b/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v index 434793f..af23f3e 100644 --- a/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v +++ b/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v b/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v index c44d28e..0972d44 100644 --- a/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v +++ b/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v b/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v index 177b58a..ca6d423 100644 --- a/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v +++ b/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v b/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v index 5909e0e..da0d7d0 100644 --- a/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v +++ b/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -250,7 +251,7 @@ module noc_shell_radio #( .NIPC (NIPC), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(2**MTU)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -288,7 +289,7 @@ module noc_shell_radio #( .NIPC (NIPC), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**(MTU+1))), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v b/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v index 51f018b..c1a5558 100644 --- a/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v +++ b/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -233,7 +234,7 @@ module noc_shell_replay #( .NIPC (MEM_DATA_W/32), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(32)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -271,7 +272,7 @@ module noc_shell_replay #( .NIPC (MEM_DATA_W/32), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v b/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v index 4e8b99e..5dca066 100644 --- a/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v +++ b/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v b/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v index 8d6c1eb..4f57ec9 100644 --- a/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v +++ b/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v b/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v index 2beb37e..88d16b7 100644 --- a/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v +++ b/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v b/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v index fd80ac7..2c3263e 100644 --- a/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v +++ b/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v b/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v index 7855d1e..6ec1803 100644 --- a/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v +++ b/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // NUM_PORTS : Number of window module instances to connect //