-
Notifications
You must be signed in to change notification settings - Fork 133
Enhance Rivermax Manager RX and TX to support multiple streams per thread #1131
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
6936d86
c39f925
8fe767e
c76507a
7029ce7
0a6d0e2
ea3e40b
23a4e2a
7fd5cb1
103007f
95336ad
866d214
79490ed
be43f5e
9f0f557
30b7ec2
2e705e6
eff477d
08bdb37
ffcccb3
fc53415
7e0616b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| %YAML 1.2 | ||
| # SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| --- | ||
| scheduler: | ||
| check_recession_period_ms: 0 | ||
| worker_thread_number: 5 | ||
| stop_on_deadlock: true | ||
| stop_on_deadlock_timeout: 500 | ||
|
|
||
| advanced_network: | ||
| cfg: | ||
| version: 1 | ||
| manager: "rivermax" | ||
| master_core: 6 # Master CPU core | ||
| debug: 1 | ||
| log_level: "debug" | ||
|
|
||
| memory_regions: | ||
| - name: "Data_TX_CPU" | ||
| kind: "huge" | ||
| affinity: 0 | ||
| num_bufs: 43200 | ||
| buf_size: 20 | ||
| - name: "Data_TX_GPU" | ||
| kind: "device" | ||
| affinity: 0 | ||
| num_bufs: 43200 | ||
| buf_size: 1200 | ||
|
|
||
| interfaces: | ||
| - name: "tx_port" | ||
| address: cc:00.1 | ||
| tx: | ||
| queues: | ||
| - name: "tx_q_1" | ||
| id: 0 | ||
| cpu_core: "14" | ||
| batch_size: 4320 | ||
| output_port: "bench_tx_out_1" | ||
| memory_regions: | ||
| - "Data_TX_CPU" | ||
| - "Data_TX_GPU" | ||
| rivermax_tx_settings: | ||
| settings_type: "media_sender" | ||
| memory_registration: true | ||
| memory_allocation: true | ||
| memory_pool_location: "device" | ||
| use_internal_memory_pool: true | ||
| #allocator_type: "huge_page_2mb" | ||
| verbose: true | ||
| sleep_between_operations: false | ||
| stats_report_interval_ms: 1000 | ||
| send_packet_ext_info: true | ||
| video_format: YCbCr-4:2:2 | ||
| bit_depth: 10 | ||
| frame_width: 1920 | ||
| frame_height: 1080 | ||
| frame_rate: 60 | ||
| dummy_sender: false | ||
| tx_threads: | ||
| - thread_id: 0 | ||
| network_settings: | ||
| - stream_id: 0 | ||
| local_ip_address: 1.1.164.19 | ||
| destination_ip_address: 224.1.50.1 | ||
| destination_port: 50505 | ||
| - thread_id: 1 | ||
| network_settings: | ||
| - stream_id: 1 | ||
| local_ip_address: 1.1.164.19 | ||
| destination_ip_address: 224.1.50.2 | ||
| destination_port: 50505 | ||
|
|
||
| bench_tx: | ||
| interface_name: cc:00.1 | ||
| sample_format: YUV422 | ||
| frame_width: 1920 | ||
| frame_height: 1080 | ||
| bit_depth: 10 | ||
| file_path: "./build/adv_networking_bench/applications/adv_networking_bench/cpp/input_file.ycbcr" | ||
| payload_memory: "device" | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| %YAML 1.2 | ||
| # SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| --- | ||
| scheduler: | ||
| check_recession_period_ms: 0 | ||
| worker_thread_number: 5 | ||
| stop_on_deadlock: true | ||
| stop_on_deadlock_timeout: 500 | ||
|
|
||
| advanced_network: | ||
| cfg: | ||
| version: 1 | ||
| manager: "rivermax" | ||
| master_core: 6 # Master CPU core | ||
| debug: 1 | ||
| log_level: "debug" | ||
|
|
||
| memory_regions: | ||
| - name: "Data_RX_CPU" | ||
| kind: "huge" | ||
| affinity: 0 | ||
| num_bufs: 43200 | ||
| buf_size: 20 | ||
| - name: "Data_RX_GPU" | ||
| kind: "device" | ||
| affinity: 0 | ||
| num_bufs: 43200 | ||
| buf_size: 1200 | ||
| - name: "Data_TX_CPU" | ||
| kind: "huge" | ||
| affinity: 0 | ||
| num_bufs: 43200 | ||
| buf_size: 20 | ||
| - name: "Data_TX_GPU" | ||
| kind: "device" | ||
| affinity: 0 | ||
| num_bufs: 43200 | ||
| buf_size: 1200 | ||
|
|
||
| interfaces: | ||
| - name: "rx_port" | ||
| address: cc:00.1 | ||
| rx: | ||
| queues: | ||
| - name: "rx_q_0" | ||
| id: 0 | ||
| cpu_core: "10" | ||
| batch_size: 4320 | ||
| memory_regions: | ||
| - "Data_RX_CPU" | ||
| - "Data_RX_GPU" | ||
| rivermax_rx_settings: | ||
| settings_type: "ipo_receiver" | ||
| memory_registration: true | ||
| #allocator_type: "huge_page_2mb" | ||
| verbose: true | ||
| max_path_diff_us: 10000 | ||
| ext_seq_num: true | ||
| sleep_between_operations_us: 0 | ||
| local_ip_addresses: | ||
| - 2.1.0.12 | ||
| - 2.1.0.12 | ||
| source_ip_addresses: | ||
| - 2.1.0.2 | ||
| - 2.1.0.2 | ||
| destination_ip_addresses: | ||
| - 224.1.1.1 | ||
| - 224.1.1.2 | ||
| destination_ports: | ||
| - 50001 | ||
| - 50001 | ||
| stats_report_interval_ms: 1000 | ||
| send_packet_ext_info: true | ||
| tx: | ||
| queues: | ||
| - name: "tx_q_1" | ||
| id: 0 | ||
| cpu_core: "14" | ||
| batch_size: 4320 | ||
| output_port: "bench_tx_out_1" | ||
| memory_regions: | ||
| - "Data_TX_CPU" | ||
| - "Data_TX_GPU" | ||
| rivermax_tx_settings: | ||
| settings_type: "media_sender" | ||
| memory_registration: true | ||
| memory_allocation: true | ||
| memory_pool_location: "device" | ||
| #allocator_type: "huge_page_2mb" | ||
| verbose: true | ||
| sleep_between_operations: false | ||
| local_ip_address: 2.1.0.12 | ||
| destination_ip_address: 224.1.1.3 | ||
| destination_port: 50001 | ||
| stats_report_interval_ms: 1000 | ||
| send_packet_ext_info: true | ||
| video_format: YCbCr-4:2:2 | ||
| bit_depth: 10 | ||
| frame_width: 1920 | ||
| frame_height: 1080 | ||
| frame_rate: 60 | ||
| dummy_sender: false | ||
|
|
||
| bench_rx: | ||
| interface_name: "rx_port" # Name of the RX port from the advanced_network config | ||
| gpu_direct: true # Set to true if using a GPU region for the Rx queues. | ||
| split_boundary: true # Whether header and data is split (Header to CPU) | ||
| batch_size: 8640 | ||
| max_packet_size: 1220 | ||
| header_size: 20 | ||
|
|
||
| bench_tx: | ||
| interface_name: cc:00.1 | ||
| sample_format: YUV422 | ||
| frame_width: 1920 | ||
| frame_height: 1080 | ||
| bit_depth: 10 | ||
| file_path: "./build/adv_networking_bench/applications/adv_networking_bench/cpp/input_file.ycbcr" | ||
| payload_memory: "device" | ||
|
|
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -82,8 +82,20 @@ add_custom_target(adv_networking_bench_gpunetio_tx_rx_yaml | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_dependencies(adv_networking_bench adv_networking_bench_gpunetio_tx_rx_yaml) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_custom_target(adv_networking_bench_rmax_rx_yaml | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rmax_rx.yaml" ${CMAKE_CURRENT_BINARY_DIR} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rmax_rx.yaml" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_custom_target(adv_networking_bench_rivermax_rx_yaml | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_rx.yaml" ${CMAKE_CURRENT_BINARY_DIR} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_rx.yaml" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_dependencies(adv_networking_bench adv_networking_bench_rmax_rx_yaml) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_custom_target(adv_networking_bench_rivermax_tx_yaml | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx.yaml" ${CMAKE_CURRENT_BINARY_DIR} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx.yaml" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_dependencies(adv_networking_bench adv_networking_bench_rmax_tx_yaml) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_custom_target(adv_networking_bench_rivermax_tx_rx_yaml | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx_rx.yaml" ${CMAKE_CURRENT_BINARY_DIR} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx_rx.yaml" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| add_dependencies(adv_networking_bench adv_networking_bench_rmax_tx_rx_yaml) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+85
to
+101
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Critical: Target names in The custom targets are defined with add_custom_target(adv_networking_bench_rivermax_rx_yaml
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_rx.yaml" ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_rx.yaml"
)
-add_dependencies(adv_networking_bench adv_networking_bench_rmax_rx_yaml)
+add_dependencies(adv_networking_bench adv_networking_bench_rivermax_rx_yaml)
add_custom_target(adv_networking_bench_rivermax_tx_yaml
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx.yaml" ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx.yaml"
)
-add_dependencies(adv_networking_bench adv_networking_bench_rmax_tx_yaml)
+add_dependencies(adv_networking_bench adv_networking_bench_rivermax_tx_yaml)
add_custom_target(adv_networking_bench_rivermax_tx_rx_yaml
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx_rx.yaml" ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/adv_networking_bench_rivermax_tx_rx.yaml"
)
-add_dependencies(adv_networking_bench adv_networking_bench_rmax_tx_rx_yaml)
+add_dependencies(adv_networking_bench adv_networking_bench_rivermax_tx_rx_yaml)📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix incorrect dependency for rivermax_tx_rx target.
Line 108 has the wrong dependency file. The target copies
adv_networking_bench_rivermax_tx_rx.yamlbut depends onadv_networking_bench_rivermax_rx.yaml, which will cause incorrect rebuild behavior.Apply this diff:
add_custom_target(adv_networking_bench_rivermax_tx_rx_yaml COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/../adv_networking_bench_rivermax_tx_rx.yaml" ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/../adv_networking_bench_rivermax_rx.yaml" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/../adv_networking_bench_rivermax_tx_rx.yaml" )🤖 Prompt for AI Agents