Thanks! Merging it now to rocko-next.
On Fri, Apr 20, 2018 at 04:27:05PM -0500, Yuan Zhao wrote: > - opencl: add monitor build recipe for ipu > - opencl: update examples list > > Signed-off-by: Yuan Zhao <[email protected]> > --- > meta-arago-extras/recipes-ti/ocl/ocl.inc | 4 +- > .../recipes-ti/ocl/opencl-examples_git.bb | 29 ++++++++---- > .../recipes-ti/ocl/opencl-monitor-ipu_git.bb | 53 > ++++++++++++++++++++++ > meta-arago-extras/recipes-ti/ocl/opencl_git.bb | 6 ++- > 4 files changed, 79 insertions(+), 13 deletions(-) > create mode 100644 meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb > > diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc > b/meta-arago-extras/recipes-ti/ocl/ocl.inc > index 635bb911..dd336397 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.14.11" > +PV = "1.1.15.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 = "6bbf15687cffc62567848e2c041e9c2dbddea999" > +OCL_SRCREV = "78b0bc0eb38e76a057bc20ed2e3e485f262a9349" > > 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 5721e581..25b01258 100644 > --- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb > @@ -5,7 +5,7 @@ LICENSE = "BSD" > include ocl.inc > require recipes-ti/includes/ti-paths.inc > > -PR = "${INC_PR}.1" > +PR = "${INC_PR}.0" > > COMPATIBLE_MACHINE = "dra7xx|keystone" > PACKAGE_ARCH = "${MACHINE_ARCH}" > @@ -22,26 +22,29 @@ RDEPENDS_${PN}-dev += " libgomp-dev" > S = "${WORKDIR}/git/opencl_example_src" > B = "${S}" > > -OCL_EXAMPLE_LIST = " buffer \ > +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 \ > - matmpy \ > - monte_carlo \ > - ooo_callback \ > - edmamgr \ > - sgemm \ > vecadd_openmp \ > vecadd_openmp_t \ > - dgemm \ > - abort_exit \ > - timeout \ > + vecadd_subdevice \ > " > > OCL_PERSISTENT_EXAMPLE_LIST = " persistent_clock_concurrent \ > @@ -55,6 +58,12 @@ OCL_PERSISTENT_EXAMPLE_LIST = " > persistent_clock_concurrent \ > > OCL_EXAMPLE_LIST_append_dra7xx = " ${OCL_PERSISTENT_EXAMPLE_LIST}" > > +OCL_MPAX_EXAMPLE_LIST = " vecadd_mpax \ > + vecadd_mpax_openmp \ > +" > + > +OCL_EXAMPLE_LIST_append_k2hk = " ${OCL_MPAX_EXAMPLE_LIST}" > + > python do_unpack_append() { > import shutil > > 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 > new file mode 100644 > index 00000000..d560744a > --- /dev/null > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor-ipu_git.bb > @@ -0,0 +1,53 @@ > +DESCRIPTION = "TI OpenCL M4/IPU device firmware for AM57x" > +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" > + > +inherit cmake 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 \ > +" > + > +COMPATIBLE_MACHINE = "am57xx-evm|am57xx-hs-evm" > +PACKAGE_ARCH = "${MACHINE_ARCH}" > + > +S = "${WORKDIR}/git/monitor_ipu" > + > +BUILD_TARGET = "ARM_AM57" > + > +EXTRA_OECMAKE += " -DCROSS_COMPILE=TRUE \ > + -DOCL_MONITOR_IPU_DIR=${S} \ > + -DBUILD_OUTPUT=all \ > +" > + > +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" > + > +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_git.bb > b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb > index fdc822d0..d1aed8a1 100644 > --- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb > +++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb > @@ -35,9 +35,13 @@ DEPENDS_append_dra7xx = " ti-ipc virtual/kernel" > DEPENDS_append_keystone = " mpm-transport multiprocmgr" > DEPENDS_remove_k2g = " libulm" > > +MONITORS = " opencl-monitor" > +MONITORS_append_am57xx-evm = " opencl-monitor-ipu" > +MONITORS_append_am57xx-hs-evm = " opencl-monitor-ipu" > + > RDEPENDS_${PN} += " bash" > RDEPENDS_${PN}-dev += " ocl-gl-headers-dev opencl-monitor" > -RDEPENDS_${PN}-runtime += " ${PN} opencl-monitor clocl ti-cgt6x" > +RDEPENDS_${PN}-runtime += " ${PN} ${MONITORS} clocl ti-cgt6x" > > ALLOW_EMPTY_${PN}-runtime = "1" > > -- > 2.14.1 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
