From f9adbe74c5d862fcc62e904de90fc3fa3fea1958 Mon Sep 17 00:00:00 2001 From: maximilianheer Date: Fri, 15 Nov 2024 16:21:00 +0100 Subject: [PATCH 1/9] Added a workflow to build hw & sw for the rdma_perf example app --- .github/workflows/build_rdma.yaml | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/build_rdma.yaml diff --git a/.github/workflows/build_rdma.yaml b/.github/workflows/build_rdma.yaml new file mode 100644 index 00000000..8872b6df --- /dev/null +++ b/.github/workflows/build_rdma.yaml @@ -0,0 +1,44 @@ +name: Build RDMA + +on: + pull_request: + branches: + - master + +defaults: + run: + shell: bash -ileo pipefail {0} + +jobs: + build_rdma_perf: + environment: fpga-synth + runs-on: [self-hosted, linux, x64] + + steps: + - uses: actions/checkout@v3 + + - name: Compile hardware for rdma_perf example + run: | + source ~/.bashrc && vivado -version + mkdir examples_hw/build_rdma_perf && cd examples_hw/build_rdma_perf + cmake ../ -DFDEV_NAME=u55c -DEXAMPLE=rdma_perf + make project && make bitgen + + - name: Compile software for RDMA-server + run: | + mkdir examples_sw/build_rdma_server && cd examples_sw/build_rdma_server + cmake ../ -DEXAMPLE=rdma_server + make + + -name: Compile software for RDMA-client + run: | + mkdir examples_sw/build_rdma_client && cd examples_sw/build_rdma_client + cmake ../ -DEXAMPLE=rdma_client + make + + - name: Artifact upload + uses: actions/upload-artifact@v3 + with: + name: bitstream-rdma-perf + path: examples_hw/build_rdma_perf/bitstreams + retention-days: 3 \ No newline at end of file From 8f2db1378338f8c935fe655745ba546ed2c1980f Mon Sep 17 00:00:00 2001 From: maximilianheer Date: Fri, 15 Nov 2024 16:45:02 +0100 Subject: [PATCH 2/9] Cleared up the spelling mistake in build_rdma.yaml and remove the src bash in both build_rdma.yaml and build_static.yaml upon request of Benjamin --- .github/workflows/build_rdma.yaml | 3 +-- .github/workflows/build_static.yaml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build_rdma.yaml b/.github/workflows/build_rdma.yaml index 8872b6df..7e9c640d 100644 --- a/.github/workflows/build_rdma.yaml +++ b/.github/workflows/build_rdma.yaml @@ -19,7 +19,6 @@ jobs: - name: Compile hardware for rdma_perf example run: | - source ~/.bashrc && vivado -version mkdir examples_hw/build_rdma_perf && cd examples_hw/build_rdma_perf cmake ../ -DFDEV_NAME=u55c -DEXAMPLE=rdma_perf make project && make bitgen @@ -30,7 +29,7 @@ jobs: cmake ../ -DEXAMPLE=rdma_server make - -name: Compile software for RDMA-client + - name: Compile software for RDMA-client run: | mkdir examples_sw/build_rdma_client && cd examples_sw/build_rdma_client cmake ../ -DEXAMPLE=rdma_client diff --git a/.github/workflows/build_static.yaml b/.github/workflows/build_static.yaml index 05298857..c8263dce 100644 --- a/.github/workflows/build_static.yaml +++ b/.github/workflows/build_static.yaml @@ -19,7 +19,6 @@ jobs: - name: Compile hardware for Perf Local Example run: | - source ~/.bashrc && vivado -version mkdir examples_hw/build_perf_local && cd examples_hw/build_perf_local cmake ../ -DFDEV_NAME=u55c -DEXAMPLE=static -DEN_XTERM=0 make project && make bitgen From a6d5b05ed27a1b47885bef45aa01fe4c0f706e7d Mon Sep 17 00:00:00 2001 From: maximilianheer Date: Fri, 15 Nov 2024 16:58:19 +0100 Subject: [PATCH 3/9] added recursive checkout to obtain the network-module as part of Coyote for deployment-builds of RDMA --- .github/workflows/build_rdma.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_rdma.yaml b/.github/workflows/build_rdma.yaml index 7e9c640d..0030df3b 100644 --- a/.github/workflows/build_rdma.yaml +++ b/.github/workflows/build_rdma.yaml @@ -16,6 +16,8 @@ jobs: steps: - uses: actions/checkout@v3 + with: + submodules: recursive - name: Compile hardware for rdma_perf example run: | From 6cd1047a5ebc8765a33044a5fa32c5da2899c15d Mon Sep 17 00:00:00 2001 From: maximilianheer Date: Sat, 16 Nov 2024 11:32:20 +0100 Subject: [PATCH 4/9] changed pointer to latest commit in the network-repository (without VivadoHLS and with updated cmake-versions) --- hw/services/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/services/network b/hw/services/network index 77df57fd..5493b2c6 160000 --- a/hw/services/network +++ b/hw/services/network @@ -1 +1 @@ -Subproject commit 77df57fdddcf2b7dc6b652f8ee4634ecc6cabf9b +Subproject commit 5493b2c68d781b2ed6d7238a05d8c38012ae0fdb From 3377be6878d353147a81fca6034ddb031f1185e9 Mon Sep 17 00:00:00 2001 From: Benjamin Ramhorst Date: Sat, 16 Nov 2024 18:46:24 +0100 Subject: [PATCH 5/9] Update commit of netwroking stack --- hw/services/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/services/network b/hw/services/network index 5493b2c6..73b55542 160000 --- a/hw/services/network +++ b/hw/services/network @@ -1 +1 @@ -Subproject commit 5493b2c68d781b2ed6d7238a05d8c38012ae0fdb +Subproject commit 73b555425023a797bb84e1a617c393cae43ccfb3 From 01824f701802be66de49ac27fc8018ac80d253d3 Mon Sep 17 00:00:00 2001 From: Benjamin Ramhorst Date: Sat, 16 Nov 2024 18:59:24 +0100 Subject: [PATCH 6/9] Fix XTERM error for RDMA build --- .github/workflows/build_rdma.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_rdma.yaml b/.github/workflows/build_rdma.yaml index 0030df3b..1c58c7ab 100644 --- a/.github/workflows/build_rdma.yaml +++ b/.github/workflows/build_rdma.yaml @@ -22,7 +22,7 @@ jobs: - name: Compile hardware for rdma_perf example run: | mkdir examples_hw/build_rdma_perf && cd examples_hw/build_rdma_perf - cmake ../ -DFDEV_NAME=u55c -DEXAMPLE=rdma_perf + cmake ../ -DFDEV_NAME=u55c -DEXAMPLE=rdma_perf -DEN_XTERM=0 make project && make bitgen - name: Compile software for RDMA-server From b3344ca4c8d67db8085f5f10fd4436f6eb3413e6 Mon Sep 17 00:00:00 2001 From: maximilianheer Date: Sun, 17 Nov 2024 17:21:42 +0100 Subject: [PATCH 7/9] changes --- hw/services/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/services/network b/hw/services/network index 73b55542..5493b2c6 160000 --- a/hw/services/network +++ b/hw/services/network @@ -1 +1 @@ -Subproject commit 73b555425023a797bb84e1a617c393cae43ccfb3 +Subproject commit 5493b2c68d781b2ed6d7238a05d8c38012ae0fdb From 62616aef95e6957e3b452492f5a98b2e946927be Mon Sep 17 00:00:00 2001 From: maximilianheer Date: Sun, 17 Nov 2024 17:26:37 +0100 Subject: [PATCH 8/9] removed the ILA from the rdma_mux_retrans so that builds don't crash anymore --- hw/hdl/network/rdma/rdma_mux_retrans.sv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/hdl/network/rdma/rdma_mux_retrans.sv b/hw/hdl/network/rdma/rdma_mux_retrans.sv index aa9f3381..53fb6c8d 100644 --- a/hw/hdl/network/rdma/rdma_mux_retrans.sv +++ b/hw/hdl/network/rdma/rdma_mux_retrans.sv @@ -353,7 +353,7 @@ assign axis_ddr_wr.tlast = s_axis_user_req.tlast; // create_ip -name ila -vendor xilinx.com -library ip -version 6.2 -module_name ila_retrans // set_property -dict [list CONFIG.C_DATA_DEPTH {8192} CONFIG.C_PROBE29_WIDTH {22} CONFIG.C_PROBE23_WIDTH {28} CONFIG.C_NUM_OF_PROBES {35} CONFIG.Component_Name {ila_retrans} CONFIG.C_EN_STRG_QUAL {1} CONFIG.C_PROBE34_MU_CNT {2} CONFIG.C_PROBE33_MU_CNT {2} CONFIG.C_PROBE32_MU_CNT {2} CONFIG.C_PROBE31_MU_CNT {2} CONFIG.C_PROBE30_MU_CNT {2} CONFIG.C_PROBE29_MU_CNT {2} CONFIG.C_PROBE28_MU_CNT {2} CONFIG.C_PROBE27_MU_CNT {2} CONFIG.C_PROBE26_MU_CNT {2} CONFIG.C_PROBE25_MU_CNT {2} CONFIG.C_PROBE24_MU_CNT {2} CONFIG.C_PROBE23_MU_CNT {2} CONFIG.C_PROBE22_MU_CNT {2} CONFIG.C_PROBE21_MU_CNT {2} CONFIG.C_PROBE20_MU_CNT {2} CONFIG.C_PROBE19_MU_CNT {2} CONFIG.C_PROBE18_MU_CNT {2} CONFIG.C_PROBE17_MU_CNT {2} CONFIG.C_PROBE16_MU_CNT {2} CONFIG.C_PROBE15_MU_CNT {2} CONFIG.C_PROBE14_MU_CNT {2} CONFIG.C_PROBE13_MU_CNT {2} CONFIG.C_PROBE12_MU_CNT {2} CONFIG.C_PROBE11_MU_CNT {2} CONFIG.C_PROBE10_MU_CNT {2} CONFIG.C_PROBE9_MU_CNT {2} CONFIG.C_PROBE8_MU_CNT {2} CONFIG.C_PROBE7_MU_CNT {2} CONFIG.C_PROBE6_MU_CNT {2} CONFIG.C_PROBE5_MU_CNT {2} CONFIG.C_PROBE4_MU_CNT {2} CONFIG.C_PROBE3_MU_CNT {2} CONFIG.C_PROBE2_MU_CNT {2} CONFIG.C_PROBE1_MU_CNT {2} CONFIG.C_PROBE0_MU_CNT {2} CONFIG.ALL_PROBE_SAME_MU_CNT {2}] [get_ips ila_retrans] -ila_retrans inst_ila_retrans ( +/* ila_retrans inst_ila_retrans ( .clk(aclk), .probe0(s_req_net.valid), @@ -399,6 +399,6 @@ ila_retrans inst_ila_retrans ( .probe32(tr_done), .probe33(req_user.ready), .probe34(req_user.valid) -); +); */ endmodule \ No newline at end of file From 362163cb7df3a9dc5be846d0f0c16660e32fa432 Mon Sep 17 00:00:00 2001 From: Benjamin Ramhorst Date: Sun, 17 Nov 2024 18:04:17 +0100 Subject: [PATCH 9/9] Fix pointer to network stack --- hw/services/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/services/network b/hw/services/network index 5493b2c6..73b55542 160000 --- a/hw/services/network +++ b/hw/services/network @@ -1 +1 @@ -Subproject commit 5493b2c68d781b2ed6d7238a05d8c38012ae0fdb +Subproject commit 73b555425023a797bb84e1a617c393cae43ccfb3