Skip to content

Commit 0f82898

Browse files
alexforencichalexforencich
committed
Compute DEPTH based on FIFO data width
Signed-off-by: Alex Forencich <[email protected]>
1 parent 9f15b3d commit 0f82898

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

‎tb/axis_async_fifo/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ MODULE = test_$(DUT)
3232
VERILOG_SOURCES += ../../rtl/$(DUT).v
3333

3434
# module parameters
35-
export PARAM_DEPTH := 1024
3635
export PARAM_DATA_WIDTH := 8
37-
export PARAM_KEEP_ENABLE := $(shell expr $(PARAM_DATA_WIDTH) \> 8 )
38-
export PARAM_KEEP_WIDTH := $(shell expr \( $(PARAM_DATA_WIDTH) + 7 \) / 8 )
36+
export PARAM_KEEP_ENABLE := $(shell echo $$(( $(PARAM_DATA_WIDTH) > 8 )))
37+
export PARAM_KEEP_WIDTH := $(shell echo $$(( ( $(PARAM_DATA_WIDTH) + 7 ) / 8 )))
38+
export PARAM_DEPTH := $(shell echo $$(( 1024 * $(PARAM_KEEP_WIDTH) )))
3939
export PARAM_LAST_ENABLE := 1
4040
export PARAM_ID_ENABLE := 1
4141
export PARAM_ID_WIDTH := 8

