From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by arago-project.org (Postfix) with ESMTPS id 85D6D529C0 for ; Wed, 11 Dec 2019 22:55:50 +0000 (UTC) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id xBBMsFs8075271 for ; Wed, 11 Dec 2019 16:54:15 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1576104855; bh=SKIucCWPt/sqTwZUsfFPnPMAxzMsfrkBeq61ZZS5tbw=; h=Date:From:To:CC:Subject:References:In-Reply-To; b=dYDMePBhUQD8k5SyW7NsAhkQq9MLcPtirPqd46ZVMLxt/9jfa/+jjUMbrUVx9Z2Cu V3i90Kopya1aA6+KTBWdqY8PWGVUvYxzyLusMl4W/s0Sz8kMxbJwUEPcuz+80EuOA4 dfTuT9KzrEn2K/ZEdxspXZn1fJWSXHYU4UfO71vI= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xBBMsFgb101995 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 11 Dec 2019 16:54:15 -0600 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Wed, 11 Dec 2019 16:54:15 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Wed, 11 Dec 2019 16:54:15 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBBMsFEo036265; Wed, 11 Dec 2019 16:54:15 -0600 Date: Wed, 11 Dec 2019 17:54:15 -0500 From: Denys Dmytriyenko To: Gaurav Mitra Message-ID: <20191211225414.GD11359@beryl> References: <20191210220730.62498-1-gaurav@ti.com> MIME-Version: 1.0 In-Reply-To: <20191210220730.62498-1-gaurav@ti.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Cc: meta-arago@arago-project.org Subject: Re: [PATCH] openmpacc: update to version 01.05.06.00 X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Dec 2019 22:55:50 -0000 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Thank you for the patch! On Tue, Dec 10, 2019 at 04:07:30PM -0600, Gaurav Mitra wrote: > - Changes for openmpacc examples: Removed vecadd_lib, edmabw > - Changes for clacc host_cc and host_link_cc parameters: Determine target > compiler name directly from CMake > - Documentation update regarding no support for variadic functions in > target regions > > Signed-off-by: Gaurav Mitra > --- > .../recipes-ti/openmpacc/clacc_git.bb | 28 ++++++++++++++++++---- > .../recipes-ti/openmpacc/openmpacc-examples_git.bb | 8 +------ > .../recipes-ti/openmpacc/openmpacc.inc | 4 ++-- > .../recipes-ti/openmpacc/openmpacc_git.bb | 4 ---- > 4 files changed, 26 insertions(+), 18 deletions(-) > > diff --git a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb > index 75ce4628..f69869d8 100644 > --- a/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb > +++ b/meta-arago-extras/recipes-ti/openmpacc/clacc_git.bb > @@ -18,16 +18,34 @@ 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() { > + if d.getVar("TOOLCHAIN_PREFIX"): > + cc_name = d.getVar("TOOLCHAIN_PREFIX") + "gcc" > + cxx_name = d.getVar("TOOLCHAIN_PREFIX") + "g++" What happens when TOOLCHAIN_PREFIX is not defined, CLACC_CC_NAME and CLACC_CXX_NAME below won't be defined as well. You might want to add else statement to derive them from TARGET_PREFIX instead. > + > + # 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_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 b2f4122c..39902f8f 100644 > --- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb > +++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc-examples_git.bb > @@ -21,8 +21,6 @@ OMPACC_EXAMPLE_LIST = " target_update \ > local \ > null \ > dsplib_fft \ > - vecadd_lib \ > - edmabw \ > sub_section \ > " > > @@ -35,7 +33,6 @@ python do_unpack_append() { > os.makedirs(s) > shutil.copy(os.path.join(git_dir,"Makefile"),s) > shutil.copy(os.path.join(git_dir,"make.inc"),s) > - shutil.copy(os.path.join(git_dir,"ompacc_env.sh"),s) > for example in d.getVar("OMPACC_EXAMPLE_LIST").split(): > shutil.copytree(os.path.join(git_dir,example), os.path.join(s,example)) > } > @@ -47,11 +44,9 @@ EXTRA_OEMAKE = " TARGET_ROOTDIR=${STAGING_DIR_HOST} \ > 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" > +sub_section/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 > @@ -66,7 +61,6 @@ do_install() { > > install -m 644 ${B}/Makefile ${D}${datadir}/ti/examples/openmpacc > install -m 644 ${B}/make.inc ${D}${datadir}/ti/examples/openmpacc > - install -m 644 ${B}/ompacc_env.sh ${D}${datadir}/ti/examples/openmpacc > > for ompacc_example in ${OMPACC_EXAMPLE_LIST}; do > install -d ${D}${datadir}/ti/examples/openmpacc/${ompacc_example} > diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc > index ce0236d4..d33a156b 100644 > --- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc > +++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc > @@ -2,7 +2,7 @@ SUMMARY = "TI OpenMP Accelerator Model" > HOMEPAGE = "http://downloads.ti.com/mctools/esd/docs/openmpacc/" > LICENSE = "BSD" > > -PV = "1.5.4.0" > +PV = "1.5.6.0" > INC_PR = "r0" > > LIC_FILES_CHKSUM = "file://../debian/copyright;md5=aaa2a0939d08197132fc382e97b62eb0" > @@ -13,7 +13,7 @@ OMPACC_GIT_URI = "git://git.ti.com/openmp/ti-openmpacc.git" > OMPACC_GIT_PROTOCOL = "git" > OMPACC_GIT_BRANCH = "master" > > -OMPACC_SRCREV = "808cef58b4ed196a9ced2310d419dbaf63dfbeb6" > +OMPACC_SRCREV = "7c4e68a0bf73ec193edff9dfc23ea764ae6ad434" > > BRANCH = "${OMPACC_GIT_BRANCH}" > SRC_URI = "${OMPACC_GIT_URI};protocol=${OMPACC_GIT_PROTOCOL};branch=${BRANCH}" > diff --git a/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb b/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb > index a28a9225..44b59a4f 100644 > --- a/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb > +++ b/meta-arago-extras/recipes-ti/openmpacc/openmpacc_git.bb > @@ -18,7 +18,3 @@ export LINUX_DEVKIT_ROOT = "${STAGING_DIR_HOST}" > EXTRA_OECMAKE += "-DVERSION="${PV}" -DBUILD_OUTPUT=lib" > > FILES_${PN} += "/usr/share/ti/openmpacc/*" > - > -do_configure_prepend() { > - sed -i -e 's/-march=armv7-a//' ${S}/libompacc/CMakeLists.txt > -} > -- > 2.14.1 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago