[PATCH 1/3] Revert "HACK: opencl: disable cmem dependency due to build failure"

[PATCH 1/3] Revert "HACK: opencl: disable cmem dependency due to build failure"

[Jacob Stiffler]

This reverts commit 2ad662005f4778a4082103a67bb42661187c41e3.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-ti/ocl/opencl_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 028ae81..7954f2f 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -13,10 +13,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES += " ${PN}-runtime"
 
-#            cmem
 DEPENDS = " ocl-gl-headers \
             opencl-monitor \
             cmake-native \
+            cmem \
             ti-llvm3.6 \
             ti-llvm3.6-native \
             binutils \
-- 
2.7.4

[PATCH 2/3] ocl: Bump SRCREV to version 1.1.8.1

[Jacob Stiffler]

* Re-work GDB debug setup with IpcPower presence
* Inline more OpenCL BIFs for OpenCV use cases
* Add monte_carlo example

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 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
index be596e3..896a0cb 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.8.0"
+PV = "1.1.8.1"
 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 = "07577df55e6a81a1b7ca85b7007baa221e24adb2"
+OCL_SRCREV = "68ea4a809f1d4e00fe99db023704fdc15c1482fa"
 
 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 981e5ad..e084463 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -28,6 +28,7 @@ OCL_EXAMPLE_LIST = " buffer \
                      simple \
                      vecadd \
                      matmpy \
+                     monte_carlo \
                      ooo_callback \
                      edmamgr \
                      sgemm \
-- 
2.7.4

[PATCH 3/3] opencl-examples: examples with openmp need to link with libdl

[Jacob Stiffler]

* GCC 5.3 got a little more strict, and executables which link with
  libgomp, now also need to link with libdl

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 ...te-matmpy-Link-with-libdl-to-resolve-link.patch | 40 ++++++++++++++++++++++
 .../recipes-ti/ocl/opencl-examples_git.bb          |  4 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 meta-arago-extras/recipes-ti/ocl/ocl/0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch

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
new file mode 100644
index 0000000..dd13d73
--- /dev/null
+++ b/meta-arago-extras/recipes-ti/ocl/ocl/0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch
@@ -0,0 +1,40 @@
+From 79b7c204cafc2c96716b8e91093f135656820e16 Mon Sep 17 00:00:00 2001
+From: Jacob Stiffler <j-stiffler@ti.com>
+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
+
+Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
+---
+ 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
index e084463..da14f1a 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -4,7 +4,9 @@ LICENSE = "BSD"
 
 include ocl.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+SRC_URI_append = " file://0001-float_compute-matmpy-Link-with-libdl-to-resolve-link.patch;pnum=2"
 
 COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
2.7.4

Re: [PATCH 1/3] Revert "HACK: opencl: disable cmem dependency due to build failure"

[Denys Dmytriyenko]

NACK, I'm sitting on a patch to disable all previous hacks in one go. Can't 
push it due to the other breakage we've discussed.

On Thu, May 05, 2016 at 11:09:00AM -0400, Jacob Stiffler wrote:
> This reverts commit 2ad662005f4778a4082103a67bb42661187c41e3.
> 
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  meta-arago-extras/recipes-ti/ocl/opencl_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> index 028ae81..7954f2f 100644
> --- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> +++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> @@ -13,10 +13,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
>  PACKAGES += " ${PN}-runtime"
>  
> -#            cmem
>  DEPENDS = " ocl-gl-headers \
>              opencl-monitor \
>              cmake-native \
> +            cmem \
>              ti-llvm3.6 \
>              ti-llvm3.6-native \
>              binutils \
> -- 
> 2.7.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago