Skip to content

Commit 9ec3b40

Browse files
committed
Merge branch 'valek-task-fpl_latency_meas' into 'devel'
docs(dma-calypte): update latency measurement results See merge request ndk/ndk-fpga!238
2 parents 20a5b92 + 76f9550 commit 9ec3b40

20 files changed

+11192
-327
lines changed

comp/dma/dma_calypte/comp/test_core/DevTree.tcl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ proc dts_calypte_test_core {DTS base_addr {dbg_en False}} {
2727
}
2828
}
2929

30-
dts_create_node dts "dma_calypte_latency_meter0" {
31-
dts_appendprop_comp_node dts $LATENCY_METER_BASE_ADDR 0x30 "cesnet,dma_calypte_latency_meter"
32-
}
30+
dts_dma_latency_meter dts $LATENCY_METER_BASE_ADDR
3331
}
3432

3533
dts_create_node dts "dma_calypte_reset_fsm0" {

comp/dma/dma_calypte/comp/test_core/Modules.tcl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,15 @@ lappend PACKAGES "$OFM_PATH/comp/base/pkg/type_pack.vhd"
88

99
set MI_ASYNC_BASE "$OFM_PATH/comp/mi_tools/async"
1010
set MI_SPLITTER_PLUS_GEN_BASE "$OFM_PATH/comp/mi_tools/splitter_plus_gen"
11-
set MI_ASYNC_BASE "$OFM_PATH/comp/mi_tools/async"
1211
set TX_DMA_DEBUG_CORE_BASE "$ENTITY_BASE/comp/tx_debug_core"
1312
set MFB_LOOPBACK_BASE "$OFM_PATH/comp/mfb_tools/flow/loopback"
14-
set DATA_LOGGER_BASE "$OFM_PATH/comp/debug/data_logger"
15-
set LATENCY_METER_BASE "$OFM_PATH/comp/debug/latency_meter"
16-
set MFB_GENERATOR_BASE "$OFM_PATH/comp/mfb_tools/debug/generator"
13+
set DMA_LAT_METER_BASE "$ENTITY_BASE/comp/dma_latency_meter"
1714

1815
lappend COMPONENTS [ list "MI_ASYNC" $MI_ASYNC_BASE "FULL" ]
1916
lappend COMPONENTS [ list "MI_SPLITTER_PLUS_GEN" $MI_SPLITTER_PLUS_GEN_BASE "FULL" ]
2017
lappend COMPONENTS [ list "TX_DMA_DEBUG_CORE" $TX_DMA_DEBUG_CORE_BASE "FULL" ]
2118
lappend COMPONENTS [ list "MFB_LOOPBACK" $MFB_LOOPBACK_BASE "FULL" ]
22-
lappend COMPONENTS [ list "DATA_LOGGER" $DATA_LOGGER_BASE "FULL" ]
23-
lappend COMPONENTS [ list "LATENCY_METER" $LATENCY_METER_BASE "FULL" ]
24-
lappend COMPONENTS [ list "MFB_GENERATOR" $MFB_GENERATOR_BASE "FULL" ]
19+
lappend COMPONENTS [ list "DMA_LATENCY_METER" $DMA_LAT_METER_BASE "FULL" ]
2520

2621
lappend MOD "$ENTITY_BASE/dma_test_core.vhd"
2722
lappend MOD "$ENTITY_BASE/DevTree.tcl"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# DevTree.tcl: generate nodes for the DMA latecny meter
2+
# Copyright (C) 2025 CESNET z. s. p. o.
3+
# Author(s): Vladisav Valek <valekv@cesnet.cz>
4+
#
5+
# SPDX-License-Identifier: BSD-3-Clause
6+
7+
proc dts_dma_latency_meter {DTS base_addr {idx 0}} {
8+
upvar 1 $DTS dts
9+
10+
dts_create_node dts "dma_latency_meter$idx" {
11+
dts_appendprop_comp_node dts $base_addr 0x30 "cesnet,dma_latency_meter"
12+
}
13+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Modules.tcl: Components include script
2+
# Copyright (C) 2023 CESNET
3+
# Author(s): Vladislav Valek <xvalek14@vutbr.cz>
4+
#
5+
6+
lappend PACKAGES "$OFM_PATH/comp/base/pkg/math_pack.vhd"
7+
lappend PACKAGES "$OFM_PATH/comp/base/pkg/type_pack.vhd"
8+
9+
set MI_ASYNC_BASE "$OFM_PATH/comp/mi_tools/async"
10+
set DATA_LOGGER_BASE "$OFM_PATH/comp/debug/data_logger"
11+
set LATENCY_METER_BASE "$OFM_PATH/comp/debug/latency_meter"
12+
set MFB_GENERATOR_BASE "$OFM_PATH/comp/mfb_tools/debug/generator"
13+
set MFB_META_EXT_BASE "$OFM_PATH/comp/mfb_tools/flow/metadata_extractor"
14+
15+
lappend COMPONENTS [ list "MI_ASYNC" $MI_ASYNC_BASE "FULL" ]
16+
lappend COMPONENTS [ list "DATA_LOGGER" $DATA_LOGGER_BASE "FULL" ]
17+
lappend COMPONENTS [ list "LATENCY_METER" $LATENCY_METER_BASE "FULL" ]
18+
lappend COMPONENTS [ list "MFB_GENERATOR" $MFB_GENERATOR_BASE "FULL" ]
19+
lappend COMPONENTS [ list "METADATA_EXTRACTOR" $MFB_META_EXT_BASE "FULL" ]
20+
21+
lappend MOD "$ENTITY_BASE/dma_latency_meter.vhd"
22+
lappend MOD "$ENTITY_BASE/DevTree.tcl"

comp/dma/dma_calypte/comp/test_core/comp/dma_latency_meter/dma_latency_meter.vhd

Lines changed: 564 additions & 0 deletions
Large diffs are not rendered by default.

comp/dma/dma_calypte/comp/test_core/dma_test_core.vhd

Lines changed: 146 additions & 291 deletions
Large diffs are not rendered by default.
310 KB
Loading

0 commit comments

Comments
 (0)