Merge branch 'Xilinx:2024.1' into 2024.1

build/build_edge_deb.sh

@@ -35,8 +35,8 @@ PROGRAM=`basename $0`
 
 # XRT Version variables
 XRT_MAJOR_VERSION=2
-XRT_MINOR_VERSION=15
-RELEASE_VERSION=202310
+XRT_MINOR_VERSION=17
+RELEASE_VERSION=202410
 
 # Default distribution
 DIST=jammy

build/debian/control

@@ -21,6 +21,7 @@ Build-Depends: cmake,
                libssl-dev,
                libudev-dev,
                libxml2-dev,
+	       libxaiengine,
                libyaml-dev,
                lsb-release,
                ocl-icd-dev,
@@ -29,7 +30,9 @@ Build-Depends: cmake,
                pkg-config,
                protobuf-compiler,
                rapidjson-dev,
+               systemtap-sdt-dev,
                uuid-dev,
+	       xaiefal,
 Standards-Version: 4.5.0
 
 Package: xrt

build/debian/rules

@@ -6,9 +6,9 @@
 override_dh_auto_configure:
 	set -ex; \
 	if [ "$$(dpkg-architecture -q DEB_TARGET_ARCH)" = arm64 ]; then \
-		XRT_NATIVE_BUILD=no DKMS_FLOW=yes dh_auto_configure; \
+	    XRT_NATIVE_BUILD=no DKMS_FLOW=yes XRT_AIE_BUILD=true CXXFLAGS="-DXRT_ENABLE_AIE -DFAL_LINUX=on" dh_auto_configure; \
 	else \
-		dh_auto_configure; \
+	    dh_auto_configure; \
 	fi
 
 override_dh_auto_test:

src/CMake/version.cmake

