From efbda256119015ed1ef0c3c656f07d9e95132d1b Mon Sep 17 00:00:00 2001 From: Bruce Ying Date: Wed, 9 Mar 2022 02:18:23 -0800 Subject: [PATCH] AIE: Update 04 packet_aie/sw/Makefile to resolve syntax issue; rm 02/03/04 description of ES board * update from xclbin to xsa * update Makefile for syntax of copyright * update README to remove ES * update graph.cpp Co-authored-by: brucey --- .../Feature_Tutorials/02-using-gmio/README.md | 6 ------ .../Feature_Tutorials/03-rtp-reconfiguration/README.md | 8 -------- .../03-rtp-reconfiguration/step1/aie/graph.cpp | 1 + .../03-rtp-reconfiguration/step2/aie/graph.cpp | 1 + .../03-rtp-reconfiguration/step3/aie/graph.cpp | 1 + .../03-rtp-reconfiguration/step4/aie/graph.cpp | 1 + .../03-rtp-reconfiguration/step5/aie/graph.cpp | 1 + .../Feature_Tutorials/04-packet-switching/README.md | 5 ----- .../04-packet-switching/pktstream_aie/sw/Makefile | 3 +-- .../04-packet-switching/window_based_aie_kernel.md | 2 +- .../Feature_Tutorials/12-axis-traffic-generator/README.md | 2 -- .../testcase_dmafifo_opt/aie/graph.cpp | 1 + .../testcase_nofifo_hang/aie/graph.cpp | 1 + .../testcase_ssfifo/aie/graph.cpp | 1 + 14 files changed, 10 insertions(+), 24 deletions(-) diff --git a/AI_Engine_Development/Feature_Tutorials/02-using-gmio/README.md b/AI_Engine_Development/Feature_Tutorials/02-using-gmio/README.md index 0c5cbc8593..4558ee1499 100644 --- a/AI_Engine_Development/Feature_Tutorials/02-using-gmio/README.md +++ b/AI_Engine_Development/Feature_Tutorials/02-using-gmio/README.md @@ -24,12 +24,6 @@ Before starting this tutorial, run the following steps: 3. Set up your IMAGE to point to xilinx-versal-common-v2022.1/Image. 4. Set up your `PLATFORM_REPO_PATHS` environment variable based upon where you downloaded the platform. -> **Note**: This tutorial targets the [VCK190 ES board](https://www.xilinx.com/products/boards-and-kits/vck190.html). This board is currently available via early access. If you have already purchased this board, download the necessary files from the lounge and ensure you have the correct licenses installed. If you do not have a board and ES license, contact your Xilinx sales contact. - -To target the VCK190 production board, modify `PLATFORM` variable in the `Makefile`(s) to: - - PLATFORM = ${PLATFORM_REPO_PATHS}/xilinx_vck190_base_202120_1/xilinx_vck190_base_202120_1.xpfm - ## Objectives After completing this tutorial, you will be able to: diff --git a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/README.md b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/README.md index 3c3d009dfa..73830814d0 100644 --- a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/README.md +++ b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/README.md @@ -24,14 +24,6 @@ Before starting this tutorial run the steps below: 3. Set up your IMAGE to point to `xilinx-versal-common-v2022.1/Image`. 4. Set up your `PLATFORM_REPO_PATHS` environment variable based upon where you downloaded the platform. -> **Note**: This tutorial targets the [VCK190 ES board](https://www.xilinx.com/products/boards-and-kits/vck190.html). This board is currently available via early access. If you have already purchased this board, download the necessary files from the lounge and ensure you have the correct licenses installed. If you do not have a board and ES license, contact your Xilinx sales contact. - -To target the VCK190 production board, modify the `PLATFORM` variable in the `Makefile`(s) to: - - ``` - PLATFORM = ${PLATFORM_REPO_PATHS}/xilinx_vck190_base_202120_1/xilinx_vck190_base_202120_1.xpfm - ``` - ## Objectives After completing this tutorial, you will be able to: diff --git a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step1/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step1/aie/graph.cpp index 2470f17ccc..2aa7c85096 100644 --- a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step1/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step1/aie/graph.cpp @@ -31,5 +31,6 @@ int main(int argc, char ** argv) { gr.update(gr.trigger,100); gr.end(); + return 0; }; #endif diff --git a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step2/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step2/aie/graph.cpp index 1ee9de797c..0c87a2c249 100644 --- a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step2/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step2/aie/graph.cpp @@ -30,4 +30,5 @@ int main(int argc, char ** argv) { gr.run(2); gr.end(); + return 0; }; diff --git a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step3/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step3/aie/graph.cpp index 26967bc40e..6c9cf68cfd 100644 --- a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step3/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step3/aie/graph.cpp @@ -28,6 +28,7 @@ int main(int argc, char **argv) gr.update(gr.coefficients, wide_filter, 12); gr.run(16); gr.end(); + return 0; }; #endif diff --git a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step4/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step4/aie/graph.cpp index cdb1f3c08e..6a95a689cb 100644 --- a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step4/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step4/aie/graph.cpp @@ -31,6 +31,7 @@ int main(int argc, char **argv) gr.run(16); // start PL kernel & AIE kernel gr.end(); + return 0; }; #endif diff --git a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step5/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step5/aie/graph.cpp index f0b11cd51d..9a0e3ee001 100644 --- a/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step5/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/03-rtp-reconfiguration/step5/aie/graph.cpp @@ -51,6 +51,7 @@ int main(int argc, char **argv) std::cout<` and 1:4 merger `pktmerge<4>`. Note that the connection type for `pktsplit` and `pktmerge` is `adf::pktstream`. The input port `in` is first connected to the `pktsplit`, and `pktsplit` switches the packets to different AI Engine kernels. The outputs of AI Engine kernels are connected to the `pktmerge`, and `pktmerge` generates packet headers for those packets automatically and outputs them through output port, `out`. +This is a graph with a 1:4 splitter `pktsplit<4>` and 1:1 merger `pktmerge<4>`. Note that the connection type for `pktsplit` and `pktmerge` is `adf::pktstream`. The input port `in` is first connected to the `pktsplit`, and `pktsplit` switches the packets to different AI Engine kernels. The outputs of AI Engine kernels are connected to the `pktmerge`, and `pktmerge` generates packet headers for those packets automatically and outputs them through output port, `out`. Run the make command `make aie` to compile the graph. Then open the compiled summary with the Vitis™ analyzer using the command `vitis_analyzer ./Work/graph.aiecompile_summary`. Then click the `Graph` tab in the Vitis analyzer. The graph of the design is shown as follows. diff --git a/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/README.md b/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/README.md index 1f99b11efd..bacdf4d709 100644 --- a/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/README.md +++ b/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/README.md @@ -45,8 +45,6 @@ Before starting this tutorial, complete the following steps: 2. Set up your `ROOTFS` and `IMAGE` to point to the `xilinx-versal-common-v2022.1` directory. 3. Set up your `PLATFORM_REPO_PATHS` environment variable based upon where you downloaded the platform. -This tutorial targets the VCK190 ES board (see https://www.xilinx.com/products/boards-and-kits/vck190.html). This board is currently available via early access. If you have already purchased this board, download the necessary files from the lounge and ensure you have the correct licenses installed. If you do not have a board and ES license please contact your Xilinx sales contact. - ### Objectives After completing the tutorial, you should be able to: diff --git a/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_dmafifo_opt/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_dmafifo_opt/aie/graph.cpp index 7f903e80ad..dce96d2946 100644 --- a/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_dmafifo_opt/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_dmafifo_opt/aie/graph.cpp @@ -34,6 +34,7 @@ int main(int argc, char **argv) event::stop_profiling(handle); double throughput = (double)total_bytes / (cycle_count * 1e-3); printf("Throughput of the graph: %f MB/s\n",throughput); + return 0; }; #endif diff --git a/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_nofifo_hang/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_nofifo_hang/aie/graph.cpp index baae8c69c4..fe56dcfe9f 100644 --- a/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_nofifo_hang/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_nofifo_hang/aie/graph.cpp @@ -21,6 +21,7 @@ int main(int argc, char **argv) gr.init(); gr.run(4); gr.wait(10000); + return 0; }; #endif diff --git a/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_ssfifo/aie/graph.cpp b/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_ssfifo/aie/graph.cpp index 6f06593125..7496085187 100644 --- a/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_ssfifo/aie/graph.cpp +++ b/AI_Engine_Development/Feature_Tutorials/13-aie-performance-analysis/testcase_ssfifo/aie/graph.cpp @@ -34,6 +34,7 @@ int main(int argc, char **argv) event::stop_profiling(handle); double throughput = (double)total_bytes / (cycle_count * 1e-3); printf("Throughput of the graph: %f MB/s\n",throughput); + return 0; }; #endif