From 195e1fa9fb13b21bc41af4e0747d4646caeb65e5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 4 Jun 2024 16:51:04 -0600 Subject: various: Remove SOC_VARIANT, split versal and versal-net, add machine_features SOC_VARIANT has been remove, we are now only using the YP standard SOC_FAMILY configuration. The defined families are: zynq, zynqmp, versal and versal-net. Our decision of breaking up versal-net from versal, is based on the SoC CPU changes from cortexa72/r5 to cortexa78/r52, thus we're treating it as a different SoC family. In order to capture the individual capabilities that we used to handle via SOC_VARIANT, we have defined the following features (some may have been previously defined): - mali400 (zynqmp eg and ev) - vcu (zynqmp ev) - rfsoc (zynqmp dr RF capabiltiies) - aie - (versal ai & premium) - vdu - (versal ai) SOC_VARIANT_ARCH and SOC_FAMILY_ARCH are now obsolete and replaced by MACHINE_ARCH. This is based on the guideline that any recipes that use MACHINE_FEATURES should be MACHINE_ARCH specific. Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb | 1 + meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb | 1 + meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb | 1 + 3 files changed, 3 insertions(+) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb index b91572f9..e5efd89c 100644 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb +++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb @@ -13,6 +13,7 @@ LICENSE = "GPL-2.0-or-later & Apache-2.0" COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb index b91572f9..e5efd89c 100644 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb +++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb @@ -13,6 +13,7 @@ LICENSE = "GPL-2.0-or-later & Apache-2.0" COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb index b91572f9..e5efd89c 100644 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb +++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb @@ -13,6 +13,7 @@ LICENSE = "GPL-2.0-or-later & Apache-2.0" COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" -- cgit v1.2.3-54-g00ecf From 942588d3898662ff6db9b70d0aa03ced27d7ec8b Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 10 Jun 2024 15:36:43 -0600 Subject: Revert "kernel-module-zocl: Rename from zocl" This reverts commit 60542eb1dea413c631330524836412cfefc933bb. This also makes the same change to 2024.1 version. This change caused: ERROR: core-image-minimal-1.0-r0 do_rootfs: Unable to find package with name 'kernel-module-zocl' in SPDX file .../tmp/deploy/spdx/by-hash/zynqmp_generic/sstate:kernel-module-zocl:zynqmp_generic-poky-linux:202410.2.17.0:r0:zynqmp_generic:12:/kernel-module-zocl-6.6.10-xilinx-g3af4295e00ef.spdx.json Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 4 ++-- .../recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb | 2 +- .../recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb | 2 +- .../recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb | 2 +- .../recipes-xrt/xrt/xrt_202210.2.13.479.bb | 2 +- .../recipes-xrt/xrt/xrt_202220.2.14.0.bb | 2 +- .../recipes-xrt/xrt/xrt_202310.2.15.0.bb | 2 +- .../recipes-xrt/xrt/xrt_202320.2.16.0.bb | 2 +- .../zocl/kernel-module-zocl_202210.2.13.479.bb | 25 ------------------- .../zocl/kernel-module-zocl_202220.2.14.0.bb | 23 ------------------ .../zocl/kernel-module-zocl_202310.2.15.0.bb | 28 ---------------------- .../zocl/kernel-module-zocl_202320.2.16.0.bb | 28 ---------------------- .../zocl/kernel-module-zocl_202410.2.17.0.bb | 28 ---------------------- .../recipes-xrt/zocl/zocl_202210.2.13.479.bb | 24 +++++++++++++++++++ .../recipes-xrt/zocl/zocl_202220.2.14.0.bb | 21 ++++++++++++++++ .../recipes-xrt/zocl/zocl_202310.2.15.0.bb | 26 ++++++++++++++++++++ .../recipes-xrt/zocl/zocl_202320.2.16.0.bb | 26 ++++++++++++++++++++ .../recipes-xrt/zocl/zocl_202410.2.17.0.bb | 26 ++++++++++++++++++++ 18 files changed, 132 insertions(+), 141 deletions(-) delete mode 100644 meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb delete mode 100644 meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb delete mode 100644 meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb delete mode 100644 meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb delete mode 100644 meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index bbd46631..864d2dff 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -29,7 +29,7 @@ LAYERSERIES_COMPAT_xilinx = "scarthgap" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ *->xrt \ - *->kernel-module-zocl \ + *->zocl \ *->cairo \ *->libepoxy \ *->gstreamer1.0-plugins-base \ @@ -84,7 +84,7 @@ XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0" XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0" XRT_ZOCL_VERSION[v2024.2] = "202410.2.17.0" PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" -PREFERRED_VERSION_kernel-module-zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" +PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" # AI-Engine AIEFAL_VERSION[v2022.1] = "1.4" diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb index a5413bdc..386e1b79 100644 --- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" inherit cmake update-rc.d systemd -DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" +DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" RDEPENDS:${PN} += " fru-print" EXTRA_OECMAKE += " \ -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb index 8343451d..f25201bd 100644 --- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb +++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" inherit cmake update-rc.d systemd -DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm" +DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm" RDEPENDS:${PN} += " freeipmi" EXTRA_OECMAKE += " \ -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb index 199ff4de..b55ce8c0 100644 --- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb +++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" inherit cmake update-rc.d systemd -DEPENDS += " libwebsockets inotify-tools libdfx kernel-module-zocl libdrm systemd" +DEPENDS += " libwebsockets inotify-tools libdfx zocl libdrm systemd" RDEPENDS:${PN} += " freeipmi" EXTRA_OECMAKE += " \ -DCMAKE_SYSROOT:PATH=${RECIPE_SYSROOT} \ diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb index c42e9a65..0e9dd3db 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb @@ -21,7 +21,7 @@ BBCLASSEXTEND = "native nativesdk" # util-linux is for libuuid-dev. DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" -RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb index cc5a9ed5..7107c3df 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb @@ -20,7 +20,7 @@ BBCLASSEXTEND = "native nativesdk" # util-linux is for libuuid-dev. DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" -RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb index 6d7d1257..cad8ccee 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb @@ -24,7 +24,7 @@ BBCLASSEXTEND = "native nativesdk" # util-linux is for libuuid-dev. DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" -RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb index a780684f..5824ae9c 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb @@ -25,7 +25,7 @@ BBCLASSEXTEND = "native nativesdk" # util-linux is for libuuid-dev. DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson libdfx" -RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb deleted file mode 100644 index a7c7e540..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) driver module" -DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" - -PROVIDES += "zocl" - -require recipes-xrt/xrt/xrt-${PV}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -LICENSE = "GPLv2 & Apache-2.0" - -# Temporary fix -# Patch is applied as -p 4 to the src/runtime_src/core/edge directory -SRC_URI += "file://0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch;striplevel=5;patchdir=./../../" - -S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" - -inherit module - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - echo "Unloading old XRT Linux kernel modules" - ( rmmod zocl || true ) > /dev/null 2>&1 - echo "Loading new XRT Linux kernel modules" - modprobe zocl -} diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb deleted file mode 100644 index 8676639a..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) driver module" -DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" - -COMPATIBLE_MACHINE:microblaze = "none" - -PROVIDES += "zocl" - -require recipes-xrt/xrt/xrt-${PV}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -LICENSE = "GPL-2.0-or-later & Apache-2.0" - -S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" - -inherit module - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - echo "Unloading old XRT Linux kernel modules" - ( rmmod zocl || true ) > /dev/null 2>&1 - echo "Loading new XRT Linux kernel modules" - modprobe zocl -} diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb deleted file mode 100644 index e5efd89c..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) driver module" -DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" - -COMPATIBLE_MACHINE:microblaze = "none" - -PROVIDES += "zocl" - -require recipes-xrt/xrt/xrt-${PV}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -LICENSE = "GPL-2.0-or-later & Apache-2.0" - -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE:zynqmp = ".*" -COMPATIBLE_MACHINE:versal = ".*" -COMPATIBLE_MACHINE:versal-net = ".*" - -S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" - -inherit module - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - echo "Unloading old XRT Linux kernel modules" - ( rmmod zocl || true ) > /dev/null 2>&1 - echo "Loading new XRT Linux kernel modules" - modprobe zocl -} diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb deleted file mode 100644 index e5efd89c..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) driver module" -DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" - -COMPATIBLE_MACHINE:microblaze = "none" - -PROVIDES += "zocl" - -require recipes-xrt/xrt/xrt-${PV}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -LICENSE = "GPL-2.0-or-later & Apache-2.0" - -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE:zynqmp = ".*" -COMPATIBLE_MACHINE:versal = ".*" -COMPATIBLE_MACHINE:versal-net = ".*" - -S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" - -inherit module - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - echo "Unloading old XRT Linux kernel modules" - ( rmmod zocl || true ) > /dev/null 2>&1 - echo "Loading new XRT Linux kernel modules" - modprobe zocl -} diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb deleted file mode 100644 index e5efd89c..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) driver module" -DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" - -COMPATIBLE_MACHINE:microblaze = "none" - -PROVIDES += "zocl" - -require recipes-xrt/xrt/xrt-${PV}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -LICENSE = "GPL-2.0-or-later & Apache-2.0" - -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE:zynqmp = ".*" -COMPATIBLE_MACHINE:versal = ".*" -COMPATIBLE_MACHINE:versal-net = ".*" - -S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" - -inherit module - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - echo "Unloading old XRT Linux kernel modules" - ( rmmod zocl || true ) > /dev/null 2>&1 - echo "Loading new XRT Linux kernel modules" - modprobe zocl -} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb new file mode 100644 index 00000000..7063178a --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb @@ -0,0 +1,24 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPLv2 & Apache-2.0" + +# Temporary fix +# Patch is applied as -p 4 to the src/runtime_src/core/edge directory +SRC_URI += "file://0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch;striplevel=5;patchdir=./../../" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb new file mode 100644 index 00000000..39e9f9fb --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + +COMPATIBLE_MACHINE:microblaze = "none" + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPL-2.0-or-later & Apache-2.0" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb new file mode 100644 index 00000000..47efc58a --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + +COMPATIBLE_MACHINE:microblaze = "none" + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPL-2.0-or-later & Apache-2.0" + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb new file mode 100644 index 00000000..47efc58a --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + +COMPATIBLE_MACHINE:microblaze = "none" + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPL-2.0-or-later & Apache-2.0" + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb new file mode 100644 index 00000000..47efc58a --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + +COMPATIBLE_MACHINE:microblaze = "none" + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPL-2.0-or-later & Apache-2.0" + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} -- cgit v1.2.3-54-g00ecf From 780168021bc1e086dddfa8af263e2f0492a007b2 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 11 Jun 2024 16:40:55 -0500 Subject: xrt: Update version to match release tag commit a75e9843c875bac0f52d34a1763e39e16fb3c9a7 is tag 202410.2.17.319 Signed-off-by: Mark Hatle --- .../recipes-xrt/xrt/xrt-202410.2.17.0.inc | 13 ----- .../xrt/xrt-202410.2.17.0/xrt-cstdint.patch | 32 ------------ .../recipes-xrt/xrt/xrt-202410.2.17.319.inc | 13 +++++ .../xrt/xrt-202410.2.17.319/xrt-cstdint.patch | 32 ++++++++++++ .../recipes-xrt/xrt/xrt_202410.2.17.0.bb | 57 ---------------------- .../recipes-xrt/xrt/xrt_202410.2.17.319.bb | 57 ++++++++++++++++++++++ 6 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc delete mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch delete mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc deleted file mode 100644 index 5a5f7321..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc +++ /dev/null @@ -1,13 +0,0 @@ -REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG};name=xrt" - -BRANCH= "2024.1" -SRCREV_xrt = "a75e9843c875bac0f52d34a1763e39e16fb3c9a7" - -SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https" -SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578" - -SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https" -SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8" -SRCREV_FORMAT = "xrt" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch deleted file mode 100644 index b83c5ef7..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0/xrt-cstdint.patch +++ /dev/null @@ -1,32 +0,0 @@ -Add cstdint as necessary - -In GCC 13.1 usage of uint64 and similar will result in an error without - #include - -Signed-off-by: Mark Hatle - -Index: src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h -=================================================================== ---- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h -+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - namespace adf - { -Index: src/runtime_src/core/edge/user/zynq_dev.h -=================================================================== ---- a/src/runtime_src/core/edge/user/zynq_dev.h -+++ b/src/runtime_src/core/edge/user/zynq_dev.h -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - class zynq_device { - public: - diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc new file mode 100644 index 00000000..5a5f7321 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc @@ -0,0 +1,13 @@ +REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" +BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" +SRC_URI = "${REPO};${BRANCHARG};name=xrt" + +BRANCH= "2024.1" +SRCREV_xrt = "a75e9843c875bac0f52d34a1763e39e16fb3c9a7" + +SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https" +SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578" + +SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https" +SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8" +SRCREV_FORMAT = "xrt" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch new file mode 100644 index 00000000..b83c5ef7 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319/xrt-cstdint.patch @@ -0,0 +1,32 @@ +Add cstdint as necessary + +In GCC 13.1 usage of uint64 and similar will result in an error without + #include + +Signed-off-by: Mark Hatle + +Index: src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h +=================================================================== +--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h ++++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + namespace adf + { +Index: src/runtime_src/core/edge/user/zynq_dev.h +=================================================================== +--- a/src/runtime_src/core/edge/user/zynq_dev.h ++++ b/src/runtime_src/core/edge/user/zynq_dev.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + class zynq_device { + public: + diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb deleted file mode 100644 index d84d3b85..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) libraries" -DESCRIPTION = "Xilinx Runtime User Space Libraries and headers" - -require xrt-${PV}.inc - -SRC_URI += "file://xrt-cstdint.patch;striplevel=2" - -LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ - file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ - file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 " - -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE:zynqmp = ".*" -COMPATIBLE_MACHINE:versal = ".*" - -S = "${WORKDIR}/git/src" - -inherit cmake pkgconfig - -BBCLASSEXTEND = "native nativesdk" - -# util-linux is for libuuid-dev. -DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx" -RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" - -EXTRA_OECMAKE += " \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_EXPORT_COMPILE_COMANDS=ON \ - -DXRT_LIBDFX=true \ - " - -# Systems with AIE also require libmetal, this is implemented in the dynamic-layers -# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend -# Note: If meta-openamp is not available, AIE will not be enabled. - -FILES_SOLIBSDEV = "" -FILES:${PN} += "\ - ${libdir}/lib*.so \ - ${libdir}/lib*.so.* \ - ${libdir}/ps_kernels_lib \ - /lib/*.so* \ - ${datadir}" -INSANE_SKIP:${PN} += "dev-so" - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then - echo "INFO: Creating ICD entry for Xilinx Platform" - mkdir -p /etc/OpenCL/vendors - echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd - chmod -R 755 /etc/OpenCL - fi -} diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb new file mode 100644 index 00000000..d84d3b85 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb @@ -0,0 +1,57 @@ +SUMMARY = "Xilinx Runtime(XRT) libraries" +DESCRIPTION = "Xilinx Runtime User Space Libraries and headers" + +require xrt-${PV}.inc + +SRC_URI += "file://xrt-cstdint.patch;striplevel=2" + +LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ + file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ + file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 " + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" + +S = "${WORKDIR}/git/src" + +inherit cmake pkgconfig + +BBCLASSEXTEND = "native nativesdk" + +# util-linux is for libuuid-dev. +DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" + +EXTRA_OECMAKE += " \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_EXPORT_COMPILE_COMANDS=ON \ + -DXRT_LIBDFX=true \ + " + +# Systems with AIE also require libmetal, this is implemented in the dynamic-layers +# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend +# Note: If meta-openamp is not available, AIE will not be enabled. + +FILES_SOLIBSDEV = "" +FILES:${PN} += "\ + ${libdir}/lib*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/ps_kernels_lib \ + /lib/*.so* \ + ${datadir}" +INSANE_SKIP:${PN} += "dev-so" + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then + echo "INFO: Creating ICD entry for Xilinx Platform" + mkdir -p /etc/OpenCL/vendors + echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd + chmod -R 755 /etc/OpenCL + fi +} -- cgit v1.2.3-54-g00ecf From c7c7c0fbb72cb9498524aadf8a96e0303c7c956d Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 11 Jun 2024 16:45:51 -0500 Subject: xrt, zocl: Update commit id Move back to gitsm, this should now work properly Changelog: Petalinux: moving to latest petalinux for 2024.1 (#8232) CR-1199344: boot scr offset made to 0x0 (#8172) (#8227) Fix PCI Link down issue during EEMI PMC reset (#8208) (#8222) libqdma: Updating QDMA to its latest commit (#8197) (#8221) Minor changes in boost.sh script (#8202) (#8212) Fixed an issue for single slot case where multiple IPs are opened. (#8177) (#8220) Fixed a issue which is causing lsf. This is related to CR-1177852 (#8188) (#8219) Fix boost library link issue when using static boost (#8193) Signed-off-by: Mark Hatle --- .../xrt/xclbinutil-native_202410.2.17.0.bb | 29 ---------------------- .../xrt/xclbinutil-native_202410.2.17.319.bb | 29 ++++++++++++++++++++++ .../recipes-xrt/xrt/xrt-202410.2.17.319.inc | 13 +++------- .../recipes-xrt/xrt/xrt_202410.2.17.319.bb | 2 +- .../recipes-xrt/zocl/zocl_202410.2.17.0.bb | 26 ------------------- .../recipes-xrt/zocl/zocl_202410.2.17.319.bb | 26 +++++++++++++++++++ 6 files changed, 59 insertions(+), 66 deletions(-) delete mode 100644 meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb delete mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb deleted file mode 100644 index 37f32a23..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) - minimal native build for xclbinutil" -DESCRIPTION = "Native build of xclbinutil using XRT codebase" - -require xrt-${PV}.inc - -FILESEXTRAPATHS:append := ":${THISDIR}/xrt" - -LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" -LIC_FILES_CHKSUM = " \ - file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ - file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ - file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \ -" - -S = "${WORKDIR}/git/src" - -inherit cmake pkgconfig native - -DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native" - -EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON" - -do_install() { - install -d ${D}${bindir} - install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir} -} diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb new file mode 100644 index 00000000..37f32a23 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb @@ -0,0 +1,29 @@ +SUMMARY = "Xilinx Runtime(XRT) - minimal native build for xclbinutil" +DESCRIPTION = "Native build of xclbinutil using XRT codebase" + +require xrt-${PV}.inc + +FILESEXTRAPATHS:append := ":${THISDIR}/xrt" + +LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" +LIC_FILES_CHKSUM = " \ + file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ + file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ + file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \ +" + +S = "${WORKDIR}/git/src" + +inherit cmake pkgconfig native + +DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native" + +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON" + +do_install() { + install -d ${D}${bindir} + install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir} +} diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc index 5a5f7321..8041e5be 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.319.inc @@ -1,13 +1,6 @@ -REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" +REPO ?= "gitsm://github.com/Xilinx/XRT.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG};name=xrt" +SRC_URI = "${REPO};${BRANCHARG}" BRANCH= "2024.1" -SRCREV_xrt = "a75e9843c875bac0f52d34a1763e39e16fb3c9a7" - -SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https" -SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578" - -SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https" -SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8" -SRCREV_FORMAT = "xrt" +SRCREV = "2c7ff250504589bd1f934010e37bdcef86afaa54" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb index d84d3b85..7f211e6f 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb @@ -25,7 +25,7 @@ BBCLASSEXTEND = "native nativesdk" # util-linux is for libuuid-dev. DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx" -RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem kernel-module-zocl (= ${PV})" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" EXTRA_OECMAKE += " \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb deleted file mode 100644 index 47efc58a..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Xilinx Runtime(XRT) driver module" -DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" - -COMPATIBLE_MACHINE:microblaze = "none" - -require recipes-xrt/xrt/xrt-${PV}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" -LICENSE = "GPL-2.0-or-later & Apache-2.0" - -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE:zynqmp = ".*" -COMPATIBLE_MACHINE:versal = ".*" -COMPATIBLE_MACHINE:versal-net = ".*" - -S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" - -inherit module - -pkg_postinst_ontarget:${PN}() { - #!/bin/sh - echo "Unloading old XRT Linux kernel modules" - ( rmmod zocl || true ) > /dev/null 2>&1 - echo "Loading new XRT Linux kernel modules" - modprobe zocl -} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb new file mode 100644 index 00000000..47efc58a --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb @@ -0,0 +1,26 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + +COMPATIBLE_MACHINE:microblaze = "none" + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPL-2.0-or-later & Apache-2.0" + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} -- cgit v1.2.3-54-g00ecf From 070ddff60df29d2e4999109ff8b9f458cf283b36 Mon Sep 17 00:00:00 2001 From: Ashwini Lomate Date: Tue, 18 Jun 2024 19:35:49 +0530 Subject: layer.conf:xrt_202410.2.17.319.bb: Fix for conflicting issue in zocl Update preferred version for xrt,zocl to pick latest bb file. And add compatible string for versal-net in xrt*.bb file. Signed-off-by: Ashwini Lomate --- meta-xilinx-core/conf/layer.conf | 2 +- meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index c583c158..a72d4cdb 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -82,7 +82,7 @@ XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0" XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0" XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0" XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0" -XRT_ZOCL_VERSION[v2024.2] = "202410.2.17.0" +XRT_ZOCL_VERSION[v2024.2] = "202410.2.17.319" PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb index 7f211e6f..ff058db3 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb @@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src" -- cgit v1.2.3-54-g00ecf From 70cf4d79de62950b93d5fa0a2ad9de77108a0d29 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 10 Jun 2024 18:43:19 +0530 Subject: xrt, zocl: update commit id for 2024.2 Changelog: In GCC 13.1 usage of uint64 and similar will result in an error without (#8224) Fix dll import/export warning (#8225) ERT command for IPU and IPU preemption (#8211) Catch all the exceptions when firmware version is not present. (#8214) hide extra validate details in verbose (#8210) Fix random crash in aie-pdi-transform (#8201) Fix PCI Link down issue during EEMI PMC reset (#8208) CID-314885,331341,331443 (#8209) Add changes to support xrt::elf based flows in HIP (#8206) Removed m_device in the xbutil advanced command since its mentioned in (#8203) CID-369005, CID-369006: Amend #8198 with missing essential operators (#8207) Added explicit destructor (#8198) Minor changes in boost.sh script (#8202) Bug fix in abs column calculation (#8200) VITIS-12055 Remove PID from aie-partitions report (#8192) CR-1199344: boot scr offset made to 0x0 (#8172) Support add_end in elf (#8180) libqdma: Updating QDMA to its latest commit (#8197) Remove used header include (#8196) Replace XRT_PRINTF with XRT_DEBUGF (#8195) VITIS-11806 Support runlist submission as chained command objects (#8194) fix the tile_type compararison (#8187) [Client][Edge] Support interface tiles input ports details metric events (#8179) Fixed a issue which is causing lsf. This is related to CR-1177852 (#8188) Apply mask to rela->r_addend to get the patching scheme (#8186) VITIS-11384 - [Preemption] XRT to support patching save/restore scratch pad address (#8157) fixed the incorrect sysfs path (#8182) Update codeql-analysis.yml Fix for CR-1182821: AIE Status was unable to get good data and was outputting empty files (#8178) Remove leftover link dependencies on boost (#8176) Fix coverity issues (#8125) Fixed an issue for single slot case where multiple IPs are opened. (#8177) VITIS-11806 Break runlist into multiple submissions if necessary (#8171) VITIS-11772 - [ELF Migration]: XRT userspace library (#8160) Implementation of read/write mem and reg of xrt::aie::device (#8166) enablign rtp updates from alias name also (#8167) VITIS-11829 Xbutil: Separate throughput and latency from verify as individual microbenchmarks (#8154) VITIS-11384 - Process elf section "preempt_save" and "preempt_restore" (#8143) fixing reserved memory logic (#8164) Fixed rw_shared flag for user managed kernel (#8158) VITIS-11112 HIP Binding: Memory Management. (#8138) Add hip related functions (#8141) Add instructions for installation of xrt package on Alma Linux (#8156) Fix bug in runlist implementation (#8153) Update CODEOWNERS Update CODEOWNERS Update CODEOWNERS Update CODEOWNERS VITIS-11334 Update XRT to remove Early Access label for Ryzen (#8148) Fix for CR-1178294: XRT AIE Status .json file does not include tile information for a tile where only memory is used (#8147) running cron at 7pm PST (#8149) Fix windows build error (#8140) giving default value for event column (#8144) Enable HIP build in windows (#8110) zocl version adjusted to 2.18 for 2024.2 (#8142) CR-1186958 Fix duplicate busybar in xbutil validate tests (#8137) initial support for execution trace (#8136) VITIS-11623 - use same patching scheme for same hardware regardless of firmware code path (#8076) fix hipMalloc() issue when running in multithreads. (#8127) CR-1199552: Fixing mem-bw test for RAVE (#8123) Explicitly load xdp_core library before all XDP Plugin in Client Flow. (#8126) replacing DMA events for PLIO in profiling (#8128) Update release version for 2024.2 (#8116) fixing issue in adf::event crash (#8119) cover all stream switch port events (#8117) Enabling 2024.2 for XRT master (#8113) ZOCL version adjusted to 2.17 for 2024.1 (#8114) fixing elapsed time calculation (#8106) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- .../xrt/xclbinutil-native_202420.2.18.0.bb | 29 ++++++++++++ .../recipes-xrt/xrt/xrt-202420.2.18.0.inc | 13 +++++ .../recipes-xrt/xrt/xrt_202420.2.18.0.bb | 55 ++++++++++++++++++++++ .../recipes-xrt/zocl/zocl_202420.2.18.0.bb | 28 +++++++++++ 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb create mode 100644 meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index a72d4cdb..4216ce8f 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -82,7 +82,7 @@ XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0" XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0" XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0" XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0" -XRT_ZOCL_VERSION[v2024.2] = "202410.2.17.319" +XRT_ZOCL_VERSION[v2024.2] = "202420.2.18.0" PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb new file mode 100644 index 00000000..37f32a23 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Xilinx Runtime(XRT) - minimal native build for xclbinutil" +DESCRIPTION = "Native build of xclbinutil using XRT codebase" + +require xrt-${PV}.inc + +FILESEXTRAPATHS:append := ":${THISDIR}/xrt" + +LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" +LIC_FILES_CHKSUM = " \ + file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ + file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ + file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \ +" + +S = "${WORKDIR}/git/src" + +inherit cmake pkgconfig native + +DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native" + +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON" + +do_install() { + install -d ${D}${bindir} + install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir} +} diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc new file mode 100644 index 00000000..0861340a --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -0,0 +1,13 @@ +REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" +BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" +SRC_URI = "${REPO};${BRANCHARG};name=xrt" + +BRANCH= "master" +SRCREV_xrt = "8964124b8809060236f377fa449420d2d361f812" + +SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https" +SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578" + +SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https" +SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8" +SRCREV_FORMAT = "xrt" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb new file mode 100644 index 00000000..65e12757 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "Xilinx Runtime(XRT) libraries" +DESCRIPTION = "Xilinx Runtime User Space Libraries and headers" + +require xrt-${PV}.inc + +LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ + file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ + file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 " + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" + +S = "${WORKDIR}/git/src" + +inherit cmake pkgconfig + +BBCLASSEXTEND = "native nativesdk" + +# util-linux is for libuuid-dev. +DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx" +RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" + +EXTRA_OECMAKE += " \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_EXPORT_COMPILE_COMANDS=ON \ + -DXRT_LIBDFX=true \ + " + +# Systems with AIE also require libmetal, this is implemented in the dynamic-layers +# See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend +# Note: If meta-openamp is not available, AIE will not be enabled. + +FILES_SOLIBSDEV = "" +FILES:${PN} += "\ + ${libdir}/lib*.so \ + ${libdir}/lib*.so.* \ + ${libdir}/ps_kernels_lib \ + /lib/*.so* \ + ${datadir}" +INSANE_SKIP:${PN} += "dev-so" + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then + echo "INFO: Creating ICD entry for Xilinx Platform" + mkdir -p /etc/OpenCL/vendors + echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd + chmod -R 755 /etc/OpenCL + fi +} diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb new file mode 100644 index 00000000..e5efd89c --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "Xilinx Runtime(XRT) driver module" +DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" + +COMPATIBLE_MACHINE:microblaze = "none" + +PROVIDES += "zocl" + +require recipes-xrt/xrt/xrt-${PV}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" +LICENSE = "GPL-2.0-or-later & Apache-2.0" + +COMPATIBLE_MACHINE ?= "^$" +COMPATIBLE_MACHINE:zynqmp = ".*" +COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" + +S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" + +inherit module + +pkg_postinst_ontarget:${PN}() { + #!/bin/sh + echo "Unloading old XRT Linux kernel modules" + ( rmmod zocl || true ) > /dev/null 2>&1 + echo "Loading new XRT Linux kernel modules" + modprobe zocl +} -- cgit v1.2.3-54-g00ecf From 3356d1b807de9e1aa52b17e0b5d2afdac6bf94b0 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 1 Jul 2024 23:55:35 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: Disable RDI CCCAHE if cmake version great that 3.20.0 (#8262) Changes to support new trace metadata & some bug fixes (#8250) Fix xbutil wrapper for Windows (#8254) Fix Copyright Device -> Devices (#8255) Removed zocl_gem_import function, using drm_gem_prime_import (#8252) Replace keyword ipu with npu (#8249) fix clang-tidy warnings for hip (#8112) Infra: Providing additional parameters to pcie-hw action (#8247) VITIS-11112 HIP Binding: Memory Management. (#8170) CR-1203967: uninit value and unlocked mutex in icap.c (#8248) Changing the default for all profiling writers to use a different directory on Windows. (#8245) Xbutil windows wrapper (#8246) CR-1201062: Fixing issue where enabling both AIE trace and PL trace resulted in PL trace not being generated (#8241) Fix distribution on Windows for host report (#8240) telemetry report update (#8239) VITIS-12131 and VITIS-11466 add command chaining benchmarks (#8238) Add getGroupID for memory port identifier as AIE Trace on Client uses it. (#8236) VITIS-11824 Consolidate examine reports, xrt-smi cleanup (#8234) enable telemetry report (#8235) Larger Debug Buffer Support (#8231) Petalinux: moving to latest petalinux for 2024.2 (#8228) removing edited from workflow file (#8223) RyzenAI-1.2-Cleanup Various cosmetic changes, removal of aie reports ... (#8229) add api to patch address directly (#8226) Add export macro for use of function in different dll (#8230) VITIS-11750 Rename exe from xbutil to xrt-smi (#8191) Signed-off-by: Manoj Takasi Moved to gitsm:// Adjust changelog to match sync Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 0861340a..9bbffffc 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -1,13 +1,6 @@ -REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" +REPO ?= "gitsm://github.com/Xilinx/XRT.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH= "master" -SRCREV_xrt = "8964124b8809060236f377fa449420d2d361f812" - -SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https" -SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578" - -SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https" -SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8" -SRCREV_FORMAT = "xrt" +SRCREV_xrt = "48259626cf397200abcfb869a3371288d20af0ac" -- cgit v1.2.3-54-g00ecf From 6b4e971c5166fc4638c29ebe6afec91ded72fbed Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Wed, 10 Jul 2024 22:59:43 +0530 Subject: Add missing compatible string for versal-net in xrt_202420.2.18.0.bb file. Signed-off-by: Manoj Takasi Also added 202310 and 202320 version. (202410 already had the entry) Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb | 1 + meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb | 1 + meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb | 1 + 3 files changed, 3 insertions(+) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb index cad8ccee..0ee4d137 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \ COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb index 5824ae9c..946b6551 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb @@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb index 65e12757..8931ce76 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" S = "${WORKDIR}/git/src" -- cgit v1.2.3-54-g00ecf From fc0b45ab507af85495929624479b5c5c59a5ba4c Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Tue, 30 Jul 2024 17:21:24 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: CR-1206993 and CR-1206941 (#8316) CR-1206982 and CR-1206998 fix (#8315) CR-1206972 Provide help menu when xrt-smi examine is given invalid report (#8313) using main branch for composite workflows (#8314) Use find tile comperator based on requirement (#8312) VITIS-12947 - Decode the mask value which is used for patching a scale value (#8298) Partial removal of AIE compilation flags in XRT (#8302) Windows build fix from the previous commit of graph task (#8301) CR-1206432 : Incorrect Help printed in xrt-smi when using incorrect option (#8299) CR-1206429 xrt-smi output and help menu fixes (#8297) VITIS-11024 enable hw_context support for xrt::graph objects 3rd commit (#8292) fix build warning 'unreferenced formal parameter' introduced in PR8283. (#8295) Fix hang in AIE Profile Plugin due to Win issue in static objects retrieving host info using WMI (#8294) Use IO type and module type enums (#8244) Added checks to build xrt with ALMA Linux 9.4 (#8290) Sw Emulation fix for Graph test case (#8291) VITIS-11024 enable hw_context support for xrt::graph objects 2nd commit (#8267) Undo #8262 (#8288) Up CMake minimum required version (#8287) Add change to support runlist test on simnowlite flow (#8283) XDP support for AIE Reload Reset feature on Edge platform. (#8006) VITIS-12786 - Fetch scratch-pad-mem size from elf (#8271) Add default ctor for xrt::runlist (#8284) Changes for periodic offload of trace on client devices for hung designs (#8263) fix coverity issue - CID 395489: Null pointer dereferences (#8278) VITIS-11272 : Remove XMA from XRT (#8279) adding additional build params for windows (#8265) Fix for CR-1186978 (#8273) revise API to patch address directly (#8272) Various Cleanup of xbutil with xrt-smi, Help Menu Fix (#8270) Add proper declspec define (#8269) Changes to fix no aie_profile data while running along with Device trace during hw emu (#8260) Use dedicated Read Reg op code for AIE Profile/Debug on client (#8251) Support polling for runlist completion (#8253) Fix issue where AIE profiling and PL device trace were not working together (#8261) enable hw_context support for xrt::graph objects (#8242) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 9bbffffc..c3672203 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -2,5 +2,5 @@ REPO ?= "gitsm://github.com/Xilinx/XRT.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG};name=xrt" -BRANCH= "master" -SRCREV_xrt = "48259626cf397200abcfb869a3371288d20af0ac" +BRANCH = "master" +SRCREV_xrt = "5a2531e9b77199483b16b9c2e46ec1461edf7a37" -- cgit v1.2.3-54-g00ecf From 753f15c3eac861c08ba692f56ef5d5948cab332c Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Fri, 2 Aug 2024 15:01:12 +0530 Subject: Add OpenCL dependency in xclbinutil-native_202420.2.18.0.bb xrt, zocl : update commit id for 2024.2 Changelog: fixing event stamp time (#8324) providing release input to setenv composite action (#8325) CR-1206962 (#8323) Fix for Incorrect behavior for xrt-smi examine --report (#8317) Use find_package for OpenCL (#8322) CR-1206951 Replace ipukmddrv with NPU Driver Version in xrt-smi host report (#8307) CR-1206955, 1206964, 1207002 Various xrt-smi output and json fixes (#8319) [XDP] Changes to support new profile format and update modules offset (#8281) Cleaning up build artifacts in the end of the build (#8320) CR-1205620: Removing cu_size limitation (#8309) CR-1206430 (#8318) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb | 2 +- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb index 37f32a23..6e280009 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/git/src" inherit cmake pkgconfig native -DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native" +DEPENDS = "libdrm-native opencl-headers-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native" EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index c3672203..90843d70 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "5a2531e9b77199483b16b9c2e46ec1461edf7a37" +SRCREV_xrt = "75a45f40293837c5bbf7113a4d041d25f278ffa1" -- cgit v1.2.3-54-g00ecf From 80b27ad0fa13441d267be1008aeb3ab1ed213aab Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Wed, 14 Aug 2024 15:45:12 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: XDP AIE Halt Plugin to set Debug Halt on AIE Cores for debugging on Client (#8344) fixing zynqmp build (#8346) Add DRC to xclbinutil for Linux file command utility compliance (#8337) add support for kernel_commit_id in AIE_PARTITION (#8335) Integrate aiebu as a submodule into XRT (#8336) Fixing issue in OpenCL counter information in Edge hardware emulation (#8342) Fixing issue where hardware emulation on Edge was not finding the debug_ip_layout file on disk (#8341) XRT OS Support for AlmaLinux 8 (#8331) Add signal API to fence_handle (#8339) Starting Event trace from specific layer (#8334) add a new metadata section in xclbin to support AIE profiling/debug (#8304) Corrected the logic in the function (#8296) Removal of AIESIM compilation flag in XRT (#8333) Remove Hardcoded register space 64KB in shim and zocl (#8300) Adding release variable (#8330) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 90843d70..0c3d72c1 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "75a45f40293837c5bbf7113a4d041d25f278ffa1" +SRCREV_xrt = "ae4a667a834b28d0c5e3149d8b6f369b47996244" -- cgit v1.2.3-54-g00ecf From d7ae35cd2286396a7c326714aa773830006c6d32 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 2 Sep 2024 14:13:43 +0530 Subject: xrt, zocl : update commit id for 2024.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: updating petalinux to latest (#8386) XRT OS Support for Ubuntu 24.04. Removed one element arrays in the driver code (#8381) [XDP] Fix the incorrect xclbin type deduction & add safe check (#8380) Bump up the aiebu version which pulls in the latest aie-rt (#8383) VITIS-13050 and VITIS-9682 (#8382) add myself as code owner for xclbinutil (#8378) External Buffer support for Edge devices (#8379) Removed hw_context flag dependency for edge on xrt.ini (#8372) moving to latest petalinux (#8371) Added hw ctx support for edge (#8305) Bump up the aiebu submodule version to resolve link with aie-rt failu… (#8353) Initialze debug buffer in Ml Timeline, AIE Profile/Debug plugins to avoid junk values when AIE trace is enabled. (#8370) Fix C HIP application compilation (#8369) [XDP] profiling support to measure latency and throughput (#8359) Add --recursive option to git submodule to fetch and update nested submodules. (#8358) Update petalinux version to v2024.2_06301231 build (#8365) Update HIP Module Load APIs (#8362) Enabled flushing of trace modules for core tiles everytime for client and edge (#8367) Added support for compile time trace for edge devices in XDP (#8366) Fix for Sw emu graph handle (#8364) Fixing incorrect copyrights on XDP files (#8360) VITIS-11401 : Shim DMA based array reconfiguration overhead (#8308) VITIS-13074 - Dump common control codes before and after being patched (#8338) Fix for non-graph XRT use cases (#8356) fixing gmio tests in sw_emu (#8357) VITIS-11024 enable hw_context support for xrt::graph objects (#8340) [XDP] Fix for single tile selection in AIE Trace plugin (#8354) add new action mask to indicate the driver to program the PDI. (#8351) Changes to use aie trace metadata section (#8352) Changing default slot for PS kernels to Zero (#8347) VITIS-11934GeMM Test Has Delay After Setting Performance Mode (#8348) fix the code formatting (indentation, trailing spaces), fix the difference between gitub and perforce (#8350) Update the ELFIO submodule to point to Release_3.12 which fixes many C++ warnings (#8349) Add changes to build xclbinutil standalone (#8345) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 0c3d72c1..50ec216c 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "ae4a667a834b28d0c5e3149d8b6f369b47996244" +SRCREV_xrt = "c34c5afb4c92cb68460349185da7e8fb24f9d957" -- cgit v1.2.3-54-g00ecf From 9cab83b50d19e36b3a81c62557bbeb2d15070577 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 9 Sep 2024 14:15:51 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: fixed aarch64 build (#8403) VITIS-13337 Add pmode turbo to xrt-smi (#8394) Removed reading of hw_context flag from xrt.ini (#8400) Add hwctx specific Aie instances (#8397) Export functions from module_int.h to use in shim tests (#8398) Segmented Config changes (#8392) Improve compatibility with other Compilers like MinGW (#8387) elfloader changes for shim patching for aie4 (#8355) aie driver api name changes (#8389) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 50ec216c..27cdf93f 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "c34c5afb4c92cb68460349185da7e8fb24f9d957" +SRCREV_xrt = "96c1b663440eb61dcc0f560dd67af43d524bf98e" -- cgit v1.2.3-54-g00ecf From eab051bb5674f1ecdabaf64096a8c6658714de87 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 16 Sep 2024 22:39:34 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: External Buffer implementation with new AIE driver API (#8420) Graph context support with hwctx for edge (#8393) Use 64 bit timestamps in record timer data (#8416) VITIS-11710 Fix: Show 0% Utilization Instead of N/A (#8415) small fixes (#8414) Multiple CRs: initialize tile type, compare tiles in maps, and properly replace paired sets (#8408) Added file utility to the ub_package_list (#8413) Update Xilinx copyright and add AMD copyright where needed (#8410) Removed check in the xclRegRW to read the offset at value zero. (#8412) Add xrt::runlist::state() to return runlist ERT command state (#8407) CR-1211324 Hw_Emulation failing with XRT error for design with event api usage for latency check (#8405) Add tracepoint for runlist execute and wait (#8406) VITIS-11710 AIE Utilization (#8396) CR-1210690 [XRT] ERROR: open_graph_handle: Operation not supported (#8404) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 27cdf93f..bfd72ee8 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "96c1b663440eb61dcc0f560dd67af43d524bf98e" +SRCREV_xrt = "6779120624b476392ec8ce4b47b60b7bf6670029" -- cgit v1.2.3-54-g00ecf From 1846769a0c2514b0dfccac38e0e80296c8a91a9c Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 23 Sep 2024 12:06:53 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: VITIS-13441 : Allow shim to read a special flag from xrt.ini for dummy app (#8436) Added checks to version api's to throw exception when information is not available (#8430) graph_object constructor with aieArray instance (#8431) Fix xbutil/xrt-smi wrapper script to find loader (#8426) Add AMD copyright (#8432) Fix Debug build warning and error (#8433) Correct Freq store & fetch (#8434) [XDP] Multiple CRs - fixed PLIO verification and refined all_stalls_s2mm metric set (#8429) Enhance no-op test logics (#8423) [XDP] Fix for profiling plugins to work on independent compilation designs (#8424) Add pasid member to aie_partition info (#8427) enabling ubuntu2404 for XRT (#8417) Remove unexpected warnings metadata for ML Timeline and AIE Halt Plugin (#8421) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index bfd72ee8..39622cce 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "6779120624b476392ec8ce4b47b60b7bf6670029" +SRCREV_xrt = "1c405960ff6733ffe637311a7d7177ad7a185cc2" -- cgit v1.2.3-54-g00ecf From 88651af8a97753c09696d1cefc25cc3d80fc32ae Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 23 Sep 2024 14:51:12 -0600 Subject: meta-xilinx-core: xrt: Rework XRT AIE dependencies The older recipes, merge xrt_% into the specific versioned items to ensure that they continue to work the way they have in the past. For the current xrt version, we remove the MACHINE dependencies and allow AIE to be selected via a PACKAGECONFIG instead. This will permit a single xrt to work across a larger set of aarch64 machines. Signed-off-by: Mark Hatle --- .../openamp-layer/recipes-xrt/xrt/xrt_%.bbappend | 8 -------- .../recipes-xrt/xrt/xrt_202210.2.13.479.bbappend | 8 ++++++++ .../openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend | 8 ++++++++ .../openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend | 11 +++++++++-- .../openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend | 11 +++++++++-- .../recipes-xrt/xrt/xrt_202410.2.17.319.bbappend | 8 ++++++++ meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb | 12 ++++++++---- 7 files changed, 50 insertions(+), 16 deletions(-) delete mode 100644 meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend create mode 100644 meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend create mode 100644 meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend create mode 100644 meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend deleted file mode 100644 index 0e7f3693..00000000 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# Use libmetal for systems with AIE -# For versal devices with the ai-engine -PACKAGE_ARCH_orig := "${PACKAGE_ARCH}" -PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}" -EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" -TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" -DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" -RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend new file mode 100644 index 00000000..0e7f3693 --- /dev/null +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202210.2.13.479.bbappend @@ -0,0 +1,8 @@ +# Use libmetal for systems with AIE +# For versal devices with the ai-engine +PACKAGE_ARCH_orig := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}" +EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" +TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" +DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend new file mode 100644 index 00000000..0e7f3693 --- /dev/null +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202220.2.14.0.bbappend @@ -0,0 +1,8 @@ +# Use libmetal for systems with AIE +# For versal devices with the ai-engine +PACKAGE_ARCH_orig := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}" +EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" +TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" +DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend index 362dc45a..a7ab6bb8 100644 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202310.2.15.0.bbappend @@ -1,2 +1,9 @@ -# Older xrt requires a manual dependency on libmetal -DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libmetal', '', d)}" +# Use libmetal for systems with AIE +# For versal devices with the ai-engine +PACKAGE_ARCH_orig := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}" +EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" +TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" +DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal libmetal', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" + diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend index 362dc45a..a7ab6bb8 100644 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202320.2.16.0.bbappend @@ -1,2 +1,9 @@ -# Older xrt requires a manual dependency on libmetal -DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libmetal', '', d)}" +# Use libmetal for systems with AIE +# For versal devices with the ai-engine +PACKAGE_ARCH_orig := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}" +EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" +TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" +DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal libmetal', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" + diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend new file mode 100644 index 00000000..0e7f3693 --- /dev/null +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt/xrt_202410.2.17.319.bbappend @@ -0,0 +1,8 @@ +# Use libmetal for systems with AIE +# For versal devices with the ai-engine +PACKAGE_ARCH_orig := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@bb.utils.contains('MACHINE_FEATURES', 'aie', '${MACHINE_ARCH}', '${PACKAGE_ARCH_orig}', d)}" +EXTRA_OECMAKE .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" +TARGET_CXXFLAGS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" +DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'aie', ' libxaiengine aiefal', '', d)}" diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb index 8931ce76..d538f947 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb @@ -11,10 +11,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 " -COMPATIBLE_MACHINE ?= "^$" -COMPATIBLE_MACHINE:zynqmp = ".*" -COMPATIBLE_MACHINE:versal = ".*" -COMPATIBLE_MACHINE:versal-net = ".*" +COMPATIBLE_HOST = "^$" +COMPATIBLE_HOST:aarch64 = ".*" S = "${WORKDIR}/git/src" @@ -22,6 +20,9 @@ inherit cmake pkgconfig BBCLASSEXTEND = "native nativesdk" +PACKAGECONFIG ??= "aie" +PACKAGECONFIG[aie] = ",,libxaiengine aiefal,libxaiengine aiefal" + # util-linux is for libuuid-dev. DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson systemtap libdfx" RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" @@ -32,6 +33,9 @@ EXTRA_OECMAKE += " \ -DXRT_LIBDFX=true \ " +EXTRA_OECMAKE .= "${@bb.utils.contains('PACKAGECONFIG', 'aie', ' -DXRT_AIE_BUILD=true', '', d)}" +TARGET_CXXFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'aie', ' -DXRT_ENABLE_AIE -DFAL_LINUX=on', '', d)}" + # Systems with AIE also require libmetal, this is implemented in the dynamic-layers # See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend # Note: If meta-openamp is not available, AIE will not be enabled. -- cgit v1.2.3-54-g00ecf From 436ad640afcaa319429b0407433e8698fda5ea80 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 30 Sep 2024 12:30:19 +0530 Subject: xrt, zocl : update commit id for 2024.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: Providing more detailed info and warning messages for AIE profiling f… (#8464) VITIS-13418 Add option to force enable/disable preemption (#8443) change failed to warning (#8460) [XDP] Fix warnings for mcdm build (#8458) Bounding the maximum transfer rate we report to 10 GB/s (#8456) Telemetry and pid updates (#8442) [XDP] enhancements for profile API and report relative location (#8444) CR-1204045 Typo in get_tag() function description in 2024.1 XRT github doc (#8453) Copying latest common layer from compiler (#8451) Modified the if loops to check for mm_node if buffers are created on DMA (#8449) Making GMIO/External buffers as XRT first class objects (#8438) VITIS-12882 Add limits for benchmarks to specify pass criteria (#8441) Made aie_ctx to ZOCL_CTX_NOOPS to support multi partition (#8448) xrt-smi validate test for spatial-sharing overhead (VITIS-13000) (#8395) Adding poll_timers_interval_us as a new valid option to AIE trace (#8445) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 39622cce..bc513c8b 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "1c405960ff6733ffe637311a7d7177ad7a185cc2" +SRCREV_xrt = "e4a659dc330f2ae49de5b5998e4afa0dae49ea9f" -- cgit v1.2.3-54-g00ecf From ed108570c8b989b983a162b96ab2439028e07cfa Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Wed, 9 Oct 2024 14:41:54 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: passing hw_context wherever needed (#8508) pass in correct type for force preemption (#8501) XDP AIE PC Plugin to capture total execution cycles of specified functions (#8439) Catch all the exceptions when firmware version is not present. (#8505) Modified zocl_free_bo and zocl_gem_prime_get_sg_table functions to check for mm_node. (#8500) adding 2G host address offset for aie4 host shimbd patching (#8489) updating gemm host with multiple max frequency support (#8495) Revert "CR-1178512 Fix xrt setup script hang on CSH shell (#8493)" (#8502) [Xbutil] Add support to in xbutil for the newly added device utilization queries (#8461) ML Timeline support for multipartition design with multiple xclbins (#8497) [XDP] CR-1210992 - Fix to stop counters for specified bytes (#8496) Add proper check for aie_only xclbin (#8499) multi-partition changes (#8498) VITIS-12792 HIP Binding: Memory pool APIs (#8268) remove any mention of clock frequencies (#8491) CR-1178512 Fix xrt setup script hang on CSH shell (#8493) close aie context cleanup in shim (#8479) Fix for CR-1214058 : xrt-smi shows Alveo help when invoked with invalid args (#8483) Enabling Async support for External Buffers (#8467) Removed creation of copy of the shared_ptr in its own destructor (#8488) Changing the order of update_device calls so AIE information is not lost (#8487) Capture and Replay: XBREPLAY module inclusion (#8465) Capture and Replay: XBTRACER module inclusion (#8466) fix for aie partition metadata file not found (#8485) Fix aie trace config for aie1 gen (#8486) Fix for CR-1206995 : Inconsistency between the version printed by xrt-smi --version and xrt-smi examine (#8476) CR-1214559 `xrt-smi validate --verbose` cannot find benchmark_1502_00.json and prints "Details: Threshold is 0.0 us" (#8482) CR-1214311 Fix xrt-smi validate crash on Alveo (#8472) [XDP] Multiple CRs - Correct parsing of buffer names and channel IDs (#8481) Add DRC for dpu_kernel_id of AIE_PARTITION section and m_kernel_id of IP_LAYOUT section. (#8463) coding style changes (#8475) [XDP] Changes to stop on specified Byte count and other enhancements for ADF profile API (#8471) Vitis 13170 - Allow setting thread CPU affinity for XRT applications on Windows (#8437) [XDP] Multiple CRs - PLIO messaging and adding channel info to profiling payload (#8459) Starting trace module using a broadcast network for XDP Client (#8455) CR-1214311 Fix xrt-smi validate crash on alveo due to query (#8462) Cleanup unused code related to Graphs (#8468) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index bc513c8b..ad66076f 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "master" -SRCREV_xrt = "e4a659dc330f2ae49de5b5998e4afa0dae49ea9f" +SRCREV_xrt = "5448dd1701a51e88cfdf73be1c3962c0a825e39d" -- cgit v1.2.3-54-g00ecf From da6218d308ccc5bdedb0e5bbed47fcc6c8332e7f Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 14 Oct 2024 15:30:57 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: create/destroy/create hw_context flow is fixed (#8522) final changes for multi-partition support (#8521) enabling external buffer logic as latest petalinux has ssw change (#8517) Driver changes to support multi-partition in edge (#8518) [XDP] Multiple CRs - Added warning messages, fixed support of profile corner cases, and better handle multiple stream IDs (#8509) [XDP] CR-1215560 - Report column shift in static data of profile report (#8513) explicit reset is not required for aie array (#8515) Spatial Sharing test update for low variance (#8506) Fix for crash in xrt-smi validate with ML Timeline enabled (#8512) Capture and Replay: Fix repeated loading of capture lib via LD_PRELOAD (#8511) VITIS-13530 : Add support to dump scratch pad memory (#8503) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index ad66076f..55b88cd9 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -2,5 +2,5 @@ REPO ?= "gitsm://github.com/Xilinx/XRT.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG};name=xrt" -BRANCH = "master" -SRCREV_xrt = "5448dd1701a51e88cfdf73be1c3962c0a825e39d" +BRANCH = "2024.2" +SRCREV_xrt = "045f332d680bd117075b48a60502f7a19eef188d" -- cgit v1.2.3-54-g00ecf From 111aadec353db162c5797de0df4864a52f35c22c Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 21 Oct 2024 19:02:28 +0530 Subject: xrt, zocl : update commit id for 2024.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: Replay minor fixes (#8548) Bump up the aiebu submodule githash to pull in the Windows compiler op… (#8547) Remove max tops (#8543) conflict (#8534) CR-1217061 revert (#8540) CR-1215083 Remove xbutil wrapper for Windows (#8510) Vitis 13612 : Allow for gemm test to wait for the clock ramp up to its maximum value (#8538) VITIS-13627 [Preemption] Add preemption telemetry report (#8539) Capture and Replay: Included support for xrt::module and xrt::elf classes (#8536) Fixes for upcoming release (#8537) CR-1216849, CR-1217061 FIX : xrt-smi configure --pmode default --help` does not print global options (#8532) Using old method for fetching xclbin uuid on Alveo HW emulation since device query is not supported (#8531) [XDP] Fix to manage stream port ID detection in profile for client (#8528) aie overlay load xclbin issue: Load xclbin even if xclbin doesnt have EMBEDDED_METADATA section (#8527) VITIS-13557 Display clocks on-demand (#8520) Vitis 12999 : Temporal Sharing overhead benchmark test (#8516) CR-1214433, CR-1214577 and CR-1215195 (#8507) Updated package version to generate packages with latest version (#8525) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 55b88cd9..1c5093d1 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "2024.2" -SRCREV_xrt = "045f332d680bd117075b48a60502f7a19eef188d" +SRCREV_xrt = "950bfe5e63ea71a24322e54bf1f489f06459cdcf" -- cgit v1.2.3-54-g00ecf From e1abe034e0c15fd87a12c47fa1c886b8750c6956 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Thu, 24 Oct 2024 11:19:29 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: changing the master branch for 2024.2 to on push event (#8542) minor error message tweak (#8556) fixing aie_only xclbin issue (#8553) Fix in ML Timeline, AIE PC plugin for Linux Client (#8546) parse qos status and fix wording for preemption report (#8550) Fix build scripts for MSVC to honor custom ext path (#8552) Windows compile with /MT and link using Hybrid CRT (#8551) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 1c5093d1..65462cb9 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "2024.2" -SRCREV_xrt = "950bfe5e63ea71a24322e54bf1f489f06459cdcf" +SRCREV_xrt = "f6800ddf5a325ba4b92fe7f394b850ac11b82d38" -- cgit v1.2.3-54-g00ecf From 74901457c54f087ad09a25f651ebc28bf1e82b66 Mon Sep 17 00:00:00 2001 From: Manoj Takasi Date: Mon, 28 Oct 2024 16:32:15 +0530 Subject: xrt, zocl : update commit id for 2024.2 Changelog: Updating the petalinux to its latest version (#8572) (#8573) Removed a debug msg which is a overhead of the performance for async operation. (#8565) (#8566) Signed-off-by: Manoj Takasi Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-xrt') diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc index 65462cb9..27522dd8 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202420.2.18.0.inc @@ -3,4 +3,4 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' SRC_URI = "${REPO};${BRANCHARG};name=xrt" BRANCH = "2024.2" -SRCREV_xrt = "f6800ddf5a325ba4b92fe7f394b850ac11b82d38" +SRCREV_xrt = "d05b18dc38cc6804ecb4b3dbe6de23f158319567" -- cgit v1.2.3-54-g00ecf