From patchwork Mon Aug 5 04:36:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47281 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03C85C3DA7F for ; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1068.1722832643090407988 for ; Sun, 04 Aug 2024 21:37:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 75F5B40CC3; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8KUNpr9_0pOf; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 5F09440C21; Mon, 5 Aug 2024 04:37:21 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 236FD164000; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 01/16] ti-analytics: remove Date: Mon, 5 Aug 2024 00:36:58 -0400 Message-Id: <20240805043713.172555-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15482 From: Denys Dmytriyenko Remove packagegroup that used to build analytics demos and dependencies. Those demos have been disabled for a while and are being deprecated - remove corresponding packagegroup first for bisectability. Signed-off-by: Denys Dmytriyenko --- .../images/tisdk-default-image.bb | 1 - .../packagegroups/ti-analytics.bb | 27 ------------------- .../recipes-core/packagegroups/ti-world.bb | 1 - 3 files changed, 29 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb index c282f9e6..4b5697e5 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -25,7 +25,6 @@ IMAGE_INSTALL += "\ packagegroup-arago-tisdk-addons \ packagegroup-arago-tisdk-addons-extra \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ - ti-analytics \ ti-demos \ ${ARAGO_DEFAULT_IMAGE_EXTRA_INSTALL} \ packagegroup-arago-tisdk-sysrepo \ diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb deleted file mode 100644 index e16e4d51..00000000 --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "TI World packagegroup" -LICENSE = "MIT" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -TENSORFLOW_DEMO = "" -#TENSORFLOW_DEMO = " \ -# ${@oe.utils.all_distro_features(d, 'opencv', 'tensorflow-lite-demo', '')} \ -#" -#TENSORFLOW_DEMO:dra7xx = " \ -# ${@['','tensorflow-lite-demo'][oe.utils.all_distro_features(d, 'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -#" - -ANALYTICS = "" -#ANALYTICS = " \ -# ${TENSORFLOW_DEMO} \ -# ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ -# ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -#" -ANALYTICS:j7 = "" -ANALYTICS:omapl138 = "" - -RDEPENDS:${PN} = "\ - ${ANALYTICS} \ -" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index a70701f9..5db67fdf 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -56,7 +56,6 @@ RDEPENDS:${PN} = "\ ${DEVTOOLS} \ ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \ packagegroup-arago-misc \ - ti-analytics \ ti-demos \ ${PREFERRED_PROVIDER_virtual/docker} \ " From patchwork Mon Aug 5 04:36:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47285 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02EC4C52D6D for ; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1069.1722832643220536582 for ; Sun, 04 Aug 2024 21:37:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 8D80C40C21; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BLj3vicoeT27; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 7760940CAF; Mon, 5 Aug 2024 04:37:21 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 2F44A164052; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 02/16] packagegroup: remove opencl/openmp packagegroups Date: Mon, 5 Aug 2024 00:36:59 -0400 Message-Id: <20240805043713.172555-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15483 From: Denys Dmytriyenko These packagegroups used to group together components for OpenCL/MP support and related other libraries, which are being deprecated. Remove them first for bisectability. Signed-off-by: Denys Dmytriyenko --- .../images/tisdk-default-image.bb | 7 ----- ...kagegroup-arago-tisdk-opencl-sdk-target.bb | 22 ------------- .../packagegroup-arago-tisdk-opencl.bb | 31 ------------------- ...ckagegroup-arago-toolchain-tisdk-target.bb | 1 - .../recipes-core/packagegroups/ti-opencl.bb | 12 ------- .../recipes-core/packagegroups/ti-world.bb | 6 ---- 6 files changed, 79 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb delete mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb index 4b5697e5..faae53d3 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -18,7 +18,6 @@ IMAGE_INSTALL += "\ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-gtk','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-qte','',d)} \ - ${@['','packagegroup-arago-tisdk-opencl'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ packagegroup-arago-tisdk-connectivity \ packagegroup-arago-tisdk-crypto \ packagegroup-arago-tisdk-multimedia \ @@ -54,13 +53,7 @@ DEVTOOLS = " \ dtc \ " -OPENCL = " \ - ${@bb.utils.contains('MACHINE_FEATURES','dsp','ti-opencl','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \ -" - IMAGE_INSTALL += "\ - ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \ ${DEVTOOLS} \ ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb deleted file mode 100644 index b660fcb4..00000000 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Task to install headers and libraries of OpenCL/MP and related components" -LICENSE = "MIT" -PR = "r2" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup features_check - -REQUIRED_DISTRO_FEATURES = "opencl" - -UTILS = " \ - opencl-staticdev \ - ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-dev')} \ -" - -UTILS:append:dra7xx = " \ - ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-dev')} \ -" - -RDEPENDS:${PN} = "\ - ${UTILS} \ -" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb deleted file mode 100644 index 1aba3f7b..00000000 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Task to install OpenCL/MP and related components" -LICENSE = "MIT" -PR = "r4" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup features_check - -REQUIRED_DISTRO_FEATURES = "opencl" - -PACKAGES =+ "${PN}-extra" - -MAIN_PKGS = " \ - opencl-examples-offline-compile \ -" - -EXTRA_PKGS = " \ -" - -# ti-fftw-examples -EXTRA_PKGS:append:dra7xx = " \ - ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \ -" - -RDEPENDS:${PN} = "\ - ${MAIN_PKGS} \ -" - -RDEPENDS:${PN}-extra = "\ - ${EXTRA_PKGS} \ -" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb index cdf54ecc..43cd9c59 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb @@ -23,6 +23,5 @@ RDEPENDS:${PN} = "\ ${TISDK_TOOLCHAIN_BASE_TARGET} \ ${TISDK_TOOLCHAIN_EXTRA_TARGET} \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \ - ${@['','packagegroup-arago-tisdk-opencl-sdk-target'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ packagegroup-arago-tisdk-addons-sdk-target \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb deleted file mode 100644 index ecae271f..00000000 --- a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb +++ /dev/null @@ -1,12 +0,0 @@ -# This is just an alias between debian and OE names - -LICENSE = "MIT" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -PACKAGES += "${PN}-runtime" - -RDEPENDS:${PN} = "opencl" -RDEPENDS:${PN}-runtime = "opencl-runtime" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index 5db67fdf..438dd8d0 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -33,11 +33,6 @@ DEVTOOLS = " \ git \ " -OPENCL = " \ - ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl ti-opencl','',d)} \ - ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \ -" - RDEPENDS:${PN} = "\ packagegroup-arago-base \ packagegroup-arago-console \ @@ -45,7 +40,6 @@ RDEPENDS:${PN} = "\ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-gtk','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-qte qt3d-examples','',d)} \ - ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \ packagegroup-arago-tisdk-connectivity \ packagegroup-arago-tisdk-crypto \ packagegroup-arago-tisdk-multimedia \ From patchwork Mon Aug 5 04:37:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47284 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17ECCC52D71 for ; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.975.1722832643304821104 for ; Sun, 04 Aug 2024 21:37:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 992F140CAF; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id usPpOAEmxQ9A; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 83D8640CB0; Mon, 5 Aug 2024 04:37:21 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 3B1F3164058; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 03/16] qt-opencv-opencl-opengl-multithreaded: deprecate Date: Mon, 5 Aug 2024 00:37:00 -0400 Message-Id: <20240805043713.172555-3-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15484 From: Denys Dmytriyenko Old analytics demos haven't been maintained for quite some time, remove. This demo used to offload processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects. Signed-off-by: Denys Dmytriyenko --- ...-opencv-opencl-opengl-multithreaded_git.bb | 46 ------------------- ...group-arago-tisdk-multimedia-sdk-target.bb | 1 - 2 files changed, 47 deletions(-) delete mode 100644 meta-arago-demos/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb diff --git a/meta-arago-demos/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb b/meta-arago-demos/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb deleted file mode 100644 index de672e28..00000000 --- a/meta-arago-demos/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "A simple multithreaded OpenCV example application using the Qt framework" -HOMEPAGE = "https://github.com/devernay/qt-opencv-multithreaded" -SECTION = "multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e28b998056a1a513e87be11c5045e85b" - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp gpu" -REQUIRED_DISTRO_FEATURES = "opencv opencl opengl" - -DEPENDS += "opencv opencl virtual/egl ti-cgt6x-native clocl-native dsplib-c66x" - -COMPATIBLE_MACHINE = "dra7xx" - -PV = "1.3.3" -PR = "r3" - -BRANCH = "master" -SRC_URI = "git://git.ti.com/git/apps/qt-opencv-opencl-opengl-multithreaded.git;protocol=https;branch=${BRANCH}" - -SRCREV = "80051ec8befd921e40cfb74a49234ed045576bbc" - -S = "${WORKDIR}/git" - -inherit qt5 - -export TARGET_ROOTDIR = "${STAGING_DIR_HOST}" -export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export TI_DSPLIB_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/ti-dsplib-c66x-tree" - -CXXFLAGS:append = " -DOCV_NATIVE " - -do_compile() { - cd ${S} - oe_runmake -f oclMakefile - cd - - oe_runmake -} - -do_install() { - install -d ${D}/usr/bin - install -m 755 qt-opencv-opencl-opengl-multithreaded ${D}/usr/bin/qt-opencv-opencl-opengl-multithreaded -} - -RDEPENDS:${PN} += "opencv opencl-runtime" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb index 62bcc0ea..121af56d 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb @@ -13,7 +13,6 @@ BARCODE_PKG = "" MULTIMEDIA = "" -# ${@['','qt-opencv-opencl-opengl-multithreaded-dev'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} MULTIMEDIA:append:dra7xx = " \ hevc-arm-decoder-dev \ hevc-arm-decoder-staticdev \ From patchwork Mon Aug 5 04:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47283 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 292E1C52D72 for ; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.976.1722832643342927974 for ; Sun, 04 Aug 2024 21:37:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id ACA5F40CC7; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fBed17g5tlep; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 8F42940CBF; Mon, 5 Aug 2024 04:37:21 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 46C85164059; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 04/16] barcode-roi: deprecate Date: Mon, 5 Aug 2024 00:37:01 -0400 Message-Id: <20240805043713.172555-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15485 From: Denys Dmytriyenko Old analytics demos haven't been maintained for quite some time, remove. This demo used to offload processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects. Signed-off-by: Denys Dmytriyenko --- .../barcode-demo/barcode-roi_git.bb | 34 ------------------- ...group-arago-tisdk-multimedia-sdk-target.bb | 10 ------ 2 files changed, 44 deletions(-) delete mode 100644 meta-arago-demos/recipes-apps/barcode-demo/barcode-roi_git.bb diff --git a/meta-arago-demos/recipes-apps/barcode-demo/barcode-roi_git.bb b/meta-arago-demos/recipes-apps/barcode-demo/barcode-roi_git.bb deleted file mode 100644 index ddad14c2..00000000 --- a/meta-arago-demos/recipes-apps/barcode-demo/barcode-roi_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Barcode demo to detect region of interest" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://detect_barcode.cpp;beginline=1;endline=25;md5=babab64d39715b3671dd16bcb4f4917b" - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencv" - -DEPENDS += "opencv" - -PV = "01.00.00" -PR = "r1" - -BRANCH = "master" -SRC_URI = "git://git.ti.com/git/apps/barcode-roi-detection.git;protocol=https;branch=${BRANCH}" - -SRCREV = "50fa051f66012ebaa10eba1cb289287c4c5e7432" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/detect_barcode ${D}${bindir} - - install -d ${D}${datadir}/ti/image - install -m 644 ${S}/test/sample_barcode.jpg ${D}${datadir}/ti/image -} - -FILES:${PN} += "\ - ${datadir}/ti/image \ -" - -INSANE_SKIP:${PN} = "ldflags" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb index 121af56d..95939c09 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb @@ -6,11 +6,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -BARCODE_PKG = "" -#BARCODE_PKG = " \ -# ${@['','barcode-roi-dev'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -#" - MULTIMEDIA = "" MULTIMEDIA:append:dra7xx = " \ @@ -18,11 +13,6 @@ MULTIMEDIA:append:dra7xx = " \ hevc-arm-decoder-staticdev \ " -MULTIMEDIA:append:ti33x = " ${BARCODE_PKG}" -MULTIMEDIA:append:ti43x = " ${BARCODE_PKG}" -MULTIMEDIA:append:omap-a15 = " ${BARCODE_PKG}" -MULTIMEDIA:append:am65xx = " ${BARCODE_PKG}" - RDEPENDS:${PN} = "\ ${MULTIMEDIA} \ packagegroup-arago-gst-sdk-target \ From patchwork Mon Aug 5 04:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47282 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02E8DC3DA4A for ; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.977.1722832643392292227 for ; Sun, 04 Aug 2024 21:37:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B7CBA40CBF; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mwIbfT1bZWNU; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 9F70940CC1; Mon, 5 Aug 2024 04:37:21 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 53EC716405A; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 05/16] arm-compute-library: remove Date: Mon, 5 Aug 2024 00:37:02 -0400 Message-Id: <20240805043713.172555-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15486 From: Denys Dmytriyenko Remove local copy of an old and outdated arm-compute-library component. There are much newer versions of this component available from other layers. Signed-off-by: Denys Dmytriyenko --- ...kagegroup-arago-tisdk-addons-sdk-target.bb | 5 +- .../arm-compute-library_git.bb | 61 ------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb index 0cd1b540..e91f33c9 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb @@ -38,24 +38,21 @@ PDM_ANOMALY_PKG_DEV = "\ EXTRA_PACKAGES = "" #EXTRA_PACKAGES:append:ti33x = " \ -# arm-compute-library-dev \ # tensorflow-lite-dev \ # tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" #EXTRA_PACKAGES:append:ti43x = " \ -# arm-compute-library-dev \ # tensorflow-lite-dev \ # tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" #EXTRA_PACKAGES:append:omap-a15 = " \ -# arm-compute-library-dev \ # tensorflow-lite-dev \ # tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" -#EXTRA_PACKAGES:append:am65xx = " arm-compute-library-dev \ +#EXTRA_PACKAGES:append:am65xx = " \ # tensorflow-lite-dev \ # tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ diff --git a/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb b/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb deleted file mode 100644 index 3612f7b9..00000000 --- a/meta-arago-extras/recipes-support/arm-compute-library/arm-compute-library_git.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "The ARM Computer Vision and Machine Learning library" -DESCRIPTION = "The ARM Computer Vision and Machine Learning library is a set of functions optimised for both ARM CPUs and GPUs." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8948bc85114b3b716576ef8d732f034f" - -COMPATIBLE_MACHINE = "armv7a|aarch64" - -SRC_URI = " \ - git://review.mlplatform.org/ml/ComputeLibrary;protocol=https;branch=${BRANCH} \ -" - -PR = "r0" -PV = "19.08" -PV_MAJOR = "${@d.getVar('PV',d,1).split('.')[0]}" - -BRANCH = "branches/arm_compute_19_08" -SRCREV = "35c3eb011d8e2813d83c6a6cbe28a446534e4a14" - -S = "${WORKDIR}/git" - -do_compile:prepend() { - sed -i 's/arm-linux-gnueabihf-/${TOOLCHAIN_SYS}-/' SConstruct - sed -i 's/aarch64-linux-gnu-/${TOOLCHAIN_SYS}-/' SConstruct - sed -i "s#env.Append(LINKFLAGS = \['-fopenmp'\])#env.Append(LINKFLAGS = \['-fopenmp','--sysroot=${STAGING_DIR_TARGET}'\])#" SConstruct - unset CC CXX -} - -inherit scons - -EXTRA_OESCONS = "arch=armv7a extra_cxx_flags="-fPIC -Wno-unused-but-set-variable -Wno-ignored-qualifiers -Wno-noexcept ${TOOLCHAIN_OPTIONS}" benchmark_tests=1 validation_tests=0 neon=1 openmp=1 opencl=0 set_soname=1" -EXTRA_OESCONS:aarch64 = "arch=arm64-v8a extra_cxx_flags="-fPIC -Wno-unused-but-set-variable -Wno-ignored-qualifiers -Wno-noexcept ${TOOLCHAIN_OPTIONS}" benchmark_tests=1 validation_tests=0 neon=1 openmp=1 opencl=0 set_soname=1" - -LIBS += "-larmpl_lp64_mp" - -do_install() { - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - - install -d ${D}${libdir} - for lib in ${S}/build/*.so* - do - cp $CP_ARGS $lib ${D}${libdir} - done - - # Install 'example' and benchmark executables - install -d ${D}${bindir} - find ${S}/build/examples/ -maxdepth 1 -type f -executable -exec cp $CP_ARGS {} ${D}${bindir} \; - cp $CP_ARGS ${S}/build/tests/arm_compute_benchmark ${D}${bindir} - - # Install built source package as expected by ARMNN - install -d ${D}${datadir}/${BPN} - cp $CP_ARGS ${S}/arm_compute ${D}${datadir}/${BPN}/. - cp $CP_ARGS ${S}/include ${D}${datadir}/${BPN}/. - cp $CP_ARGS ${S}/support ${D}${datadir}/${BPN}/. -} - -INSANE_SKIP:${PN} = "ldflags" -INSANE_SKIP:${PN}-dev = "dev-elf ldflags" - -FILES:${PN}-source = "${datadir}/${BPN}" -INSANE_SKIP:${PN}-source = "ldflags libdir staticdev" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" From patchwork Mon Aug 5 04:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47290 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21BF5C52D6D for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.979.1722832644444973225 for ; Sun, 04 Aug 2024 21:37:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id CCB4240CAF; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pd1U_utsUcl4; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id A47AB40CB0; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 5F84D16405B; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 06/16] tensorflow-lite: remove Date: Mon, 5 Aug 2024 00:37:03 -0400 Message-Id: <20240805043713.172555-6-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15488 From: Denys Dmytriyenko Remove local copy of an old and outdated tensorflow-lite component. There are much newer versions of this component available from other layers. Signed-off-by: Denys Dmytriyenko --- ...kagegroup-arago-tisdk-addons-sdk-target.bb | 8 -- ...akefile-add-label_image-example-1.15.patch | 82 ----------- ...odification-for-tflite-1.15-to-eigen.patch | 16 --- .../files/tensorflow-lite.pc.in | 6 - .../tensorflow-lite/files/tflite-benchmark.sh | 59 -------- .../tensorflow-lite-demo_git.bb | 64 --------- .../tensorflow-lite/tensorflow-lite_1.15.bb | 133 ------------------ 7 files changed, 368 deletions(-) delete mode 100644 meta-arago-extras/recipes-support/tensorflow-lite/files/0001-Makefile-add-label_image-example-1.15.patch delete mode 100644 meta-arago-extras/recipes-support/tensorflow-lite/files/apply-modification-for-tflite-1.15-to-eigen.patch delete mode 100644 meta-arago-extras/recipes-support/tensorflow-lite/files/tensorflow-lite.pc.in delete mode 100644 meta-arago-extras/recipes-support/tensorflow-lite/files/tflite-benchmark.sh delete mode 100644 meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb delete mode 100644 meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb index e91f33c9..3e0a2720 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb @@ -38,23 +38,15 @@ PDM_ANOMALY_PKG_DEV = "\ EXTRA_PACKAGES = "" #EXTRA_PACKAGES:append:ti33x = " \ -# tensorflow-lite-dev \ -# tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" #EXTRA_PACKAGES:append:ti43x = " \ -# tensorflow-lite-dev \ -# tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" #EXTRA_PACKAGES:append:omap-a15 = " \ -# tensorflow-lite-dev \ -# tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" #EXTRA_PACKAGES:append:am65xx = " \ -# tensorflow-lite-dev \ -# tensorflow-lite-staticdev \ # ${PDM_ANOMALY_PKG_DEV} \ #" diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/files/0001-Makefile-add-label_image-example-1.15.patch b/meta-arago-extras/recipes-support/tensorflow-lite/files/0001-Makefile-add-label_image-example-1.15.patch deleted file mode 100644 index ef5e1cbf..00000000 --- a/meta-arago-extras/recipes-support/tensorflow-lite/files/0001-Makefile-add-label_image-example-1.15.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 481c021e98c443195b73484fd0d9d50a2e0ae69a Mon Sep 17 00:00:00 2001 -From: Hongmei Gou -Date: Wed, 25 Sep 2019 18:07:04 -0400 -Subject: [PATCH] Makefile: add label_image example - -Upstream-Status: Pending - -Signed-off-by: Hongmei Gou ---- - tensorflow/lite/tools/make/Makefile | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/tensorflow/lite/tools/make/Makefile b/tensorflow/lite/tools/make/Makefile -index 73c50d3272..e2f664e1eb 100644 ---- a/tensorflow/lite/tools/make/Makefile -+++ b/tensorflow/lite/tools/make/Makefile -@@ -201,6 +201,12 @@ BENCHMARK_SRCS := $(filter-out \ - $(BENCHMARK_SRCS_DIR)/benchmark_plus_flex_main.cc, \ - $(BENCHMARK_ALL_SRCS)) - -+# label image example -+LABELIMAGE_SRCS := \ -+ tensorflow/lite/examples/label_image/bitmap_helpers.cc \ -+ tensorflow/lite/examples/label_image/label_image.cc \ -+ $(EVALUATION_UTILS_SRCS) -+ - # These target-specific makefiles should modify or replace options like - # CXXFLAGS or LIBS to work for a specific targetted architecture. All logic - # based on platforms or architectures should happen within these files, to -@@ -209,6 +215,7 @@ include $(wildcard $(MAKEFILE_DIR)/targets/*_makefile.inc) - - ALL_SRCS := \ - $(MINIMAL_SRCS) \ -+ $(LABELIMAGE_SRCS) \ - $(PROFILER_SRCS) \ - $(PROFILER_SUMMARIZER_SRCS) \ - $(TF_LITE_CC_SRCS) \ -@@ -225,6 +232,7 @@ LIB_PATH := $(LIBDIR)$(LIB_NAME) - BENCHMARK_LIB := $(LIBDIR)$(BENCHMARK_LIB_NAME) - BENCHMARK_BINARY := $(BINDIR)$(BENCHMARK_BINARY_NAME) - MINIMAL_BINARY := $(BINDIR)minimal -+LABELIMAGE_BINARY := $(BINDIR)label_image - - CXX := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}g++ - CC := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}gcc -@@ -233,6 +241,9 @@ AR := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}ar - MINIMAL_OBJS := $(addprefix $(OBJDIR), \ - $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(MINIMAL_SRCS)))) - -+LABELIMAGE_OBJS := $(addprefix $(OBJDIR), \ -+$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(LABELIMAGE_SRCS)))) -+ - LIB_OBJS := $(addprefix $(OBJDIR), \ - $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(TF_LITE_CC_SRCS))))) - -@@ -252,7 +263,7 @@ $(OBJDIR)%.o: %.cpp - $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ - - # The target that's compiled if there's no command-line arguments. --all: $(LIB_PATH) $(MINIMAL_BINARY) $(BENCHMARK_BINARY) -+all: $(LIB_PATH) $(MINIMAL_BINARY) $(LABELIMAGE_BINARY) $(BENCHMARK_BINARY) - - # The target that's compiled for micro-controllers - micro: $(LIB_PATH) -@@ -276,6 +287,14 @@ $(MINIMAL_BINARY): $(MINIMAL_OBJS) $(LIB_PATH) - - minimal: $(MINIMAL_BINARY) - -+$(LABELIMAGE_BINARY): $(LABELIMAGE_OBJS) $(LIB_PATH) -+ @mkdir -p $(dir $@) -+ $(CXX) $(CXXFLAGS) $(INCLUDES) \ -+ -o $(LABELIMAGE_BINARY) $(LABELIMAGE_OBJS) \ -+ $(LIBFLAGS) $(LIB_PATH) $(LDFLAGS) $(LIBS) -+ -+label_image: $(LABELIMAGE_BINARY) -+ - $(BENCHMARK_LIB) : $(LIB_PATH) $(BENCHMARK_OBJS) - @mkdir -p $(dir $@) - $(AR) $(ARFLAGS) $(BENCHMARK_LIB) $(LIB_OBJS) $(BENCHMARK_OBJS) --- -2.17.1 - diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/files/apply-modification-for-tflite-1.15-to-eigen.patch b/meta-arago-extras/recipes-support/tensorflow-lite/files/apply-modification-for-tflite-1.15-to-eigen.patch deleted file mode 100644 index 491dcbfa..00000000 --- a/meta-arago-extras/recipes-support/tensorflow-lite/files/apply-modification-for-tflite-1.15-to-eigen.patch +++ /dev/null @@ -1,16 +0,0 @@ - -Upstream-Status: Inappropriate [arago specific] - -diff --git a/tensorflow/lite/tools/make/downloads/eigen/Eigen/src/Core/arch/NEON/Complex.h b/tensorflow/lite/tools/make/downloads/eigen/Eigen/src/Core/arch/NEON/Complex.h -index 306a309beb..4527a64c91 100644 ---- a/tensorflow/lite/tools/make/downloads/eigen/Eigen/src/Core/arch/NEON/Complex.h -+++ b/tensorflow/lite/tools/make/downloads/eigen/Eigen/src/Core/arch/NEON/Complex.h -@@ -307,7 +307,7 @@ - static uint64x2_t p2ul_CONJ_XOR = {0x0, 0x8000000000000000}; - #else - const uint64_t p2ul_conj_XOR_DATA[] = { 0x0, 0x8000000000000000 }; -- static uint64x2_t p2ul_CONJ_XOR = vld1q_u64( p2ul_conj_XOR_DATA ); -+ static uint64x2_t p2ul_CONJ_XOR;// = vld1q_u64( p2ul_conj_XOR_DATA ); - Removed by script - #endif - - struct Packet1cd diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/files/tensorflow-lite.pc.in b/meta-arago-extras/recipes-support/tensorflow-lite/files/tensorflow-lite.pc.in deleted file mode 100644 index 44afd0ee..00000000 --- a/meta-arago-extras/recipes-support/tensorflow-lite/files/tensorflow-lite.pc.in +++ /dev/null @@ -1,6 +0,0 @@ - Name: tensorflow lite - Description: tensorflow lite static library - Version: @version@ - Requires: - Libs: -L@libdir@ -ltensorflow-lite - Cflags: -I@includedir@ diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/files/tflite-benchmark.sh b/meta-arago-extras/recipes-support/tensorflow-lite/files/tflite-benchmark.sh deleted file mode 100644 index 868b6c08..00000000 --- a/meta-arago-extras/recipes-support/tensorflow-lite/files/tflite-benchmark.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -#list of model packages -declare -a model_list=( -"http://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224_quant.tgz" -"http://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/mobilenet_v2_1.0_224_quant.tgz" -"http://storage.googleapis.com/download.tensorflow.org/models/inception_v1_224_quant_20181026.tgz" -"http://storage.googleapis.com/download.tensorflow.org/models/inception_v2_224_quant_20181026.tgz" -"http://storage.googleapis.com/download.tensorflow.org/models/tflite_11_05_08/inception_v3_quant.tgz" -"http://storage.googleapis.com/download.tensorflow.org/models/inception_v4_299_quant_20181026.tgz" -"http://storage.googleapis.com/download.tensorflow.org/models/tflite/coco_ssd_mobilenet_v1_1.0_quant_2018_06_29.zip" -) - -# create a new directory to host and unpack the models -rm -rf ~/tflite-benchmark -mkdir ~/tflite-benchmark - -# Set maximal number of threads to the number of arm cores -max_num_threads=`nproc` - -# TFLite install dir on filesystem -tflite_install_dir=$(find /usr/share -maxdepth 1 -type d -name "tensorflow-lite*") - -for model_link in "${model_list[@]}" -do - # download the model package to modeldir - modelpkg="${model_link##*/}" - modeldir="${modelpkg%.*}" - - mkdir ~/tflite-benchmark/$modeldir - cd ~/tflite-benchmark/$modeldir - - echo "Downloading $modelpkg..." - wget "$model_link" - if [[ $? -ne 0 ]]; then - echo "wget failed. Set up http proxy as needed before running the scripts!" - exit 1 - fi - - # unpack the model package - if [[ $modelpkg =~ \.tgz$ ]]; then - tar -xzvf $modelpkg - fi - if [[ $modelpkg =~ \.zip$ ]]; then - unzip $modelpkg - fi - - # run benchmark for the model - for model in *.tflite; do - for num_threads in $( seq 1 $max_num_threads ) - do - echo "Running benchmark_model for $model with $num_threads thread(s)..." - $tflite_install_dir/examples/benchmark_model --graph=${model} --num_threads=$num_threads --enable_op_profiling=true > ${modeldir}_thread_${num_threads}.log - cat ${modeldir}_thread_${num_threads}.log | grep Timings - done - done -done - -echo "Benchmarking completed!" diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb deleted file mode 100644 index fcbc84ab..00000000 --- a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Tensorflow Lite Demo with input and display via OpenCV and TIDL acceleration for AM5" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d8927f3331d2b3e321b7dd1925166d25" - -inherit features_check - -REQUIRED_DISTRO_FEATURES = "opencv" -REQUIRED_DISTRO_FEATURES:append:dra7xx = " opencl" - -DEPENDS = "tensorflow-lite flatbuffers opencv" -DEPENDS:append:dra7xx = " tidl-api" - -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PV = "01.00.00" -PR = "r1" - -BRANCH = "master" -SRC_URI = "git://git.ti.com/git/apps/tensorflow-lite-examples.git;protocol=https;branch=${BRANCH} \ - http://storage.googleapis.com/download.tensorflow.org/models/tflite/gpu/deeplabv3_257_mv_gpu.tflite;name=deeplabv3;subdir=${WORKDIR}/model;destsuffix=model \ - http://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz;name=mobilenetv1;subdir=${WORKDIR}/model;destsuffix=model \ - http://raw.githubusercontent.com/google-coral/edgetpu/master/test_data/bird_segmentation.bmp;name=bird_segmentation;subdir=${WORKDIR}/test_data;destsuffix=test_data" - -SRC_URI[deeplabv3.md5sum] = "4a24db5a5fb05c47586a1197765e8548" -SRC_URI[deeplabv3.sha256sum] = "68a539782c2c6a72f8aac3724600124a85ed977162b44e84cbae5db717c933c6" -SRC_URI[mobilenetv1.md5sum] = "d5f69cef81ad8afb335d9727a17c462a" -SRC_URI[mobilenetv1.sha256sum] = "1ccb74dbd9c5f7aea879120614e91617db9534bdfaa53dfea54b7c14162e126b" -SRC_URI[bird_segmentation.md5sum] = "fc3202ac4e3033b36df3043de6dc32c9" -SRC_URI[bird_segmentation.sha256sum] = "e43cedd29ab385db787531c8a6cdcb31c5e4292af34f242877ed40611e502670" - -SRCREV = "bd6a429c21f96d5112e0b6dea44a13b748eefd74" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "\ - 'CXX=${CXX}' \ - 'CXXFLAGS=${CXXFLAGS}' \ - 'AR=${AR}' \ - 'LD=${LD}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'TARGET=${TARGET_OS}' \ - 'TARGET_ARCH=${TARGET_ARCH}'" - -EXTRA_OEMAKE += "SYSROOT_INCDIR="${STAGING_INCDIR}" SYSROOT_LIBDIR="${STAGING_LIBDIR}" \ - TIDL_API_DIR="${STAGING_DATADIR}/ti/tidl"" - -TIDL = "no" -TIDL:dra7xx = "yes" -do_compile() { - oe_runmake -f Makefile TIDL_ACC=${TIDL} -} - -do_install() { - install -d ${D}${datadir}/tensorflow-lite/demos - install -m 0755 ${S}/tflite_classification ${D}${datadir}/tensorflow-lite/demos - install -m 0755 ${S}/tflite_segmentation ${D}${datadir}/tensorflow-lite/demos - install -m 0644 ${WORKDIR}/model/deeplabv3_257_mv_gpu.tflite ${D}${datadir}/tensorflow-lite/demos - install -m 0644 ${WORKDIR}/model/mobilenet_v1_1.0_224.tflite ${D}${datadir}/tensorflow-lite/demos - install -m 0644 ${WORKDIR}/test_data/bird_segmentation.bmp ${D}${datadir}/tensorflow-lite/demos - install -m 0755 ${S}/scripts/run*.sh ${D}${datadir}/tensorflow-lite/demos -} - -FILES:${PN} = "${datadir}/tensorflow-lite/demos" diff --git a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb b/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb deleted file mode 100644 index e4a1ec85..00000000 --- a/meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite_1.15.bb +++ /dev/null @@ -1,133 +0,0 @@ -DESCRIPTION = "TensorFlow's lightweight solution for mobile and embedded devices" -AUTHOR = "Google Inc. and Yuan Tang" -HOMEPAGE = "https://www.tensorflow.org/lite" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=64a34301f8e355f57ec992c2af3e5157" - -MD5SUM_EIGEN = "a28a728acb3298471b11132ab5c0c3cb" -SHA256SUM_EIGEN = "7e7a57e33c59280a17a66e521396cd8b1a55d0676c9f807078522fda52114b5c" -MD5SUM_FFT = "4255dd8a74949d123216b1ab91520469" -SHA256SUM_FFT = "52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296" - -SRC_URI = "git://github.com/tensorflow/tensorflow.git;branch=r${PV};rev=590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b;protocol=https \ - https://bitbucket.org/eigen/eigen/get/8071cda5714d.tar.gz;md5sum=${MD5SUM_EIGEN};sha256sum=${SHA256SUM_EIGEN} \ - git://github.com/google/gemmlowp;destsuffix=gemmlowp/;branch=master;rev=12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3;protocol=https \ - git://github.com/google/googletest;destsuffix=googletest/;branch=master;rev=release-1.8.0;protocol=https \ - git://github.com/abseil/abseil-cpp;destsuffix=abseil-cpp/;branch=master;rev=43ef2148c0936ebf7cb4be6b19927a9d9d145b8f;nobranch=1;protocol=https \ - git://github.com/intel/ARM_NEON_2_x86_SSE;destsuffix=neon_2_sse/;branch=master;rev=3057bb91b99bae9c7fbdf8710c032d462ca10051;protocol=https \ - git://github.com/google/farmhash;destsuffix=farmhash/;branch=master;rev=816a4ae622e964763ca0862d9dbd19324a1eaf45;protocol=https \ - git://github.com/google/flatbuffers;destsuffix=flatbuffers/;branch=master;rev=v1.11.0;protocol=https \ - https://mirror.bazel.build/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz;md5sum=${MD5SUM_FFT};sha256sum=${SHA256SUM_FFT} \ - http://download.tensorflow.org/models/mobilenet_v1_2018_08_02/mobilenet_v1_1.0_224_quant.tgz;name=mobilenet_v1_quant;subdir=${WORKDIR}/model;destsuffix=model \ - file://apply-modification-for-tflite-${PV}-to-eigen.patch \ - file://0001-Makefile-add-label_image-example-${PV}.patch \ - file://tflite-benchmark.sh \ - file://tensorflow-lite.pc.in" - -SRCREV_FORMAT="tensorflow_gemmlowp_googletest_abseil-cpp_ARM_NEON_2_x86_SSE_farmhash_flatbuffers" - -SRC_URI[mobilenet_v1_quant.md5sum] = "36af340c00e60291931cb30ce32d4e86" -SRC_URI[mobilenet_v1_quant.sha256sum] = "d32432d28673a936b2d6281ab0600c71cf7226dfe4cdcef3012555f691744166" - -PR = "r5" - -S = "${WORKDIR}/git" - -DEPENDS = "zlib" -TARGET_CFLAGS:remove = "-O2" -TARGET_CPPFLAGS:remove = "-O2" -TARGET_CXXFLAGS:remove = "-O2" -CFLAGS:append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \ - -I${STAGING_INCDIR}" -CPPFLAGS:append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \ - -I${STAGING_INCDIR}" -LDFLAGS:remove = "-Wl,-O1" -CXXFLAGS:append = " -O3 -DNDEBUG -fPIC -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \ - -I${STAGING_INCDIR}" -LIBS = "-lstdc++ -lpthread -lm -lz -ldl -lrt" -BUILD_DEPS_DOWNLOAD_DIR_PREFIX = "${S}/tensorflow/lite/tools/make/downloads/" - -do_cp_downloaded_build_deps() { - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}eigen - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}gemmlowp - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}googletest - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}absl - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}farmhash - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}neon_2_sse - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}flatbuffers - mkdir -p ${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}fft2d - - cp -rf ${WORKDIR}/eigen-eigen-8071cda5714d/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}eigen" - cp -rf ${WORKDIR}/gemmlowp/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}gemmlowp/" - cp -rf ${WORKDIR}/googletest/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}googletest/" - cp -rf ${WORKDIR}/abseil-cpp/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}absl/" - cp -rf ${WORKDIR}/farmhash/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}farmhash/" - cp -rf ${WORKDIR}/neon_2_sse/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}neon_2_sse/" - cp -rf ${WORKDIR}/flatbuffers/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}flatbuffers/" - cp -rf ${WORKDIR}/fft/* "${BUILD_DEPS_DOWNLOAD_DIR_PREFIX}fft2d" -} -addtask do_cp_downloaded_build_deps after do_unpack before do_patch - -EXTRA_OEMAKE = "\ - 'CC=${CC}' \ - 'CXX=${CXX}' \ - 'CPP=${CPP}' \ - 'CFLAGS=${CFLAGS}' \ - 'CPPFLAGS=${CPPFLAGS}' \ - 'CXXFLAGS=${CXXFLAGS}' \ - 'AR=${AR}' \ - 'LD=${LD}' \ - 'LDFLAGS=${LDFLAGS}' \ - 'LIBS=${LIBS}' \ - 'TARGET=${TARGET_OS}' \ - 'TARGET_ARCH=${TUNE_ARCH}'" - -do_compile() { - oe_runmake -f tensorflow/lite/tools/make/Makefile -} - -do_install() { - install -d ${D}${libdir} - install -m 0644 ${S}/tensorflow/lite/tools/make/gen/${TARGET_OS}_${TUNE_ARCH}/lib/*.a ${D}${libdir}/ - install -d ${D}${includedir}/tensorflow/lite - install -m 0644 ${S}/tensorflow/lite/*.h ${D}${includedir}/tensorflow/lite/ - install -d ${D}${includedir}/tensorflow/lite/c - install -m 0644 ${S}/tensorflow/lite/c/*.h ${D}${includedir}/tensorflow/lite/c/ - install -d ${D}${includedir}/tensorflow/lite/core/ - install -m 0644 ${S}/tensorflow/lite/core/*.h ${D}${includedir}/tensorflow/lite/core/ - install -d ${D}${includedir}/tensorflow/lite/core/api/ - install -m 0644 ${S}/tensorflow/lite/core/api/*.h ${D}${includedir}/tensorflow/lite/core/api/ - install -d ${D}${includedir}/tensorflow/lite/kernels - install -m 0644 ${S}/tensorflow/lite/kernels/*.h ${D}${includedir}/tensorflow/lite/kernels/ - install -d ${D}${includedir}/tensorflow/lite/profiling/ - install -m 0644 ${S}/tensorflow/lite/profiling/*.h ${D}${includedir}/tensorflow/lite/profiling/ - install -d ${D}${includedir}/tensorflow/lite/schema/ - install -m 0644 ${S}/tensorflow/lite/schema/*.h ${D}${includedir}/tensorflow/lite/schema/ - install -m 0644 ${S}/tensorflow/lite/schema/schema.fbs ${D}${includedir}/tensorflow/lite/schema/ - install -d ${D}${includedir}/tensorflow/lite/tools/ - install -m 0644 ${S}/tensorflow/lite/tools/*.h ${D}${includedir}/tensorflow/lite/tools/ - install -d ${D}${includedir}/tensorflow/lite/delegates/nnapi/ - install -m 0644 ${S}/tensorflow/lite/delegates/nnapi/*.h ${D}${includedir}/tensorflow/lite/delegates/nnapi/ - install -d ${D}${includedir}/tensorflow/lite/experimental/resource_variable/ - install -m 0644 ${S}/tensorflow/lite/experimental/resource_variable/*.h ${D}${includedir}/tensorflow/lite/experimental/resource_variable/ - install -d ${D}${includedir}/tensorflow/lite/kernels/internal/ - install -m 0644 ${S}/tensorflow/lite/kernels/internal/*.h ${D}${includedir}/tensorflow/lite/kernels/internal/ - - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/tensorflow-lite.pc.in ${D}${libdir}/pkgconfig/tensorflow-lite.pc - sed -i 's:@version@:${PV}:g - s:@libdir@:${libdir}:g - s:@includedir@:${includedir}:g' ${D}${libdir}/pkgconfig/tensorflow-lite.pc - # install examples - install -d ${D}${datadir}/${BPN}/examples - install -m 0755 ${S}/tensorflow/lite/tools/make/gen/${TARGET_OS}_${TUNE_ARCH}/bin/minimal ${D}${datadir}/${BPN}/examples - install -m 0755 ${S}/tensorflow/lite/tools/make/gen/${TARGET_OS}_${TUNE_ARCH}/bin/benchmark_model ${D}${datadir}/${BPN}/examples - install -m 0755 ${S}/tensorflow/lite/tools/make/gen/${TARGET_OS}_${TUNE_ARCH}/bin/label_image ${D}${datadir}/${BPN}/examples - install -m 0644 ${S}/tensorflow/lite/examples/label_image/testdata/grace_hopper.bmp ${D}${datadir}/${BPN}/examples - install -m 0644 ${S}/tensorflow/lite/java/ovic/src/testdata/labels.txt ${D}${datadir}/${BPN}/examples - install -m 0644 ${WORKDIR}/model/mobilenet_v1_1.0_224_quant.tflite ${D}${datadir}/${BPN}/examples - # install scripts for benchmarking - install -m 0755 ${WORKDIR}/tflite-benchmark.sh ${D}${datadir}/${BPN}/examples -} - -BBCLASSEXTEND = "native nativesdk" From patchwork Mon Aug 5 04:37:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47287 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1908BC3DA7F for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.978.1722832644409740978 for ; Sun, 04 Aug 2024 21:37:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C38C540CCE; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x0tRigmUxpcR; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id AAF8640CC6; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 639B616405D; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 07/16] tidl-api, tidl-utils: deprecate Date: Mon, 5 Aug 2024 00:37:04 -0400 Message-Id: <20240805043713.172555-7-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15487 From: Denys Dmytriyenko Remove old tidl components as deprecated and not maintained. This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko Acked-by: Andrew Davis --- ...nativesdk-packagegroup-arago-tisdk-host.bb | 8 --- .../recipes-ti/tidl-api/tidl-api.inc | 21 ------- .../recipes-ti/tidl-api/tidl-api_git.bb | 57 ------------------- .../recipes-ti/tidl-api/tidl-examples_git.bb | 52 ----------------- .../recipes-ti/tidl-api/tidl-viewer_git.bb | 33 ----------- .../recipes-ti/tidl-utils/tidl-import_git.bb | 46 --------------- .../recipes-ti/tidl-utils/tidl-utils.bb | 34 ----------- .../recipes-ti/tidl-utils/tidl-utils.inc | 4 -- 8 files changed, 255 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc delete mode 100644 meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb delete mode 100644 meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb delete mode 100644 meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb delete mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb delete mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb delete mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb index 92a80b6b..ed29b6c4 100644 --- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb +++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb @@ -7,13 +7,6 @@ inherit_defer nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -TIDL_TOOLS = "" -#TIDL_TOOLS = " \ -# nativesdk-tidl-import \ -# nativesdk-tidl-viewer \ -# nativesdk-tidl-utils \ -#" - EXTRA_TI_TOOLS = " \ nativesdk-ti-cgt6x \ nativesdk-ti-cgt-pru \ @@ -22,7 +15,6 @@ EXTRA_TI_TOOLS = " \ nativesdk-open62541-examples \ nativesdk-open62541-tests \ nativesdk-gcc-arm-baremetal \ - ${@oe.utils.all_distro_features(d, "opencl opencv", "${TIDL_TOOLS}")} \ " RDEPENDS:${PN} = "\ diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc deleted file mode 100644 index 389e565a..00000000 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc +++ /dev/null @@ -1,21 +0,0 @@ -PV = "1.5.1" -INC_PR = "r0" - -LIC_FILES_CHKSUM = "file://license.txt;md5=e3daeabffb9fc131a73f16d16cbdb118" - -GIT_URI = "git://git.ti.com/git/tidl/tidl-api.git" -GIT_PROTOCOL = "https" -BRANCH = "master" - -SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "4b801ad96b50f53e977b96d8b227ba4bcb26e011" - -# default patchdir is ${S} -S = "${WORKDIR}/git" - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_MACHINE_FEATURES:class-native = "" -REQUIRED_MACHINE_FEATURES:class-nativesdk = "" -REQUIRED_DISTRO_FEATURES = "opencl opencv" diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb deleted file mode 100644 index 7f37b63b..00000000 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "TIDL API" -DESCRIPTION = "TIDL API header and library. Refer TIDL API User's Guide for details." -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/tidl-api/intro.html" -LICENSE = "BSD-3-Clause" - -include tidl-api.inc -require recipes-ti/includes/ti-paths.inc - -PR = "${INC_PR}.0" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit python3native - -DEPENDS = "opencv \ - opencl \ - opencl-monitor \ - ti-cgt6x-native \ - clocl-native \ -" - -RDEPENDS:${PN} += "opencl-runtime \ - opencv \ -" - -EXTRA_OEMAKE = " -C ${S}/tidl_api \ - TARGET_ROOTDIR=${STAGING_DIR_HOST} \ - TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ -" - -do_compile() { - oe_runmake -} - -CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - -TIDL_INSTALL_DIR = "${datadir}/ti/tidl" - -do_install() { - install -d ${D}${TIDL_INSTALL_DIR} - install -d ${D}${TIDL_INSTALL_DIR}/tidl_api - install -d ${D}${TIDL_INSTALL_DIR}/viewer - install -d ${D}${libdir} - cp ${CP_ARGS} ${S}/tidl_api/libtidl_*.so* ${D}${libdir} - rm -f ${S}/tidl_api/libtidl_*.so* - cp ${CP_ARGS} ${S}/tidl_api/* ${D}${TIDL_INSTALL_DIR}/tidl_api/ - cp ${CP_ARGS} ${S}/viewer/* ${D}${TIDL_INSTALL_DIR}/viewer/ - install ${S}/readme.md ${D}${TIDL_INSTALL_DIR}/ -} - -FILES:${PN} += "\ - ${TIDL_INSTALL_DIR} \ -" - - -INSANE_SKIP:${PN} = "arch ldflags textrel staticdev" diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb deleted file mode 100644 index c9756d40..00000000 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "TIDL API examples" -DESCRIPTION = "Examples of TIDL API. Refer TIDL API User's Guide for details." -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/tidl-api/intro.html" -LICENSE = "BSD-3-Clause" - -include tidl-api.inc -require recipes-ti/includes/ti-paths.inc - -PR = "${INC_PR}.0" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEPENDS = "opencv \ - clocl-native \ - ti-cgt6x-native \ - tidl-api \ - json-c \ -" - -RDEPENDS:${PN} += "tidl-api \ - opencl-runtime \ - opencv \ - json-c \ - python3-core \ -" - -EXTRA_OEMAKE = " -C ${S}/examples \ - TARGET_ROOTDIR=${STAGING_DIR_HOST} \ - TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ -" - -do_compile() { - oe_runmake -} - -CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - -TIDL_INSTALL_DIR = "${datadir}/ti/tidl" - -do_install() { - install -d ${D}${TIDL_INSTALL_DIR} - install -d ${D}${TIDL_INSTALL_DIR}/examples - cp ${CP_ARGS} ${S}/examples/* ${D}${TIDL_INSTALL_DIR}/examples/ -} - -FILES:${PN} += "\ - ${TIDL_INSTALL_DIR} \ -" - - -INSANE_SKIP:${PN} = "arch ldflags textrel staticdev" diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb deleted file mode 100644 index 644b8626..00000000 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-viewer_git.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "TIDL Network Viewer" -DESCRIPTION = "TIDL Network viewer using dot and graphviz" -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/tidl-api/intro.html" -LICENSE = "BSD-3-Clause" - -include tidl-api.inc - -PR = "${INC_PR}.0" - -DEPENDS = "boost boost-native ti-cgt6x-native clocl-native" - -TARGET:class-target = "arm" -TARGET:class-native = "x86" -TARGET:class-nativesdk = "x86" - -CXXFLAGS:append:class-native = " -DPLATFORM_64BIT " -CXXFLAGS:append:class-nativesdk = " -DPLATFORM_64BIT " - -EXTRA_OEMAKE = " -C ${S}/viewer \ - TARGET=${TARGET} \ - TARGET_ROOTDIR=${STAGING_DIR_HOST} \ -" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/viewer/${TARGET}/tidl_viewer ${D}${bindir} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb deleted file mode 100644 index 3c1b81ff..00000000 --- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "TIDL import tool for conversion of Caffe and TF models into TI custom network format" -DESCRIPTION = "TIDL import tool is using protobuf to read and parse information from external network models \ - This is ARM Linux implementation." - -require ./tidl-utils.inc - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://modules/ti_dl/inc/itidl_ti.h;beginline=1;endline=34;md5=cabe1fdaabfa0d85dc5544566b0e2425" - -S = "${WORKDIR}/git/src/importTool" - -DEPENDS = "protobuf zlib protobuf-native flatbuffers tensorflow-lite flatbuffers-native tensorflow-lite-native" - -EXTRA_OEMAKE += "TIARM_TOOLS=${GCC_ARM_NONE_TOOLCHAIN}" -EXTRA_OEMAKE += "XDAIS_PATH=${XDAIS_INSTALL_DIR}" -EXTRA_OEMAKE += "SHOW_COMMANDS=1" -EXTRA_OEMAKE += "CORE=eve" -EXTRA_OEMAKE += "TARGET_BUILD=release" -EXTRA_OEMAKE += "TARGET_PLATFORM=PC" - -EXTRA_MAKE_ARGS = "PLATFORM_BUILD=x86 LINUXENV=x86 LINUX_IMPORT_TOOL=64BIT \ - PROTOBUF_LIB_DIR=${STAGING_DIR_NATIVE}/usr/lib PROTOBUF_INC_DIR=${STAGING_DIR_NATIVE}/usr/include \ - FLATBUFFERS_INC_DIR=${STAGING_DIR_NATIVE}$/usr/include/flatbuffers \ - TF_LITE_GENERATED_PATH=${STAGING_DIR_NATIVE}/usr/include/tensorflow/lite/schema" -EXTRA_MAKE_ARGS:class-target = "LINUX_BUILD_TOOLS=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} \ - PROTOBUF_LIB_DIR=${STAGING_LIBDIR} PROTOBUF_INC_DIR=${STAGING_INCDIR} \ - FLATBUFFERS_INC_DIR=${STAGING_INCDIR}/flatbuffers \ - TF_LITE_GENERATED_PATH=${STAGING_INCDIR}/tensorflow/lite/schema LINUXENV=oearm" - -EXTRA_OEMAKE += "${EXTRA_MAKE_ARGS}" - -do_compile() { - cd ${S}/modules/ti_dl/utils - ./genProtoSrc.sh - cd ${S} - oe_runmake -C modules/ti_dl/utils/tidlModelImport -} - -do_install () { - install -d ${D}${bindir} - install -m 755 ${S}/modules/ti_dl/utils/tidlModelImport/out/tidl_model_import.out ${D}${bindir} -} - -INSANE_SKIP:${PN} = "ldflags" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb deleted file mode 100644 index e8aad51c..00000000 --- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "TIDL Utilities and configuration files" -DESCRIPTION = "TIDL Utilities for standalone simulation and importing / translation of Caffe and TF-Slim models" -HOMEPAGE = "http://software-dl.ti.com/processor-sdk-linux/esd/docs/latest/linux/Foundational_Components.html#tidl" -LICENSE = "TI-TFL" - -require ./tidl-utils.inc - -LIC_FILES_CHKSUM = "file://docs/LICENSE.txt;md5=a93aa5af7a3bbbb6fb34c8df59efaa5c" - -RDEPENDS:${PN}:class-target += "tidl-api tidl-examples" - -S = "${WORKDIR}/git" - -TARGET:class-target = "arm" -TARGET:class-native = "x86" -TARGET:class-nativesdk = "x86" - -CP_ARGS = "-Prf --preserve=mode,timestamps --no-preserve=ownership" - -do_install() { - install -d ${D}${bindir} - install -d ${D}${datadir}/ti/tidl/utils/test - install -d ${D}${datadir}/ti/tidl/utils/docs - install -m 755 ${S}/${TARGET}/bin/* ${D}${bindir} - cp ${CP_ARGS} ${S}/test/* ${D}${datadir}/ti/tidl/utils/test/. - cp ${CP_ARGS} ${S}/docs/* ${D}${datadir}/ti/tidl/utils/docs/. -} - -FILES:${PN} += "${datadir}/ti/tidl/utils \ - ${bindir}" - -BBCLASSEXTEND = "native nativesdk" - -INSANE_SKIP:${PN} += "build-deps ldflags already-stripped" diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc deleted file mode 100644 index 80eefe9d..00000000 --- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc +++ /dev/null @@ -1,4 +0,0 @@ -SRC_URI = "git://git.ti.com/git/tidl/tidl-utils.git;protocol=https;branch=master" -SRCREV = "6a51b2aff1709c13edb3445bdb4698a28fbb2ae7" -PV = "01.01.03.02" -PR = "r1" From patchwork Mon Aug 5 04:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47296 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DC70C52D7D for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1070.1722832644494118919 for ; Sun, 04 Aug 2024 21:37:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id D8BEF40C21; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aoCjlE43BgUB; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id BA94640CC1; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 6FC4016405E; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 08/16] tiovx: deprecate Date: Mon, 5 Aug 2024 00:37:05 -0400 Message-Id: <20240805043713.172555-8-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15489 From: Denys Dmytriyenko Remove tiovx components as deprecated and not maintained. This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko --- ...r-Yocto-build-and-add-RTOS-build-var.patch | 135 ------------------ .../recipes-ti/tiovx/files/reload-dsp-fw.sh | 66 --------- .../recipes-ti/tiovx/files/setenv.sh | 8 -- .../recipes-ti/tiovx/tiovx-app-host.bb | 60 -------- .../recipes-ti/tiovx/tiovx-lib-host.bb | 42 ------ .../recipes-ti/tiovx/tiovx-sys-iface.bb | 51 ------- .../recipes-ti/tiovx/tiovx-sys.inc | 5 - 7 files changed, 367 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/tiovx/files/0001-Fix-paths-for-Yocto-build-and-add-RTOS-build-var.patch delete mode 100755 meta-arago-extras/recipes-ti/tiovx/files/reload-dsp-fw.sh delete mode 100644 meta-arago-extras/recipes-ti/tiovx/files/setenv.sh delete mode 100644 meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb delete mode 100644 meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb delete mode 100644 meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb delete mode 100644 meta-arago-extras/recipes-ti/tiovx/tiovx-sys.inc diff --git a/meta-arago-extras/recipes-ti/tiovx/files/0001-Fix-paths-for-Yocto-build-and-add-RTOS-build-var.patch b/meta-arago-extras/recipes-ti/tiovx/files/0001-Fix-paths-for-Yocto-build-and-add-RTOS-build-var.patch deleted file mode 100644 index ff80debc..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/files/0001-Fix-paths-for-Yocto-build-and-add-RTOS-build-var.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 32bd788608034f5a49d9cd4a0163190ef666d9a2 Mon Sep 17 00:00:00 2001 -From: Djordje Senicic -Date: Mon, 14 Aug 2017 10:26:39 -0400 -Subject: [PATCH] Fix paths for Yocto build and add RTOS build var - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Djordje Senicic ---- - Makefile | 27 +++++++++++++++++++-------- - psdk_tools_path.mak | 32 ++++++++++++++------------------ - 2 files changed, 33 insertions(+), 26 deletions(-) - -diff --git a/Makefile b/Makefile -index 0832e07..1be5b0d 100755 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - - # Valid values are: vsdk psdk --BUILD_SDK=vsdk -+BUILD_SDK=psdk - - include $(BUILD_SDK)_tools_path.mak - -@@ -8,11 +8,12 @@ BUILD_EMULATION_MODE?=no - BUILD_TARGET_MODE?=yes - - BUILD_CONFORMANCE_TEST?=yes --BUILD_IVISION_KERNELS?=yes -+BUILD_IVISION_KERNELS?=no - BUILD_BAM?=yes - BUILD_TUTORIAL?=yes - BUILD_LINUX_A15?=yes --BUILD_EVE?=yes -+BUILD_RTOS?=no -+BUILD_EVE?=no - - PROFILE?=all - -@@ -43,12 +44,17 @@ TARGET_COMBOS := - - ifeq ($(BUILD_TARGET_MODE),yes) - ifeq ($(PROFILE), $(filter $(PROFILE), debug all)) -- TARGET_COMBOS += TDAX:SYSBIOS:M4:1:debug:TIARMCGT -- TARGET_COMBOS += TDAX:SYSBIOS:C66:1:debug:CGT6X -+ ifeq ($(BUILD_RTOS),yes) -+ TARGET_COMBOS += TDAX:SYSBIOS:M4:1:debug:TIARMCGT -+ TARGET_COMBOS += TDAX:SYSBIOS:C66:1:debug:CGT6X -+ endif -+ - ifeq ($(BUILD_EVE),yes) - TARGET_COMBOS += TDAX:SYSBIOS:EVE:1:debug:ARP32CGT - endif -+ ifeq ($(BUILD_RTOS),yes) - TARGET_COMBOS += TDAX:SYSBIOS:A15:1:debug:GCC -+ endif - ifneq ($(OS),Windows_NT) - ifeq ($(BUILD_LINUX_A15),yes) - TARGET_COMBOS += TDAX:LINUX:A15:1:debug:GCC_LINARO -@@ -57,12 +63,17 @@ ifeq ($(BUILD_TARGET_MODE),yes) - endif - - ifeq ($(PROFILE), $(filter $(PROFILE), release all)) -- TARGET_COMBOS += TDAX:SYSBIOS:M4:1:release:TIARMCGT -- TARGET_COMBOS += TDAX:SYSBIOS:C66:1:release:CGT6X -+ ifeq ($(BUILD_RTOS),yes) -+ TARGET_COMBOS += TDAX:SYSBIOS:M4:1:release:TIARMCGT -+ TARGET_COMBOS += TDAX:SYSBIOS:C66:1:release:CGT6X -+ endif -+ - ifeq ($(BUILD_EVE),yes) - TARGET_COMBOS += TDAX:SYSBIOS:EVE:1:release:ARP32CGT - endif -- TARGET_COMBOS += TDAX:SYSBIOS:A15:1:release:GCC -+ ifeq ($(BUILD_RTOS),yes) -+ TARGET_COMBOS += TDAX:SYSBIOS:A15:1:release:GCC -+ endif - ifneq ($(OS),Windows_NT) - ifeq ($(BUILD_LINUX_A15),yes) - TARGET_COMBOS += TDAX:LINUX:A15:1:release:GCC_LINARO -diff --git a/psdk_tools_path.mak b/psdk_tools_path.mak -index 36394f8..8fd468d 100755 ---- a/psdk_tools_path.mak -+++ b/psdk_tools_path.mak -@@ -2,7 +2,6 @@ - TIOVX_PATH = $(abspath .) - - PLSDK_PATH := /home/x0157990/ti-processor-sdk-linux-am57xx-evm-04.00.00.04 --PRSDK_PATH := /home/x0157990/ti-processor-sdk-rtos-am57xx-evm-04-00-00-04 - - CROSS_COMPILE_LINARO := arm-linux-gnueabihf- - CROSS_COMPILE := arm-none-eabi- -@@ -16,23 +15,20 @@ ifeq ($(BUILD_OS),Windows_NT) - GCC_WINDOWS_ROOT ?= C:/CodeBlocks/MinGW - endif - --XDC_PATH := $(PRSDK_PATH)/xdctools_3_32_01_22_core/ --TIARMCGT_ROOT := $(PRSDK_PATH)/ti-cgt-arm_16.9.2.LTS -+XDC_PATH := $(XDC_INSTALL_DIR) -+TIARMCGT_ROOT := $(TIARMCGTPATH) -+GCC_ROOT_LINARO := $(GCCLINARO) -+XDIAS_PATH := $(XDAISPATH) -+BIOS_PATH := $(SYSBIOSPATH) -+PDK_PATH := $(PDKPATH) -+SDK_PLATFORM_IF_PATH := $(SDKPLATFORMIFPATH) - --GCC_ROOT := $(PRSDK_PATH)/gcc-arm-none-eabi-4_9-2015q3 --GCC_ROOT_LINARO := /home/x0157990/linaro/gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf --CGT6X_ROOT := $(PRSDK_PATH)/ti-cgt-c6000_8.1.3/ -+GCC_ROOT ?= $(GCCARMNONEPATH) -+CGT6X_ROOT := $(TI_CGT_INSTALL) - GCC_LINUX_ROOT ?= /usr/ -+VXLIB_PATH ?= $(VXLIBPATH) -+ARP32CGT_ROOT ?= $(EVETOOLSPATH} -+DMAUTILS_PATH ?= $(DSPAPPS_PATH)/dmautils -+ALGFRAMEWORK_PATH ?= $(DSPAPPS_PATH)/algframework -+EDMA3_LLD_PATH := $(EDMA3LLDPATH) - -- --VXLIB_PATH ?= $(PRSDK_PATH)/vxlib_c66x_1_1_0_0 --XDIAS_PATH := $(PRSDK_PATH)/xdais_7_24_00_04 --EDMA3_LLD_PATH := $(PRSDK_PATH)/edma3_lld_2_12_04_28/ --BIOS_PATH := $(PRSDK_PATH)/bios_6_46_05_55/ -- --DMAUTILS_PATH ?= $(PRSDK_PATH)/REL.DMAUTILS.00.08.00.02/dmautils --ALGFRAMEWORK_PATH ?= $(PRSDK_PATH)/REL.ALGFRAMEWORK.02.07.00.00/algframework --PDK_PATH := $(PRSDK_PATH)/pdk_am57xx_1_0_7 --CMEM_PATH ?= $(PLSDK_INSTALL_PATH)/board-support/extra-drivers/cmem-mod-4.14.00.00+gitAUTOINC+b514a99ac4/ --TARGETFS := $(PLSDK_PATH)/linux-devkit/sysroots/armv7ahf-neon-linux-gnueabi/ --SDK_PLATFORM_IF_PATH ?= /home/x0157990/am57/openvx/ex41_forwardmsg/vx -\ No newline at end of file --- -1.9.1 - diff --git a/meta-arago-extras/recipes-ti/tiovx/files/reload-dsp-fw.sh b/meta-arago-extras/recipes-ti/tiovx/files/reload-dsp-fw.sh deleted file mode 100755 index 198fd60f..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/files/reload-dsp-fw.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -usage() { - cat << EOF - - Usage: - $0 - -EOF -} - -if [ "$1" ]; then -case "$1" in - opencl) echo "Reload opencl firmware to DSP" - ;; - tiovx) echo "Reload tiovx firmware to DSP" - ;; - *) echo "Wrong argument $1" - usage - exit - ;; -esac -else - usage - exit -fi - -fw="${1}" - -if [[ ${fw} == opencl ]]; then - #Start OpenCL CMEM memory allocation daemon - if pgrep -x "ti-mctd" > /dev/null - then - echo "ti-mctd is running" - else - echo "Starting ti-mctd..." - ti-mctd - fi - # Link opencl monitor firmware for DSPs - ln -s -f /lib/firmware/dra7-dsp1-fw.xe66.opencl-monitor /lib/firmware/dra7-dsp1-fw.xe66 - ln -s -f /lib/firmware/dra7-dsp2-fw.xe66.opencl-monitor /lib/firmware/dra7-dsp2-fw.xe66 -fi - -if [[ ${fw} == tiovx ]]; then - # Kill CMEM multi-process daemon. This releases all CMEM memory used by OpenCL memory allocation - pkill ti-mctd - - # Link tiovx firmware for DSPs - ln -s -f /lib/firmware/dra7-dsp1-fw.xe66.openvx /lib/firmware/dra7-dsp1-fw.xe66 - ln -s -f /lib/firmware/dra7-dsp2-fw.xe66.openvx /lib/firmware/dra7-dsp2-fw.xe66 -fi - -cd /sys/bus/platform/drivers/omap-rproc/ - -# release DSPs -echo "Releasing DSPs..." -echo 40800000.dsp > unbind - -echo 41000000.dsp > unbind - -# reload firmware for DSPs -echo "Reloading firmware for DSPs..." -echo 40800000.dsp > bind - -echo 41000000.dsp > bind - -cd ~- diff --git a/meta-arago-extras/recipes-ti/tiovx/files/setenv.sh b/meta-arago-extras/recipes-ti/tiovx/files/setenv.sh deleted file mode 100644 index dc7bcea3..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/files/setenv.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -export PROC_LIST='host khronos_example' - -export LINUX_SYSROOT_DIR=/ -export TIOVXPATH=/usr/include/VX -export IPCPATH=/usr/share/ti/ti-ipc-tree -export SDKPLATFORMIFPATH=/usr/share/ti/ti-tiovx-lib-tree/sys-iface diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb b/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb deleted file mode 100644 index ec8355e0..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "TI OpenVX HOST (Linux A15) conformance verification application, Khronos tutorial example, and Host side IPC implementation" -DESCRIPTION = "TI OpenVX implementation, TIOVX, includes Khronos defined conformance test and tutorial example, as well as additional TI \ -specific tests. This package creates application which runs all the conformance tests (7K-8K) and Khronos tutorial exercise1. \ -Same package includes IPC implementation (MessageQ based) needed for communication with DSP firmware (loaded at boot time)" - -LICENSE = "BSD-3-Clause & MIT" -LIC_FILES_CHKSUM = "file://docs/manifest/TIOVX-APP-HOST_01.00.01.00_manifest.html;md5=247d7c56d783f583bf802490d5c93db3" - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append = "\ - file://setenv.sh \ -" - -inherit pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "opencv" - -require recipes-ti/includes/arago-paths.inc -require tiovx-sys.inc - -DEPENDS = "tiovx-sys-iface tiovx-lib-host ti-ipc cmem opencv udev" -RDEPENDS:${PN} = "tiovx-sys-iface tiovx-sys-iface-firmware tiovx-lib-host ti-ipc cmem" - -PR = "r3" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PROCLIST = "host khronos_example" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE += " TARGET_ROOTDIR=${STAGING_DIR_HOST} " -EXTRA_OEMAKE += " GCCLINARO=${TOOLCHAIN_PATH} TIOVXPATH=${TIOVX_INSTALL_DIR} IPCPATH=${IPC_INSTALL_DIR} " -EXTRA_OEMAKE += " SDKPLATFORMIFPATH=${TIOVX_INSTALL_DIR}/sys-iface " -EXTRA_OEMAKE += " PROC_LIST='${PROCLIST}' " - -do_install () { - install -d ${D}${bindir}/ - install -m 0755 ${S}/host/bin/debug/app_host ${D}${bindir}/tiovx-app_host - install -m 0755 ${S}/khronos_example/bin/debug/opticalflow ${D}${bindir}/tiovx-opticalflow - - oe_runmake clean - install -d ${D}${datadir}/ti/examples/openvx - install -m 644 ${S}/products.mak ${D}${datadir}/ti/examples/openvx - install -m 644 ${S}/makefile ${D}${datadir}/ti/examples/openvx - install -m 644 ${WORKDIR}/setenv.sh ${D}${datadir}/ti/examples/openvx - cp -r ${S}/host ${D}${datadir}/ti/examples/openvx - cp -r ${S}/khronos_example ${D}${datadir}/ti/examples/openvx - cp -r ${S}/shared ${D}${datadir}/ti/examples/openvx -} - -PACKAGES += "${PN}-examples" -FILES:${PN}-examples = "${datadir}/ti/examples/openvx" -RDEPENDS:${PN}-examples = "tiovx-lib-host-staticdev tiovx-lib-host-dev" - -FILES:${PN} += "${bindir}/*" -INSANE_SKIP:${PN} = "ldflags" -INSANE_SKIP:${PN}-examples = "dev-deps" diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb b/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb deleted file mode 100644 index e2ee926e..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "TI OpenVX HOST (Linux A15) side library" -DESCRIPTION = "TI OpenVX implementation, TIOVX, based on Khronos OpenVX framework implementation including multiple C66 optimized kernels. \ -Khronos defined conformance test is part of this package as well as additional TI specific tests. Few tutorial examples are also included. \ -This package creates necessary libraries and header files for Linux Host side only. " - -LICENSE = "TI-TSPA" -LIC_FILES_CHKSUM = "file://docs/manifest/TIOVX_manifest.html;md5=edd4fbfc6c1f01c20d49def4670efac0" - -require recipes-ti/includes/arago-paths.inc - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PV = "01.00.00.00" -PR = "r1" - -BRANCH = "master" -SRC_URI = "git://git.ti.com/git/processor-sdk/tiovx.git;protocol=https;branch=${BRANCH}" -SRC_URI += "file://0001-Fix-paths-for-Yocto-build-and-add-RTOS-build-var.patch " -SRCREV = "2bfa01201804eaf2e675c743e708e88ab612049e" - -S = "${WORKDIR}/git" - -DEPENDS = "tiovx-sys-iface" - -EXTRA_OEMAKE += " GCCLINARO=${TOOLCHAIN_PATH} " -EXTRA_OEMAKE += " SDKPLATFORMIFPATH=${TIOVX_INSTALL_DIR}/sys-iface BUILD_RTOS=no " - -do_install () { - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - install -d ${D}${includedir}/VX - install -d ${D}${includedir}/VX/TI - install -d ${D}${libdir} - cp ${CP_ARGS} ${S}/lib/TDAX/A15/LINUX/release/*.a ${D}${libdir} - cp ${CP_ARGS} ${S}/include/VX/* ${D}${includedir}/VX - cp ${CP_ARGS} ${S}/include/TI/* ${D}${includedir}/VX/TI -} - -FILES:${PN}-staticdev = "${libdir}" -FILES:${PN}-dev = "${includedir}" - -ALLOW_EMPTY:${PN} = "1" diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb b/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb deleted file mode 100644 index 3a900e5f..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "TI OpenVX interface header files between TIOVX library and HOST, DSP IPC side implementation" -DESCRIPTION = "Collection of header files needed to define interface between TIOVX library and HOST and DSP IPC side implementation. \ -In order to maintain source compatibility, directory structure follows VSDK source tree layout." - -LICENSE = "TI-TSPA" -LIC_FILES_CHKSUM = "file://iface/VSDK/docs/TIOVX-SYS-IFACE_1.0.0.0_manifest.html;md5=10904cbdb4f065c025a63ca71ae7de2d" - -require recipes-ti/includes/arago-paths.inc -require tiovx-sys.inc - -PR = "r1" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-alternatives features_check - -REQUIRED_MACHINE_FEATURES = "dsp" - -SRC_URI:append = "\ - file://reload-dsp-fw.sh \ -" - -S = "${WORKDIR}/git" - -do_install () { -# Install the header files - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - install -d ${D}${TIOVX_INSTALL_DIR_RECIPE}/sys-iface - cp ${CP_ARGS} ${S}/iface/VSDK/* ${D}${TIOVX_INSTALL_DIR_RECIPE}/sys-iface -# Install the firmware - install -d ${D}/${base_libdir}/firmware - install -m 0644 ${S}/firmware/tiovx_dsp1.xe66 ${D}/${base_libdir}/firmware/dra7-dsp1-fw.xe66.openvx - install -m 0644 ${S}/firmware/tiovx_dsp2.xe66 ${D}/${base_libdir}/firmware/dra7-dsp2-fw.xe66.openvx -# Install the scripts for loading dsp firmware - install -d ${D}${bindir}/ - install -m 0755 ${WORKDIR}/reload-dsp-fw.sh ${D}${bindir} -} - -ALTERNATIVE:${PN} = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" -ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" -ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.openvx" -ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" -ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.openvx" -ALTERNATIVE_PRIORITY = "20" - -FILES:${PN} += "${TIOVX_INSTALL_DIR_RECIPE}/sys-iface/* " -PACKAGES =+ "${PN}-firmware" -FILES:${PN}-firmware = "${base_libdir}/firmware/*" - -INSANE_SKIP:${PN}-firmware = "arch" diff --git a/meta-arago-extras/recipes-ti/tiovx/tiovx-sys.inc b/meta-arago-extras/recipes-ti/tiovx/tiovx-sys.inc deleted file mode 100644 index 41fc6825..00000000 --- a/meta-arago-extras/recipes-ti/tiovx/tiovx-sys.inc +++ /dev/null @@ -1,5 +0,0 @@ -PV = "01.00.01.00" - -BRANCH="master" -SRCREV = "5be60aee8d013907a4d8a6cc8af35a517a33b49e" -SRC_URI = "git://git.ti.com/git/processor-sdk/tiovx-app.git;protocol=https;branch=${BRANCH}" From patchwork Mon Aug 5 04:37:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47288 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D25FC52D71 for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.984.1722832645526351526 for ; Sun, 04 Aug 2024 21:37:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E064C40C21; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2t5__W9avcBB; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C2F0040CC3; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 72EE116405F; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 09/16] fftlib: deprecate Date: Mon, 5 Aug 2024 00:37:06 -0400 Message-Id: <20240805043713.172555-9-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15496 From: Denys Dmytriyenko Remove fftlib component as deprecated and not maintained. This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko --- .../recipes-ti/fftlib/fftlib.inc | 17 --- .../recipes-ti/fftlib/fftlib_git.bb | 103 ------------------ .../recipes-ti/fftlib/ti-fftw-examples_git.bb | 25 ----- .../recipes-ti/fftlib/ti-fftw_git.bb | 63 ----------- 4 files changed, 208 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/fftlib/fftlib.inc delete mode 100644 meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb delete mode 100644 meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb delete mode 100644 meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb diff --git a/meta-arago-extras/recipes-ti/fftlib/fftlib.inc b/meta-arago-extras/recipes-ti/fftlib/fftlib.inc deleted file mode 100644 index 49777a53..00000000 --- a/meta-arago-extras/recipes-ti/fftlib/fftlib.inc +++ /dev/null @@ -1,17 +0,0 @@ -PV = "3_1_0_0" -INC_PR = "r4" - -require recipes-ti/includes/arago-paths.inc - - -FFTLIB_GIT_URI = "git://git.ti.com/git/fftlib/fftlib" -FFTLIB_GIT_PROTOCOL = "https" -FFTLIB_GIT_BRANCH = "master" -FFTLIB_GIT_DESTSUFFIX = "${WORKDIR}/git" - -FFTLIB_SRCREV = "e05426894c73af940ccc26880ebd7f2c9ce21880" - -BRANCH = "${FFTLIB_GIT_BRANCH}" -SRC_URI = "${FFTLIB_GIT_URI};destsuffix=${FFTLIB_GIT_DESTSUFFIX};protocol=${FFTLIB_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${FFTLIB_SRCREV}" diff --git a/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb b/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb deleted file mode 100644 index 3f7ea874..00000000 --- a/meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY = "TI FFTLIB" -HOMEPAGE = "http://git.ti.com/fftlib/fftlib" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://ti/fftlib/docs/manifest/manifest.xml.xdt;md5=178402e86abc15ff3bac0d4fc57e5463" - -include fftlib.inc - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "openmp" - -PR = "${INC_PR}.0" - -DEPENDS = "common-csl-ip-rtos libarch ti-xdctools-native doxygen-native ti-cgt6x-native ti-xdais libulm dsplib-c66x php libxslt-native libxslt openmp-rtos" - -COMPATIBLE_MACHINE = "dra7xx" - -TARGET:dra7xx = "SOC_AM572x" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -export FFTLIB_ROOT="${S}" -export DOXYGEN_DIR="${DOXYGEN_INSTALL_DIR}" - -export TI_OCL_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/opencl" -export CGTROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export XDC_DIR = "${XDC_INSTALL_DIR}" -export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}" -export XDAIS_DIR = "${XDAIS_INSTALL_DIR}" -export FC_DIR = "${FC_INSTALL_DIR}" -export PDK_DIR = "${PDK_INSTALL_DIR}" -export OMP_DIR ="${OMP_INSTALL_DIR}" -export IPC_DIR = "${IPC_INSTALL_DIR}/packages" -export LIBARCH_DIR = "${LIBARCH_INSTALL_DIR}" -export TARGET_ROOTDIR ="${STAGING_DIR_TARGET}" - -export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" -export C6636_PDK_DIR ="${PDK_INSTALL_DIR}/packages" -export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export LINUX_DEVKIT_ROOT = "${STAGING_DIR_TARGET}" - -export PDK_INSTALL_DIR -export FC_INSTALL_DIR -export IPC_INSTALL_DIR -export XDC_INSTALL_DIR -export XDAIS_INSTALL_DIR - -export OPENMP_INSTALL_DIR="${OMP_INSTALL_DIR}" -export BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" -export EDMA_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" -export C66CODEGENTOOL="${TI_OCL_CGT_INSTALL}" -export C64CODEGENTOOL="${TI_OCL_CGT_INSTALL}" -export TI_DOXYGEN_TEMPLATES="${DOXYGEN_DIR}/TI_Templates/10-01-2007" -export XDCBUILDCFG="${FFTLIB_ROOT}/ti/mas/swtools/config.bld" -export FFTLIB_INSTALL_DIR="${FFTLIB_ROOT}" -export IPC_DIR="{IPC_INSTALL_DIR}" - -XDCPATH.="${XDCCGROOT}/include;" -XDCPATH.="${XDAIS_INSTALL_DIR}/packages;" -XDCPATH.="${XDC_INSTALL_DIR}/packages;" -XDCPATH.="${FFTLIB_INSTALL_DIR};" -XDCPATH.="${FC_INSTALL_DIR}/packages;" -XDCPATH.="${OMP_INSTALL_DIR}/packages;" -XDCPATH.="${PDK_INSTALL_DIR}/packages;" -XDCPATH.="${BIOS_INSTALL_DIR}/packages;" -XDCPATH.="${EDMA3_LLD_INSTALL_DIR}/packages;" -XDCPATH.="${DSPLIB_C66_INSTALL_DIR}/packages;" -XDCPATH.="${IPC_INSTALL_DIR}/packages;" -XDCPATH.="${LIBARCH_INSTALL_DIR}/packages;" -XDCPATH.="${TI_OCL_INSTALL_DIR};" - -XDCPATH.="${FFTLIB_ROOT}" - -export XDCPATH -export PATH := "${XDC_INSTALL_DIR}:${PATH}" - - -do_compile() { - echo "Building the FFTLIB.zip" - cd ${FFTLIB_ROOT}/ti/fftlib - xdc XDCARGS="${TARGET} c66x armplusdsp bundle" XDCOPTIONS="-v" -} - -do_install() { - - cd ${FFTLIB_ROOT}/ti/fftlib - install -d ${D}${FFTLIB_INSTALL_DIR_RECIPE} - - find -name "fftlib*.zip" -exec unzip -o {} -d ${D}${FFTLIB_INSTALL_DIR_RECIPE} \; - mv ${D}${FFTLIB_INSTALL_DIR_RECIPE}/fftlib/* ${D}${FFTLIB_INSTALL_DIR_RECIPE} - rm -r ${D}${FFTLIB_INSTALL_DIR_RECIPE}/fftlib - -} - -FILES:${PN}-dev += "${FFTLIB_INSTALL_DIR_RECIPE}" - -# skip checking binary against ARM architecture -INSANE_SKIP:${PN}-dev = "arch" -ALLOW_EMPTY:${PN} = "1" diff --git a/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb b/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb deleted file mode 100644 index 9e3347cb..00000000 --- a/meta-arago-extras/recipes-ti/fftlib/ti-fftw-examples_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "TI FFTW" -HOMEPAGE = "http://git.ti.com/fftlib" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://../docs/TI-FFTW_3.1.0_manifest.html;md5=aaa275ec704a738216ba696898941b44" - -include fftlib.inc - -PR = "${INC_PR}.0" - -DEPENDS = "ti-fftw" - -RDEPENDS:${PN} += "ti-fftw-staticdev" - -S = "${WORKDIR}/git/ti/fftw/examples" - -EXTRA_OEMAKE += "TARGET_ROOTDIR="${STAGING_DIR_TARGET}"" - -do_install() { - install -d ${D}${datadir}/ti/examples/fftw - cp -r ./* ${D}${datadir}/ti/examples/fftw -} - -FILES:${PN} = "${datadir}/ti/examples/fftw" -INSANE_SKIP:${PN} = "ldflags" diff --git a/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb b/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb deleted file mode 100644 index df9e9708..00000000 --- a/meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "TI FFTW" -HOMEPAGE = "http://git.ti.com/fftlib" -LICENSE = "GPL-2.0-only & BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://docs/TI-FFTW_3.1.0_manifest.html;md5=aaa275ec704a738216ba696898941b44 \ - file://fftw-3.3.4/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -include fftlib.inc - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencl" - -PR = "${INC_PR}.0" - -DEPENDS = "common-csl-ip-rtos common-csl-ip ti-xdctools-native ti-sysbios ti-cgt6x-native ti-xdais libulm fftlib dsplib-c66x opencl clocl-native libarch" - -RDEPENDS:${PN} += "opencl-runtime" - -COMPATIBLE_MACHINE = "dra7xx" -TARGET:dra7xx = "SOC_AM572x" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git/ti/fftw" - -export TI_OCL_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/opencl" -export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export PDK_DIR = "${PDK_INSTALL_DIR}" -export IPC_DIR = "${IPC_INSTALL_DIR}/packages" -export XDC_DIR = "${XDC_INSTALL_DIR}" -export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}" -export XDAIS_DIR = "${XDAIS_INSTALL_DIR}" -export FC_DIR = "${FC_INSTALL_DIR}" -export ULM_DIR ="${STAGING_DIR_TARGET}/usr/share/ti/ulm" -export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" -export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" -export C6636_PDK_DIR ="${PDK_INSTALL_DIR}/packages" -export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export LINUX_DEVKIT_ROOT = "${STAGING_DIR_TARGET}" -export TARGET_ROOTDIR="${STAGING_DIR_TARGET}" -export OMP_DIR = "${OMP_INSTALL_DIR}" -export FFTLIB_DIR="${FFTLIB_INSTALL_DIR}" -export DSPLIB_DIR="${DSPLIB_C66_INSTALL_DIR}" -export BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" -export EDMA_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" -export XDCTOOLS_DIR="${XDC_INSTALL_DIR}/packages" -export LIBARCH_DIR = "${LIBARCH_INSTALL_DIR}" - -do_compile() { - make build TARGET=${TARGET} -} - -do_install() { - make install DESTDIR=${D} - - # These files will be installed by the ti-fftw-examples recipe - rm -rf ${D}${datadir}/ti -} - -ALLOW_EMPTY:${PN} = "1" - -INSANE_SKIP:${PN} = "arch" From patchwork Mon Aug 5 04:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47295 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76C2BC52D7C for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.980.1722832644538094800 for ; Sun, 04 Aug 2024 21:37:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E228140CB0; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RT38l4K0bh9i; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C5E9840CC4; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7E923164060; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 10/16] linalg: deprecate Date: Mon, 5 Aug 2024 00:37:07 -0400 Message-Id: <20240805043713.172555-10-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15490 From: Denys Dmytriyenko Remove linalg component as deprecated and not maintained. This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko --- ...001-Makefile-fix-toolchain-variables.patch | 194 ------------------ ...RALLEL_MAKE-variable-to-overwrite-j8.patch | 66 ------ .../recipes-ti/linalg/linalg-examples_git.bb | 34 --- .../recipes-ti/linalg/linalg.inc | 56 ----- .../recipes-ti/linalg/linalg_git.bb | 25 --- 5 files changed, 375 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch delete mode 100644 meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch delete mode 100644 meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb delete mode 100644 meta-arago-extras/recipes-ti/linalg/linalg.inc delete mode 100644 meta-arago-extras/recipes-ti/linalg/linalg_git.bb diff --git a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch b/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch deleted file mode 100644 index df387977..00000000 --- a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch +++ /dev/null @@ -1,194 +0,0 @@ -From a99f267c7dd799cd66f64fa41a3bd7b5c5d6f8a1 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Sun, 26 Mar 2017 18:17:06 -0400 -Subject: [PATCH] Makefile: fix toolchain variables - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Denys Dmytriyenko ---- - examples/arm+dsp/make.inc | 1 - - src/ti/linalg/blis/config/cortex-a15/make_defs.mk | 1 - - src/ti/linalg/cblas/Makefile.ARM | 4 +--- - src/ti/linalg/clapack/make.inc.ARM | 8 +++----- - src/ti/linalg/clapack/make.inc.ARMBLAS | 10 ++++------ - src/ti/linalg/clapack/make.inc.ARMOpenCL | 8 +++----- - src/ti/linalg/make.inc | 6 +----- - src/ti/linalg/tuning/make.inc | 1 - - 8 files changed, 12 insertions(+), 27 deletions(-) - -diff --git a/examples/arm+dsp/make.inc b/examples/arm+dsp/make.inc -index c3a042d..e916b97 100644 ---- a/examples/arm+dsp/make.inc -+++ b/examples/arm+dsp/make.inc -@@ -11,7 +11,6 @@ ifneq (,$(findstring 86, $(UNAME_M))) - - # gcc ARM cross compiler will not, by default, search the host's - # /usr/include. Explicitly specify here to find dependent vendor headers -- CC = arm-linux-gnueabihf-gcc - else - CC = gcc - endif -diff --git a/src/ti/linalg/blis/config/cortex-a15/make_defs.mk b/src/ti/linalg/blis/config/cortex-a15/make_defs.mk -index 58130a0..13e10be 100644 ---- a/src/ti/linalg/blis/config/cortex-a15/make_defs.mk -+++ b/src/ti/linalg/blis/config/cortex-a15/make_defs.mk -@@ -74,7 +74,6 @@ GIT_LOG := $(GIT) log --decorate - # - - # --- Determine the C compiler and related flags --- --CC := arm-linux-gnueabihf-gcc - #CC := gcc - # Enable IEEE Standard 1003.1-2004 (POSIX.1d). - # NOTE: This is needed to enable posix_memalign(). -diff --git a/src/ti/linalg/cblas/Makefile.ARM b/src/ti/linalg/cblas/Makefile.ARM -index 3702887..e065831 100644 ---- a/src/ti/linalg/cblas/Makefile.ARM -+++ b/src/ti/linalg/cblas/Makefile.ARM -@@ -32,8 +32,6 @@ LN_S = ln -sf - # Compilers - #----------------------------------------------------------------------------- - --CC = arm-linux-gnueabihf-gcc --FC = arm-linux-gnueabihf-gfortran - LOADER = $(FC) - - #----------------------------------------------------------------------------- -@@ -47,6 +45,6 @@ FFLAGS = -O2 - # Archive programs and flags - #----------------------------------------------------------------------------- - --ARCH = arm-linux-gnueabihf-ar -+ARCH = $(AR) - ARCHFLAGS = r - RANLIB = echo -diff --git a/src/ti/linalg/clapack/make.inc.ARM b/src/ti/linalg/clapack/make.inc.ARM -index 0fdbe72..204904b 100644 ---- a/src/ti/linalg/clapack/make.inc.ARM -+++ b/src/ti/linalg/clapack/make.inc.ARM -@@ -23,10 +23,9 @@ PLAT = _ARM - # This is used to compile C libary - #CC = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP - # if no wrapping of the blas library is needed, uncomment next line --CC = arm-linux-gnueabihf-gcc - CFLAGS = -O2 -I$(TOPDIR)/INCLUDE --LINKER = arm-linux-gnueabihf-ld --LOADER = arm-linux-gnueabihf-gcc -+LINKER = $(LD) -+LOADER = $(CC) - LOADOPTS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib - NOOPT = -O0 -I$(TOPDIR)/INCLUDE - DRVCFLAGS = $(CFLAGS) -@@ -51,9 +50,8 @@ TIMER = INT_CPU_TIME - # The archiver and the flag(s) to use when building archive (library) - # If you system has no ranlib, set RANLIB = echo. - # --ARCH = arm-linux-gnueabihf-ar -+ARCH = $(AR) - ARCHFLAGS= cr --RANLIB = arm-linux-gnueabihf-ranlib - # - # The location of BLAS library for linking the testing programs. - # The target's machine-specific, optimized BLAS library should be -diff --git a/src/ti/linalg/clapack/make.inc.ARMBLAS b/src/ti/linalg/clapack/make.inc.ARMBLAS -index e3b1b04..d95763c 100644 ---- a/src/ti/linalg/clapack/make.inc.ARMBLAS -+++ b/src/ti/linalg/clapack/make.inc.ARMBLAS -@@ -23,10 +23,9 @@ PLAT = _ARMBLAS - # This is used to compile C libary - #CC = arm-linux-gnueabihf-gcc - # if no wrapping of the blas library is needed, uncomment next line --CC = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP --CFLAGS = -O3 -I$(TOPDIR)/INCLUDE --LINKER = arm-linux-gnueabihf-ld --LOADER = arm-linux-gnueabihf-gcc -+CFLAGS = -O3 -I$(TOPDIR)/INCLUDE -DNO_BLAS_WRAP -+LINKER = $(LD) -+LOADER = $(CC) - LOADOPTS = - NOOPT = -O0 -I$(TOPDIR)/INCLUDE - DRVCFLAGS = $(CFLAGS) -@@ -51,9 +50,8 @@ TIMER = INT_CPU_TIME - # The archiver and the flag(s) to use when building archive (library) - # If you system has no ranlib, set RANLIB = echo. - # --ARCH = arm-linux-gnueabihf-ar -+ARCH = $(AR) - ARCHFLAGS= cr --RANLIB = arm-linux-gnueabihf-ranlib - # - # The location of BLAS library for linking the testing programs. - # The target's machine-specific, optimized BLAS library should be -diff --git a/src/ti/linalg/clapack/make.inc.ARMOpenCL b/src/ti/linalg/clapack/make.inc.ARMOpenCL -index 036b3d1..1acc421 100644 ---- a/src/ti/linalg/clapack/make.inc.ARMOpenCL -+++ b/src/ti/linalg/clapack/make.inc.ARMOpenCL -@@ -21,12 +21,11 @@ PLAT = _ARM - # - ####################################################### - # This is used to compile C libary --CC = arm-linux-gnueabihf-gcc #-pg - # if no wrapping of the blas library is needed, uncomment next line - #CC = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP - CFLAGS = -O2 -I$(TOPDIR)/INCLUDE #-g --LINKER = arm-linux-gnueabihf-ld --LOADER = arm-linux-gnueabihf-gcc -+LINKER = $(LD) -+LOADER = $(CC) - LOADOPTS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib - NOOPT = -O0 -I$(TOPDIR)/INCLUDE - DRVCFLAGS = $(CFLAGS) -@@ -51,9 +50,8 @@ TIMER = INT_CPU_TIME - # The archiver and the flag(s) to use when building archive (library) - # If you system has no ranlib, set RANLIB = echo. - # --ARCH = arm-linux-gnueabihf-ar -+ARCH = $(AR) - ARCHFLAGS= cr --RANLIB = arm-linux-gnueabihf-ranlib - # - # The location of BLAS library for linking the testing programs. - # The target's machine-specific, optimized BLAS library should be -diff --git a/src/ti/linalg/make.inc b/src/ti/linalg/make.inc -index b2e1afe..8588019 100644 ---- a/src/ti/linalg/make.inc -+++ b/src/ti/linalg/make.inc -@@ -1,5 +1,4 @@ -- --CPP = g++ -+CPP = $(CXX) - CL6X = cl6x -mv6600 --abi=eabi $(DSP_INCLUDE) - CLOCL = clocl - -@@ -7,8 +6,6 @@ LIBS = -lOpenCL -locl_util #-lstdc++ -lrt - - UNAME_M :=$(shell uname -m) - --OBJCOPY = arm-linux-gnueabihf-objcopy -- - ifneq (,$(findstring 86, $(UNAME_M))) - .DEFAULT_GOAL := cross - -@@ -29,7 +26,6 @@ ifneq (,$(findstring 86, $(UNAME_M))) - - # gcc ARM cross compiler will not, by default, search the host's - # /usr/include. Explicitly specify here to find dependent vendor headers -- cross: override CPP = arm-linux-gnueabihf-g++ - cross: CPP_FLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include - #cross: CL6X_FLAGS += -I$(OMP_DIR)/packages/ti/runtime/openmp - -diff --git a/src/ti/linalg/tuning/make.inc b/src/ti/linalg/tuning/make.inc -index cd3c653..ecce3d9 100644 ---- a/src/ti/linalg/tuning/make.inc -+++ b/src/ti/linalg/tuning/make.inc -@@ -11,7 +11,6 @@ ifneq (,$(findstring 86, $(UNAME_M))) - - # gcc ARM cross compiler will not, by default, search the host's - # /usr/include. Explicitly specify here to find dependent vendor headers -- CC = arm-linux-gnueabihf-gcc - else - CC = gcc - endif --- -2.7.4 - diff --git a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch b/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch deleted file mode 100644 index 7d2f1409..00000000 --- a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 54378094d58c79a9d5ff6c1cc17d7bfd9c497dab Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Wed, 29 Mar 2017 13:09:05 -0400 -Subject: [PATCH] Makefile: pass PARALLEL_MAKE variable to overwrite -j8 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Denys Dmytriyenko ---- - src/ti/linalg/Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/ti/linalg/Makefile b/src/ti/linalg/Makefile -index 90b8ef4..8d8e338 100644 ---- a/src/ti/linalg/Makefile -+++ b/src/ti/linalg/Makefile -@@ -13,6 +13,8 @@ CLAPACK_HEADERS =$(LINALG_CLAPACK_DIR)/INCLUDE/blaswrap.h - CLAPACK_HEADERS+=$(LINALG_CLAPACK_DIR)/INCLUDE/clapack.h - CLAPACK_HEADERS+=$(LINALG_CLAPACK_DIR)/INCLUDE/f2c.h - -+PARALLEL_MAKE ?= "-j8" -+ - ifneq (,$(findstring DSP,$(MAKECMDGOALS))) - - ifeq ($(LIBOS),LIB_RTOS) -@@ -52,7 +54,7 @@ endif - DSPlibs: - cd $(LINALG_CBLAS_DIR); make arch=C66 alllib || exit 1; \ - cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; \ -- make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; make install; \ -+ make $(PARALLEL_MAKE) MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; make install; \ - cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES) || exit 1; cd ../lib; \ - echo "combining BLIS, CBLAS, and TICBLAS libraries into one: libcblas.ae66"; \ - rm -rf blas_objs blis_objs; mkdir blas_objs blis_objs; cd blis_objs; ar x ../../../blis/install/$(BLIS_CFG)/lib/libblis.ae66; chmod +rw *; \ -@@ -63,8 +65,8 @@ DSPlibs: - # Build ARM code for ARM+DSP platforms - ARMlibs: - cd $(LINALG_CBLAS_DIR); make arch=ARM alllib || exit 1; \ -- cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8 NUM_ARM_CORES=$(NUM_ARM_CORES) || exit 1; make install; \ -- cd ../$(LINALG_CLAPACK_DIR); make f2clib || exit 1; make cblaswrap || exit 1; cd SRC; make -j8 || exit 1; cd .. -+ cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make $(PARALLEL_MAKE) NUM_ARM_CORES=$(NUM_ARM_CORES) || exit 1; make install; \ -+ cd ../$(LINALG_CLAPACK_DIR); make f2clib || exit 1; make cblaswrap || exit 1; cd SRC; make $(PARALLEL_MAKE) || exit 1; cd .. - - # Build host-callable libraries for ARM+DSP platforms. - # BLAS has a single archive: libcblas_armplusdsp.a, which includes: -@@ -91,7 +93,7 @@ ARMplusDSP: DSPlibs ARMlibs - cleanDSPlibs: - rm -f lib/* - cd $(LINALG_CBLAS_DIR); make arch=C66 clean; \ -- cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make -j8 clean; rm -r install/$(BLIS_CFG); \ -+ cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make $(PARALLEL_MAKE) clean; rm -r install/$(BLIS_CFG); \ - cd ../$(LINALG_TICBLAS_DIR)/src; make clean; - - cleanARMlibs: -@@ -103,7 +105,7 @@ cleanARMlibs: - - BLIStest: - cd $(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; \ -- cd testsuite; make lib=OpenCLCBLAS -j8 -+ cd testsuite; make lib=OpenCLCBLAS $(PARALLEL_MAKE) - - BLIStestDSP: - cd $(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; \ --- -2.7.4 - diff --git a/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb deleted file mode 100644 index 0871193f..00000000 --- a/meta-arago-extras/recipes-ti/linalg/linalg-examples_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "TI Linear Algebra Library examples" - -include linalg.inc -PR = "${INC_PR}.0" - -DEPENDS += "linalg" -RDEPENDS:${PN} += "opencl-runtime" - -export LINALG_DIR = "${LINALG_INSTALL_DIR}" - -EXAMPLES_ROOT = "${WORKDIR}/git/examples/arm+dsp" - -do_compile() { - cd examples/arm+dsp - make - # Remove object files before installing so that the binaries are not present - find . -name "*.obj" -type f -delete - find . -name "*.o" -type f -delete -} - -do_install() { - install -d ${D}${datadir}/ti/examples/linalg - cp -r examples/arm+dsp/* ${D}${datadir}/ti/examples/linalg -} - -FILES:${PN} += "\ - ${datadir}/ti/examples/linalg/* \ -" - -FILES:${PN}-dbg += "\ - ${datadir}/ti/examples/linalg/*/.debug \ -" - -INSANE_SKIP:${PN} = "arch ldflags textrel" diff --git a/meta-arago-extras/recipes-ti/linalg/linalg.inc b/meta-arago-extras/recipes-ti/linalg/linalg.inc deleted file mode 100644 index 32459847..00000000 --- a/meta-arago-extras/recipes-ti/linalg/linalg.inc +++ /dev/null @@ -1,56 +0,0 @@ -HOMEPAGE = "git://git.ti.com/git/dense-linear-algebra-libraries/linalg.git" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://src/ti/linalg/docs/LINALG_1.2.0_manifest.html;md5=f30895e41e5947c3439b1ad4cf4c8555" - -PV = "1_2_0_0" -INC_PR = "r7" - -COMPATIBLE_MACHINE = "dra7xx" - -require recipes-ti/includes/arago-paths.inc -require recipes-ti/includes/ti-staging.inc - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencl openmp" - -SRC_URI = " \ - git://git.ti.com/git/dense-linear-algebra-libraries/linalg.git;protocol=https;branch=${BRANCH} \ - file://0001-Makefile-fix-toolchain-variables.patch \ - file://0001-Makefile-pass-PARALLEL_MAKE-variable-to-overwrite-j8.patch \ -" - -BRANCH = "master" -SRCREV = "01960b319783b29aacf12b2a72606b28d657b78e" - -DEPENDS = " \ - common-csl-ip \ - libarch \ - ti-xdctools-native \ - ti-ipc-rtos \ - ti-sysbios \ - ti-cgt6x-native \ - ti-xdais \ - ti-framework-components \ - libulm \ - openmp-rtos \ - opencl \ - clocl-native \ - doxygen-native \ - zip-native \ -" - -S = "${WORKDIR}/git" - -export TI_OCL_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/opencl" -export CGTROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export XDC_DIR = "${XDC_INSTALL_DIR}" -export BIOS_DIR= "${SYSBIOS_INSTALL_DIR}" -export XDAIS_DIR = "${XDAIS_INSTALL_DIR}" -export FC_DIR = "${FC_INSTALL_DIR}" -export PDK_DIR = "${PDK_INSTALL_DIR}" -export OMP_DIR ="${OMP_INSTALL_DIR}" -export LIBARCH_DIR = "${LIBARCH_INSTALL_DIR}" -export TARGET_ROOTDIR="${STAGING_DIR_TARGET}" diff --git a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb b/meta-arago-extras/recipes-ti/linalg/linalg_git.bb deleted file mode 100644 index aa87f5f2..00000000 --- a/meta-arago-extras/recipes-ti/linalg/linalg_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "TI Linear Algebra Library" - -include linalg.inc -PR = "${INC_PR}.0" - -TARGET:dra7xx = "SOC_AM572x" -MEM_MODEL:dra7xx = "Small" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_compile() { - make -f build/Makefile MEM_MODEL=${MEM_MODEL} TARGET=${TARGET} LIBOS=LIB_OPENCL PARALLEL_MAKE="${PARALLEL_MAKE}" -} - -do_install() { - install -d ${D}${LINALG_INSTALL_DIR_RECIPE} - cp -r exports/linalg_${PV}/* ${D}${LINALG_INSTALL_DIR_RECIPE} -} - -# to create a package for LINALG -FILES:${PN}-dev += "${LINALG_INSTALL_DIR_RECIPE}" - -INSANE_SKIP:${PN}-dev = "arch staticdev" -ALLOW_EMPTY:${PN} = "1" - -RDEPENDS:${PN}-dev += "bash perl" From patchwork Mon Aug 5 04:37:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47294 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C0F1C52D74 for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.981.1722832644566176827 for ; Sun, 04 Aug 2024 21:37:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id EAD1040CBF; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TPIHffFXKymP; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D0BBB40CC8; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 81B03164061; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 11/16] libarch: deprecate Date: Mon, 5 Aug 2024 00:37:08 -0400 Message-Id: <20240805043713.172555-11-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15491 From: Denys Dmytriyenko Remove libarch component as deprecated and not maintained. This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko --- .../libarch/libarch-examples_git.bb | 36 ------------------- .../recipes-ti/libarch/libarch.inc | 36 ------------------- .../recipes-ti/libarch/libarch_git.bb | 20 ----------- 3 files changed, 92 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb delete mode 100644 meta-arago-extras/recipes-ti/libarch/libarch.inc delete mode 100644 meta-arago-extras/recipes-ti/libarch/libarch_git.bb diff --git a/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb b/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb deleted file mode 100644 index f7b893f7..00000000 --- a/meta-arago-extras/recipes-ti/libarch/libarch-examples_git.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "TI Library Architecture Examples" - -include libarch.inc - -PR = "${INC_PR}.0" - -DEPENDS += "libarch clocl-native" -RDEPENDS:${PN} += "opencl-runtime" - -export LIBARCH_DIR = "${LIBARCH_INSTALL_DIR}" -export TARGET_ROOTDIR = "${STAGING_DIR_TARGET}" - -do_compile() { - cd examples - make TARGET=${TARGET} LIBOS=LIB_OPENCL - # Remove object files before installing so that the binaries are not present - find . -name "*.obj" -type f -delete - find . -name "*.o" -type f -delete - find . -name "*.out" -type f -delete - find . -name "*.dsp_h" -type f -delete -} - -do_install() { - install -d ${D}${datadir}/ti/examples/libarch - cp -r examples/arm+dsp ${D}${datadir}/ti/examples/libarch - cp -r examples/common ${D}${datadir}/ti/examples/libarch - cp examples/Makefile ${D}${datadir}/ti/examples/libarch -} - -FILES:${PN} += "\ - ${datadir}/ti/examples/libarch/* \ " - -FILES:${PN}-dbg += "\ - ${datadir}/ti/examples/libarch/*/.debug \ " - -INSANE_SKIP:${PN} = "arch ldflags textrel" diff --git a/meta-arago-extras/recipes-ti/libarch/libarch.inc b/meta-arago-extras/recipes-ti/libarch/libarch.inc deleted file mode 100644 index 3c708250..00000000 --- a/meta-arago-extras/recipes-ti/libarch/libarch.inc +++ /dev/null @@ -1,36 +0,0 @@ -HOMEPAGE = "https://git.ti.com/library-architecture/libarch" -LICENSE = "BSD-3-Clause" - -PV = "1_0_0_0" -INC_PR = "r2" - -require recipes-ti/includes/arago-paths.inc -require recipes-ti/includes/ti-staging.inc - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencl" - -BRANCH = "master" -LIC_FILES_CHKSUM = "file://src/ti/libarch/docs/LibArch_1.0.0_manifest.html;md5=bb48cacb8827ec8d8e5a94c4f2425ee3" -SRC_URI = "git://git.ti.com/git/library-architecture/libarch.git;protocol=https;branch=${BRANCH}" -SRCREV = "cb6d785e95cd390c6388853a4f1e99a302e5a58f" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -DEPENDS = "common-csl-ip-rtos ti-xdctools-native ti-sysbios ti-cgt6x-native ti-xdais ti-framework-components opencl opencl-monitor doxygen-native zip-native" - -export CGTROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export TI_OCL_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/opencl" -export XDC_DIR = "${XDC_INSTALL_DIR}" -export BIOS_DIR= "${SYSBIOS_INSTALL_DIR}" -export XDAIS_DIR = "${XDAIS_INSTALL_DIR}" -export FC_DIR = "${FC_INSTALL_DIR}" -export PDK_DIR = "${PDK_INSTALL_DIR}" - -TARGET:dra7xx = "SOC_AM572x" diff --git a/meta-arago-extras/recipes-ti/libarch/libarch_git.bb b/meta-arago-extras/recipes-ti/libarch/libarch_git.bb deleted file mode 100644 index 4151e1c4..00000000 --- a/meta-arago-extras/recipes-ti/libarch/libarch_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "TI Library Architecture" - -include libarch.inc - -PR = "${INC_PR}.0" - -do_compile() { - make -f build/Makefile TARGET=${TARGET} LIBOS=LIB_OPENCL -} - -do_install() { - install -d ${D}${LIBARCH_INSTALL_DIR_RECIPE} - cp -r exports/libarch_*/* ${D}${LIBARCH_INSTALL_DIR_RECIPE} -} - -FILES:${PN}-dev += "${LIBARCH_INSTALL_DIR_RECIPE}" - -# skip checking binary against ARM architecture -INSANE_SKIP:${PN}-dev = "arch" -ALLOW_EMPTY:${PN} = "1" From patchwork Mon Aug 5 04:37:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47289 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41576C52D72 for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1071.1722832645379551863 for ; Sun, 04 Aug 2024 21:37:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id F1D2140CC1; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z14S_yDgq1tB; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id DBAE740CCA; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 8CE24164062; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 12/16] gstreamer1.0-plugins-dsp66: deprecate Date: Mon, 5 Aug 2024 00:37:09 -0400 Message-Id: <20240805043713.172555-12-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15492 From: Denys Dmytriyenko Remove gstreamer1.0-plugins-dsp66 component as deprecated and not maintained. This component was offloading processing tasks to DSP using heavily modified OpenCL/OpenCV forks of old versions of corresponding upstream projects on legacy platforms. Signed-off-by: Denys Dmytriyenko --- .../packagegroup-arago-gst-sdk-target.bb | 5 - .../packagegroups/packagegroup-arago-gst.bb | 5 - ...-use-of-CPP-CXX-and-other-standard-v.patch | 91 ------------------- ...e.ac-stop-using-export-symbols-regex.patch | 32 ------- .../gstreamer1.0-plugins-dsp66_git.bb | 50 ---------- 5 files changed, 183 deletions(-) delete mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch delete mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch delete mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb index 845cc7ff..fd749711 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb @@ -14,13 +14,8 @@ GSTREAMER_DEPS = " \ gstreamer1.0-libav-dev \ " -GSTREAMER_DSP = " \ - ${@['','gstreamer1.0-plugins-dsp66-dev'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" - # gstreamer1.0-plugins-hevc-dev GSTREAMER_DEPS:append:dra7xx = " \ - ${GSTREAMER_DSP} \ " RDEPENDS:${PN} = " \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb index e8a639bd..3bc3bfc1 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb @@ -17,13 +17,8 @@ GSTREAMER_DEPS = " \ gstreamer1.0-libav \ " -GSTREAMER_DSP = " \ - ${@['','gstreamer1.0-plugins-dsp66'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" - # gstreamer1.0-plugins-hevc GSTREAMER_DEPS:append:dra7xx = " \ - ${GSTREAMER_DSP} \ " GSTREAMER_ACCEL_MM = "" diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch deleted file mode 100644 index 8048de93..00000000 --- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 145964aa34bc2cbf1499de6e14de80a7c2d7e935 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Sun, 26 Mar 2017 15:12:44 -0400 -Subject: [PATCH] Makefile: correct use of CPP/CXX and other standard variables - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Denys Dmytriyenko ---- - src/kernels/make.inc | 16 +++++++--------- - src/kernels/oclconv/Makefile | 7 +++---- - 2 files changed, 10 insertions(+), 13 deletions(-) - -diff --git a/src/kernels/make.inc b/src/kernels/make.inc -index 797e64b..f1475a3 100644 ---- a/src/kernels/make.inc -+++ b/src/kernels/make.inc -@@ -4,7 +4,6 @@ DSP_INCLUDE += -I$(TARGET_ROOTDIR)/usr/share/ti/opencl - TI_IMGLIB_DIR=${TARGET_ROOTDIR}/usr/share/ti/ti-imglib-c66x-tree - TI_VLIB_DIR=${TARGET_ROOTDIR}/usr/share/ti/ti-vlib-c66x-tree - --CPP = g++ - CL6X = cl6x -mv6600 --abi=eabi $(DSP_INCLUDE) - CLOCL = clocl - -@@ -16,9 +15,9 @@ UNAME_M :=$(shell uname -m) - # If TI_OCL_INSTALL is set, setup make from that location - # ---------------------------------------------------------------------------- - ifneq ($(TI_OCL_INSTALL),) -- CPP = g++ -- CPP_FLAGS += -I$(TI_OCL_INSTALL)/usr/include -- LD_FLAGS += -L$(TI_OCL_INSTALL)/usr/lib -+ CXX = g++ -+ CXXFLAGS += -I$(TI_OCL_INSTALL)/usr/include -+ LDFLAGS += -L$(TI_OCL_INSTALL)/usr/lib - LIBS += -lbfd - - # ---------------------------------------------------------------------------- -@@ -38,20 +37,19 @@ else ifneq (,$(findstring 86, $(UNAME_M))) - - # gcc ARM cross compiler will not, by default, search the host's - # /usr/include. Explicitly specify here to find dependent vendor headers -- cross: override CPP = arm-linux-gnueabihf-g++ -- cross: CPP_FLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include -+ cross: CXXFLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include - - # If cross-compilineg, provide path to dependent ARM libraries on the - # target filesystem -- cross: LD_FLAGS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib -+ cross: LDFLAGS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib - endif - - %.o: %.cpp -- @$(CPP) -c $(CPP_FLAGS) $< -+ @$(CXX) -c $(CXXFLAGS) $< - @echo Compiling $< - - %.o: %.c -- @$(CPP) -c $(CPP_FLAGS) $< -+ @$(CXX) -c $(CXXFLAGS) $< - @echo Compiling $< - - %.obj: %.c -diff --git a/src/kernels/oclconv/Makefile b/src/kernels/oclconv/Makefile -index e271670..c3774f8 100644 ---- a/src/kernels/oclconv/Makefile -+++ b/src/kernels/oclconv/Makefile -@@ -1,12 +1,12 @@ - EXE = liboclconv.so --CPP_FLAGS = -O3 -shared -fPIC -L. -+CXXFLAGS = -O3 -shared -fPIC -L. - CLOCL_FLAGS = - include ../make.inc - - all: ${EXE} - --$(EXE): oclconv.o -- @$(CPP) $(CPP_FLAGS) oclconv.o $(LD_FLAGS) $(LIBS) -o $@ -+$(EXE): oclconv.o -+ @$(CXX) $(CXXFLAGS) oclconv.o $(LDFLAGS) $(LIBS) -o $@ - - oclconv.o: conv.dsp_h - -@@ -16,4 +16,3 @@ conv.dsp_h: conv.cl ${TI_IMGLIB_DIR}/lib/imglib.ae66 ${TI_VLIB_DIR}/packages/ti/ - - install: - mkdir -p ${DESTDIR}/usr/lib && install -m 755 ${EXE} ${DESTDIR}/usr/lib/. -- --- -2.7.4 - diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch deleted file mode 100644 index e3df61ac..00000000 --- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-configure.ac-stop-using-export-symbols-regex.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0fcda9d85c96d5c39dffe21d3bdf01a038b911c9 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 22 Jan 2019 20:39:15 -0500 -Subject: [PATCH] configure.ac: stop using -export-symbols-regex - -The old regex is no longer correct for GStreamer 1.14. - -Bug-Debian: https://bugs.debian.org/894642 - -Upstream-Status: Inappropriate [arago specific] - -Signed-off-by: Denys Dmytriyenko ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fee3161..8159c60 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,7 @@ fi - AC_SUBST(plugindir) - - dnl set proper LDFLAGS for plugins --GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" -+GST_PLUGIN_LDFLAGS="-module -avoid-version $GST_ALL_LDFLAGS" - AC_SUBST(GST_PLUGIN_LDFLAGS) - - AC_CONFIG_FILES([Makefile src/Makefile]) --- -2.7.4 - diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb deleted file mode 100644 index d92efb9b..00000000 --- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "GStreamer elements to use the TI DSP C66 in multimedia applications" -HOMEPAGE = "https://git.ti.com/processor-sdk/gst-plugin-dsp66" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=2827f94fc0a1adeff4d9702e97ce2979" - -SRC_URI = "git://git.ti.com/git/processor-sdk/gst-plugin-dsp66.git;protocol=https;branch=master \ - file://0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch \ - file://0001-configure.ac-stop-using-export-symbols-regex.patch \ -" -SRCREV = "0abedafadbed693592804f23482a9447d81b2dbf" - -S = "${WORKDIR}/git" - -COMPATIBLE_MACHINE = "dra7xx" - -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base opencl ti-cgt6x-native clocl-native imglib-c66x vlib-c66x gettext-native" - -inherit autotools-brokensep pkgconfig gettext -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencl" - -PR = "r1" - -RDEPENDS:${PN} += "opencl-runtime" - -EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \ - TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ -" - -do_configure() { - cd ${S} - chmod +x autogen.sh - ./autogen.sh --host=arm-linux --with-libtool-sysroot=${STAGING_DIR_TARGET} --prefix=/usr -} - -EXTRA_OECONF += "--enable-maintainer-mode" -EXTRA_OEMAKE += "'ERROR_CFLAGS=-Wno-deprecated-declarations'" - -FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" -FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" - -FILES:${PN} += "${libdir}/*.so" -FILES:${PN}-dbg += "${libdir}/.debug" -FILES:${PN}-dev += "${libdir}/*.la" -FILES_SOLIBSDEV = "" - -INSANE_SKIP:${PN} = "ldflags" From patchwork Mon Aug 5 04:37:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47291 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41908C52D76 for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1072.1722832645389681189 for ; Sun, 04 Aug 2024 21:37:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 0674B40CC4; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p_VzZaXUCn09; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id E2DBD40CCB; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 989D3164063; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 13/16] openmpacc: deprecate Date: Mon, 5 Aug 2024 00:37:10 -0400 Message-Id: <20240805043713.172555-13-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15494 From: Denys Dmytriyenko Remove openmpacc component as deprecated and not maintained. Signed-off-by: Denys Dmytriyenko --- ...nativesdk-packagegroup-arago-tisdk-host.bb | 1 - .../recipes-ti/openmpacc/clacc_git.bb | 65 --------------- .../openmpacc/openmpacc-examples_git.bb | 79 ------------------- .../recipes-ti/openmpacc/openmpacc.inc | 27 ------- .../recipes-ti/openmpacc/openmpacc_git.bb | 20 ----- 5 files changed, 192 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb delete mode 100644 meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb delete mode 100644 meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc delete mode 100644 meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb index ed29b6c4..ccc8d380 100644 --- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb +++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb @@ -11,7 +11,6 @@ EXTRA_TI_TOOLS = " \ nativesdk-ti-cgt6x \ nativesdk-ti-cgt-pru \ nativesdk-clocl \ - ${@oe.utils.all_distro_features(d, "opencl openmp", "nativesdk-clacc")} \ nativesdk-open62541-examples \ nativesdk-open62541-tests \ nativesdk-gcc-arm-baremetal \ diff --git a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb deleted file mode 100644 index f56d65cc..00000000 --- a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "TI OpenMP-Acc C compiler" - -include openmpacc.inc - -PR = "${INC_PR}.0" - -DEPENDS = "boost elfutils perl-native" -RDEPENDS:${PN} += "clocl" - -S = "${WORKDIR}/git/host" - -TARGET:class-target = "clacc_arm" -TARGET:class-native = "clacc_x86" -TARGET:class-nativesdk = "clacc_x86" - -export LINUX_DEVKIT_ROOT = "${STAGING_DIR_HOST}" -export X86_HOST_ROOT = "${STAGING_DIR_HOST}" - -PARALLEL_MAKE = "" - -# The variables CLACC_CC and CLACC_CXX are used to point clacc to set its -# host_cc and host_link_cc variables which were previously hardcoded in clacc.h. -# This adds support for different toolchain configurations to build clacc by -# passing in the compiler names at the build stage and removes corresponding -# string replacement requirements in yocto recipes. -python __anonymous() { - cc_name = "" - cxx_name = "" - if d.getVar("TOOLCHAIN_PREFIX"): - cc_name = d.getVar("TOOLCHAIN_PREFIX") + "gcc" - cxx_name = d.getVar("TOOLCHAIN_PREFIX") + "g++" - else: - cc_name = d.getVar("TARGET_PREFIX") + "gcc" - cxx_name = d.getVar("TARGET_PREFIX") + "g++" - - # Convert to upper case to workaround GCC preprocessor bug where the word - # 'linux' is defined to be 1. This results in arm-linux-gnueabihf- being - # stringized to arm-1-gnueabihf- by the GCC preprocessor. To workaround this - # bug, convert the names to upper case and send through. Clacc will convert - # to lower case before usage. - d.setVar("CLACC_CC_NAME", cc_name.upper()) - d.setVar("CLACC_CXX_NAME", cxx_name.upper()) -} - - -EXTRA_OEMAKE = " -C ${S}/clacc \ - ${TARGET} \ - CXX="${CXX}" \ - CLACC_CC="${CLACC_CC_NAME}" \ - CLACC_CXX="${CLACC_CXX_NAME}" \ -" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${bindir} - install -m 755 clacc/${TARGET} ${D}${bindir}/clacc - - install -d ${D}${mandir}/man1 - install -m 644 clacc/clacc.1 ${D}${mandir}/man1 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb b/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb deleted file mode 100644 index 260daf03..00000000 --- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "TI OpenMP-Acc example applications" - -include openmpacc.inc - -PR = "${INC_PR}.1" - -DEPENDS = "openmpacc clacc-native clocl-native ti-cgt6x-native" -RDEPENDS:${PN} += "opencl-runtime" - -S = "${WORKDIR}/git/openmpacc-examples-src" - -OMPACC_EXAMPLE_LIST = " target_update \ - vecadd \ - printf_debug \ - edmamgr \ - dspheap \ - target_orphan_call \ - target_implicit_map \ - vecadd_t \ - vecadd_complex \ - local \ - null \ - dsplib_fft \ - sub_section \ -" - -python do_unpack:append() { - import shutil - - git_dir = d.expand("${WORKDIR}/git/examples") - s = d.getVar("S") - - os.makedirs(s) - shutil.copy(os.path.join(git_dir,"Makefile"),s) - shutil.copy(os.path.join(git_dir,"make.inc"),s) - for example in d.getVar("OMPACC_EXAMPLE_LIST").split(): - shutil.copytree(os.path.join(git_dir,example), os.path.join(s,example)) -} - -EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \ - TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ -" - -MKFILELIST = "vecadd/Makefile vecadd_complex/Makefile dsplib_fft/Makefile \ -null/Makefile dspheap/Makefile target_implicit_map/Makefile printf_debug/Makefile \ -edmamgr/Makefile vecadd_t/Makefile target_orphan_call/Makefile target_update/Makefile \ -sub_section/Makefile local/Makefile" - -do_configure() { - for f in ${MKFILELIST}; do - sed "s|-fopenmp|-fopenmp ${TUNE_CCARGS}${TOOLCHAIN_OPTIONS}|g" -i $f - done -} - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${datadir}/ti/examples/openmpacc - - install -m 644 ${B}/Makefile ${D}${datadir}/ti/examples/openmpacc - install -m 644 ${B}/make.inc ${D}${datadir}/ti/examples/openmpacc - - for ompacc_example in ${OMPACC_EXAMPLE_LIST}; do - install -d ${D}${datadir}/ti/examples/openmpacc/${ompacc_example} - cp -rv ${B}/${ompacc_example}/* ${D}${datadir}/ti/examples/openmpacc/${ompacc_example} - done -} - -FILES:${PN} += "\ - ${datadir}/ti/examples/openmpacc \ -" - -FILES:${PN}-dbg += "\ - ${datadir}/ti/examples/openmpacc/*/.debug \ -" - -INSANE_SKIP:${PN} = "arch ldflags textrel staticdev" diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc deleted file mode 100644 index a54fa48d..00000000 --- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "TI OpenMP Accelerator Model" -HOMEPAGE = "http://downloads.ti.com/mctools/esd/docs/openmpacc/" -LICENSE = "BSD-3-Clause" - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_MACHINE_FEATURES:class-native = "" -REQUIRED_MACHINE_FEATURES:class-nativesdk = "" -REQUIRED_DISTRO_FEATURES = "opencl openmp" - -PV = "1.5.6.0" -INC_PR = "r0" - -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=aaa2a0939d08197132fc382e97b62eb0" - -FILESEXTRAPATHS:prepend := "${THISDIR}/openmpacc:" - -OMPACC_GIT_URI = "git://git.ti.com/git/openmp/ti-openmpacc.git" -OMPACC_GIT_PROTOCOL = "https" -OMPACC_GIT_BRANCH = "master" - -OMPACC_SRCREV = "7c4e68a0bf73ec193edff9dfc23ea764ae6ad434" - -BRANCH = "${OMPACC_GIT_BRANCH}" -SRC_URI = "${OMPACC_GIT_URI};protocol=${OMPACC_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${OMPACC_SRCREV}" diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb deleted file mode 100644 index 7a18e47e..00000000 --- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "TI OpenMP-Acc host runtime and development packages" - -include openmpacc.inc - -PR = "${INC_PR}.1" - -inherit cmake - -DEPENDS = "boost boost-native opencl" -RDEPENDS:${PN} += "opencl-runtime" -RDEPENDS:${PN}-dev += "clacc" - -S = "${WORKDIR}/git/host" - -export TARGET_ROOTDIR = "${STAGING_DIR_HOST}" -export LINUX_DEVKIT_ROOT = "${STAGING_DIR_HOST}" - -EXTRA_OECMAKE += "-DVERSION="${PV}" -DBUILD_OUTPUT=lib" - -FILES:${PN} += "/usr/share/ti/openmpacc/*" From patchwork Mon Aug 5 04:37:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47292 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 310BDC52D73 for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.983.1722832645436572827 for ; Sun, 04 Aug 2024 21:37:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 0FC8F40CC6; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fb9v5d-e1Fz9; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id E4B2640CCC; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id A49E6164064; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 14/16] opencl: deprecate Date: Mon, 5 Aug 2024 00:37:11 -0400 Message-Id: <20240805043713.172555-14-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15495 From: Denys Dmytriyenko Remove opencl components as deprecated and not maintained. Signed-off-by: Denys Dmytriyenko Acked-by: Andrew Davis --- .../conf/distro/include/branding-core.inc | 4 - .../recipes-core/images/arago-image.inc | 1 - ...nativesdk-packagegroup-arago-tisdk-host.bb | 1 - meta-arago-extras/recipes-ti/ocl/clocl_git.bb | 43 ------ ...-resource-table-for-new-Linux-kernel.patch | 95 ------------ meta-arago-extras/recipes-ti/ocl/ocl.inc | 17 --- ...tmpy-Link-with-libdl-to-resolve-link.patch | 42 ----- .../recipes-ti/ocl/opencl-examples_git.bb | 144 ------------------ .../recipes-ti/ocl/opencl-monitor-ipu_git.bb | 64 -------- .../recipes-ti/ocl/opencl-monitor_git.bb | 103 ------------- .../recipes-ti/ocl/opencl-tidl-fw_git.bb | 39 ----- .../recipes-ti/ocl/opencl_git.bb | 79 ---------- 12 files changed, 632 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/ocl/clocl_git.bb delete mode 100644 meta-arago-extras/recipes-ti/ocl/files/0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch delete mode 100644 meta-arago-extras/recipes-ti/ocl/ocl.inc delete mode 100644 meta-arago-extras/recipes-ti/ocl/ocl/0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch delete mode 100644 meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb delete mode 100644 meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb delete mode 100644 meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb delete mode 100644 meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb delete mode 100644 meta-arago-extras/recipes-ti/ocl/opencl_git.bb diff --git a/meta-arago-distro/conf/distro/include/branding-core.inc b/meta-arago-distro/conf/distro/include/branding-core.inc index f183e3a0..1d52ed60 100644 --- a/meta-arago-distro/conf/distro/include/branding-core.inc +++ b/meta-arago-distro/conf/distro/include/branding-core.inc @@ -5,10 +5,6 @@ # The policy is for the "Core" brand to be the default, # hence this file is mostly empty and used as a template -# Lower opencl-monitor priority for now -ALTERNATIVE_PRIORITY:pn-opencl-monitor = "1" -ALTERNATIVE_PRIORITY:pn-opencl-monitor-ipu = "1" - # Raise priority for sample IPC FW images ALTERNATIVE_PRIORITY:pn-ti-ipc-rtos = "15" diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc index 17325619..c4438e5c 100644 --- a/meta-arago-distro/recipes-core/images/arago-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-image.inc @@ -23,7 +23,6 @@ SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" BAD_RECOMMENDATIONS += " \ ti-llvm3.6-dev \ - opencl-monitor-dev \ libulm-dev \ gdbserver-c6x-dev \ coreutils \ diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb index ccc8d380..177fa668 100644 --- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb +++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-tisdk-host.bb @@ -10,7 +10,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" EXTRA_TI_TOOLS = " \ nativesdk-ti-cgt6x \ nativesdk-ti-cgt-pru \ - nativesdk-clocl \ nativesdk-open62541-examples \ nativesdk-open62541-tests \ nativesdk-gcc-arm-baremetal \ diff --git a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb deleted file mode 100644 index b6ad9782..00000000 --- a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "TI OpenCL offline C compiler for compute devices" -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html" -LICENSE = "BSD-3-Clause" - -include ocl.inc - -PR = "${INC_PR}.0" - -DEPENDS = "ti-llvm3.6 ti-llvm3.6-native boost" - -S = "${WORKDIR}/git/host" - -export WANT_LLVM_RELEASE = "3.6-ti" - -TARGET:class-target = "arm" -TARGET:class-native = "x86" -TARGET:class-nativesdk = "x86" - -EXTRA_OEMAKE = " -C ${S}/clocl \ - _PRODUCT_VERSION=${PV} \ - TARGET=${TARGET} \ - LLVM_CONFIG_EXE=${STAGING_BINDIR_NATIVE}/llvm-config \ -" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/clocl/${TARGET}/clocl ${D}${bindir} -} - -RDEPENDS:${PN} += "ti-cgt6x" -BBCLASSEXTEND = "native nativesdk" - -# Disable the "buildpaths" check while we figure out how we are -# going to address this issue. -# -# The ti-llvm3.6 compiler is a custom TI compiler that has not -# been updated for a number of years. It does not currently -# support reproducible builds. -INSANE_SKIP:${PN} += "buildpaths" diff --git a/meta-arago-extras/recipes-ti/ocl/files/0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch b/meta-arago-extras/recipes-ti/ocl/files/0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch deleted file mode 100644 index fcdb2215..00000000 --- a/meta-arago-extras/recipes-ti/ocl/files/0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch +++ /dev/null @@ -1,95 +0,0 @@ -ocl: Update VRING in resource table for new Linux kernel - -- Mark the vring device addresses as FW_RSC_ADDR_ANY, so that Linux kernel - knows it needs to update these to the actual dynamically allocated - memory locations. The virtqueue driver itself will poll for the - completion status of this update. -- The change is backward compatible with 4.19 kernel - -Upstream-Status: Submitted - -Signed-off-by: Yuan Zhao ---- - monitor/src/custom_rsc_table_tci6638.h | 7 +++---- - monitor/src/custom_rsc_table_vayu_dsp.h | 7 +++---- - monitor_ipu/src/custom_rsc_table_vayu_ipu1.h | 7 +++---- - 3 files changed, 9 insertions(+), 12 deletions(-) - -diff --git a/monitor/src/custom_rsc_table_tci6638.h b/monitor/src/custom_rsc_table_tci6638.h -index db6f686..c9f3f49 100644 ---- a/monitor/src/custom_rsc_table_tci6638.h -+++ b/monitor/src/custom_rsc_table_tci6638.h -@@ -49,8 +49,7 @@ - /* flip up bits whose indices represent features we support */ - #define RPMSG_IPU_C0_FEATURES 1 - --#define RPMSG_VRING0_DA 0xA0000000 --#define RPMSG_VRING1_DA 0xA0004000 -+#define RPMSG_VRING_ADDR_ANY FW_RSC_ADDR_ANY - - /* - * sizes of the virtqueues (expressed in number of buffers supported, -@@ -112,8 +111,8 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = { - /* no config data */ - }, - /* the two vrings */ -- { RPMSG_VRING0_DA, 4096, RPMSG_VQ0_SIZE, 1, 0 }, -- { RPMSG_VRING1_DA, 4096, RPMSG_VQ1_SIZE, 2, 0 }, -+ { RPMSG_VRING_ADDR_ANY, 4096, RPMSG_VQ0_SIZE, 1, 0 }, -+ { RPMSG_VRING_ADDR_ANY, 4096, RPMSG_VQ1_SIZE, 2, 0 }, - #endif - - { -diff --git a/monitor/src/custom_rsc_table_vayu_dsp.h b/monitor/src/custom_rsc_table_vayu_dsp.h -index ddcf4a5..f7fe9e7 100644 ---- a/monitor/src/custom_rsc_table_vayu_dsp.h -+++ b/monitor/src/custom_rsc_table_vayu_dsp.h -@@ -138,8 +138,7 @@ - - // Must be marked non-cached by monitor - #define DSP_MEM_IPC_VRING 0xFFF00000 --#define DSP_MEM_RPMSG_VRING0 0xFFF00000 --#define DSP_MEM_RPMSG_VRING1 0xFFF04000 -+#define RPMSG_VRING_ADDR_ANY FW_RSC_ADDR_ANY - #define DSP_MEM_VRING_BUFS0 0xFFF40000 - #define DSP_MEM_VRING_BUFS1 0xFFF80000 - -@@ -272,8 +271,8 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = { - /* no config data */ - }, - /* the two vrings */ -- { DSP_MEM_RPMSG_VRING0, 4096, DSP_RPMSG_VQ0_SIZE, 1, 0 }, -- { DSP_MEM_RPMSG_VRING1, 4096, DSP_RPMSG_VQ1_SIZE, 2, 0 }, -+ { RPMSG_VRING_ADDR_ANY, 4096, DSP_RPMSG_VQ0_SIZE, 1, 0 }, -+ { RPMSG_VRING_ADDR_ANY, 4096, DSP_RPMSG_VQ1_SIZE, 2, 0 }, - - { - TYPE_CARVEOUT, -diff --git a/monitor_ipu/src/custom_rsc_table_vayu_ipu1.h b/monitor_ipu/src/custom_rsc_table_vayu_ipu1.h -index b06ab86..ab80089 100644 ---- a/monitor_ipu/src/custom_rsc_table_vayu_ipu1.h -+++ b/monitor_ipu/src/custom_rsc_table_vayu_ipu1.h -@@ -96,8 +96,7 @@ - - #define IPU_MEM_IPC_VRING 0x60000000 - #define IPU_PHYS_MEM_IPC_VRING 0x9D000000 --#define IPU_MEM_RPMSG_VRING0 0x60000000 --#define IPU_MEM_RPMSG_VRING1 0x60004000 -+#define RPMSG_VRING_ADDR_ANY FW_RSC_ADDR_ANY - - /* - * Sizes of the virtqueues (expressed in number of buffers supported, -@@ -206,8 +205,8 @@ struct my_resource_table ti_ipc_remoteproc_ResourceTable = { - /* no config data */ - }, - /* the two vrings */ -- { IPU_MEM_RPMSG_VRING0, 4096, IPU_RPMSG_VQ0_SIZE, 1, 0 }, -- { IPU_MEM_RPMSG_VRING1, 4096, IPU_RPMSG_VQ1_SIZE, 2, 0 }, -+ { RPMSG_VRING_ADDR_ANY, 4096, IPU_RPMSG_VQ0_SIZE, 1, 0 }, -+ { RPMSG_VRING_ADDR_ANY, 4096, IPU_RPMSG_VQ1_SIZE, 2, 0 }, - - { - TYPE_CARVEOUT, --- -2.17.1 - diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc deleted file mode 100644 index 9a9231a8..00000000 --- a/meta-arago-extras/recipes-ti/ocl/ocl.inc +++ /dev/null @@ -1,17 +0,0 @@ -# patch version at the end needs to be in double digits -PV = "1.2.00.02" -INC_PR = "r0" - -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff" - -FILESEXTRAPATHS:prepend := "${THISDIR}/ocl:" - -OCL_GIT_URI = "git://git.ti.com/git/opencl/ti-opencl.git" -OCL_GIT_PROTOCOL = "https" -OCL_GIT_BRANCH = "master" - -OCL_SRCREV = "b1dfed9af21a1236380b9d643c432e4f0c619fce" - -BRANCH = "${OCL_GIT_BRANCH}" -SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "${OCL_SRCREV}" diff --git a/meta-arago-extras/recipes-ti/ocl/ocl/0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch b/meta-arago-extras/recipes-ti/ocl/ocl/0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch deleted file mode 100644 index 43bc9900..00000000 --- a/meta-arago-extras/recipes-ti/ocl/ocl/0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 79b7c204cafc2c96716b8e91093f135656820e16 Mon Sep 17 00:00:00 2001 -From: Jacob Stiffler -Date: Thu, 5 May 2016 08:35:34 -0400 -Subject: [PATCH] float_compute, matmpy: Link with libdl to resolve linking - error - -* with GCC 5.3 toolchain, linking with libgomp also requires linking - with libdl - -Upstream-Status: Pending - -Signed-off-by: Jacob Stiffler ---- - examples/float_compute/Makefile | 2 +- - examples/matmpy/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/examples/float_compute/Makefile b/examples/float_compute/Makefile -index cb129f3..5514e0e 100644 ---- a/examples/float_compute/Makefile -+++ b/examples/float_compute/Makefile -@@ -5,4 +5,4 @@ CLOCL_FLAGS = - include ../make.inc - - $(EXE): main.o dsp_compute.out -- @$(CPP) $(CPP_FLAGS) main.o $(LD_FLAGS) $(LIBS) -o $@ -lrt -+ @$(CPP) $(CPP_FLAGS) main.o $(LD_FLAGS) $(LIBS) -o $@ -lrt -ldl -diff --git a/examples/matmpy/Makefile b/examples/matmpy/Makefile -index 9b20091..f9e6112 100644 ---- a/examples/matmpy/Makefile -+++ b/examples/matmpy/Makefile -@@ -6,6 +6,6 @@ CLOCL_FLAGS = - include ../make.inc - - $(EXE): main.o kernel.out -- @$(CPP) $(CPP_FLAGS) main.o $(LD_FLAGS) $(LIBS) -lrt -lgomp -o $@ -+ @$(CPP) $(CPP_FLAGS) main.o $(LD_FLAGS) $(LIBS) -lrt -lgomp -ldl -o $@ - - kernel.out: ccode.obj --- -1.9.1 - diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb deleted file mode 100644 index 98b6b64d..00000000 --- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb +++ /dev/null @@ -1,144 +0,0 @@ -SUMMARY = "TI OpenCL example applications" -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html" -LICENSE = "BSD-3-Clause" - -include ocl.inc -require recipes-ti/includes/ti-paths.inc - -PR = "${INC_PR}.1" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEPENDS = "opencl opencl-monitor ti-cgt6x-native clocl-native" - -OCL_PERSISTENT_DEPENDS = "ti-xdctools-native ti-ipc-rtos ti-sysbios" - -DEPENDS:append:dra7xx = " ${OCL_PERSISTENT_DEPENDS}" - -# Split examples into two groups: -# - offline-compile: examples who's kernels are precompiled (offline). -# - runtime-compile: examples who's kernels are compiled during runtime. -PACKAGES =+ "${PN}-runtime-compile ${PN}-runtime-compile-dbg ${PN}-offline-compile ${PN}-offline-compile-dbg" - -RDEPENDS:${PN} = "${PN}-runtime-compile ${PN}-offline-compile" -RDEPENDS:${PN}-dev += "libgomp-dev" -RDEPENDS:${PN}-offline-compile += "opencl-runtime" -RDEPENDS:${PN}-runtime-compile += "opencl" - -S = "${WORKDIR}/git/opencl_example_src" -B = "${S}" - -OCL_RUNTIME_COMPILE_EXAMPLE_LIST = " \ - ccode \ - null \ - ooo_callback \ - simple \ - vecadd \ - vecadd_openmp \ - vecadd_openmp_t \ - vecadd_subdevice \ -" - -OCL_EXAMPLE_LIST = " abort_exit \ - buffer \ - ccode \ - conv1d \ - dgemm \ - dspheap \ - dsplib_fft \ - edmamgr \ - float_compute \ - matmpy \ - monte_carlo \ - null \ - offline \ - offline_embed \ - ooo_callback \ - platforms \ - sgemm \ - simple \ - timeout \ - vecadd \ - vecadd_openmp \ - vecadd_openmp_t \ - vecadd_subdevice \ -" - -OCL_PERSISTENT_EXAMPLE_LIST = " persistent_clock_concurrent \ - persistent_clock_spanning \ - persistent_common \ - persistent_kernel_timeout \ - persistent_messageq_concurrent \ - persistent_task_concurrent \ - persistent_task_spanning \ -" - -OCL_EXAMPLE_LIST:append:dra7xx = " ${OCL_PERSISTENT_EXAMPLE_LIST}" - -OCL_MPAX_EXAMPLE_LIST = " vecadd_mpax \ - vecadd_mpax_openmp \ -" - -python do_unpack:append() { - s = d.getVar("S") - os.makedirs(s) -} - -python do_patch:append() { - import shutil - git_dir = d.expand("${WORKDIR}/git/examples") - s = d.getVar("S") - shutil.copy(os.path.join(git_dir,"Makefile"),s) - shutil.copy(os.path.join(git_dir,"make.inc"),s) - for example in d.getVar("OCL_EXAMPLE_LIST").split(): - shutil.copytree(os.path.join(git_dir,example), os.path.join(s,example)) -} - - -EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \ - TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \ -" - -export XDC_DIR = "${XDC_INSTALL_DIR}/packages" -export IPC_DIR = "${IPC_INSTALL_DIR}/packages" -export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}/packages" - -do_install() { - install -d ${D}${datadir}/ti/examples/opencl - - install ${B}/Makefile ${D}${datadir}/ti/examples/opencl - install ${B}/make.inc ${D}${datadir}/ti/examples/opencl - - for ocl_example in ${OCL_EXAMPLE_LIST}; do - install -d ${D}${datadir}/ti/examples/opencl/${ocl_example} - cp -rv ${B}/${ocl_example}/* ${D}${datadir}/ti/examples/opencl/${ocl_example} - done -} - -# First package the examples which require run-time kernel compilation. -FILES:${PN}-runtime-compile += "\ - ${@' '.join(['${datadir}/ti/examples/opencl/' + example for example in d.getVar('OCL_RUNTIME_COMPILE_EXAMPLE_LIST').split()])} \ -" - -FILES:${PN}-runtime-compile-dbg += "\ - ${@' '.join(['${datadir}/ti/examples/opencl/' + example + '/.debug' for example in d.getVar('OCL_RUNTIME_COMPILE_EXAMPLE_LIST').split()])} \ -" - -# Remaining examples will fall through to the "offline" package. -FILES:${PN}-offline-compile += "\ - ${datadir}/ti/examples/opencl/ \ -" - -FILES:${PN}-offline-compile-dbg += "\ - ${datadir}/ti/examples/opencl/*/.debug \ -" - -# Add makefiles to dev package -FILES:${PN}-dev = "${datadir}/ti/examples/opencl/Makefile \ - ${datadir}/ti/examples/opencl/make.inc" - -ALLOW_EMPTY:${PN} = "1" -INSANE_SKIP:${PN} = "arch ldflags textrel staticdev" -INSANE_SKIP:${PN}-offline-compile = "arch ldflags textrel staticdev" -INSANE_SKIP:${PN}-runtime-compile = "arch ldflags textrel staticdev" diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb deleted file mode 100644 index 4ec9a547..00000000 --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -DESCRIPTION = "TI OpenCL M4/IPU device firmware for AM57x" -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html" -LICENSE = "BSD-3-Clause" - -include ocl.inc -require recipes-ti/includes/arago-paths.inc - -PR = "${INC_PR}.1" -SRC_URI += "file://0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch;patchdir=.." - -inherit update-alternatives - -DEPENDS = " common-csl-ip-rtos \ - pm-lld-rtos \ - ti-xdctools-native \ - ti-ipc-rtos \ - ti-sysbios \ - ti-pdk-build-rtos \ - ti-cgt-arm-native \ - util-linux-native \ - opencl-tidl-fw \ -" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git/monitor_ipu" - -export IPC_DIR = "${IPC_INSTALL_DIR}" -export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}" -export PDK_DIR = "${PDK_INSTALL_DIR}" -export XDC_DIR = "${XDC_INSTALL_DIR}" -export TI_OCL_M4_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/ti-cgt-arm" -export CSL_LIB_M4 = "${PDK_DIR}/packages/ti/csl/lib/am572x/m4/release/ti.csl.aem4" -export PM_HAL_LIB_M4 = "$(PDK_DIR)/packages/ti/drv/pm/lib/am572x/m4/release/pm_hal.aem4" -export OCL_TIDL_FW_DIR = "${OCL_TIDL_FW_INSTALL_DIR}" -export OCL_FPERMS = "664" -export OCL_DPERMS = "775" - -EXTRA_OEMAKE += " BUILD_AM57=1 \ - WORKING_DIRECTORY=${S} \ -" - -do_compile() { - oe_runmake -f Makefile -} - -do_install() { - install -m ${OCL_DPERMS} -d ${D}${base_libdir}/firmware - install -m ${OCL_FPERMS} bin/release/server_ipu1.xem4 ${D}${base_libdir}/firmware/dra7-ipu1-fw.xem4.opencl-monitor -} - -ALTERNATIVE:${PN} = "dra7-ipu1-fw.xem4" -ALTERNATIVE_LINK_NAME[dra7-ipu1-fw.xem4] = "${base_libdir}/firmware/dra7-ipu1-fw.xem4" -ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${base_libdir}/firmware/dra7-ipu1-fw.xem4.opencl-monitor" -ALTERNATIVE_PRIORITY = "100" - -MONITOR_IPU_FIRMWARE = "${base_libdir}/firmware/dra7-ipu1-fw.*" - -FILES:${PN} += " \ - ${MONITOR_IPU_FIRMWARE} \ -" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb deleted file mode 100644 index c5bfe36a..00000000 --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb +++ /dev/null @@ -1,103 +0,0 @@ -DESCRIPTION = "TI OpenCL compute device firmware" -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html" -LICENSE = "BSD-3-Clause" - -include ocl.inc -require recipes-ti/includes/arago-paths.inc - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "dsp" -REQUIRED_DISTRO_FEATURES = "opencl openmp" - -PR = "${INC_PR}.2" -SRC_URI += "file://0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch;patchdir=.." - -inherit update-alternatives - -DEPENDS = " ti-llvm3.6-native \ - common-csl-ip-rtos \ - ti-xdctools-native \ - ti-ipc-rtos \ - ti-sysbios \ - ti-cgt6x-native \ - edma3-lld-rtos \ - ti-xdais \ - ti-framework-components \ - libulm \ - gdbserver-c6x \ - libaet \ - openmp-rtos \ -" - -DEPENDS:append:dra7xx = " opencl-tidl-fw \ -" - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git/monitor" - -BUILD_TARGET:dra7xx = "ARM_AM57" - -export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" -export PDK_DIR = "${PDK_INSTALL_DIR}" -export IPC_DIR = "${IPC_INSTALL_DIR}" -export XDC_DIR = "${XDC_INSTALL_DIR}" -export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}" -export EDMA3LLD_DIR = "${EDMA3_LLD_INSTALL_DIR}" -export XDAIS_DIR = "${XDAIS_INSTALL_DIR}" -export FC_DIR = "${FC_INSTALL_DIR}" -export MPM_DIR = "${MPM_INSTALL_DIR}" -export OMP_DIR = "${OMP_INSTALL_DIR}" -export ULM_DIR ="${STAGING_DIR_TARGET}/usr/share/ti/ulm" -export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x" -export AET_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/ctoolslib/aet" -export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr" -export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages" -export OCL_TIDL_FW_DIR = "${OCL_TIDL_FW_INSTALL_DIR}" -export OCL_FPERMS = "664" -export OCL_DPERMS = "775" -export SHARE_PATH="${D}${datadir}/ti/opencl" - -EXTRA_OEMAKE += " BUILD_OS=linux \ - WORKING_DIRECTORY=${S} \ - BUILD_TARGET=${BUILD_TARGET} \ -" -do_compile() { - oe_runmake -f Makefile -} - -do_install() { - install -m ${OCL_DPERMS} -d ${SHARE_PATH} -} - -install_dsp_objs() { - install -m ${OCL_FPERMS} monitor_${1}/dsp0.out ${SHARE_PATH}/dsp.out - install -m ${OCL_FPERMS} monitor_${1}/dsp0.syms.obj ${SHARE_PATH}/dsp_syms.obj - install -m ${OCL_FPERMS} monitor_${1}/dsp0.syms ${SHARE_PATH}/dsp.syms -} - -do_install:append:dra7xx() { - install_dsp_objs am57x - install -m ${OCL_DPERMS} -d ${D}${base_libdir}/firmware - install -m ${OCL_FPERMS} monitor_am57x/dsp0.out ${D}${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN} - install -m ${OCL_FPERMS} monitor_am57x/dsp1.out ${D}${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN} -} - -ALTERNATIVE:${PN}:dra7xx = "dra7-dsp1-fw.xe66 dra7-dsp2-fw.xe66" -ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66" -ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${base_libdir}/firmware/dra7-dsp1-fw.xe66.${BPN}" -ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66" -ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${base_libdir}/firmware/dra7-dsp2-fw.xe66.${BPN}" -ALTERNATIVE_PRIORITY = "100" - -MONITOR_FIRMWARE = "" -MONITOR_FIRMWARE:dra7xx = "${base_libdir}/firmware/*" - -FILES:${PN} += " \ - ${datadir}/ti/opencl/* \ - ${MONITOR_FIRMWARE} \ -" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb deleted file mode 100644 index 46796147..00000000 --- a/meta-arago-extras/recipes-ti/ocl/opencl-tidl-fw_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "OpenCL TIDL firmware for AM57xx" - -LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=082a028431c455252c1e1d3d1021d382" - -PV = "01.02.00.01" -PR = "r0" - -require recipes-ti/includes/arago-paths.inc - -COMPATIBLE_MACHINE = "dra7xx" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -GIT_URI = "git://git.ti.com/git/opencl/opencl-firmware.git" -GIT_PROTOCOL = "https" -BRANCH = "master" -SRCREV = "9e3d0b34f604203f275fba4807481a8a763a4f63" - -SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${BRANCH}" - -S = "${WORKDIR}/git" - -TARGET = "eve_firmware.bin ocl_tidl_dsp.lib" - -do_install() { - install -d ${D}${OCL_TIDL_FW_INSTALL_DIR_RECIPE} - for f in ${TARGET}; do - install -m 0644 ${S}/$f ${D}${OCL_TIDL_FW_INSTALL_DIR_RECIPE}/$f - done -} - -FILES:${PN} += "${OCL_TIDL_FW_INSTALL_DIR_RECIPE}" - -INSANE_SKIP:${PN} = "arch" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb deleted file mode 100644 index 0bdbed7e..00000000 --- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb +++ /dev/null @@ -1,79 +0,0 @@ -DESCRIPTION = "TI OpenCL host runtime and development packages" -HOMEPAGE = "https://downloads.ti.com/mctools/esd/docs/opencl/index.html" -LICENSE = "BSD-3-Clause" - -include ocl.inc - -PR = "${INC_PR}.3" - -inherit cmake systemd - -COMPATIBLE_MACHINE = "dra7xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# Define runtime package for minimal dependencies to run opencl applications -# which precompile the offloaded kernels. The base package will provide the -# ability to compile kernels (clocl) during runtime. -PACKAGES =+ "${PN}-runtime" - -MONITORS = " opencl-monitor" -MONITORS:append:dra7xx = " opencl-monitor-ipu" - -DEPENDS = " virtual/libgl \ - ${MONITORS} \ - cmake-native \ - cmem \ - ti-llvm3.6 \ - ti-llvm3.6-native \ - binutils \ - sqlite3 \ - libffi \ - boost \ - boost-native \ - libloki \ - pkgconfig-native \ - libulm \ - elfutils \ - json-c \ -" - -DEPENDS:append:dra7xx = " ti-ipc virtual/kernel" - -RDEPENDS:${PN}-runtime += "bash ${MONITORS}" -RDEPENDS:${PN}-dev += "virtual-libgl-dev" -RDEPENDS:${PN} += "${PN}-runtime clocl bash" - -# Use main package to pull in full support -ALLOW_EMPTY:${PN} = "1" - -S = "${WORKDIR}/git/host" - -export WANT_LLVM_RELEASE = "3.6-ti" - -OCL_BUILD_TARGET:dra7xx = "ARM_AM57" - -ENABLE_ULM = "1" -SHMEM_MANAGER = "CMEM" - -EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABLE_ULM=${ENABLE_ULM} -DOCL_VERSION=${PV} -DSHMEM_MANAGER=${SHMEM_MANAGER}" - -EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}" -export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}" - -MCTD = "" -MCTD:dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x" - -do_install:append() { - install -d ${D}${systemd_system_unitdir} - install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service -} - -SYSTEMD_PACKAGES = "${PN}-runtime" -SYSTEMD_SERVICE:${PN}-runtime = "ti-mct-daemon.service" -SYSTEMD_AUTO_ENABLE:${PN}-runtime = "${@oe.utils.conditional("RESERVE_CMEM", "1", "enable", "disable", d)}" - -FILES:${PN}-runtime += "${bindir} ${systemd_system_unitdir} ${sysconfdir}/ti-mctd ${libdir}/lib*${SOLIBS}" - -FILES:${PN} += " \ - ${datadir}/ti/opencl/* \ -" From patchwork Mon Aug 5 04:37:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47293 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F964C52D7B for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1073.1722832645435396707 for ; Sun, 04 Aug 2024 21:37:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 1750A40CC7; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hrh8tV4fl6y0; Mon, 5 Aug 2024 04:37:24 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id EF7F340CCD; Mon, 5 Aug 2024 04:37:22 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id B24DF164065; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 15/16] llvm: deprecate Date: Mon, 5 Aug 2024 00:37:12 -0400 Message-Id: <20240805043713.172555-15-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15493 From: Denys Dmytriyenko Remove llvm component as deprecated and not maintained. Signed-off-by: Denys Dmytriyenko --- .../recipes-core/images/arago-image.inc | 1 - .../recipes-core/llvm/llvm-common.bb | 23 --- .../recipes-core/llvm/llvm-common.bbappend | 5 - .../recipes-core/llvm/llvm-common/llvm-config | 11 -- meta-arago-extras/recipes-core/llvm/llvm.inc | 162 --------------- ...not-check-build-executable-extension.patch | 39 ---- .../recipes-core/llvm/ti-llvm3.6_3.6.bb | 184 ------------------ 7 files changed, 425 deletions(-) delete mode 100644 meta-arago-extras/recipes-core/llvm/llvm-common.bb delete mode 100644 meta-arago-extras/recipes-core/llvm/llvm-common.bbappend delete mode 100644 meta-arago-extras/recipes-core/llvm/llvm-common/llvm-config delete mode 100644 meta-arago-extras/recipes-core/llvm/llvm.inc delete mode 100644 meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch delete mode 100644 meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc index c4438e5c..37b20850 100644 --- a/meta-arago-distro/recipes-core/images/arago-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-image.inc @@ -22,7 +22,6 @@ TOOLCHAIN_HOST_TASK:append = " nativesdk-buildtools-perl-dummy" SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" BAD_RECOMMENDATIONS += " \ - ti-llvm3.6-dev \ libulm-dev \ gdbserver-c6x-dev \ coreutils \ diff --git a/meta-arago-extras/recipes-core/llvm/llvm-common.bb b/meta-arago-extras/recipes-core/llvm/llvm-common.bb deleted file mode 100644 index cf03e434..00000000 --- a/meta-arago-extras/recipes-core/llvm/llvm-common.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Helper script for OE's llvm support" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI = "file://llvm-config" - -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" - -ALLOW_EMPTY:${PN} = "1" -SYSROOT_PREPROCESS_FUNCS:append:class-target = " llvm_common_sysroot_preprocess" - -llvm_common_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 0755 ${S}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ -} - -do_install:class-native() { - install -d ${D}${bindir} - install -m 0755 ${S}/llvm-config ${D}${bindir} -} - -BBCLASSEXTEND = "native" diff --git a/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend b/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend deleted file mode 100644 index 273fb314..00000000 --- a/meta-arago-extras/recipes-core/llvm/llvm-common.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PR:append = ".arago0" - -SYSROOT_PREPROCESS_FUNCS:append:class-nativesdk = " llvm_common_sysroot_preprocess" - -BBCLASSEXTEND += "nativesdk" diff --git a/meta-arago-extras/recipes-core/llvm/llvm-common/llvm-config b/meta-arago-extras/recipes-core/llvm/llvm-common/llvm-config deleted file mode 100644 index b0f33c8d..00000000 --- a/meta-arago-extras/recipes-core/llvm/llvm-common/llvm-config +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Wrapper script for real llvm-config. Simply calls - -if [ $WANT_LLVM_RELEASE ]; then - exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@} -else - echo "To use llvm-common WANT_LLVM_RELEASE needs to be exported." - echo "For example if this is being called through a recipe:" - echo "export WANT_LLVM_RELEASE=\"3.3\"" - exit 1 -fi diff --git a/meta-arago-extras/recipes-core/llvm/llvm.inc b/meta-arago-extras/recipes-core/llvm/llvm.inc deleted file mode 100644 index 64451af8..00000000 --- a/meta-arago-extras/recipes-core/llvm/llvm.inc +++ /dev/null @@ -1,162 +0,0 @@ -# LLVM does not provide ABI stability between different versions. For this -# reason OE makes it possible to build and install different llvm versions -# at the same time. -# -# This is true for the normal recipes as well as the native ones. -# -# All regular installation directories are prefixed with 'llvm${LLVM_RELEASE}' -# e.g. "${STAGING_BINDIR}/llvm2.5" or "${STAGING_INCDIR}/llvm2.5" -# -# For your program or library that makes use of llvm you do should not need to -# modify anything as long as it uses the results of various llvm-config -# invocations. If you need customizations something is wrong and it needs to be -# fixed (report bug). -# -# However the *recipe* for your program/library *must* declare -# export WANT_LLVM_RELEASE = "" -# The version number is picked up by a generic wrapper script which just calls -# the variant of the specified version. - -DESCRIPTION = "The Low Level Virtual Machine" -HOMEPAGE = "http://llvm.org" - -# 3-clause BSD-like -# University of Illinois/NCSA Open Source License -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=d0a3ef0d3e0e8f5cf59e5ffc273ab1f8" - -DEPENDS = "libffi libxml2-native llvm-common" - -inherit perlnative python3native autotools - -LLVM_RELEASE = "${PV}" -LLVM_DIR = "llvm${LLVM_RELEASE}" - -SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz" -S = "${WORKDIR}/llvm-${PV}.src" - -LLVM_BUILD_DIR = "${WORKDIR}/llvm-${PV}.build" -LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" - -EXTRA_OECONF += "--disable-assertions \ - --enable-debug-runtime \ - --disable-expensive-checks \ - --enable-bindings=none \ - --enable-keep-symbols \ - --enable-libffi \ - --enable-optimized \ - --enable-shared \ - --enable-targets=host-only" -EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" - -do_configure:prepend() { - # Remove RPATHs - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' ${S}/Makefile.rules - - # Drop "svn" suffix from version string - sed -i 's/${PV}svn/${PV}/g' ${S}/configure - - # Fix paths in llvm-config - sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp - sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp - - # Fix the hardcoded libdir in llvm-config - sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp - - # Fails to build unless using separate directory from source - mkdir -p ${LLVM_BUILD_DIR} - cd ${LLVM_BUILD_DIR} -} - -do_compile() { - cd ${LLVM_BUILD_DIR} - - # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config - - oe_runmake \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CFLAGS="${BUILD_CFLAGS}" \ - CXX="${BUILD_CXX}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - CPP="${BUILD_CPP}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - NM="${BUILD_NM}" \ - RANLIB="${BUILD_RANLIB}" \ - PATH="${STAGING_BINDIR_NATIVE}:$PATH" \ - cross-compile-build-tools - oe_runmake -} - -do_install() { - cd ${LLVM_BUILD_DIR} - oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install - - mv ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-llvm-config-host ${LLVM_INSTALL_DIR}/llvm-config-host - - install -d ${D}${bindir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/ - - install -d ${D}${includedir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${includedir}/* ${D}${includedir}/${LLVM_DIR}/ - - install -d ${D}${libdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/ - ln -s ${LLVM_DIR}/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so - - install -d ${D}${docdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR} -} - -SYSROOT_PREPROCESS_FUNCS += "llvm_sysroot_preprocess" - -llvm_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} -} - -PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello" -ALLOW_EMPTY:${PN} = "1" -ALLOW_EMPTY:${PN}-staticdev = "1" -FILES:${PN} = "" -FILES:${PN}-staticdev = "" -FILES:${PN}-dbg = " \ - ${bindir}/${LLVM_DIR}/.debug \ - ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \ - ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \ - /usr/src/debug \ -" - -FILES:${PN}-dev = " \ - ${bindir}/${LLVM_DIR} \ - ${includedir}/${LLVM_DIR} \ -" -RRECOMMENDS:${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello" - -FILES:${PN}-bugpointpasses = "\ - ${libdir}/${LLVM_DIR}/BugpointPasses.so \ -" -FILES:${PN}-llvmhello = "\ - ${libdir}/${LLVM_DIR}/LLVMHello.so \ -" - -PACKAGES_DYNAMIC = "^libllvm${LLVM_RELEASE}-.*$" -NOAUTOPACKAGEDEBUG = "1" - -INSANE_SKIP:${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so" - -python llvm_populate_packages() { - libdir = bb.data.expand('${libdir}', d) - libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) - split_dbg_packages = do_split_packages(d, libllvm_libdir+'/.debug', '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s-dbg', 'Split debug package for %s', allow_dirs=True) - split_packages = do_split_packages(d, libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True) - split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) - if split_packages: - pn = d.getVar('PN') - d.appendVar('RDEPENDS:' + pn, ' '+' '.join(split_packages)) - d.appendVar('RDEPENDS:' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) - d.appendVar('RDEPENDS:' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) -} - -PACKAGESPLITFUNCS:prepend = "llvm_populate_packages " diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch deleted file mode 100644 index e9c332ac..00000000 --- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 60da8adc29a84796c9768a1a962eda1915c87332 Mon Sep 17 00:00:00 2001 -From: Jake Stiffler -Date: Fri, 20 Feb 2015 10:55:11 -0500 -Subject: [PATCH] configure: Do not check build executable extension. - - * This seems to cause issues nativesdk and build sdk - architectures are the same. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Jake Stiffler ---- - configure | 3 +++ - 1 files changed, 3 insertions(+) - -diff --git a/configure b/configure -index decbc40..387c4fd 100755 ---- a/configure -+++ b/configure -@@ -4951,6 +4951,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_build_exeext= -+ -+if false; then - if { (eval echo "$as_me:$LINENO: \"$ac_build_link\"") >&5 - (eval $ac_build_link) 2>&5 - ac_status=$? -@@ -4967,6 +4969,7 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - echo "$as_me: error: installation or configuration problem: compiler cannot create executables." >&2;} - { (exit 1); exit 1; }; } - fi -+fi - rm -f conftest* - test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank - fi --- -1.7.9.5 - diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb deleted file mode 100644 index 395651d3..00000000 --- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb +++ /dev/null @@ -1,184 +0,0 @@ -DESCRIPTION = "LLVM 3.6 with support for TI C66x intrinsics" -HOMEPAGE = "https://git.ti.com/opencl/llvm" - -PR = "r7" - -do_configure:prepend:class-native() { - # Fix paths in llvm-config - sed -i "s|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|sys::path::parent_path(CurrentPath))\.str()|g" ${S}/tools/llvm-config/llvm-config.cpp -} - -do_configure:prepend() { - # Workaround for libdir fix for multilib to undo what is currently upstream - sed -i 's:${base_libdir}:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp -} - -require recipes-core/llvm/llvm.inc - -inherit pkgconfig - -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d" - -DEPENDS += "ncurses libxml2 groff-native" -DEPENDS:append:class-target = " valgrind" - -LLVM_DIR = "ti-llvm${PV}" - -LLVM_GIT_NAME = "llvm" -LLVM_GIT_URI = "git://git.ti.com/git/opencl/llvm.git" -LLVM_GIT_PROTOCOL = "https" -LLVM_GIT_BRANCH = "release_36_ti" -LLVM_GIT_DESTSUFFIX = "git" -LLVM_GIT_SRCREV = "09780c6750b30da81e4a0a805aedf1699fbc37c7" - -CLANG_GIT_NAME = "clang" -CLANG_GIT_URI = "git://git.ti.com/git/opencl/clang.git" -CLANG_GIT_PROTOCOL = "https" -CLANG_GIT_BRANCH = "release_36_ti" -CLANG_GIT_DESTSUFFIX = "${LLVM_GIT_DESTSUFFIX}/tools/clang" -CLANG_GIT_SRCREV = "5b006f07bdc22b5ae6917eecdfe243908dd7b029" - -SRC_URI = " \ - ${LLVM_GIT_URI};protocol=${LLVM_GIT_PROTOCOL};branch=${LLVM_GIT_BRANCH};destsuffix=${LLVM_GIT_DESTSUFFIX};name=${LLVM_GIT_NAME} \ - ${CLANG_GIT_URI};protocol=${CLANG_GIT_PROTOCOL};branch=${CLANG_GIT_BRANCH};destsuffix=${CLANG_GIT_DESTSUFFIX};name=${CLANG_GIT_NAME} \ - file://0001-configure-Do-not-check-build-executable-extension.patch \ -" - -SRCREV_${LLVM_GIT_NAME} = "${LLVM_GIT_SRCREV}" -SRCREV_${CLANG_GIT_NAME} = "${CLANG_GIT_SRCREV}" - -SRCREV_FORMAT = "${LLVM_GIT_NAME}" - -S = "${WORKDIR}/git" - -LIBXML2_INC = "`pkg-config libxml-2.0 --cflags`" -LIBXML2_LIBS = "`pkg-config libxml-2.0 --libs`" - -EXTRA_OECONF += " --enable-targets="host,arm,c6000,msp430" \ - --disable-zlib \ - --disable-terminfo \ - --disable-libedit \ -" - -EXTRA_OEMAKE += "LIBXML2_INC="${LIBXML2_INC}" LIBXML2_LIBS="${LIBXML2_LIBS}"" - -do_compile:class-native() { - cd ${LLVM_BUILD_DIR} - - # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config - - oe_runmake -} - -do_compile:class-nativesdk() { - # Fix for buildpaths error referring to TMPDIR - sed -i 's:@LLVM_SRC_ROOT@::g' ${S}/tools/llvm-config/BuildVariables.inc.in - sed -i 's:@LLVM_OBJ_ROOT@::g' ${S}/tools/llvm-config/BuildVariables.inc.in - - cd ${LLVM_BUILD_DIR} - - # Fix libdir for multilib - sed -i 's:(PROJ_prefix)/lib:(PROJ_prefix)/${baselib}:g' Makefile.config - - oe_runmake \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CFLAGS="${BUILD_CFLAGS}" \ - CXX="${BUILD_CXX}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - CPP="${BUILD_CPP}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - LD="${BUILD_LD}" \ - LDFLAGS="${BUILD_LDFLAGS}" \ - NM="${BUILD_NM}" \ - RANLIB="${BUILD_RANLIB}" \ - PATH="${STAGING_BINDIR_NATIVE}:$PATH" \ - cross-compile-build-tools - - # Workaround for timestamp issue on built-tools - for f in ${LLVM_BUILD_DIR}/BuildTools/Release/bin/* - do - touch $f - done - - oe_runmake -} - -# Workaround for libdir fix for multilib -do_compile() { - cd ${LLVM_BUILD_DIR} - - # Fix libdir for multilib - sed -i 's:(PROJ_prefix)${base_libdir}:(PROJ_prefix)/${baselib}:g' Makefile.config - - oe_runmake \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CFLAGS="${BUILD_CFLAGS}" \ - CXX="${BUILD_CXX}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - CPP="${BUILD_CPP}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - NM="${BUILD_NM}" \ - RANLIB="${BUILD_RANLIB}" \ - PATH="${STAGING_BINDIR_NATIVE}:$PATH" \ - cross-compile-build-tools - oe_runmake -} - -do_install:append:class-target() { - for b in ${D}${bindir}/${LLVM_DIR}/${HOST_SYS}-clang*; do - if [ ! -L ${b} ]; then - mv ${b} ${D}${bindir}/`echo "${b}" | sed -e 's|${D}${bindir}/${LLVM_DIR}/${HOST_SYS}-||g'` - fi - done -} - -do_install:class-native() { - cd ${LLVM_BUILD_DIR} - oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install - - mv ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-llvm-config ${LLVM_INSTALL_DIR}/llvm-config${PV}-ti - - install -d ${D}${bindir} - for b in ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-clang*; do - if [ ! -L ${b} ]; then - mv ${b} ${D}${bindir}/`echo "${b}" | sed -e 's|${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-||g'` - fi - done - - install -d ${D}${bindir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/ - - install -d ${D}${includedir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${includedir}/* ${D}${includedir}/${LLVM_DIR}/ - - install -d ${D}${libdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/ - ln -s ${LLVM_DIR}/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so - - install -d ${D}${docdir}/${LLVM_DIR} - mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR} - - install -d ${D}${bindir} - install -m 0755 ${LLVM_INSTALL_DIR}/llvm-config${PV}-ti ${D}${bindir} -} - - -SYSROOT_PREPROCESS_FUNCS:class-target += "llvm_sysroot_preprocess_target" -SYSROOT_PREPROCESS_FUNCS:class-nativesdk += "llvm_sysroot_preprocess_target" - -llvm_sysroot_preprocess() { - : -} - -llvm_sysroot_preprocess_target() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}-ti -} - -INSANE_SKIP:${PN} += "installed-vs-shipped" -INSANE_SKIP:${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.0 += "dev-so" - -BBCLASSEXTEND = "native nativesdk" From patchwork Mon Aug 5 04:37:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 47286 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12CADC3DA4A for ; Mon, 5 Aug 2024 04:37:34 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.1074.1722832646562814796 for ; Sun, 04 Aug 2024 21:37:26 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E6CC840C21; Mon, 5 Aug 2024 04:37:25 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id keZ-QGl-2lvG; Mon, 5 Aug 2024 04:37:25 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D097840CAF; Mon, 5 Aug 2024 04:37:23 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id BE9D7164066; Mon, 5 Aug 2024 00:37:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][RFC PATCH 16/16] arago-paths.inc: remove Date: Mon, 5 Aug 2024 00:37:13 -0400 Message-Id: <20240805043713.172555-16-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240805043713.172555-1-denis@denix.org> References: <20240805043713.172555-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 05 Aug 2024 04:37:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15497 From: Denys Dmytriyenko This include file was referenced from many deprecated components and is no longer needed, remove. Signed-off-by: Denys Dmytriyenko --- .../recipes-ti/includes/arago-paths.inc | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/includes/arago-paths.inc diff --git a/meta-arago-extras/recipes-ti/includes/arago-paths.inc b/meta-arago-extras/recipes-ti/includes/arago-paths.inc deleted file mode 100644 index 3c0c3863..00000000 --- a/meta-arago-extras/recipes-ti/includes/arago-paths.inc +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-ti/includes/ti-paths.inc - -export LIBARCH_INSTALL_DIR_RECIPE = "${installdir}/ti-libarch-tree" -export LINALG_INSTALL_DIR_RECIPE = "${installdir}/ti-linalg-tree" -export OCL_TIDL_FW_INSTALL_DIR_RECIPE = "${installdir}/ti-opencl-tidl-fw-tree" -export FFTLIB_INSTALL_DIR_RECIPE = "${installdir}/ti-fftlib-tree" -export FFTW_INSTALL_DIR_RECIPE = "${installdir}/ti-fftw-tree" -export TIOVX_INSTALL_DIR_RECIPE = "${installdir}/ti-tiovx-lib-tree" - -export LIBARCH_INSTALL_DIR = "${STAGING_DIR_TARGET}${LIBARCH_INSTALL_DIR_RECIPE}" -export LINALG_INSTALL_DIR = "${STAGING_DIR_TARGET}${LINALG_INSTALL_DIR_RECIPE}" -export OCL_TIDL_FW_INSTALL_DIR = "${STAGING_DIR_TARGET}${OCL_TIDL_FW_INSTALL_DIR_RECIPE}" -export FFTLIB_INSTALL_DIR = "${STAGING_DIR_TARGET}${FFTLIB_INSTALL_DIR_RECIPE}" -export FFTW_INSTALL_DIR = "${STAGING_DIR_TARGET}${FFTW_INSTALL_DIR_RECIPE}" -export TIOVX_INSTALL_DIR = "${STAGING_DIR_TARGET}${TIOVX_INSTALL_DIR_RECIPE}"