Skip to contentSkip to conversation

Enable OpenCL support in Mesa 3D

PATCH New Valentin Korenblit 3 participants 11 messages Oct 20, 2018

lore
Share & tools
lore
#0 lore raw

v8 cover Enable OpenCL support in Mesa 3D

This series is the continuation of the series "llvm for mesa3d".

Changes v6 -> v7:

*libclc headers installed to /usr/share/clc
*Remove libclc dependencies on target llvm
*Add OpenCL support for RadeonSI

Changes v7 -> v8:
*Add preliminary patch to disable OpenCL as suggested by Thomas *Update libclc to a more recent version
*Move Mesa's patch to PATCH 3/4

I've left my old signature as I started this series while working for Smile.

Valentin Korenblit (4):
package/mesa3d: disable opencl
package/libclc: new package
package/mesa3d: enable OpenCL support
package/clinfo: new package

 DEVELOPERS                                      |  2 ++
 package/Config.in                               |  2 ++
 package/clinfo/Config.in                        |  9 ++++++
 package/clinfo/clinfo.hash                      |  3 ++
 package/clinfo/clinfo.mk                        | 23 ++++++++++++++
 package/libclc/Config.in                        | 10 ++++++
 package/libclc/libclc.hash                      |  3 ++
 package/libclc/libclc.mk                        | 42 +++++++++++++++++++++++++
 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 26 +++++++++++++++
 package/mesa3d/Config.in                        |  9 ++++++
 package/mesa3d/mesa3d.mk                        | 12 +++++++
 11 files changed, 141 insertions(+)
 create mode 100644 package/clinfo/Config.in
 create mode 100644 package/clinfo/clinfo.hash
 create mode 100644 package/clinfo/clinfo.mk
 create mode 100644 package/libclc/Config.in
 create mode 100644 package/libclc/libclc.hash
 create mode 100644 package/libclc/libclc.mk
 create mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch
Signature · 1 line
2.7.4
#1 lore raw

PATCH v8 1/4 package/mesa3d: disable opencl

Preliminary patch to prevent Mesa from building OpenCL lib as soon as libclc is available.

---
 package/mesa3d/mesa3d.mk | 3 +++
 1 file changed, 3 insertions(+)
package/mesa3d/mesa3d.mk +3 -0
index 23de2eb..48041dd 100644
@@ -43,6 +43,9 @@ else
 MESA3D_CONF_OPTS += --disable-llvm
 endif
 
+# Disable opencl in case libclc is detected
+MESA3D_CONF_OPTS += --disable-opencl
+
 ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
 MESA3D_DEPENDENCIES += elfutils
 endif
Signature · 1 line
2.7.4
#2 lore raw

PATCH v8 1/4 package/mesa3d: disable opencl

Le 20/10/2018 ? 16:34, Valentin Korenblit a ?crit?:

Quoted 5 lines

Preliminary patch to prevent Mesa from building OpenCL lib as soon as libclc is available.

Quoted 19 lines
---
 package/mesa3d/mesa3d.mk | 3 +++
 1 file changed, 3 insertions(+)
package/mesa3d/mesa3d.mk +3 -0
index 23de2eb..48041dd 100644
@@ -43,6 +43,9 @@ else
 MESA3D_CONF_OPTS += --disable-llvm
 endif
 
+# Disable opencl in case libclc is detected
+MESA3D_CONF_OPTS += --disable-opencl
+
 ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
 MESA3D_DEPENDENCIES += elfutils
 endif
#3 lore raw

PATCH v8 1/4 package/mesa3d: disable opencl

In reply to Valentin Korenblit

Hello,

Quoted 8 lines · Valentin Korenblit

Preliminary patch to prevent Mesa from building OpenCL lib as soon as libclc is available.

---
 package/mesa3d/mesa3d.mk | 3 +++
 1 file changed, 3 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH v8 2/4 package/libclc: new package

In reply to Valentin Korenblit

