[krogoth][PATCH 1/2] ocl: update to version 1.1.12.0

[krogoth][PATCH 1/2] ocl: update to version 1.1.12.0

[Jacob Stiffler]

* opencl : add systemd service for MCT daemon
* monitor : sources unified between platforms
* examples : add new examples

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-ti/ocl/ocl.inc                |  4 ++--
 meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb |  2 ++
 meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb  |  2 --
 meta-arago-extras/recipes-ti/ocl/opencl_git.bb          | 12 +++++++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
index 38f08b9..94e3dd8 100644
--- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
+++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
@@ -1,4 +1,4 @@
-PV = "1.1.11.2"
+PV = "1.1.12.0"
 INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
@@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
 OCL_GIT_PROTOCOL = "git"
 OCL_GIT_BRANCH = "master"
 
-OCL_SRCREV = "5a8f16bb1809a410b961292ae070d079b89e749a"
+OCL_SRCREV = "8c0ec9c270cafaef0a56c376fc28c1b7714cb09c"
 
 BRANCH = "${OCL_GIT_BRANCH}"
 SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index 2a4b714..f01d5e1 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -35,6 +35,8 @@ OCL_EXAMPLE_LIST = " buffer \
                      vecadd_openmp \
                      vecadd_openmp_t \
                      dgemm \
+                     abort_exit \
+                     timeout \
 "
 
 python do_unpack_append() {
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
index 8fc1e81..c0a8a6c 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -45,8 +45,6 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/monitor"
-S_dra7xx = "${WORKDIR}/git/monitor_vayu"
-S_k2g = "${WORKDIR}/git/monitor_vayu"
 
 BUILD_TARGET_k2hk-evm = "ARM_K2H"
 BUILD_TARGET_k2l-evm  = "ARM_K2L"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 9676687..1d39274 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -6,7 +6,7 @@ include ocl.inc
 
 PR = "${INC_PR}.0"
 
-inherit cmake
+inherit cmake systemd
 
 COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -58,6 +58,16 @@ EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABL
 EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}"
 export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
 
+MCTD = "${S}/mct-daemon/ti-mct-daemon.service.k2x"
+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_SERVICE_${PN} = "ti-mct-daemon.service"
+
 FILES_${PN} += " \
     ${datadir}/ti/opencl/* \
 "
-- 
2.7.4

[krogoth][PATCH 2/2] opencl-examples: add persistent examples for dra7xx

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../recipes-ti/ocl/opencl-examples_git.bb            | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index f01d5e1..2cd12dc 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
 LICENSE = "BSD"
 
 include ocl.inc
+require recipes-ti/includes/ti-paths.inc
 
 PR = "${INC_PR}.0"
 
@@ -11,6 +12,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "opencl ti-cgt6x-native clocl-native"
 
+OCL_PERSISTENT_DEPENDS = "ti-xdctools ti-ipc-rtos ti-sysbios"
+
+DEPENDS_append_dra7xx = " ${OCL_PERSISTENT_DEPENDS}"
+
 RDEPENDS_${PN} += " opencl-runtime"
 RDEPENDS_${PN}-dev += " libgomp-dev"
 
@@ -39,6 +44,17 @@ OCL_EXAMPLE_LIST = " buffer \
                      timeout \
 "
 
+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}"
+
 python do_unpack_append() {
     import shutil
 
@@ -57,6 +73,10 @@ 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_compile() {
     oe_runmake
 }
-- 
2.7.4