From 7cd64cc018d4eed644826076ec3eae3573f24e8f Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 3 Sep 2021 09:20:02 +0800 Subject: opencl-clang: restructure Restructured recipes, having common code in .inc Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../recipes-opencl/opencl-clang/opencl-clang.inc | 24 +++++++++++++++++++ .../opencl-clang/opencl-clang_10.0.0.bb | 28 ++++------------------ .../opencl-clang/opencl-clang_11.0.0.bb | 26 +++----------------- .../opencl-clang/opencl-clang_12.0.0.bb | 25 +++---------------- 4 files changed, 34 insertions(+), 69 deletions(-) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc new file mode 100644 index 00000000..1d9b4d51 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc @@ -0,0 +1,24 @@ +SUMMARY = "Common clang is a thin wrapper library around clang" +DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ + to compile OpenCL C kernels to SPIR-V modules." + +LICENSE = "NCSA" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" + +SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \ + " +S = "${WORKDIR}/git" + +inherit cmake +DEPENDS += "clang" +DEPENDS:append:class-target = " opencl-clang-native" + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST:libc-musl = "null" + +do_install:append:class-native() { + install -d ${D}${bindir} + install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb index c870b90b..e08f2278 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb @@ -1,35 +1,15 @@ -SUMMARY = "Common clang is a thin wrapper library around clang" -DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ - to compile OpenCL C kernels to SPIR-V modules." +require opencl-clang.inc -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" - -SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol=https \ - file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ +SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ file://0001-Building-in-tree-with-LLVM-10.0-with-the-LLVM_LINK_L.patch \ " SRC_URI:append:class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" -SRCREV = "c8cd72e32b6abc18ce6da71c357ea45ba78b52f0" - -S = "${WORKDIR}/git" - -inherit cmake -DEPENDS += "clang" -DEPENDS:append:class-target = " opencl-clang-native" +BRANCH = "ocl-open-100" -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" +SRCREV = "c8cd72e32b6abc18ce6da71c357ea45ba78b52f0" EXTRA_OECMAKE += "\ -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ -DCMAKE_SKIP_RPATH=TRUE \ " - -do_install:append:class-native() { - install -d ${D}${bindir} - install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb index e0b12d1f..60d5f0cc 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_11.0.0.bb @@ -1,35 +1,15 @@ -SUMMARY = "Common clang is a thin wrapper library around clang" -DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ - to compile OpenCL C kernels to SPIR-V modules." +require opencl-clang.inc -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" - -SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-110;protocol=https \ - file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ +SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ " SRC_URI:append:class-native = " file://0002-make-sure-only-static-libraries-linked-for-native-bu.patch" SRCREV = "c67648d41df00ea8ee9d701d17299b86f86f0321" -S = "${WORKDIR}/git" - -inherit cmake -DEPENDS += "clang" -DEPENDS:append:class-target = " opencl-clang-native" - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" +BRANCH = "ocl-open-110" EXTRA_OECMAKE += "\ -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ -DCMAKE_SKIP_RPATH=TRUE \ -DPREFERRED_LLVM_VERSION="11.1.0" \ " - -do_install:append:class-native() { - install -d ${D}${bindir} - install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb index 92befaf0..d0b2acfb 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb @@ -1,31 +1,12 @@ -SUMMARY = "Common clang is a thin wrapper library around clang" -DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ - to compile OpenCL C kernels to SPIR-V modules." +require opencl-clang.inc -LICENSE = "NCSA" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" - -SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-120;protocol=https \ - " SRCREV = "8fc6b059248dc6c9c40c7cbe5fedcc6ebb951983" -S = "${WORKDIR}/git" - -inherit cmake -DEPENDS += " clang spirv-llvm-translator" -DEPENDS:append:class-target = " opencl-clang-native" +DEPENDS += " spirv-llvm-translator" -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST:libc-musl = "null" +BRANCH = "ocl-open-120" EXTRA_OECMAKE += "\ -DCMAKE_SKIP_RPATH=TRUE \ -DPREFERRED_LLVM_VERSION="12.0.0" \ " - -do_install:append:class-native() { - install -d ${D}${bindir} - install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ -} - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf