From 9d96b41da85dad4b541daefd152fb5e96cb8a86b Mon Sep 17 00:00:00 2001 From: Ally Zhou Date: Wed, 31 May 2023 13:45:51 +0800 Subject: [PATCH] bulk changes based on standardized checker reportd Former-commit-id: 7e44b1ad47f9533b2e6ae5dfd22b95be03d8ca4d --- .../04-Polyphase-Channelizer/description.json | 2 +- .../examples/9_matrix_mult_v/description.json | 4 +- .../examples/9_matrix_mult_z/description.json | 6 +- .../guupServer_vck190_sample_env_setup.sh | 134 ------------------ .../guupServer_zcu102_sample_env_setup.sh | 134 ------------------ .../01-convolution-tutorial/description.json | 4 +- .../build/description.json | 8 +- .../08-alveo_aurora_kernel/description.json | 2 +- .../reference_files/description.json | 2 +- .../ref_files/vck190/Makefile | 1 - 10 files changed, 14 insertions(+), 283 deletions(-) delete mode 100644 Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_vck190_sample_env_setup.sh delete mode 100644 Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_zcu102_sample_env_setup.sh diff --git a/AI_Engine_Development/Design_Tutorials/04-Polyphase-Channelizer/description.json b/AI_Engine_Development/Design_Tutorials/04-Polyphase-Channelizer/description.json index 137d4b1386..c75919ef86 100644 --- a/AI_Engine_Development/Design_Tutorials/04-Polyphase-Channelizer/description.json +++ b/AI_Engine_Development/Design_Tutorials/04-Polyphase-Channelizer/description.json @@ -37,7 +37,7 @@ "custom_build_target": { "all": "all" }, - "customer_board_target": "run_test", + "custom_board_target": "run_test", "tasks": { "board" : { "pre_exec" : ["./env_setup_versal.sh"] diff --git a/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_v/description.json b/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_v/description.json index f19974ebcc..cb90e5d93c 100644 --- a/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_v/description.json +++ b/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_v/description.json @@ -1,5 +1,5 @@ { - "name": "Developer_Contributed-03-HLS_Code_Optimization--matrix_mult", + "name": "Developer_Contributed-03-HLS_Code_Optimization--matrix_mult_v", "description": "03-HLS_Code_Optimization--matrix_mult", "gui": "false", "flow": "versal", @@ -31,7 +31,7 @@ "custom_board_target": "run_test", "tasks": { "build": { - "pre_exec": ["./env_setup_versal.sh"] + "pre_exec": "./env_setup_versal.sh" } } diff --git a/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_z/description.json b/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_z/description.json index 6c75c0054b..2c765fdd61 100644 --- a/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_z/description.json +++ b/Developer_Contributed/03-HLS_Code_Optimization/files/examples/9_matrix_mult_z/description.json @@ -1,5 +1,5 @@ { - "name": "Developer_Contributed-03-HLS_Code_Optimization--matrix_mult", + "name": "Developer_Contributed-03-HLS_Code_Optimization--matrix_mult_z", "description": "03-HLS_Code_Optimization--matrix_mult", "gui": "false", "flow": "vitis", @@ -16,7 +16,7 @@ ], "targets": [ - "vitis_hw_build", + "vitis_hw_build", "vitis_hw_run" ], "make_options": [ @@ -31,7 +31,7 @@ "custom_board_target": "run_test", "tasks": { "build": { - "pre_exec": ["./env_setup_zynqmp.sh"] + "pre_exec": "./env_setup_zynqmp.sh" } } diff --git a/Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_vck190_sample_env_setup.sh b/Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_vck190_sample_env_setup.sh deleted file mode 100644 index e94059bdf4..0000000000 --- a/Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_vck190_sample_env_setup.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/bash - -# Copyright © 2023 Advanced Micro Devices, Inc. All rights reserved. -# SPDX-License-Identifier: MIT - -# Author: Daniele Bagni -# Date: 13 April 20223 - -###################################################################################### -# WARNING: THIS SCRIPT IS VALID ONLY FOR VCK190 on AMD/XILINX GUUP (LINUX) SERVERS -###################################################################################### - -# ======================================================= -# GUUP Environment Setup: -# set Platform, Vitis and Petalinux repo -# ======================================================= -#ts 2022.2_daily_latest -petalinux petalinux-v2022.2_daily_latest -#ts 2023.1_daily_latest -petalinux petalinux-v2023.1_daily_latest - - -export CUR_DIR=$PWD - -# ======================================================= -# global variables for this tutorial -# ======================================================= -#RELEASE=2022.2 -RELEASE=2023.1 -BOARD=vck190 -BASE_NUM=202310_1 -#BASE_NUM=202220_1 - -export GUUP_DIR= - -export WRK_DIR=${GUUP_DIR}/danieleb/ide2023.1/Vitis-Tutorials_2023.1_next/Developer_Contributed - -export TUTORIAL=03-HLS_Code_Optimization - -# ======================================================= -# to emulate SPRITE regression env in GUUP Servers -# ======================================================= -cd ${WRK_DIR}/../Vitis-Tutorials-Admin-2023.1_next -source env_setup_versal.sh -#back to the wrk dir -cd ${WRK_DIR}/${TUTORIAL}/files/ - -#================================================================================== -# Set Versal Common Image repo (OR eventually install it into /tmp) -# This local foldr must not be a "NFS" hard disk drive, only "ext4" is supported -# ================================================================================== - -# export TMP DIRECTORY= -mkdir -p /tmp/danieleb -export TMPDIR=/tmp/danieleb - -# PETALINUX and VERSAL COMMON IMAGE -export COMMON_IMAGE_VERSAL=${HOME}/common/xilinx-versal-common-v2023.1 - -: ' # do it only once -# clean versal folder content -rm -rf ${COMMON_IMAGE_VERSAL} -# install SDK -export VERSAL_COMMON_2023v1=$PETALINUX/../../bsp/internal/xilinx-versal-common-v2023.1/ -cd ${VERSAL_COMMON_2023v1} -bash ./sdk.sh -y -p -d ${COMMON_IMAGE_VERSAL} -cp bl31.elf boot.scr Image README.txt rootfs.ext4 rootfs.manifest u-boot.elf ${COMMON_IMAGE_VERSAL}/ - -cd ${WRK_DIR}/${TUTORIAL}/files -source ${WRK_DIR}/${TUTORIAL}/files/make-flow/local_var_setup.sh -' - -# ======================================================== -# Set DSP Library for Vitis -# ======================================================== -## already set in "env_setup.sh" but not yet available in EMEA servers -#export DSPLIB_ROOT= -export DSPLIB_VITIS=/group/xirguup/danieleb/ide2022.2/Vitis_Libraries -export DSPLIB_ROOT=${DSPLIB_VITIS}/dsp - - -# ========================================================= -# Platform Selection... -# ========================================================= -export VERSAL_VITIS_PLATFORM=xilinx_${BOARD}\_base_${BASE_NUM} -export VITIS_PLATFORM_DIR=${PLATFORM_REPO_PATHS}/${VERSAL_VITIS_PLATFORM} -export VITIS_PLATFORM_XPFM=${VITIS_PLATFORM_DIR}/${VERSAL_VITIS_PLATFORM}.xpfm - -# ======================================================== -# Set SysRoot, RootFS and Image -# ======================================================== -export VITIS_SYSROOTS=${COMMON_IMAGE_VERSAL}/sysroots/cortexa72-cortexa53-xilinx-linux -export SDKTARGETSYSROOT=${VITIS_SYSROOTS} -export KERNEL_IMAGE=${COMMON_IMAGE_VERSAL}/Image -export ROOTFS=${COMMON_IMAGE_VERSAL}/rootfs.ext4 - -# ======================================================== -# for compatibility with official Vitis Tutorials -# ======================================================== -export XLNX_VERSAL=${COMMON_IMAGE_VERSAL} -export PLATFORM=${VITIS_PLATFORM_XPFM} - -# ======================================================== -# check env variables -# ======================================================== -echo " " -echo "Vitis/Petalinux GUUP Environmental variables" -echo " " -echo "LD_LIBRARY_PATH " $LD_LIBRARY_PATH -echo "XILINX_VITIS " $XILINX_VITIS -echo "BSP_DIR " $BSP_DIR -#echo "PETALINUX_VER " $PETALINUX_VER -echo "PLATFORM_REPO_PATHS " $PLATFORM_REPO_PATHS -echo "XILINX_XRT " $XILINX_XRT -echo "XILINX_VIVADO " $XILINX_VIVADO -#echo "XILINXD_LICENSE_FILE " $XILINXD_LICENSE_FILE -echo "XILINX_HLS " $XILINX_HLS -#echo "XSCT_TOOLCHAIN" $XSCT_TOOLCHAIN -#echo "XDG_DATA_DIRS " $XDG_DATA_DIRS -#echo "GUUP_ROOT " $GUUP_ROOT -echo "SHELL " $SHELL -#echo "LM_LICENSE_FILE " $LM_LICENSE_FILE -#echo "PYTHONPATH " $PYTHONPATH -#echo "PETALINUX_MAJOR_VER " $PETALINUX_MAJOR_VER -echo "PETALINUX " $PETALINUX -echo "SDKTARGETSYSROOT " ${VITIS_SYSROOTS} -echo "VERSAL_COMMON_2023v1 " ${VERSAL_COMMOM_2023v1} -echo "COMMON_IMAGE_VERSAL " ${COMMON_IMAGE_VERSAL} -echo "SDKTARGETSYSROOT " ${VITIS_SYSROOTS} -echo "VITIS_PLATFORM_XPFM " ${VITIS_PLATFORM_XPFM} -echo "KERNEL_IMAGE " ${KERNEL_IMAGE} -echo "ROOTFS " ${ROOTFS} -echo "VITIS_PLATFORM_XPFM " ${VITIS_PLATFORM_XPFM} -echo "PLATFORM_REPO_PATHS " ${PLATFORM_REPO_PATHS} -#echo "PATH " ${PATH} -echo "DSPLIB_ROOT " ${DSPLIB_VITIS}/dsp diff --git a/Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_zcu102_sample_env_setup.sh b/Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_zcu102_sample_env_setup.sh deleted file mode 100644 index 929791f2a9..0000000000 --- a/Developer_Contributed/03-HLS_Code_Optimization/files/scripts/guupServer_zcu102_sample_env_setup.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/bash - -# Copyright © 2023 Advanced Micro Devices, Inc. All rights reserved. -# SPDX-License-Identifier: MIT - -# Author: Daniele Bagni -# Date: 26 May 20223 - -###################################################################################### -# WARNING: THIS SCRIPT IS VALID ONLY FOR ZCU102 on AMD/XILINX GUUP (LINUX) SERVERS -###################################################################################### - -# ======================================================= -# GUUP Environment Setup: -# set Platform, Vitis and Petalinux repo -# ======================================================= -#ts 2022.2_daily_latest -petalinux petalinux-v2022.2_daily_latest -#ts 2023.1_daily_latest -petalinux petalinux-v2023.1_daily_latest - -export CUR_DIR=$PWD - -# ======================================================= -# global variables for this tutorial -# ======================================================= -#RELEASE=2022.2 -RELEASE=2023.1 -BOARD=zcu102 -BASE_NUM=202310_1 -#BASE_NUM=202220_1 - -export GUUP_DIR= - -export WRK_DIR=${GUUP_DIR}/danieleb/ide2023.1/Vitis-Tutorials_2023.1_next/Developer_Contributed - -export TUTORIAL=03-HLS_Code_Optimization - -# ======================================================= -# to emulate SPRITE regression env in GUUP Servers -# ======================================================= -cd ${WRK_DIR}/../Vitis-Tutorials-Admin-2023.1_next -source env_setup_petalinux_zynqmp.sh -#back to the wrk dir -cd ${WRK_DIR}/${TUTORIAL}/files/ - -#================================================================================== -# Set ZCU102 Common Image repo (OR eventually install it into /tmp) -# This local foldr must not be a "NFS" hard disk drive, only "ext4" is supported -# ================================================================================== - -# export TMP DIRECTORY= -mkdir -p /tmp/danieleb -export TMPDIR=/tmp/danieleb - -# PETALINUX and ZYNQMP COMMON IMAGE -export COMMON_IMAGE_ZYNQMP=${HOME}/common/xilinx-zynqmp-common-v2023.1 - -: ' -# install Versal SDK on $HOME/common -echo " " -echo "NOW INSTALLING ZCU102 SDK in $HOME/common " -echo " " -export ZYNQMP_COMMON_2023v1=$PETALINUX/../../bsp/internal/xilinx-zynqmp-common-v2023.1/ -# clean zynqmp folder content -rm -rf ${COMMON_IMAGE_ZYNQMP} -# install SDK -cd ${ZYNQMP_COMMON_2023v1} -bash ./sdk.sh -y -p -d ${COMMON_IMAGE_ZYNQMP} -cp bl31.elf boot.scr Image README.txt rootfs.ext4 rootfs.manifest u-boot.elf ${COMMON_IMAGE_ZYNQMP}/ -' - -# ======================================================== -# Set DSP Library for Vitis -# ======================================================== -## already set in "env_setup.sh" but not yet available in EMEA servers -#export DSPLIB_ROOT= -export DSPLIB_VITIS=/group/xirguup/danieleb/ide2022.2/Vitis_Libraries -export DSPLIB_ROOT=${DSPLIB_VITIS}/dsp - - -# ========================================================= -# Platform Selection... -# ========================================================= -export ZYNQMP_VITIS_PLATFORM=xilinx_${BOARD}\_base_${BASE_NUM} -export VITIS_PLATFORM_DIR=${PLATFORM_REPO_PATHS}/${VERSAL_VITIS_PLATFORM} -export VITIS_PLATFORM_XPFM=${VITIS_PLATFORM_DIR}/${VERSAL_VITIS_PLATFORM}.xpfm - -# ======================================================== -# Set SysRoot, RootFS and Image -# ======================================================== -export VITIS_SYSROOTS=${COMMON_IMAGE_VERSAL}/sysroots/cortexa72-cortexa53-xilinx-linux -export SDKTARGETSYSROOT=${VITIS_SYSROOTS} -export KERNEL_IMAGE=${COMMON_IMAGE_VERSAL}/Image -export ROOTFS=${COMMON_IMAGE_VERSAL}/rootfs.ext4 - -# ======================================================== -# for compatibility with official Vitis Tutorials -# ======================================================== -#export XLNX_VERSAL=${COMMON_IMAGE_VERSAL} -export PLATFORM=${VITIS_PLATFORM_XPFM} - -# ======================================================== -# check env variables -# ======================================================== -echo " " -echo "Vitis/Petalinux GUUP Environmental variables" -echo " " -echo "LD_LIBRARY_PATH " $LD_LIBRARY_PATH -echo "XILINX_VITIS " $XILINX_VITIS -echo "BSP_DIR " $BSP_DIR -#echo "PETALINUX_VER " $PETALINUX_VER -echo "PLATFORM_REPO_PATHS " $PLATFORM_REPO_PATHS -echo "XILINX_XRT " $XILINX_XRT -echo "XILINX_VIVADO " $XILINX_VIVADO -#echo "XILINXD_LICENSE_FILE " $XILINXD_LICENSE_FILE -echo "XILINX_HLS " $XILINX_HLS -#echo "XSCT_TOOLCHAIN" $XSCT_TOOLCHAIN -#echo "XDG_DATA_DIRS " $XDG_DATA_DIRS -#echo "GUUP_ROOT " $GUUP_ROOT -echo "SHELL " $SHELL -#echo "LM_LICENSE_FILE " $LM_LICENSE_FILE -#echo "PYTHONPATH " $PYTHONPATH -#echo "PETALINUX_MAJOR_VER " $PETALINUX_MAJOR_VER -echo "PETALINUX " $PETALINUX -echo "SDKTARGETSYSROOT " ${VITIS_SYSROOTS} -echo "ZYNQMP_COMMON_2023v1 " ${ZYNQMP_COMMOM_2023v1} -echo "COMMON_IMAGE_ZYNQMP " ${COMMON_IMAGE_ZYNQMP} -echo "SDKTARGETSYSROOT " ${VITIS_SYSROOTS} -echo "VITIS_PLATFORM_XPFM " ${VITIS_PLATFORM_XPFM} -echo "KERNEL_IMAGE " ${KERNEL_IMAGE} -echo "ROOTFS " ${ROOTFS} -echo "VITIS_PLATFORM_XPFM " ${VITIS_PLATFORM_XPFM} -echo "PLATFORM_REPO_PATHS " ${PLATFORM_REPO_PATHS} -#echo "PATH " ${PATH} -echo "DSPLIB_ROOT " ${DSPLIB_VITIS}/dsp diff --git a/Hardware_Acceleration/Design_Tutorials/01-convolution-tutorial/description.json b/Hardware_Acceleration/Design_Tutorials/01-convolution-tutorial/description.json index 13e966a188..559751c937 100644 --- a/Hardware_Acceleration/Design_Tutorials/01-convolution-tutorial/description.json +++ b/Hardware_Acceleration/Design_Tutorials/01-convolution-tutorial/description.json @@ -9,10 +9,10 @@ "test_name": "HW_D_01-convolution", "tasks": { "build": { - "pre_exec": "/proj/xtools/dsv/projects/sdx_libs/cpp_libs/opencv/set_opencv_os.sh" + "pre_exec": "./env_setup_opencv.sh" }, "board": { - "pre_exec": "/proj/xtools/dsv/projects/sdx_libs/cpp_libs/opencv/set_opencv_os.sh" + "pre_exec": "./env_setup_opencv.sh" } }, "jobs": [ diff --git a/Hardware_Acceleration/Design_Tutorials/04-traveling-salesperson/build/description.json b/Hardware_Acceleration/Design_Tutorials/04-traveling-salesperson/build/description.json index 9804d3f122..2b1c8b1d96 100644 --- a/Hardware_Acceleration/Design_Tutorials/04-traveling-salesperson/build/description.json +++ b/Hardware_Acceleration/Design_Tutorials/04-traveling-salesperson/build/description.json @@ -1,13 +1,13 @@ { "name": "04-traveling-salesperson", "description": "04-traveling-salesperson", - "flow": "hls", - + "flow": "vitis", + "platform_allowlist": ["u200"], - + "platform_blocklist": [], "testinfo": { "test_name": "HW_D_04-travel-sales", - "disable": 1, + "disable": false, "jobs": [ { "max_memory_MB": 32768, diff --git a/Hardware_Acceleration/Design_Tutorials/08-alveo_aurora_kernel/description.json b/Hardware_Acceleration/Design_Tutorials/08-alveo_aurora_kernel/description.json index cde150c3a3..b37a6a769a 100644 --- a/Hardware_Acceleration/Design_Tutorials/08-alveo_aurora_kernel/description.json +++ b/Hardware_Acceleration/Design_Tutorials/08-alveo_aurora_kernel/description.json @@ -5,7 +5,7 @@ "flow": "vitis", "platform_allowlist": [ "u200"], - "platform_blacklist": [], + "platform_blocklist": [], "testinfo": { "test_name": "HW_D_08-alveo-aurora", diff --git a/Hardware_Acceleration/Feature_Tutorials/03-dataflow_debug_and_optimization/reference_files/description.json b/Hardware_Acceleration/Feature_Tutorials/03-dataflow_debug_and_optimization/reference_files/description.json index a73535ad3d..24e70d043f 100644 --- a/Hardware_Acceleration/Feature_Tutorials/03-dataflow_debug_and_optimization/reference_files/description.json +++ b/Hardware_Acceleration/Feature_Tutorials/03-dataflow_debug_and_optimization/reference_files/description.json @@ -1,7 +1,7 @@ { "name": "03-dataflow_debug_and_optimization", "description": "03-dataflow_debug_and_optimization", - "flow": "hls", + "flow": "vitis", "platform_allowlist": ["u200"], diff --git a/Vitis_Platform_Creation/Feature_Tutorials/02_petalinux_customization/ref_files/vck190/Makefile b/Vitis_Platform_Creation/Feature_Tutorials/02_petalinux_customization/ref_files/vck190/Makefile index a8d2d62eee..97e14687f5 100755 --- a/Vitis_Platform_Creation/Feature_Tutorials/02_petalinux_customization/ref_files/vck190/Makefile +++ b/Vitis_Platform_Creation/Feature_Tutorials/02_petalinux_customization/ref_files/vck190/Makefile @@ -10,7 +10,6 @@ ABS_SW_PATH=$(ABS_BUILD_PATH)/$(PETALINUX_PROJ_NAME) PETALINUX_DIR=$(ABS_SW_PATH) PETALINUX_CONFIG=$(PETALINUX_DIR)/project-spec/configs/config PETALINUX_ROOTFS_CONFIG=$(PETALINUX_DIR)/project-spec/configs/rootfs_config -#XSA_PATH ?=/group/bcapps/sven/project/github/Vitis-Tutorials_419/Vitis_Platform_Creation/Design_Tutorials/03_Edge_VCK190/ref_files/step1_vivado/build/vivado/ #XSA_NAME ?=xsa_file_for_petalinux PDI_DIR =pdi_dir #PDI_PATH =$(ROOT_DIR)/$(PDI_DIR)