Accepting request 861549 from science

OBS-URL: https://build.opensuse.org/request/show/861549
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pocl?expand=0&rev=23

link_against_libclang-cpp_so.patch

@@ -1,12 +1,13 @@
-diff -u -r pocl-1.5.orig/cmake/LLVM.cmake pocl-1.5/cmake/LLVM.cmake
---- pocl-1.5.orig/cmake/LLVM.cmake	2020-06-25 12:22:37.500539000 +0200
-+++ pocl-1.5/cmake/LLVM.cmake	2020-06-25 12:23:23.091551000 +0200
-@@ -219,7 +219,7 @@
- string(REGEX REPLACE "-W[^ ]*" "" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}")
+diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
+index 2827d64..e186bc1 100644
+--- a/cmake/LLVM.cmake
++++ b/cmake/LLVM.cmake
+@@ -239,7 +239,7 @@ string(STRIP "${LLVM_SYSLIBS}" LLVM_SYSLIBS)
+ ####################################################################
  
- # Llvm-config does not include clang libs
--if((9 LESS LLVM_MAJOR) AND (LLVM_LIB_IS_SHARED MATCHES "shared"))
-+if((8 LESS LLVM_MAJOR) AND (LLVM_LIB_IS_SHARED MATCHES "shared"))
-   # Link against a single shared library instead of multiple component shared
+ # llvm-config does not include clang libs
+-if((9 LESS LLVM_MAJOR) AND (NOT STATIC_LLVM))
++if((8 LESS LLVM_MAJOR) AND (NOT STATIC_LLVM))
+   # For Clang 10+, link against a single shared library instead of multiple component shared
    # libraries.
-   set(CLANG_LIBNAMES clang-cpp)
+   if("${LLVM_LIBNAMES}" MATCHES "LLVMTCE")

pocl-1.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fcf4618171727d165fc044d465a66e3119217bb4577a97374f94fcd8aed330e
-size 1575635

pocl-1.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0a4c0c056371b6f0db726b88fbb76bbee94948fb2abd4dbc8d958f7c42f766c
+size 1595212

pocl.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Dec 25 14:30:16 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 1.6
+  * Support for LLVM 11.
+  * CUDA kernels using constant __local blocks are now ABI
+    incompatible with previous release. Users need to delete their
+    pocl cache.
+  * Improved debugging of OpenCL code with CPU driver.
+  * Improved the PTX code generation for __local blocks.
+  * Improved handling of command queue barriers
+  * Fix LLVM loop vectorizing remarks printing
+    (POCL_VECTORIZER_REMARKS=1).
+  * Fix an issue in which the loop vectorizer produced code with
+    invalid memory reads (issue #757).
+  * Fix compilation error when CMake option SINGLE_LLVM_LIB is
+    set to OFF.
+  * Fix wrongly output dlerror (Undefined symbol) after dlopen,
+    caused by a previous libdl call in an ICD loader
+  * [CPU] safety margin of pocl's CPU driver local memory
+    allocation has been reduced to a much more reasonable value
+  * [CPU] buffer size for OpenCL printf is now configurable with
+    PRINTF_BUFFER_SIZE CMake variable
+  * [CPU] local memory size reported is now the size of last level
+    of non-shared data cache (usually L1 or L2 depending on CPU),
+    if hwloc can determine it.
+- Update patch link_against_libclang-cpp_so.patch
+
 -------------------------------------------------------------------
 Fri Oct 23 22:46:28 UTC 2020 - Ondřej Súkup <mimi.vx@gmail.com>
 

pocl.spec

@@ -17,9 +17,9 @@
 #
 
 
-%define sover  2.5.0
+%define sover  2.6.0
 Name:           pocl
-Version:        1.5
+Version:        1.6
 Release:        0
 Summary:        Portable Computing Language - an OpenCL implementation
 # The whole code is under MIT
@@ -31,7 +31,7 @@ URL:            http://portablecl.org/
 Source0:        https://github.com/pocl/pocl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source99:       pocl-rpmlintrc
 Patch0:         link_against_libclang-cpp_so.patch
-BuildConflicts: clang-devel >= 11
+BuildConflicts: clang-devel >= 12
 BuildRequires:  clang-devel >= 6
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -76,7 +76,7 @@ Summary:        Development files for the Portable Computing Language
 Group:          Development/Languages/Other
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libpocl2 = %{version}-%{release}
-Requires:       opencl-headers
+Requires:       opencl-headers >= 2.2
 
 %description devel
 Portable Computing Language (pocl) is an implementation of the OpenCL standard
@@ -132,6 +132,8 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_datadir}/OpenCL/ve
 %{_bindir}/poclcc
 %dir %{_libdir}/pocl/
 %{_libdir}/pocl/libllvmopencl.so
+%{_libdir}/pocl/libpocl-devices-basic.so
+%{_libdir}/pocl/libpocl-devices-pthread.so
 %{_datadir}/pocl/
 
 %files -n libpocl2