@@ -36,6 +36,11 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+#Set XRT_HEAD_COMMITS to default value if above command is not executed
+if (NOT XRT_HEAD_COMMITS)
+set (XRT_HEAD_COMMITS -1)
+endif()
+
 # Get number of commits between HEAD and master
 execute_process(
   COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD ^origin/master
@@ -44,6 +49,11 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+#Set XRT_BRANCH_COMMITS to default value if above command is not executed
+if (NOT XRT_BRANCH_COMMITS)
+set (XRT_BRANCH_COMMITS -1)
+endif()
+
 # Get the latest abbreviated commit hash date of the working branch
 execute_process(
   COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%cD

src/runtime_src/core/edge/drm/zocl/common/zocl_bo.c

@@ -57,7 +57,7 @@ void zocl_describe(const struct drm_zocl_bo *obj)
 static inline void
 zocl_bo_describe(const struct drm_zocl_bo *bo, uint64_t *size, uint64_t *paddr)
 {
-	if (bo->flags & (ZOCL_BO_FLAGS_CMA | ZOCL_BO_FLAGS_USERPTR)) {
+	if (!bo->mm_node) {
 		*size = (uint64_t)bo->cma_base.base.size;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 		*paddr = (uint64_t)bo->cma_base.dma_addr;
@@ -213,46 +213,43 @@ zocl_create_range_mem(struct drm_device *dev, size_t size, struct zocl_mem *mem)
 	struct zocl_mem *head_mem = mem;
 	int err = -ENOMEM;
 
-	bo = kzalloc(sizeof(struct drm_zocl_bo), GFP_KERNEL);
-	if (IS_ERR(bo))
-		return ERR_PTR(-ENOMEM);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
-	bo->gem_base.funcs = &zocl_gem_object_funcs;
-#endif
-	err = drm_gem_object_init(dev, &bo->gem_base, size);
-	if (err) {
-		kfree(bo);
-		return ERR_PTR(err);
-	}
-
-	bo->mm_node = kzalloc(sizeof(struct drm_mm_node),
-			GFP_KERNEL);
-	if (IS_ERR(bo->mm_node)) {
-		drm_gem_object_release(&bo->gem_base);
-		kfree(bo);
-		return ERR_PTR(-ENOMEM);
-	}
-
 	mutex_lock(&zdev->mm_lock);
 	do {
 		if (mem->zm_type == ZOCL_MEM_TYPE_CMA) {
 			struct drm_zocl_bo *cma_bo =
 				zocl_create_cma_mem(dev, size);
 			if (!IS_ERR(cma_bo)) {
 				/* Get the memory from CMA memory region */
-				mutex_unlock(&zdev->mm_lock);
-				kfree(bo->mm_node);
-				drm_gem_object_release(&bo->gem_base);
-				kfree(bo);
 				cma_bo->flags |= ZOCL_BO_FLAGS_CMA;
 				return cma_bo;
 			}
 			DRM_WARN("Memory allocated from CMA region"
 				" whereas requested for reserved memory region\n");
 		}
 		else {
-			err = drm_mm_insert_node_in_range(zdev->zm_drm_mm,
+                        bo = kzalloc(sizeof(struct drm_zocl_bo), GFP_KERNEL);
+                        if (IS_ERR(bo))
+                                return ERR_PTR(-ENOMEM);
+
+                        #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
+                                bo->gem_base.funcs = &zocl_gem_object_funcs;
+                        #endif
+
+                        err = drm_gem_object_init(dev, &bo->gem_base, size);
+                        if (err) {
+                                kfree(bo);
+                                return ERR_PTR(err);
+                        }
+
+                        bo->mm_node = kzalloc(sizeof(struct drm_mm_node),GFP_KERNEL);
+
+	                if (IS_ERR(bo->mm_node)) {
+		                drm_gem_object_release(&bo->gem_base);
+		                kfree(bo);
+		                return ERR_PTR(-ENOMEM);
+	                }
+
+                        err = drm_mm_insert_node_in_range(zdev->zm_drm_mm,
 				bo->mm_node, size, PAGE_SIZE, 0,
 				mem->zm_base_addr,
 				mem->zm_base_addr + mem->zm_size, 0);
@@ -403,7 +400,7 @@ zocl_create_bo(struct drm_device *dev, uint64_t unaligned_size, u32 user_flags)
 struct sg_table *zocl_gem_prime_get_sg_table(struct drm_gem_object *obj)
 {
         struct drm_zocl_bo *zocl_obj = to_zocl_bo(obj);
-	if (zocl_obj && (zocl_obj->flags & ZOCL_BO_FLAGS_CMA)) {
+	if (zocl_obj && !(zocl_obj->mm_node)) {
 		return drm_gem_dma_get_sg_table(&zocl_obj->cma_base);
 	}
         struct drm_device *drm = obj->dev;

src/runtime_src/core/edge/drm/zocl/common/zocl_drv.c

@@ -586,7 +586,7 @@ void zocl_free_bo(struct drm_gem_object *obj)
 			zocl_free_userptr_bo(obj);
 		else if (zocl_obj->flags & ZOCL_BO_FLAGS_HOST_BO)
 			zocl_free_host_bo(obj);
-		else if (zocl_obj->flags & ZOCL_BO_FLAGS_CMA) {
+		else if (!zocl_obj->mm_node) {
 			/* Update memory usage statistics */
 			zocl_update_mem_stat(zdev, obj->size, -1,
 			    zocl_obj->mem_index);
@@ -708,7 +708,7 @@ zocl_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 		 */
 		vma->vm_page_prot = prot;
 
-	if (bo->flags & ZOCL_BO_FLAGS_CMA) {
+	if (!bo->mm_node) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
 		dma_obj = to_drm_gem_dma_obj(gem_obj);
 		paddr = dma_obj->dma_addr;
@@ -719,8 +719,8 @@ zocl_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 	} else
 		paddr = bo->mm_node->start;
 
-	if ((!(bo->flags & ZOCL_BO_FLAGS_CMA)) ||
-	    (bo->flags & ZOCL_BO_FLAGS_CMA &&
+	if (bo->mm_node ||
+	    (!bo->mm_node &&
 	    bo->flags & ZOCL_BO_FLAGS_CACHEABLE)) {
 		/* Map PL-DDR and cacheable CMA */
 		rc = remap_pfn_range(vma, vma->vm_start,

src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c

@@ -305,7 +305,7 @@ zocl_update_apertures(struct drm_zocl_dev *zdev, struct drm_zocl_slot *slot)
 	int i = 0;
         char kname[64] = {0};
         char *kname_p = NULL;
-      	struct kernel_info *krnl_info = NULL;
+        struct kernel_info *krnl_info = NULL;
 
 	/* Update aperture should only happen when loading xclbin */
 	if (slot->ip)
@@ -339,7 +339,7 @@ zocl_update_apertures(struct drm_zocl_dev *zdev, struct drm_zocl_slot *slot)
 			apt = &zdev->cu_subdev.apertures[apt_idx];
 
 			apt->addr = ip->m_base_address;
-                        
+
                         strncpy(kname, ip->m_name, sizeof(kname));
 		        kname[sizeof(kname)-1] = '\0';
 		        kname_p = &kname[0];

src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h

@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <vector>
 

src/runtime_src/core/edge/user/zynq_dev.h

@@ -17,6 +17,7 @@
 #ifndef _XCL_ZYNQ_DEV_H_
 #define _XCL_ZYNQ_DEV_H_
 
+#include <cstdint>
 #include <fstream>
 #include <string>
 #include <vector>

src/runtime_src/xdp/profile/database/statistics_database.cpp

@@ -220,7 +220,7 @@ namespace xdp {
 
     auto threadId = std::this_thread::get_id();
     auto key      = std::make_pair(name, threadId);
-    auto value    = std::make_pair(timestamp, (double)0.0);
+    std::pair<double, double>value {timestamp, 0.0};
 
     // Since a single thread can call a function multiple times, we store
     // the starts in a vector.  If the thread makes a recursive call, we'll