Merge pull request #37 from Xilinx/dev

Dev

Author: hpc-aulmamei

.github/workflows/ci-build-sw.yml

@@ -0,0 +1,47 @@
+# ##################################################################################################
+#  The MIT License (MIT)
+#  Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
+# 
+#  Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+#  and associated documentation files (the "Software"), to deal in the Software without restriction,
+#  including without limitation the rights to use, copy, modify, merge, publish, distribute,
+#  sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+# 
+#  The above copyright notice and this permission notice shall be included in all copies or
+#  substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# ##################################################################################################
+
+name: CI Build SW
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    permissions: { contents: read }
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install build tools
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y build-essential linux-headers-$(uname -r) libxml2-dev libzmq3-dev libjsoncpp-dev
+
+      - name: Build hotplug driver
+        if: ${{ false }}
+        run: |
+          cd ${{ github.workspace }}/submodules/pcie-hotplug-drv/ && make
+
+      - name: Build linker
+        run: |
+          cd ${{ github.workspace }}/submodules/v80-vitis-flow && cmake . && make

README.md

@@ -5,7 +5,9 @@ This repository contains SLASH, a SmartNIC platform for Alveo V80. SLASH consist
 - V80 RunTime (VRT): the VRT API implementation, along with examples.
 - (upcoming) 200Gbps MAC implementation for network-attached kernels and SmartNIC applications
 
-The project was tested with AMD Vivado & Vitis tools version 2024.2, kernel version 5.15.
+> [!WARNING]
+> The project was only tested with AMD Vivado & Vitis tools version 2024.2, on Ubuntu 22.04, kernel version 5.15. Please use same versions of tools/kernel.
+
 ## Dependencies
 
 - libxml2

deploy/base_pdi/build.py

@@ -26,7 +26,7 @@
 
 ROOT_PATH = os.path.realpath(".")
 DESIGN_PDI_PATH = os.path.join(ROOT_PATH, "..")
-NOC_SOLUTION_PATH = os.path.realpath("../../submodules/v80-vitis-flow/resources/")
+RESOURCES_PATH = os.path.realpath("../../submodules/v80-vitis-flow/resources/")
 COMPUTE_EXAMPLE_DIR = os.path.realpath("../../examples/05_perf/")
 DEPLOY_PROJECT_COMPUTE = os.path.join(os.getcwd(), "deploy_project_compute")
 HLS_DIR_COMPUTE = os.path.join(DEPLOY_PROJECT_COMPUTE, "hls/")
@@ -103,6 +103,7 @@ def linker_step(platform):
         sol1_paths = [os.path.join(d, "sol1") for d in build_dirs]
         run_linker(CONFIG_FILE_PATH_COMPUTE, sol1_paths)
         shutil.copy(os.path.join(LINKER_BUILD_DIR_COMPUTE, "run_pre.tcl"), AVED_SRC_DIR_COMPUTE)
+        shutil.copy(os.path.join(RESOURCES_PATH, "run_post.tcl"), AVED_SRC_DIR_COMPUTE)
     elif platform == "eth":
         print("Eth mode not supported yet.")
     else:
@@ -130,8 +131,9 @@ def generate_pdi_step(platform):
 def generate_noc_solution_step(platform):
     if platform == "compute":
         os.chdir(AVED_ROOT_DIR_COMPUTE)
-        subprocess.run(["vivado", "-mode", "tcl", "-source", "src/export_noc.tcl"], check=True)
-        shutil.copy(os.path.join(AVED_ROOT_DIR_COMPUTE, "noc_sol.ncr"), os.path.join(NOC_SOLUTION_PATH, "noc_sol_compute.ncr"))
+        # subprocess.run(["vivado", "-mode", "tcl", "-source", "src/export_noc.tcl"], check=True)
+        # shutil.copy(os.path.join(AVED_ROOT_DIR_COMPUTE, "noc_sol.ncr"), os.path.join(RESOURCES_PATH, "noc_sol_compute.ncr"))
+        shutil.copy(os.path.join(RESOURCES_PATH, "noc_sol.ncr"), os.path.join(RESOURCES_PATH, "noc_sol_compute.ncr"))
     elif platform == "eth":
         print("Eth mode not supported yet.")
     else:
@@ -215,9 +217,9 @@ def step_index(step_id):
     #     shutil.copy(os.path.join(AVED_ROOT_DIR_COMPUTE, "design.pdi"), os.path.join(ROOT_PATH, "design.pdi"))
     #     # Generate NoC solution from the vivado project
     #     subprocess.run(["vivado", "-mode", "batch", "-source", "export_noc.tcl"], check=True)
-    #     shutil.copy(os.path.join(AVED_ROOT_DIR_COMPUTE, "noc_sol.ncr"), os.path.join(NOC_SOLUTION_PATH, "noc_sol_compute.ncr"))
+    #     shutil.copy(os.path.join(AVED_ROOT_DIR_COMPUTE, "noc_sol.ncr"), os.path.join(RESOURCES_PATH, "noc_sol_compute.ncr"))
     # elif args.platform == "eth":
     #     print("Eth mode not supported yet.")
 
 if __name__ == "__main__":
-    main()
+    main()

deploy/base_pdi/tcl/export_noc.tcl

@@ -1,4 +1,4 @@
-# ##################################################################################################
+deploy/base_pdi/build.py# ##################################################################################################
 #  The MIT License (MIT)
 #  Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
 # 
@@ -20,7 +20,8 @@
 
 set build_dir "build"
 open_project $build_dir/prj.xpr
-open_run impl_1
+open_run synth_1
 set_property lock true [get_noc_net_routes -of [get_noc_logical_paths -filter {initial_boot == 1}]]
+set_property lock true [get_noc_net_routes -of [get_noc_logical_paths -of [get_noc_logical_instances *n?u128*]]]
 write_noc_solution -file noc_sol.ncr
-exit
+exit