From aa3e8e81135b0de329060835491eaa3f339e1c30 Mon Sep 17 00:00:00 2001 From: Gregory Williams Date: Mon, 19 Jun 2023 08:42:51 -0700 Subject: meta-xilinx-core: Update ai-engine-driver and aiefal versions Updates ai-engine-driver and aiefal versions for 2023.2 release. Source revision is updated to latest commit of main-aie branch. Signed-off-by: Gregory Williams Signed-off-by: Mark Hatle --- .../recipes-bsp/ai-engine/ai-engine-driver_3.3.bb | 47 ---------------------- .../recipes-bsp/ai-engine/ai-engine-driver_3.4.bb | 47 ++++++++++++++++++++++ meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc | 4 +- .../recipes-bsp/ai-engine/aiefal_1.4.bb | 33 --------------- .../recipes-bsp/ai-engine/aiefal_1.5.bb | 33 +++++++++++++++ 5 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb create mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb delete mode 100644 meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb 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 deleted file mode 100644 index 47b79c47..00000000 --- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Xilinx AI Engine runtime" -DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP" - -require aie-rt.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}" 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..47b79c47 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb @@ -0,0 +1,47 @@ +SUMMARY = "Xilinx AI Engine runtime" +DESCRIPTION = "This library provides APIs for the runtime support of the Xilinx AI Engine IP" + +require aie-rt.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}" diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc index 5eeb69d4..421ddc81 100644 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt.inc @@ -2,8 +2,8 @@ SECTION = "libs" REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https" -BRANCH ?= "xlnx_rel_v2023.1" -SRCREV ?= "1ad203de0b7f282b1c0659fd2ae3f218652c7274" +BRANCH ?= "main-aie" +SRCREV ?= "5a63ccdf8d77394bf64b47977a98825329aa18e3" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM ?= "file://license.txt;md5=b81abf1f508952331dd7d2ab36408f5b" 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 deleted file mode 100644 index 641c39a9..00000000 --- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -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 - -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}" 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..641c39a9 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb @@ -0,0 +1,33 @@ +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 + +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}" -- cgit v1.2.3-54-g00ecf