This patch provides libclc, an open source implementation of the library requirements of the OpenCL C programming language, as specified by the OpenCL 1.1 Specification. It is intended to be used with Clover (Mesa3D's OpenCL implementation for AMD GPUs.

It needs to be compiled with host-clang, as it generates LLVM IR bitcode files containing device builtin functions for each target.

Currently, libclc supports AMDGCN, R600 and NVPTX targets.

As OpenCL kernels can be built dynamically on the target using libclang and libLLVM, it is necessary to have clc headers installed on the target. Buildroot removes /usr/include in its target-finalize step, so clc headers are installed to /usr/share/clc.

---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libclc/Config.in   | 10 ++++++++++
 package/libclc/libclc.hash |  3 +++
 package/libclc/libclc.mk   | 42 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 package/libclc/Config.in
 create mode 100644 package/libclc/libclc.hash
 create mode 100644 package/libclc/libclc.mk
DEVELOPERS +1 -0
index 341bf7d..ffcbc76 100644
@@ -2116,6 +2116,7 @@ F:	package/tstools/
 
 N:	Valentin Korenblit <[email protected]>
 F:	package/clang/
+F:	package/libclc
 F:	package/llvm/
 
 N:	Vanya Sergeev <[email protected]>
package/Config.in +1 -0
index fd86e37..8d53c72 100644
@@ -1618,6 +1618,7 @@ menu "Other"
 	source "package/libcap/Config.in"
 	source "package/libcap-ng/Config.in"
 	source "package/libcgroup/Config.in"
+	source "package/libclc/Config.in"
 	source "package/libcofi/Config.in"
 	source "package/libcorrect/Config.in"
 	source "package/libcroco/Config.in"
package/libclc/Config.in new file +10 -0
new file mode 100644
index 0000000..4bba6a9
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBCLC
+	bool "libclc"
+	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
+	help
+	  libclc is an open source, BSD licensed implementation of
+	  the library requirements of the OpenCL C programming language,
+	  as specified by the OpenCL 1.1 Specification.
+
+	  http://libclc.llvm.org/
package/libclc/libclc.hash new file +3 -0
new file mode 100644
index 0000000..6c06648
@@ -0,0 +1,3 @@
+# locally calculated
+sha256 8d7b42fba6db4a124c74f0ac475c1bc515761cbf3d559820b4cbe5b33e94f26c libclc-dabae5a2afb78cba0320a86e3f5f0b5dc83e077c.tar.gz
+sha256 45187a46f0637e4e92decb51d8dc3c9e4957b349d0283dfbd6647e8000d9ac7f LICENSE.TXT
package/libclc/libclc.mk new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw

PATCH v8 2/4 package/libclc: new package

Le 20/10/2018 ? 16:34, Valentin Korenblit a ?crit?:

Quoted 85 lines

This patch provides libclc, an open source implementation of the library requirements of the OpenCL C programming language, as specified by the OpenCL 1.1 Specification. It is intended to be used with Clover (Mesa3D's OpenCL implementation for AMD GPUs.

It needs to be compiled with host-clang, as it generates LLVM IR bitcode files containing device builtin functions for each target.

Currently, libclc supports AMDGCN, R600 and NVPTX targets.

As OpenCL kernels can be built dynamically on the target using libclang and libLLVM, it is necessary to have clc headers installed on the target. Buildroot removes /usr/include in its target-finalize step, so clc headers are installed to /usr/share/clc.

---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libclc/Config.in   | 10 ++++++++++
 package/libclc/libclc.hash |  3 +++
 package/libclc/libclc.mk   | 42 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 package/libclc/Config.in
 create mode 100644 package/libclc/libclc.hash
 create mode 100644 package/libclc/libclc.mk
DEVELOPERS +1 -0
index 341bf7d..ffcbc76 100644
@@ -2116,6 +2116,7 @@ F:	package/tstools/
 
 N:	Valentin Korenblit <[email protected]>
 F:	package/clang/
+F:	package/libclc
 F:	package/llvm/
 
 N:	Vanya Sergeev <[email protected]>
package/Config.in +1 -0
index fd86e37..8d53c72 100644
@@ -1618,6 +1618,7 @@ menu "Other"
 	source "package/libcap/Config.in"
 	source "package/libcap-ng/Config.in"
 	source "package/libcgroup/Config.in"
+	source "package/libclc/Config.in"
 	source "package/libcofi/Config.in"
 	source "package/libcorrect/Config.in"
 	source "package/libcroco/Config.in"
package/libclc/Config.in new file +10 -0
new file mode 100644
index 0000000..4bba6a9
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBCLC
+	bool "libclc"
+	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
+	help
+	  libclc is an open source, BSD licensed implementation of
+	  the library requirements of the OpenCL C programming language,
+	  as specified by the OpenCL 1.1 Specification.
+
+	  http://libclc.llvm.org/
package/libclc/libclc.hash new file +3 -0
new file mode 100644
index 0000000..6c06648
@@ -0,0 +1,3 @@
+# locally calculated
+sha256 8d7b42fba6db4a124c74f0ac475c1bc515761cbf3d559820b4cbe5b33e94f26c libclc-dabae5a2afb78cba0320a86e3f5f0b5dc83e077c.tar.gz
+sha256 45187a46f0637e4e92decb51d8dc3c9e4957b349d0283dfbd6647e8000d9ac7f LICENSE.TXT
package/libclc/libclc.mk new file +2 -0
new file mode 100644
index 0000000..608f026
@@ -0,0 +1,42 @@
+################################################################################
+#

package/libclc/libclc.mk line 12

Quoted 10 lines
package/libclc/libclc.mk new file +10 -0
+# libclc
+#
+################################################################################
+
+# There are only two releases: release_35 and release_38, but the last
+# commit is from 2 years ago. Master has some recent activity.
+LIBCLC_VERSION = dabae5a2afb78cba0320a86e3f5f0b5dc83e077c
+LIBCLC_SITE = https://git.llvm.org/git/libclc
+LIBCLC_SITE_METHOD = git
+LIBCLC_LICENSE = NCSA

The libclc library is dual licensed under both the University of Illinois "BSD-Like" license and the MIT license.

With that fixed

Quoted 31 lines
package/libclc/libclc.mk new file +30 -0
+LIBCLC_LICENSE_FILES = LICENSE.TXT
+
+LIBCLC_DEPENDENCIES = host-clang host-llvm
+LIBCLC_INSTALL_STAGING = YES
+
+# C++ compiler is used to build a small tool (prepare-builtins) for the host.
+# It must be built with the C++ compiler from the host
+LIBCLC_CONF_OPTS = --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \
+	--prefix=/usr \
+	--includedir=/usr/share \
+	--pkgconfigdir=/usr/lib/pkgconfig \
+	--with-cxx-compiler=$(HOSTCXX)
+
+define LIBCLC_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS))
+endef
+
+define LIBCLC_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define LIBCLC_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define LIBCLC_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+$(eval $(generic-package))
#6 lore raw

PATCH v8 2/4 package/libclc: new package

In reply to Valentin Korenblit

Hello,

Quoted 17 lines · Valentin Korenblit

This patch provides libclc, an open source implementation of the library requirements of the OpenCL C programming language, as specified by the OpenCL 1.1 Specification. It is intended to be used with Clover (Mesa3D's OpenCL implementation for AMD GPUs.

It needs to be compiled with host-clang, as it generates LLVM IR bitcode files containing device builtin functions for each target.

Currently, libclc supports AMDGCN, R600 and NVPTX targets.

As OpenCL kernels can be built dynamically on the target using libclang and libLLVM, it is necessary to have clc headers installed on the target. Buildroot removes /usr/include in its target-finalize step, so clc headers are installed to /usr/share/clc.

Quoted 10 lines
---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libclc/Config.in   | 10 ++++++++++
 package/libclc/libclc.hash |  3 +++
 package/libclc/libclc.mk   | 42 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 package/libclc/Config.in
 create mode 100644 package/libclc/libclc.hash
 create mode 100644 package/libclc/libclc.mk

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH v8 3/4 package/mesa3d: enable OpenCL support

In reply to Valentin Korenblit

This patch provides Clover, the OpenCL 1.1 API implementation by Mesa for AMD GPUs. It generates libOpenCL.so.

Add --disable-opencl-icd because in Mesa 18 it defaults to on. When disabled, the shared library is named libOpenCL instead of libMesaOpenCL and CL headers are installed.

Given that clc headers are being installed to a non-standard location, it is necessary to specify this path in configure.ac. Otherwise, pkg-config will output the absolute path to these headers located in STAGING_DIR, which will cause a runtime error when calling clBuildProgram.

---
 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 26 +++++++++++++++++++++++++
 package/mesa3d/Config.in                        |  9 +++++++++
 package/mesa3d/mesa3d.mk                        | 11 ++++++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch
package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch new file +26 -0
new file mode 100644
index 0000000..e9a8b25
@@ -0,0 +1,26 @@
+From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001
+From: Valentin Korenblit <[email protected]>
+Date: Sat, 20 Oct 2018 10:56:23 +0200
+Subject: [PATCH 1/1] set LIBCLC_INCLUDEDIR
+
+Signed-off-by: Valentin Korenblit <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 864dcae..cc2390b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then
+                     PKG_CONFIG_PATH environment variable.
+                     By default libclc.pc is installed to /usr/local/share/pkgconfig/])
+     else
+-        LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc`
++        LIBCLC_INCLUDEDIR="/usr/share"
+         LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc`
+         AC_SUBST([LIBCLC_INCLUDEDIR])
+         AC_SUBST([LIBCLC_LIBEXECDIR])
+-- 
+2.7.4
+
package/mesa3d/Config.in +9 -0
index 872859b..f16f1b1 100644
@@ -50,6 +50,15 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
+#clang and libclc dependencies are satisfied by BR2_PACKAGE_MESA3D_LLVM
+config BR2_PACKAGE_MESA3D_OPENCL
+	bool "OpenCL support"
+	depends on BR2_PACKAGE_MESA3D_LLVM
+	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \
+		BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
+	select BR2_PACKAGE_CLANG
+	select BR2_PACKAGE_LIBCLC
+
 # inform the .mk file of gallium, dri or vulkan driver selection
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	bool
package/mesa3d/mesa3d.mk +10 -1
index 48041dd..b32ce59 100644
@@ -10,6 +10,7 @@ MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = https://mesa.freedesktop.org/archive
 MESA3D_LICENSE = MIT, SGI, Khronos
 MESA3D_LICENSE_FILES = docs/license.html
