From 7a47ed3e37cec4b8d61cb2f11052127c52d9bbbd Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 17 Apr 2024 12:31:28 -0600 Subject: aie: Cleanup recipes so year versions work properly Signed-off-by: Mark Hatle --- .../recipes-bsp/ai-engine/ai-engine-driver_3.3.bb | 2 +- .../recipes-bsp/ai-engine/ai-engine-driver_3.4.bb | 49 ++++++++++++++++++++++ .../recipes-bsp/ai-engine/ai-engine-driver_3.5.bb | 2 +- .../recipes-bsp/ai-engine/aie-rt-2023.inc | 11 +++++ .../recipes-bsp/ai-engine/aie-rt-2024.inc | 11 +++++ meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc | 11 ----- .../recipes-bsp/ai-engine/aiefal_1.4.bb | 2 +- .../recipes-bsp/ai-engine/aiefal_1.5.bb | 35 ++++++++++++++++ .../recipes-bsp/ai-engine/aiefal_1.6.bb | 2 +- 9 files changed, 110 insertions(+), 15 deletions(-) create mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb create mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2023.inc create mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc delete mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc create mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb index 6a4fd880..b8f5b3dd 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb +++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb @@ -1,7 +1,7 @@ SUMMARY = "Xilinx AI Engine runtime" DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP" -require aie-rt.inc +require aie-rt-2022.inc SECTION = "libs" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb new file mode 100644 index 00000000..34e86301 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb @@ -0,0 +1,49 @@ +SUMMARY = "Xilinx AI Engine runtime" +DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP" + +require aie-rt-2023.inc + +SECTION = "libs" + +AIEDIR ?= "${S}/driver" +S = "${WORKDIR}/git" +I = "${AIEDIR}/include" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" +COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}" +PV = "3.3" + +IOBACKENDS ?= "Linux" + +DEPENDS = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}" +RDEPENDS:${PN} = "${@bb.utils.contains('IOBACKENDS', 'metal', 'libmetal', '', d)}" + +PROVIDES = "libxaiengine" +RPROVIDES:${PN} = "libxaiengine" + +# The makefile isn't ready for parallel execution at the moment +PARALLEL_MAKE = "-j 1" + +CFLAGS += "-Wall -Wextra" +CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'Linux', ' -D__AIELINUX__', '', d)}" +CFLAGS += "${@bb.utils.contains('IOBACKENDS', 'metal', ' -D__AIEMETAL__', '', d)}" +EXTRA_OEMAKE = "-C ${AIEDIR}/src -f Makefile.Linux CFLAGS='${CFLAGS}'" + + +do_compile(){ + oe_runmake +} + +do_install(){ + install -d ${D}${includedir} + install ${I}/*.h ${D}${includedir}/ + install -d ${D}${includedir}/xaiengine + install ${I}/xaiengine/*.h ${D}${includedir}/xaiengine/ + install -d ${D}${libdir} + cp -dr ${AIEDIR}/src/*.so* ${D}${libdir} +} + +PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}" +PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}" + diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb index f86c5985..89038b03 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb +++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Xilinx AI Engine runtime" DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP" -require aie-rt-2022.inc +require aie-rt-2024.inc SECTION = "libs" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2023.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2023.inc new file mode 100644 index 00000000..11059465 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2023.inc @@ -0,0 +1,11 @@ +SECTION = "libs" + +REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https" + +BRANCH ?= "xlnx_rel_v2023.2" +SRCREV ?= "84debe5d22c144fb09269b8410df4cb8a6aa3b2a" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897" + +SRC_URI = "${REPO};branch=${BRANCH}" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc new file mode 100644 index 00000000..a59ef469 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc @@ -0,0 +1,11 @@ +SECTION = "libs" + +REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https" + +BRANCH ?= "main-aie" +SRCREV ?= "c41476c833034259eb760d2a2f7c7118a5be727d" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897" + +SRC_URI = "${REPO};branch=${BRANCH}" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc deleted file mode 100644 index a59ef469..00000000 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "libs" - -REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https" - -BRANCH ?= "main-aie" -SRCREV ?= "c41476c833034259eb760d2a2f7c7118a5be727d" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897" - -SRC_URI = "${REPO};branch=${BRANCH}" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb index 641c39a9..7bb4b849 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb @@ -1,7 +1,7 @@ SUMMARY = "Xilinx AI Engine FAL(Functional Abstraction Layer)" DESCRIPTION = "AIE FAL provides functional abstraction APIs for runtime support of Xilinx AI Engine IP" -require aie-rt.inc +require aie-rt-2022.inc SECTION = "devel" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb new file mode 100644 index 00000000..45e38977 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb @@ -0,0 +1,35 @@ +SUMMARY = "Xilinx AI Engine FAL(Functional Abstraction Layer)" +DESCRIPTION = "AIE FAL provides functional abstraction APIs for runtime support of Xilinx AI Engine IP" + +require aie-rt-2023.inc + +SECTION = "devel" + +XAIEFAL_DIR ?= "fal" +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" +COMPATIBLE_MACHINE:versal-ai-edge = "${SOC_VARIANT_ARCH}" + +IOBACKENDS ?= "Linux" + +PROVIDES = "aiefal" +ALLOW_EMPTY:${PN} = "1" + +inherit pkgconfig cmake + +DEPENDS = "libxaiengine" + +OECMAKE_SOURCEPATH = "${S}/${XAIEFAL_DIR}" + +EXTRA_OECMAKE = "-DWITH_TESTS=OFF " +EXTRA_OECMAKE:append = "${@'-DWITH_EXAMPLES=ON' if d.getVar('WITH_EXAMPLES') == 'y' else '-DWITH_EXAMPLES=OFF'}" + +FILES:${PN}-demos = " \ + ${bindir}/* \ +" + +PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}" +PACKAGE_ARCH:versal-ai-edge = "${SOC_VARIANT_ARCH}" + diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb index cb9d95f9..5c479d05 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb @@ -1,7 +1,7 @@ SUMMARY = "Xilinx AI Engine FAL(Functional Abstraction Layer)" DESCRIPTION = "AIE FAL provides functional abstraction APIs for runtime support of Xilinx AI Engine IP" -require aie-rt-2022.inc +require aie-rt-2024.inc SECTION = "devel" -- cgit v1.2.3-54-g00ecf