‎tb/axis_async_fifo/test_axis_async_fifo.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,10 @@ def test_axis_async_fifo(request, data_width, ram_pipeline, output_fifo,
595595

596596
parameters = {}
597597

598-
parameters['DEPTH'] = 1024
599598
parameters['DATA_WIDTH'] = data_width
600599
parameters['KEEP_ENABLE'] = int(parameters['DATA_WIDTH'] > 8)
601600
parameters['KEEP_WIDTH'] = (parameters['DATA_WIDTH'] + 7) // 8
601+
parameters['DEPTH'] = 1024 * parameters['KEEP_WIDTH']
602602
parameters['LAST_ENABLE'] = 1
603603
parameters['ID_ENABLE'] = 1
604604
parameters['ID_WIDTH'] = 8

‎tb/axis_async_fifo_adapter/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ VERILOG_SOURCES += ../../rtl/axis_async_fifo.v
3434
VERILOG_SOURCES += ../../rtl/axis_adapter.v
3535

3636
# module parameters
37-
export PARAM_DEPTH := 1024
3837
export PARAM_S_DATA_WIDTH := 8
39-
export PARAM_S_KEEP_ENABLE := $(shell expr $(PARAM_S_DATA_WIDTH) \> 8 )
40-
export PARAM_S_KEEP_WIDTH := $(shell expr \( $(PARAM_S_DATA_WIDTH) + 7 \) / 8 )
38+
export PARAM_S_KEEP_ENABLE := $(shell echo $$(( $(PARAM_S_DATA_WIDTH) > 8 )))
39+
export PARAM_S_KEEP_WIDTH := $(shell echo $$(( ( $(PARAM_S_DATA_WIDTH) + 7 ) / 8 )))
4140
export PARAM_M_DATA_WIDTH := 8
42-
export PARAM_M_KEEP_ENABLE := $(shell expr $(PARAM_M_DATA_WIDTH) \> 8 )
43-
export PARAM_M_KEEP_WIDTH := $(shell expr \( $(PARAM_M_DATA_WIDTH) + 7 \) / 8 )
41+
export PARAM_M_KEEP_ENABLE := $(shell echo $$(( $(PARAM_M_DATA_WIDTH) > 8 )))
42+
export PARAM_M_KEEP_WIDTH := $(shell echo $$(( ( $(PARAM_M_DATA_WIDTH) + 7 ) / 8 )))
43+
export PARAM_DEPTH := $(shell echo $$(( 1024 * ($(PARAM_S_KEEP_WIDTH) > $(PARAM_M_KEEP_WIDTH) ? $(PARAM_S_KEEP_WIDTH) : $(PARAM_M_KEEP_WIDTH)) )))
4444
export PARAM_ID_ENABLE := 1
4545
export PARAM_ID_WIDTH := 8
4646
export PARAM_DEST_ENABLE := 1

‎tb/axis_async_fifo_adapter/test_axis_async_fifo_adapter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,13 +590,13 @@ def test_axis_async_fifo_adapter(request, s_data_width, m_data_width, frame_fifo
590590

591591
parameters = {}
592592

593-
parameters['DEPTH'] = 1024
594593
parameters['S_DATA_WIDTH'] = s_data_width
595594
parameters['S_KEEP_ENABLE'] = int(parameters['S_DATA_WIDTH'] > 8)
596595
parameters['S_KEEP_WIDTH'] = (parameters['S_DATA_WIDTH'] + 7) // 8
597596
parameters['M_DATA_WIDTH'] = m_data_width
598597
parameters['M_KEEP_ENABLE'] = int(parameters['M_DATA_WIDTH'] > 8)
599598
parameters['M_KEEP_WIDTH'] = (parameters['M_DATA_WIDTH'] + 7) // 8
599+
parameters['DEPTH'] = 1024 * max(parameters['S_KEEP_WIDTH'], parameters['M_KEEP_WIDTH'])
600600
parameters['ID_ENABLE'] = 1
601601
parameters['ID_WIDTH'] = 8
602602
parameters['DEST_ENABLE'] = 1

‎tb/axis_fifo/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ MODULE = test_$(DUT)
3232
VERILOG_SOURCES += ../../rtl/$(DUT).v
3333

3434
# module parameters
35-
export PARAM_DEPTH := 1024
3635
export PARAM_DATA_WIDTH := 8
37-
export PARAM_KEEP_ENABLE := $(shell expr $(PARAM_DATA_WIDTH) \> 8 )
38-
export PARAM_KEEP_WIDTH := $(shell expr \( $(PARAM_DATA_WIDTH) + 7 \) / 8 )
36+
export PARAM_KEEP_ENABLE := $(shell echo $$(( $(PARAM_DATA_WIDTH) > 8 )))
37+
export PARAM_KEEP_WIDTH := $(shell echo $$(( ( $(PARAM_DATA_WIDTH) + 7 ) / 8 )))
38+
export PARAM_DEPTH := $(shell echo $$(( 1024 * $(PARAM_KEEP_WIDTH) )))
3939
export PARAM_LAST_ENABLE := 1
4040
export PARAM_ID_ENABLE := 1
4141
export PARAM_ID_WIDTH := 8

‎tb/axis_fifo/test_axis_fifo.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,10 @@ def test_axis_fifo(request, data_width, ram_pipeline, output_fifo,
374374

375375
parameters = {}
376376

377-
parameters['DEPTH'] = 1024
378377
parameters['DATA_WIDTH'] = data_width
379378
parameters['KEEP_ENABLE'] = int(parameters['DATA_WIDTH'] > 8)
380379
parameters['KEEP_WIDTH'] = (parameters['DATA_WIDTH'] + 7) // 8
380+
parameters['DEPTH'] = 1024 * parameters['KEEP_WIDTH']
381381
parameters['LAST_ENABLE'] = 1
382382
parameters['ID_ENABLE'] = 1
383383
parameters['ID_WIDTH'] = 8

‎tb/axis_fifo_adapter/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ VERILOG_SOURCES += ../../rtl/axis_fifo.v
3434
VERILOG_SOURCES += ../../rtl/axis_adapter.v
3535

3636
# module parameters
37-
export PARAM_DEPTH := 1024
3837
export PARAM_S_DATA_WIDTH := 8
39-
export PARAM_S_KEEP_ENABLE := $(shell expr $(PARAM_S_DATA_WIDTH) \> 8 )
40-
export PARAM_S_KEEP_WIDTH := $(shell expr \( $(PARAM_S_DATA_WIDTH) + 7 \) / 8 )
38+
export PARAM_S_KEEP_ENABLE := $(shell echo $$(( $(PARAM_S_DATA_WIDTH) > 8 )))
39+
export PARAM_S_KEEP_WIDTH := $(shell echo $$(( ( $(PARAM_S_DATA_WIDTH) + 7 ) / 8 )))
4140
export PARAM_M_DATA_WIDTH := 8
42-
export PARAM_M_KEEP_ENABLE := $(shell expr $(PARAM_M_DATA_WIDTH) \> 8 )
43-
export PARAM_M_KEEP_WIDTH := $(shell expr \( $(PARAM_M_DATA_WIDTH) + 7 \) / 8 )
41+
export PARAM_M_KEEP_ENABLE := $(shell echo $$(( $(PARAM_M_DATA_WIDTH) > 8 )))
42+
export PARAM_M_KEEP_WIDTH := $(shell echo $$(( ( $(PARAM_M_DATA_WIDTH) + 7 ) / 8 )))
43+
export PARAM_DEPTH := $(shell echo $$(( 1024 * ($(PARAM_S_KEEP_WIDTH) > $(PARAM_M_KEEP_WIDTH) ? $(PARAM_S_KEEP_WIDTH) : $(PARAM_M_KEEP_WIDTH)) )))
4444
export PARAM_ID_ENABLE := 1
4545
export PARAM_ID_WIDTH := 8
4646
export PARAM_DEST_ENABLE := 1

‎tb/axis_fifo_adapter/test_axis_fifo_adapter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,13 @@ def test_axis_fifo_adapter(request, s_data_width, m_data_width, frame_fifo, drop
373373

374374
parameters = {}
375375

376-
parameters['DEPTH'] = 1024
377376
parameters['S_DATA_WIDTH'] = s_data_width
378377
parameters['S_KEEP_ENABLE'] = int(parameters['S_DATA_WIDTH'] > 8)
379378
parameters['S_KEEP_WIDTH'] = (parameters['S_DATA_WIDTH'] + 7) // 8
380379
parameters['M_DATA_WIDTH'] = m_data_width
381380
parameters['M_KEEP_ENABLE'] = int(parameters['M_DATA_WIDTH'] > 8)
382381
parameters['M_KEEP_WIDTH'] = (parameters['M_DATA_WIDTH'] + 7) // 8
382+
parameters['DEPTH'] = 1024 * max(parameters['S_KEEP_WIDTH'], parameters['M_KEEP_WIDTH'])
383383
parameters['ID_ENABLE'] = 1
384384
parameters['ID_WIDTH'] = 8
385385
parameters['DEST_ENABLE'] = 1

0 commit comments

Comments
 (0)