AIE/F/16: Fix HLS config files

Xilinx · Jul 12, 2024 · 679390b · 679390b
1 parent 3c4dbb6
commit 679390b
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 6 deletions.
diff --git a/...elopment/AIE/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/Makefile b/...elopment/AIE/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/Makefile
@@ -28,7 +28,7 @@ EXTIO ?= true
 # PYTHON: A Python based traffic generator is used
 # CPP: A C++ traffic generator is used
 # MATLAB: A MATLAB based traffic generator is used
-TRAFFIC_GEN ?= 
+TRAFFIC_GEN ?= CPP 
 
 # necessary settings to run the python ETG
 PYTHON_INSTALL ?= $(XILINX_VIVADO)/tps/lnx64/python-3.8.3/bin/
@@ -115,7 +115,7 @@ endif
 CONFIG_FILE ?= system_etg.cfg
 else # WITHOUT External Traffic Generator
 KERNEL := $(wildcard pl_kernels/*.cpp)
-ifeq ifeq (${TARGET}, sw_emu)
+ifeq (${TARGET}, sw_emu)
 KERNEL_XO := mm2s.xo s2mm.xo polar_clip.xo
 else
 KERNEL_XO := pl_kernels/mm2s.xo pl_kernels/s2mm.xo pl_kernels/polar_clip.xo
@@ -134,7 +134,8 @@ LDCLFLAGS :=
 ifeq ($(TARGET),sw_emu)
 	VPP_XO_FLAGS := -c --platform $(BASE_PLATFORM) -t $(TARGET) --save-temps -g -DDATA_WIDTH=32
 else
-	VPP_XO_FLAGS := -c --mode hls --platform $(BASE_PLATFORM) 
+	VPP_XO_FLAGS := -c --mode hls --platform $(BASE_PLATFORM)
+
 endif
 
 ifeq (${EXTIO}, true)
@@ -271,7 +272,7 @@ endif
 HW_EMU := cd sw; ./launch_hw_emu.sh -no-reboot -run-app embedded_exec.sh
 SW_EMU := cd sw; ./host.exe a.xclbin 
 
-all: disp aie host kernels xsa package 
+all: disp aie host kernels xsa package
 ifeq (${TRAFFIC_GEN}, PYTHON)
 #For Python External Traffic Generator
 HW_EMU_ETG := ./scripts/etg_py.sh & $(HW_EMU)

diff --git a/.../AIE/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/description.json b/.../AIE/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/description.json
@@ -0,0 +1,53 @@
+{
+    "name": "AI_Engine_Development-16-external-traffic-generator-aie",
+    "description": "16-external-traffic-generator-aie",
+    "flow": "versal",
+
+    "platform_allowlist": [ "vck190"],
+    "platform_blocklist": [],
+
+    "testinfo": {
+        "test_name": "AIE_F_16-external-tfc-gen",
+        "disable": true,
+        "jobs": [
+            {
+                "index": 0,
+                "dependency": [],
+                "env": "",
+                "cmd": "",
+                "max_memory_MB": 32768,
+                "max_time_min": {
+                    "vitis_aie_sim": 50,
+                    "vitis_aie_x86sim": 50,
+                    "vitis_hw_build": 470,
+                    "vitis_hw_emu": 300
+                }
+            }
+        ],
+        "targets": [
+            "vitis_hw_emu"
+        ],
+        "category": "canary",
+        "make_options": [
+            "CXX=${XILINX_VITIS}/gnu/aarch64/lin/aarch64-linux/bin/aarch64-linux-gnu-g++",
+            "HOST_ARCH=aarch64",
+            "EDGE_COMMON_SW=${EDGE_COMMON_SW}",
+            "SYSROOT=${SYSROOT}",
+			"SDKTARGETSYSROOT=${SYSROOT}",
+			"ROOTFS=${EDGE_COMMON_SW}/rootfs.ext4",
+			"IMAGE=${EDGE_COMMON_SW}/Image",
+            "EMU_CMD=\\\"./launch_hw_emu.sh -run-app embedded_exec.sh\\\"",
+	    "EMBEDDED_PACKAGE_OUT=./",
+	    "EMBEDDED_EXEC_SCRIPT=./embedded_exec.sh"
+        ],
+        "custom_build_target":
+        {
+            "all": "run"
+        },
+        "tasks": {
+            "build": {
+                "pre_exec": "./env_setup_versal.sh"
+            }
+        }
+    }
+}
diff --git a/...E/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/pl_kernels/mm2s.cfg b/...E/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/pl_kernels/mm2s.cfg
@@ -2,8 +2,8 @@
 flow_target=vitis
 syn.file=mm2s.cpp
 syn.cflags=-I.
+syn.file_cflags=mm2s.cpp,-DDATA_WIDTH=32
 syn.top=mm2s
-syn.cflags=DATA_WIDTH=32
 package.ip.name=mm2s
 package.output.syn=true
 package.output.format=xo

diff --git a/...E/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/pl_kernels/s2mm.cfg b/...E/Feature_Tutorials/16-external-traffic-generator-aie/SW-HW_Emulation/pl_kernels/s2mm.cfg
@@ -2,8 +2,8 @@
 flow_target=vitis
 syn.file=s2mm.cpp
 syn.cflags=-I.
+syn.file_cflags=s2mm.cpp,-DDATA_WIDTH=32
 syn.top=s2mm
-syn.cflags=DATA_WIDTH=32
 package.ip.name=s2mm
 package.output.syn=true
 package.output.format=xo