+# 0003-set-LIBCLC_INCLUDEDIR.patch needed when OpenCL is enabled
 MESA3D_AUTORECONF = YES
 
 MESA3D_INSTALL_STAGING = YES
@@ -43,8 +44,16 @@ else
 MESA3D_CONF_OPTS += --disable-llvm
 endif
 
-# Disable opencl in case libclc is detected
+# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of
+# libMesaOpenCL and CL headers are installed
+ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y)
+MESA3D_DEPENDENCIES += clang libclc
+MESA3D_CONF_OPTS += --enable-opencl \
+	--disable-opencl-icd \
+	--with-clang-libdir=$(STAGING_DIR)/usr/lib
+else
 MESA3D_CONF_OPTS += --disable-opencl
+endif
 
 ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
 MESA3D_DEPENDENCIES += elfutils
Signature · 1 line
2.7.4
#8 lore raw

PATCH v8 3/4 package/mesa3d: enable OpenCL support

Le 20/10/2018 ? 16:34, Valentin Korenblit a ?crit?:

Quoted 4 lines

This patch provides Clover, the OpenCL 1.1 API implementation by Mesa for AMD GPUs. It generates libOpenCL.so.

Add --disable-opencl-icd because in Mesa 18 it defaults to on.

This option is on as soon as opencl is enabled.

Quoted 2 lines

When disabled, the shared library is named libOpenCL instead of libMesaOpenCL and CL headers are installed.

Can you say with this is required in the commit log, what's the issue with opencl-icl option when enable.

Otherwise

Quoted 98 lines

Given that clc headers are being installed to a non-standard location, it is necessary to specify this path in configure.ac. Otherwise, pkg-config will output the absolute path to these headers located in STAGING_DIR, which will cause a runtime error when calling clBuildProgram.

---
 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 26 +++++++++++++++++++++++++
 package/mesa3d/Config.in                        |  9 +++++++++
 package/mesa3d/mesa3d.mk                        | 11 ++++++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch
package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch new file +26 -0
new file mode 100644
index 0000000..e9a8b25
@@ -0,0 +1,26 @@
+From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001
+From: Valentin Korenblit <[email protected]>
+Date: Sat, 20 Oct 2018 10:56:23 +0200
+Subject: [PATCH 1/1] set LIBCLC_INCLUDEDIR
+
+Signed-off-by: Valentin Korenblit <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 864dcae..cc2390b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then
+                     PKG_CONFIG_PATH environment variable.
+                     By default libclc.pc is installed to /usr/local/share/pkgconfig/])
+     else
+-        LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc`
++        LIBCLC_INCLUDEDIR="/usr/share"
+         LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc`
+         AC_SUBST([LIBCLC_INCLUDEDIR])
+         AC_SUBST([LIBCLC_LIBEXECDIR])
+-- 
+2.7.4
+
package/mesa3d/Config.in +9 -0
index 872859b..f16f1b1 100644
@@ -50,6 +50,15 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
+#clang and libclc dependencies are satisfied by BR2_PACKAGE_MESA3D_LLVM
+config BR2_PACKAGE_MESA3D_OPENCL
+	bool "OpenCL support"
+	depends on BR2_PACKAGE_MESA3D_LLVM
+	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \
+		BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
+	select BR2_PACKAGE_CLANG
+	select BR2_PACKAGE_LIBCLC
+
 # inform the .mk file of gallium, dri or vulkan driver selection
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	bool
package/mesa3d/mesa3d.mk +10 -1
index 48041dd..b32ce59 100644
@@ -10,6 +10,7 @@ MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = https://mesa.freedesktop.org/archive
 MESA3D_LICENSE = MIT, SGI, Khronos
 MESA3D_LICENSE_FILES = docs/license.html
+# 0003-set-LIBCLC_INCLUDEDIR.patch needed when OpenCL is enabled
 MESA3D_AUTORECONF = YES
 
 MESA3D_INSTALL_STAGING = YES
@@ -43,8 +44,16 @@ else
 MESA3D_CONF_OPTS += --disable-llvm
 endif
 
-# Disable opencl in case libclc is detected
+# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of
+# libMesaOpenCL and CL headers are installed
+ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y)
+MESA3D_DEPENDENCIES += clang libclc
+MESA3D_CONF_OPTS += --enable-opencl \
+	--disable-opencl-icd \
+	--with-clang-libdir=$(STAGING_DIR)/usr/lib
+else
 MESA3D_CONF_OPTS += --disable-opencl
+endif
 
 ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)
 MESA3D_DEPENDENCIES += elfutils
#9 lore raw

PATCH v8 4/4 package/clinfo: new package

In reply to Valentin Korenblit

This tool allows to verify if the OpenCL environment is set up correctly and provides information related to the supported OpenCL platforms.

---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/clinfo/Config.in   |  9 +++++++++
 package/clinfo/clinfo.hash |  3 +++
 package/clinfo/clinfo.mk   | 23 +++++++++++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 package/clinfo/Config.in
 create mode 100644 package/clinfo/clinfo.hash
 create mode 100644 package/clinfo/clinfo.mk
DEVELOPERS +1 -0
index ffcbc76..659fa2d 100644
@@ -2116,6 +2116,7 @@ F:	package/tstools/
 
 N:	Valentin Korenblit <[email protected]>
 F:	package/clang/
+F:	package/clinfo/
 F:	package/libclc
 F:	package/llvm/
 
package/Config.in +1 -0
index 8d53c72..18b6421 100644
@@ -83,6 +83,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/blktrace/Config.in"
 	source "package/bonnie/Config.in"
 	source "package/cache-calibrator/Config.in"
+	source "package/clinfo/Config.in"
 	source "package/dhrystone/Config.in"
 	source "package/dieharder/Config.in"
 	source "package/dmalloc/Config.in"
package/clinfo/Config.in new file +9 -0
new file mode 100644
index 0000000..279b5ac
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_CLINFO
+	bool "clinfo"
+	depends on BR2_PACKAGE_MESA3D_OPENCL
+	help
+	  clinfo is a simple command-line application that enumerates
+	  all possible (known) properties of the OpenCL platform and
+	  devices available on the system.
+
+	  https://github.com/Oblomov/clinfo
package/clinfo/clinfo.hash new file +3 -0
new file mode 100644
index 0000000..1ba3481
@@ -0,0 +1,3 @@
+# locally calculated
+sha256 64b02e68ccff3b95437bd0bd70dcb88438c58adec16a7145a5d4e5c26a898ccf clinfo-2.2.18.03.26.tar.gz
+sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt
package/clinfo/clinfo.mk new file +23 -0
new file mode 100644
index 0000000..1477b76
@@ -0,0 +1,23 @@
+################################################################################
+#
+# clinfo
+#
+################################################################################
+
+CLINFO_VERSION = 2.2.18.03.26
+CLINFO_SITE = $(call github,Oblomov,clinfo,$(CLINFO_VERSION))
+CLINFO_LICENSE = CC0-1.0
+CLINFO_LICENSE_FILES = legalcode.txt
+
+# libOpenCL is needed
+CLINFO_DEPENDENCIES = mesa3d
+
+define CLINFO_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define CLINFO_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/clinfo $(TARGET_DIR)/usr/bin/clinfo
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.7.4
#10 lore raw

PATCH v8 4/4 package/clinfo: new package

Le 20/10/2018 ? 16:34, Valentin Korenblit a ?crit?:

Quoted 70 lines

This tool allows to verify if the OpenCL environment is set up correctly and provides information related to the supported OpenCL platforms.

---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/clinfo/Config.in   |  9 +++++++++
 package/clinfo/clinfo.hash |  3 +++
 package/clinfo/clinfo.mk   | 23 +++++++++++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 package/clinfo/Config.in
 create mode 100644 package/clinfo/clinfo.hash
 create mode 100644 package/clinfo/clinfo.mk
DEVELOPERS +1 -0
index ffcbc76..659fa2d 100644
@@ -2116,6 +2116,7 @@ F:	package/tstools/
 
 N:	Valentin Korenblit <[email protected]>
 F:	package/clang/
+F:	package/clinfo/
 F:	package/libclc
 F:	package/llvm/
 
package/Config.in +1 -0
index 8d53c72..18b6421 100644
@@ -83,6 +83,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/blktrace/Config.in"
 	source "package/bonnie/Config.in"
 	source "package/cache-calibrator/Config.in"
+	source "package/clinfo/Config.in"
 	source "package/dhrystone/Config.in"
 	source "package/dieharder/Config.in"
 	source "package/dmalloc/Config.in"
package/clinfo/Config.in new file +9 -0
new file mode 100644
index 0000000..279b5ac
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_CLINFO
+	bool "clinfo"
+	depends on BR2_PACKAGE_MESA3D_OPENCL
+	help
+	  clinfo is a simple command-line application that enumerates
+	  all possible (known) properties of the OpenCL platform and
+	  devices available on the system.
+
+	  https://github.com/Oblomov/clinfo
package/clinfo/clinfo.hash new file +3 -0
new file mode 100644
index 0000000..1ba3481
@@ -0,0 +1,3 @@
+# locally calculated
+sha256 64b02e68ccff3b95437bd0bd70dcb88438c58adec16a7145a5d4e5c26a898ccf clinfo-2.2.18.03.26.tar.gz
+sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 legalcode.txt
package/clinfo/clinfo.mk new file +0 -0
new file mode 100644
index 0000000..1477b76

package/clinfo/clinfo.mk line 7

Quoted 7 lines
package/clinfo/clinfo.mk new file +7 -0
@@ -0,0 +1,23 @@
+################################################################################
+#
+# clinfo
+#
+################################################################################
+
+CLINFO_VERSION = 2.2.18.03.26

Note there is a new version 2.2.18.04.06, but OK to merge this version and bump to the new version latter.

package/clinfo/clinfo.mk line 10

Quoted 3 lines
package/clinfo/clinfo.mk new file +3 -0
+CLINFO_SITE = $(call github,Oblomov,clinfo,$(CLINFO_VERSION))
+CLINFO_LICENSE = CC0-1.0
+CLINFO_LICENSE_FILES = legalcode.txt

There is also a LICENSE file

Quoted 14 lines
package/clinfo/clinfo.mk new file +13 -0
+
+# libOpenCL is needed
+CLINFO_DEPENDENCIES = mesa3d
+
+define CLINFO_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define CLINFO_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/clinfo $(TARGET_DIR)/usr/bin/clinfo
+endef
+
+$(eval $(generic-package))