Add opencl-headers and use ocl-icd as OpenCL provider (#19463)

* ocl-icd: fix build problems

* New package: opencl-c-headers

* New package: opencl-clhpp

* New bundled package: opencl-headers

- bundle C and C++ header files

* ocl-icd: Add +headers variant to use this as opencl provider

* ocl-icd: add new upstream release 2.2.13

* ocl-icd: add asciidoc-py3 and xmlto dependency needed for manpage generation

* ocl-icd and opencl-headers provides OpenCL 3.0

- also add more explicit version providing for older ocl-icd versions

* opencl-headers: add maximum of supported opencl versions for all versions

* opencl-headers: there aren't final releases with OpenCL 3.0

4 files changed, 96 insertions, 0 deletions

diff --git a/var/spack/repos/builtin/packages/ocl-icd/package.py b/var/spack/repos/builtin/packages/ocl-icd/package.py
index fa49bab56a..88bd00a2e6 100644
--- a/var/spack/repos/builtin/packages/ocl-icd/package.py
+++ b/var/spack/repos/builtin/packages/ocl-icd/package.py
@@ -13,6 +13,7 @@ OpenCL ICD loaders."""
     homepage = "https://github.com/OCL-dev/ocl-icd"
     url      = "https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz"
 
+    version('2.2.13', sha256='f85d59f3e8327f15637b91e4ae8df0829e94daeff68c647b2927b8376b1f8d92')
     version('2.2.12', sha256='17500e5788304eef5b52dbe784cec197bdae64e05eecf38317840d2d05484272')
     version('2.2.11', sha256='c1865ef7701b8201ebc6930ed3ac757c7e5cb30f3aa4c1e742a6bc022f4f2292')
     version('2.2.10', sha256='d0459fa1421e8d86aaf0a4df092185ea63bc4e1a7682d3af261ae5d3fae063c7')
@@ -24,7 +25,29 @@ OpenCL ICD loaders."""
     version('2.2.4',  sha256='92853137ffff393cc74f829357fdd80ac46a82b46c970e80195db86164cca316')
     version('2.2.3',  sha256='46b8355d90f8cc240555e4e077f223c47b950abeadf3e1af52d6e68d2efc2ff3')
 
+    variant("headers", default=False, description="Install also OpenCL headers to use this as OpenCL provider")
+
     depends_on('autoconf', type='build')
     depends_on('automake', type='build')
     depends_on('libtool',  type='build')
     depends_on('m4',       type='build')
+    depends_on('ruby',     type='build')
+    depends_on('asciidoc-py3', type='build')
+    depends_on('xmlto',    type='build')
+    depends_on('opencl-headers@2.2:', when='+headers')
+
+    provides('opencl@:2.2', when='@2.2.12:+headers')
+    provides('opencl@:2.1', when='@2.2.8:2.2.11+headers')
+    provides('opencl@:2.0', when='@2.2.3:2.2.7+headers')
+
+    def flag_handler(self, name, flags):
+        if name == 'cflags' and self.spec.satisfies('@:2.2.12'):
+            # https://github.com/OCL-dev/ocl-icd/issues/8
+            # this is fixed in version grater than 2.2.12
+            flags.append('-O2')
+            # gcc-10 change the default from -fcommon to fno-common
+            # This is fixed in versions greater than 2.2.12:
+            # https://github.com/OCL-dev/ocl-icd/commit/4667bddd365bcc1dc66c483835971f0083b44b1d
+            if self.spec.satisfies('%gcc@10:'):
+                flags.append('-fcommon')
+        return (flags, None, None)
diff --git a/var/spack/repos/builtin/packages/opencl-c-headers/package.py b/var/spack/repos/builtin/packages/opencl-c-headers/package.py
new file mode 100644
index 0000000000..c93d5eb53d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/opencl-c-headers/package.py
@@ -0,0 +1,24 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack import *
+import sys
+
+
+class OpenclCHeaders(Package):
+    """OpenCL (Open Computing Language) C header files"""
+
+    homepage = "https://www.khronos.org/registry/OpenCL/"
+    url      = "https://github.com/KhronosGroup/OpenCL-Headers/archive/v2020.06.16.tar.gz"
+
+    version('2020.06.16', sha256='2f5a60e5ac4b127650618c58a7e3b35a84dbf23c1a0ac72eb5e7baf221600e06')
+    version('2020.03.13', sha256='664bbe587e5a0a00aac267f645b7c413586e7bc56dca9ff3b00037050d06f476')
+
+    def install(self, spec, prefix):
+        install_tree('CL', prefix.include.CL)
+        if sys.platform == 'darwin':
+            ln = which('ln')
+            ln('-s', prefix.include.CL, prefix.include.OpenCL)
diff --git a/var/spack/repos/builtin/packages/opencl-clhpp/package.py b/var/spack/repos/builtin/packages/opencl-clhpp/package.py
new file mode 100644
index 0000000000..3e335c2180
--- /dev/null
+++ b/var/spack/repos/builtin/packages/opencl-clhpp/package.py
@@ -0,0 +1,28 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack import *
+import sys
+
+
+class OpenclClhpp(CMakePackage):
+    """C++ headers for OpenCL development"""
+
+    homepage = "https://www.khronos.org/registry/OpenCL/"
+    url      = "https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.12.tar.gz"
+
+    version('2.0.12', sha256='20b28709ce74d3602f1a946d78a2024c1f6b0ef51358b9686612669897a58719')
+    version('2.0.11', sha256='ffc2ca08cf4ae90ee55f14ea3735ccc388f454f4422b69498b2e9b93a1d45181')
+    version('2.0.10', sha256='fa27456295c3fa534ce824eb0314190a8b3ebd3ba4d93a0b1270fc65bf378f2b')
+    version('2.0.9',  sha256='ba8ac4977650d833804f208a1b0c198006c65c5eac7c83b25dc32cea6199f58c')
+
+    root_cmakelists_dir = 'include'
+
+    @run_after('install')
+    def post_install(self):
+        if sys.platform == 'darwin':
+            ln = which('ln')
+            ln('-s', prefix.include.CL, prefix.include.OpenCL)
diff --git a/var/spack/repos/builtin/packages/opencl-headers/package.py b/var/spack/repos/builtin/packages/opencl-headers/package.py
new file mode 100644
index 0000000000..dc6427d515
--- /dev/null
+++ b/var/spack/repos/builtin/packages/opencl-headers/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack import *
+
+
+class OpenclHeaders(BundlePackage):
+    """Bundled OpenCL (Open Computing Language) header files"""
+
+    homepage = "https://www.khronos.org/registry/OpenCL/"
+
+    version('2.2')
+    version('2.1')
+    version('2.0')
+
+    depends_on('opencl-c-headers@2020.03.13:')
+    depends_on('opencl-clhpp@2.0.11:', when='@2.1:')
+    depends_on('opencl-clhpp@2.0.9:', when='@2.0')