Re: [RFC][PATCH] opencl, openmp: don't hardcode specific toolchain, pass the one being used for the build

[Denys Dmytriyenko <denys@ti.com>]

Yes, that was my intention with this RFC. I'll start a separate discussion 
with mctools guys to get it fixed in their code, eventually. Meanwhile, we 
might need these changes to get us going...

-- 
Denys


On Thu, Dec 08, 2016 at 03:53:49PM -0500, Jacob Stiffler wrote:
> Is this something we should propose to fix in the sources?
> 
> - Jake
> 
> 
> On 12/7/2016 3:25 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> >  meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb | 10 +++++++---
> >  meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb     |  9 +++++++--
> >  .../recipes-ti/openmpacc/openmpacc-examples_git.bb      | 17 +++++++++++++++--
> >  3 files changed, 29 insertions(+), 7 deletions(-)
> >
> >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..c69b7e2 100644
> >--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> >+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> >@@ -1,10 +1,10 @@
> >-DESCRIPTION = "TI OpenCL example applications"
> >+SUMMARY = "TI OpenCL example applications"
> >  HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
> >  LICENSE = "BSD"
> >  include ocl.inc
> >-PR = "${INC_PR}.0"
> >+PR = "${INC_PR}.1"
> >  COMPATIBLE_MACHINE = "dra7xx|keystone"
> >  PACKAGE_ARCH = "${MACHINE_ARCH}"
> >@@ -55,8 +55,12 @@ EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \
> >                   TI_OCL_CGT_INSTALL=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x \
> >  "
> >+do_configure() {
> >+    sed "s|arm-linux-gnueabihf-g++|${CXX}|g" -i make.inc
> >+}
> >+
> >  do_compile() {
> >-    oe_runmake
> >+    oe_runmake CC="${CC}" CPP="${CPP}" CXX="${CXX}"
> >  }
> >  do_install() {
> >diff --git a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb
> >index f41c291..75ce462 100644
> >--- a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb
> >+++ b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb
> >@@ -1,8 +1,8 @@
> >-DESCRIPTION = "TI OpenMP-Acc C compiler"
> >+SUMMARY = "TI OpenMP-Acc C compiler"
> >  include openmpacc.inc
> >-PR = "${INC_PR}.0"
> >+PR = "${INC_PR}.1"
> >  DEPENDS = "boost elfutils"
> >  RDEPENDS_${PN} += "clocl"
> >@@ -23,6 +23,11 @@ EXTRA_OEMAKE = " -C ${S}/clacc \
> >                    CXX="${CXX}" \
> >  "
> >+do_configure() {
> >+    sed "s|arm-linux-gnueabihf-gcc|${TOOLCHAIN_PREFIX}gcc|g" -i clacc/clacc.h
> >+    sed "s|arm-linux-gnueabihf-g++|${TOOLCHAIN_PREFIX}g++|g" -i clacc/clacc.h
> >+}
> >+
> >  do_compile() {
> >      oe_runmake
> >  }
> >diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb b/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb
> >index 703e754..e96fa76 100644
> >--- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb
> >+++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb
> >@@ -1,8 +1,8 @@
> >-DESCRIPTION = "TI OpenMP-Acc example applications"
> >+SUMMARY = "TI OpenMP-Acc example applications"
> >  include openmpacc.inc
> >-PR = "${INC_PR}.0"
> >+PR = "${INC_PR}.1"
> >  DEPENDS = "openmpacc clacc-native clocl-native ti-cgt6x-native"
> >  RDEPENDS_${PN} += "opencl-runtime"
> >@@ -44,6 +44,19 @@ 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 \
> >+edmabw/Makefile sub_section/Makefile vecadd_lib/Makefile local/Makefile"
> >+
> >+do_configure() {
> >+    sed "s|arm-linux-gnueabihf-gcc|${CC}|g" -i make.inc
> >+    sed "s|arm-linux-gnueabihf-g++|${CXX}|g" -i make.inc
> >+    for f in ${MKFILELIST}; do
> >+        sed "s|-fopenmp|-fopenmp ${TUNE_CCARGS}${TOOLCHAIN_OPTIONS}|g" -i $f
> >+    done
> >+}
> >+
> >  do_compile() {
> >      oe_runmake
> >  }
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago