diff --git a/AI_Engine_Development/Design_Tutorials/04-custom-platform-emulation/Makefile b/AI_Engine_Development/Design_Tutorials/04-custom-platform-emulation/Makefile index 962d74c687..ecf9258a54 100644 --- a/AI_Engine_Development/Design_Tutorials/04-custom-platform-emulation/Makefile +++ b/AI_Engine_Development/Design_Tutorials/04-custom-platform-emulation/Makefile @@ -18,10 +18,6 @@ ifndef PLATFORM_REPO_PATHS export PLATFORM_REPO_PATHS endif -EMBEDDED_PLATFORM=$(lastword $(subst :, ,$(PLATFORM_REPO_PATHS))) -SYSROOT:=$(EMBEDDED_PLATFORM)/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux -CXX:=$(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SYSROOT} - XF_PROJ_ROOT ?= $(shell bash -c 'export MK_PATH=$(MK_PATH); echo $${MK_PATH%/AI_Engine_Development/*}') # Makefile input options @@ -38,11 +34,15 @@ CONFIG_FILE := system.cfg TEST := SPRITE ifeq (${TEST}, SPRITE) + EMBEDDED_PLATFORM=$(lastword $(subst :, ,$(PLATFORM_REPO_PATHS))) + SYSROOT:=$(EMBEDDED_PLATFORM)/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux + CXX:=$(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SYSROOT} + BASE_PLATFORM := /wrk/vitis_collateral/vck190_artifacts/vck190_xpfm/vck190_custom.xpfm ROOTFS := /wrk/vitis_collateral/vck190_artifacts/vck190_xpfm/rootfs.ext4 IMAGE := /wrk/vitis_collateral/vck190_artifacts/vck190_xpfm/Image else - SYSROOT := ../../../Vitis_Platform_Creation/Introduction/03_Edge_VCK190/ref_files/step3_pfm/sw_comp/sysroots/cortexa72-cortexa53-xilinx-linux + SDKTARGETSYSROOT := ../../../Vitis_Platform_Creation/Introduction/03_Edge_VCK190/ref_files/step3_pfm/sw_comp/sysroots/cortexa72-cortexa53-xilinx-linux BASE_PLATFORM := ../../../Vitis_Platform_Creation/Introduction/03_Edge_VCK190/ref_files/step3_pfm/platform_repo/vck190_custom/export/vck190_custom/vck190_custom.xpfm ROOTFS :=../../../Vitis_Platform_Creation/Introduction/03_Edge_VCK190/ref_files/step3_pfm/sw_comp/rootfs.ext4 IMAGE := ../../../Vitis_Platform_Creation/Introduction/03_Edge_VCK190/ref_files/step3_pfm/sw_comp/Image @@ -124,14 +124,25 @@ host: guard-SYSROOT guard-CXX # Depending on the TARGET, it'll either generate the PDI for hw_emu or hw. package: guard-IMAGE guard-ROOTFS cd ./sw - v++ -p -t ${TARGET} \ - -f ${BASE_PLATFORM} \ - --package.rootfs=${ROOTFS} \ - --package.image_format=ext4 \ - --package.boot_mode=sd \ - --package.kernel_image=${IMAGE} \ - --package.defer_aie_run \ - --package.sd_file host.exe ../tutorial.xclbin ../libadf.a + ifeq (${TEST}, SPRITE) + v++ -p -t ${TARGET} \ + -f ${BASE_PLATFORM} \ + --package.rootfs=${ROOTFS} \ + --package.image_format=ext4 \ + --package.boot_mode=sd \ + --package.kernel_image=${IMAGE} \ + --package.defer_aie_run \ + --package.sd_file host.exe ../tutorial.xclbin ../libadf.a + else + v++ -p -t ${TARGET} \ + -f ..${BASE_PLATFORM} \ + --package.rootfs=../${ROOTFS} \ + --package.image_format=ext4 \ + --package.boot_mode=sd \ + --package.kernel_image=../${IMAGE} \ + --package.defer_aie_run \ + --package.sd_file host.exe ../tutorial.xclbin ../libadf.a + endif ################################################################################################### ########################################################################### diff --git a/AI_Engine_Development/Feature_Tutorials/05-AI-engine-versal-integration/Makefile b/AI_Engine_Development/Feature_Tutorials/05-AI-engine-versal-integration/Makefile index c16e0874f0..d53aac35ee 100644 --- a/AI_Engine_Development/Feature_Tutorials/05-AI-engine-versal-integration/Makefile +++ b/AI_Engine_Development/Feature_Tutorials/05-AI-engine-versal-integration/Makefile @@ -12,8 +12,11 @@ ifndef IMAGE export IMAGE endif -SDKTARGETSYSROOT = ${PLATFORM_REPO_PATHS}/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux -CXX = $(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SDKTARGETSYSROOT} +TEST := +ifeq (${TEST}, SPRITE) + SDKTARGETSYSROOT := ${PLATFORM_REPO_PATHS}/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux + CXX := $(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SDKTARGETSYSROOT} +endif XF_PROJ_ROOT ?= $(shell bash -c 'export MK_PATH=$(MK_PATH); echo $${MK_PATH%/AI_Engine_Development/*}') @@ -59,8 +62,6 @@ GCC_LIB := -lxaiengine -ladf_api_xrt -lxrt_core -lxrt_coreutil \ LDCLFLAGS := $(GCC_LIB) -XF_PROJ_ROOT := . - .ONESHELL: .PHONY: clean all kernels aie xclbin host package run_emu diff --git a/AI_Engine_Development/Feature_Tutorials/06-versal-system-design-clocking-tutorial/Makefile b/AI_Engine_Development/Feature_Tutorials/06-versal-system-design-clocking-tutorial/Makefile index 4a95cd7029..d0d9becf44 100644 --- a/AI_Engine_Development/Feature_Tutorials/06-versal-system-design-clocking-tutorial/Makefile +++ b/AI_Engine_Development/Feature_Tutorials/06-versal-system-design-clocking-tutorial/Makefile @@ -12,8 +12,11 @@ ifndef IMAGE export IMAGE endif -SDKTARGETSYSROOT = ${PLATFORM_REPO_PATHS}/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux -CXX = $(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SDKTARGETSYSROOT} +TEST := +ifeq (${TEST}, SPRITE) + SDKTARGETSYSROOT := ${PLATFORM_REPO_PATHS}/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux + CXX := $(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SDKTARGETSYSROOT} +endif XF_PROJ_ROOT ?= $(shell bash -c 'export MK_PATH=$(MK_PATH); echo $${MK_PATH%/AI_Engine_Development/*}') @@ -126,6 +129,9 @@ xclbin: guard-PLATFORM_REPO_PATHS $(GRAPH_O) $(KERNEL_XO) host: guard-CXX guard-SDKTARGETSYSROOT cd ./sw $(CXX) $(GCC_FLAGS) $(GCC_INCLUDES) -o aie_control_xrt.o ../Work/ps/c_rts/aie_control_xrt.cpp + ifeq (${TEST},SPRITE) + $(CXX) $(GCC_FLAGS) $(GCC_INCLUDES) -o main.o /wrk/vitis_collateral/06-versal-system-design-clocking/host.cpp + endif $(CXX) $(GCC_FLAGS) $(GCC_INCLUDES) -o main.o host.cpp $(CXX) *.o $(GCC_LIB) -std=c++14 -o host.exe @echo "COMPLETE: Host application created." diff --git a/AI_Engine_Development/Feature_Tutorials/11-ai-engine-emulation-waveform-analysis/Makefile b/AI_Engine_Development/Feature_Tutorials/11-ai-engine-emulation-waveform-analysis/Makefile index fc6d496b35..9a72058e0b 100644 --- a/AI_Engine_Development/Feature_Tutorials/11-ai-engine-emulation-waveform-analysis/Makefile +++ b/AI_Engine_Development/Feature_Tutorials/11-ai-engine-emulation-waveform-analysis/Makefile @@ -12,8 +12,11 @@ ifndef IMAGE export IMAGE endif -SDKTARGETSYSROOT = ${PLATFORM_REPO_PATHS}/sw/versal/Xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux -CXX = $(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SDKTARGETSYSROOT} +TEST := +ifeq (${TEST}, SPRITE) + SDKTARGETSYSROOT := ${PLATFORM_REPO_PATHS}/sw/versal/xilinx-versal-common-v2021.1/sysroots/aarch64-xilinx-linux + CXX := $(XILINX_VITIS)/gnu/aarch64/lin/aarch64-linux/x86_64-petalinux-linux/usr/bin/aarch64-xilinx-linux/aarch64-xilinx-linux-g++ --sysroot=${SDKTARGETSYSROOT} +endif XF_PROJ_ROOT ?= $(shell bash -c 'export MK_PATH=$(MK_PATH); echo $${MK_PATH%/AI_Engine_Development/*}') @@ -64,8 +67,6 @@ GCC_LIB := -lxaiengine -ladf_api_xrt -lxrt_core -lxrt_coreutil \ .ONESHELL: .PHONY: clean all kernels aie xclbin host package run_emu - - ### # Guarding Checks. Do not modify. ### diff --git a/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/CheckJSONDescription.sh b/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/CheckJSONDescription.sh deleted file mode 100755 index 298c0fa46c..0000000000 --- a/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/CheckJSONDescription.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/bash - -DATE=`date +%Y%m%d_%H%M` -echo "Startof CheckJSONDescription.sh $DATE" - -#export ENVROOT=/proj/rdi/env/stable/hierdesign -#source ${ENVROOT}/skel/g_profile -export ENVROOT=/proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization -source /proj/rdi/env/stable/hierdesign/skel/g_profile -umask 002 - -# "branch" env variable should be present in Jenkins Jobs -if [ "${branch}" == "master" ]; then - EXT_2020_2=".2020.2" -else - EXT_2020_2="" -fi -if [[ -z "$exception" ]]; then - dedicated_exception=/proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/Exception.${libname}${EXT_2020_2}.json - if [[ -f $dedicated_exception ]]; then - export exception=$dedicated_exception - else - export exception=/proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/Exception${EXT_2020_2}.json - fi -fi - -if [[ -z "$GENERATE" ]]; then - GENERATE=True -fi - -if [[ ! -z "$select_allowed_platforms" && "$select_allowed_platforms" != '' ]] ; then - export SELECT_ALLOWED_PLATFORMS=$select_allowed_platforms - echo "[INFO]: CheckJsonDescription.sh: SELECT_ALLOWED_PLATFORMS=$SELECT_ALLOWED_PLATFORMS" -fi - -if [[ ! -z "$force_platforms" && "$force_platforms" != '' ]] ; then - export FORCE_PLATFORMS=$force_platforms - echo "[INFO]: CheckJsonDescription.sh: FORCE_PLATFORMS=$FORCE_PLATFORMS" -fi - -ADDITIONAL_ARG="" -if [[ ! -z "$coverage" && "$coverage" == 'true' ]] ; then - echo "[INFO] CheckJSONDescription.sh : Add coverage vars to testinfo.yml" - ADDITIONAL_ARG=" --coverage True " -fi - -#echo "[INFO] : using $exception" -echo "[DEBUG] env vars" -set -echo "[DEBUG] python /proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/CheckJsonDescription.py --library-name ${libname} --path ${WORKSPACE} --exception $exception --generate ${GENERATE} --output $WORKSPACE/tcrepo --version ${TOOLVERSION} ${ADDITIONAL_ARG}" -python /proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/CheckJsonDescription.py --library-name ${libname} --path ${WORKSPACE} --exception $exception --generate ${GENERATE} --output $WORKSPACE/tcrepo --version ${TOOLVERSION} ${ADDITIONAL_ARG} - -DATE=`date +%Y%m%d_%H%M` -echo "End of CheckJSONDescription.sh $DATE" diff --git a/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/CheckMakefile.sh b/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/CheckMakefile.sh deleted file mode 100755 index 1fb4b421f9..0000000000 --- a/AI_Engine_Development/Feature_Tutorials/12-axis-traffic-generator/CheckMakefile.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/bash - -DATE=`date +%Y%m%d_%H%M` -echo "Startof CheckMakefile.sh $DATE" - -#export ENVROOT=/proj/rdi/env/stable/hierdesign -#source ${ENVROOT}/skel/g_profile -export ENVROOT=/proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization -source /proj/rdi/env/stable/hierdesign/skel/g_profile -umask 002 - -# "branch" env variable should be present in Jenkins Jobs -if [ "${branch}" == "master" ]; then - EXT_2020_2=".2020.2" -else - EXT_2020_2="" -fi -if [[ -z "$exception" ]]; then - dedicated_exception=/proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/Exception.${libname}${EXT_2020_2}.json - if [[ -f $dedicated_exception ]]; then - export exception=$dedicated_exception - else - export exception=/proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/Exception${EXT_2020_2}.json - fi -fi - -echo "[INFO] : using $exception" -python /proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/CheckMakefile.py --path ${WORKSPACE} --exception $exception --forbidden-variables /proj/xtools/dsv/projects/sdx_libs/CheckLibraryStandardization/forbidden_variables.json --version ${TOOLVERSION} - -DATE=`date +%Y%m%d_%H%M` -echo "End of CheckMakefile.sh $DATE"