[pocl] 05/07: disable get_cpu_name() under cmake

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch experimental
in repository pocl.

commit f5cd7829ada3695155da686df808054de8f7835e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Nov 25 06:27:42 2017 +0100

    disable get_cpu_name() under cmake
---
 debian/changelog                           |  2 ++
 debian/patches/cmake-no-get_cpu_name.patch | 44 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e42fc65..fecee86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pocl (0.13-12) UNRELEASED; urgency=medium
   * llvmopencl.so.7 is now a private library.  (Closes: #823528)
   * cmake-no-fno-rtti.patch: Build without -fno-rtti (a workaround for
     clang-3.7), like autotools, to avoid symbol changes.
+  * cmake-no-get_cpu_name.patch: Do not use get_cpu_name(), makes some tests
+    fail.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 26 Nov 2017 21:37:57 +0100
 
diff --git a/debian/patches/cmake-no-get_cpu_name.patch b/debian/patches/cmake-no-get_cpu_name.patch
new file mode 100644
index 0000000..886b94f
--- /dev/null
+++ b/debian/patches/cmake-no-get_cpu_name.patch
@@ -0,0 +1,44 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: disable get_cpu_name() under CMake
+ makes some tests fail (on amd64, ivybridge cpu):
+ 81% tests passed, 20 tests failed out of 108
+ The following tests FAILED:
+	  2 - kernel/test_as_type (Failed)
+	  3 - kernel/test_convert_type_1 (Failed)
+	  4 - kernel/test_convert_type_2 (Failed)
+	  5 - kernel/test_convert_type_4 (Failed)
+	  6 - kernel/test_convert_type_8 (Failed)
+	  7 - kernel/test_convert_type_16 (Failed)
+	  8 - kernel/test_bitselect (Failed)
+	  9 - kernel/test_hadd_loopvec (Failed)
+	 10 - kernel/test_hadd_loops (Failed)
+	 15 - kernel/test_rotate (Failed)
+	 16 - kernel/test_fabs (Failed)
+	 17 - kernel/test_short16 (Failed)
+	 23 - kernel/test_shuffle_short (Failed)
+	 24 - kernel/test_shuffle_ushort (Failed)
+	 25 - kernel/test_shuffle_int (Failed)
+	 26 - kernel/test_shuffle_uint (Failed)
+	 27 - kernel/test_shuffle_float (Failed)
+	 28 - kernel/test_shuffle_long (Failed)
+	 29 - kernel/test_shuffle_ulong (Failed)
+	 30 - kernel/test_shuffle_double (Failed)
+
+--- a/lib/CL/devices/basic/basic.c
++++ b/lib/CL/devices/basic/basic.c
+@@ -332,11 +332,11 @@ pocl_basic_init_device_infos(struct _cl_
+   dev->extensions = HOST_DEVICE_EXTENSIONS;
+ 
+   dev->llvm_target_triplet = OCL_KERNEL_TARGET;
+-#ifdef POCL_BUILT_WITH_CMAKE
+-  dev->llvm_cpu = get_cpu_name();
+-#else
++//#ifdef POCL_BUILT_WITH_CMAKE
++//  dev->llvm_cpu = get_cpu_name();
++//#else
+   dev->llvm_cpu = OCL_KERNEL_TARGET_CPU;
+-#endif
++//#endif
+   dev->has_64bit_long = 1;
+   dev->autolocals_to_args = 1;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 18e430c..36a0e64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ consistent-newlines-in-POCL_ABORT.patch
 do-not-export-clang-symbols.patch
 libstdc++-7-dev.patch
 cmake-no-fno-rtti.patch
+cmake-no-get_cpu_name.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git