[Pkg-opencl-devel] [beignet] 52/66: Imported Debian patch 0.2+git20130928+187c17e-1
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Oct 31 07:27:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository beignet.
commit 090e90c42235ae54e6c8e4daac36a3f33c1888db
Merge: b33a4cc 3756b22
Author: Simon Richter <sjr at debian.org>
Date: Sat Sep 28 14:19:29 2013 +1000
Imported Debian patch 0.2+git20130928+187c17e-1
CMake/FindEGL.cmake | 18 +
CMake/FindGBM.cmake | 36 -
CMakeLists.txt | 18 +-
backend/CMakeLists.txt | 2 +-
backend/src/CMakeLists.txt | 13 +-
backend/src/backend/context.cpp | 82 +-
backend/src/backend/context.hpp | 5 +-
backend/src/backend/gen/gen_mesa_disasm.c | 5 +
backend/src/backend/gen_context.cpp | 649 ++++++++++-
backend/src/backend/gen_context.hpp | 15 +
backend/src/backend/gen_defs.hpp | 19 +
backend/src/backend/gen_encoder.cpp | 69 +-
backend/src/backend/gen_encoder.hpp | 6 +-
.../src/backend/gen_insn_gen7_schedule_info.hxx | 9 +
backend/src/backend/gen_insn_selection.cpp | 334 +++++-
backend/src/backend/gen_insn_selection.hpp | 6 +-
backend/src/backend/gen_insn_selection.hxx | 11 +
backend/src/backend/gen_program.cpp | 43 +-
backend/src/backend/gen_program.hpp | 10 +-
backend/src/backend/gen_reg_allocation.cpp | 100 +-
backend/src/backend/gen_register.hpp | 14 +
backend/src/backend/program.cpp | 320 +++++-
backend/src/backend/program.h | 3 +-
backend/src/backend/program.hpp | 59 +-
backend/src/builtin_vector_proto.def | 25 +-
backend/src/gbe_bin_generater.cpp | 308 ++++++
backend/src/gen_builtin_vector.py | 5 +-
backend/src/gen_convert.sh | 30 +-
backend/src/ir/constant.cpp | 101 ++
backend/src/ir/constant.hpp | 28 +-
backend/src/ir/context.hpp | 1 +
backend/src/ir/image.cpp | 139 +++
backend/src/ir/image.hpp | 25 +-
backend/src/ir/instruction.cpp | 122 ++-
backend/src/ir/instruction.hpp | 32 +-
backend/src/ir/instruction.hxx | 5 +
backend/src/ir/profile.cpp | 5 +-
backend/src/ir/profile.hpp | 4 +-
backend/src/ir/sampler.cpp | 98 ++
backend/src/ir/sampler.hpp | 25 +-
backend/src/llvm/llvm_gen_backend.cpp | 380 ++++---
backend/src/llvm/llvm_gen_ocl_function.hxx | 38 +-
backend/src/llvm/llvm_scalarize.cpp | 1 -
backend/src/ocl_common_defines.h | 57 +-
backend/src/ocl_convert.h | 411 +++++++
backend/src/ocl_stdlib.tmpl.h | 1136 +++++++++++++++++---
backend/src/sys/platform.hpp | 44 +
debian/changelog | 6 +
debian/clean | 1 +
...d-OpenCL-1.2-definitions-required-for-ICD.patch | 97 --
.../0002-Revert-GBE-disable-cl_khr_fp64.patch | 26 +
.../0003-ICD-dispatch-table-must-be-first.patch | 26 +
debian/patches/private | 26 +-
debian/patches/series | 2 +
kernels/builtin_atan2.cl | 4 +
kernels/builtin_lgamma.cl | 4 +
kernels/builtin_lgamma_r.cl | 4 +
kernels/builtin_sinpi.cl | 4 +
kernels/builtin_tgamma.cl | 4 +
kernels/compiler_abs_diff.cl | 2 +
kernels/compiler_bool_cross_basic_block.cl | 21 +
kernels/compiler_box_blur_image.cl | 2 +-
kernels/compiler_function_constant0.cl | 2 +-
kernels/compiler_global_constant.cl | 59 +-
kernels/compiler_global_constant_2.cl | 13 +-
kernels/compiler_group_size.cl | 17 +
kernels/compiler_long_convert.cl | 12 +
kernels/compiler_upsample_long.cl | 2 +-
kernels/compiler_vector_inc.cl | 13 +
kernels/test_copy_image_3d.cl | 27 +-
kernels/test_fill_image_3d.cl | 2 +-
kernels/test_fill_image_3d_2.cl | 2 +-
src/CMakeLists.txt | 18 +-
src/cl_api.c | 705 ++++++++++--
src/cl_command_queue.c | 108 +-
src/cl_command_queue.h | 16 +-
src/cl_command_queue_gen7.c | 86 +-
src/cl_context.c | 30 +-
src/cl_context.h | 34 +-
src/cl_device_id.c | 2 +-
src/cl_driver.h | 82 +-
src/cl_driver_defs.c | 14 +-
src/cl_driver_type.h | 24 +
src/cl_enqueue.c | 256 +++--
src/cl_enqueue.h | 33 +-
src/cl_event.c | 110 +-
src/cl_event.h | 8 +-
src/cl_extensions.c | 23 +-
src/cl_extensions.h | 25 -
src/cl_gt_device.h | 10 +-
src/cl_image.c | 26 +-
src/cl_kernel.c | 14 +-
src/cl_khr_icd.h | 4 +
src/cl_mem.c | 636 +++++++++--
src/cl_mem.h | 138 ++-
src/cl_mem_gl.c | 194 +---
src/cl_platform_id.c | 2 +-
src/cl_platform_id.h | 5 +-
src/cl_program.c | 37 +-
src/cl_program.h | 2 +
src/cl_sampler.c | 2 +-
src/cl_utils.h | 12 +-
src/intel/intel_dri_resource_sharing.c | 208 ++++
src/intel/intel_dri_resource_sharing.h | 39 +
src/intel/intel_dri_resource_sharing_int.h | 143 +++
src/intel/intel_driver.c | 231 +++-
src/intel/intel_driver.h | 8 +-
src/intel/intel_gpgpu.c | 147 ++-
src/intel/intel_structs.h | 16 +-
src/x11/dricommon.h | 5 -
src/x11/gbm_deps/backend.h | 36 -
src/x11/gbm_deps/common.h | 42 -
src/x11/gbm_deps/common_drm.h | 48 -
src/x11/gbm_deps/gbm.h | 292 -----
src/x11/gbm_deps/gbm_driint.h | 108 --
src/x11/gbm_deps/gbmint.h | 116 --
src/x11/gbm_dri2_x11_platform.c | 126 ---
src/x11/mesa_egl_extension.c | 307 ++++++
src/x11/mesa_egl_extension.h | 20 +
src/x11/mesa_egl_res_share.c | 135 +++
src/x11/mesa_egl_res_share.h | 44 +
utests/CMakeLists.txt | 28 +-
utests/builtin_atan2.cpp | 43 +
utests/builtin_lgamma.cpp | 40 +
utests/builtin_lgamma_r.cpp | 46 +
utests/builtin_sinpi.cpp | 104 ++
utests/builtin_tgamma.cpp | 42 +
utests/compiler_abs_diff.cpp | 35 +-
utests/compiler_bool_cross_basic_block.cpp | 55 +
utests/compiler_copy_image_3d.cpp | 36 +-
utests/compiler_fill_image_3d.cpp | 6 +-
utests/compiler_fill_image_3d_2.cpp | 10 +-
utests/compiler_function_constant0.cpp | 4 +-
utests/compiler_global_constant.cpp | 75 ++
utests/compiler_global_constant_2.cpp | 29 +
utests/compiler_group_size.cpp | 55 +
utests/compiler_long.cpp | 4 +-
utests/compiler_long_2.cpp | 4 +-
utests/compiler_long_convert.cpp | 91 ++
utests/compiler_vector_inc.cpp | 46 +
utests/load_program_from_bin.cpp | 77 ++
utests/runtime_event.cpp | 7 +-
utests/utest.cpp | 28 +-
utests/utest.hpp | 14 +-
utests/utest_helper.cpp | 29 +-
utests/utest_helper.hpp | 5 +-
utests/utest_run.cpp | 94 +-
147 files changed, 8699 insertions(+), 2279 deletions(-)
diff --cc debian/changelog
index 0690704,0000000..bbad468
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,187 -1,0 +1,193 @@@
++beignet (0.2+git20130928+187c17e-1) experimental; urgency=low
++
++ * New upstream release
++
++ -- Simon Richter <sjr at debian.org> Sat, 28 Sep 2013 14:19:29 +1000
++
+beignet (0.2+git20130816+cc09b26-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Fri, 16 Aug 2013 12:07:35 +0200
+
+beignet (0.2+git20130807+c4d1f40-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Wed, 07 Aug 2013 16:14:06 +0200
+
+beignet (0.2+git20130730+da26376-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Tue, 30 Jul 2013 13:43:36 +0200
+
+beignet (0.2+git20130710+613e829-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Wed, 10 Jul 2013 15:25:14 +0200
+
+beignet (0.2-2) unstable; urgency=low
+
+ * Patch OpenCL C version
+
+ -- Simon Richter <sjr at debian.org> Fri, 05 Jul 2013 15:27:32 +0200
+
+beignet (0.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #712903)
+
+ -- Simon Richter <sjr at debian.org> Fri, 05 Jul 2013 15:01:51 +0200
+
+beignet (0.1+git20130703+84f63e8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Wed, 03 Jul 2013 09:52:32 +0200
+
+beignet (0.1+git20130626+41005e0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Wed, 26 Jun 2013 10:06:29 +0200
+
+beignet (0.1+git20130625+97c3a9b-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Tue, 25 Jun 2013 13:52:00 +0200
+
+beignet (0.1+git20130621+30586bf-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Fri, 21 Jun 2013 12:08:49 +0200
+
+beignet (0.1+git20130619+42967d2-2) unstable; urgency=low
+
+ * Drop EGL support for kFreeBSD for the time being
+
+ -- Simon Richter <sjr at debian.org> Thu, 20 Jun 2013 11:18:59 +0200
+
+beignet (0.1+git20130619+42967d2-1) unstable; urgency=low
+
+ * New upstream release
+ * Build against Mesa 9
+ * Enable GL sharing extension
+
+ -- Simon Richter <sjr at debian.org> Wed, 19 Jun 2013 20:48:03 +0200
+
+beignet (0.1+git20130614+89b5e40-2) unstable; urgency=low
+
+ * Add Ubuntu support
+ * Upload to unstable to get an ICD capable package there
+
+ -- Simon Richter <sjr at debian.org> Fri, 14 Jun 2013 17:40:45 +0200
+
+beignet (0.1+git20130614+89b5e40-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Fri, 14 Jun 2013 15:22:18 +0200
+
+beignet (0.1+git20130521+a7ea35c-1) experimental; urgency=low
+
+ * Rename binary package
+
+ -- Simon Richter <sjr at debian.org> Tue, 21 May 2013 10:48:39 +0200
+
+beignet (0.1+git20130521+a7ea35c-1~prerename) experimental; urgency=low
+
+ * New upstream release
+ * Move libraries to /usr/lib/beignet (should not be used directly)
+
+ -- Simon Richter <sjr at debian.org> Tue, 21 May 2013 09:17:45 +0200
+
+beignet (0.1+git20130514+19e9c58-1) experimental; urgency=low
+
+ * New upstream release
+ * Added a number of tentative patches
+
+ -- Simon Richter <sjr at debian.org> Tue, 14 May 2013 20:04:29 +0200
+
+beignet (0.1+git20130502+63e60ed-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Mon, 06 May 2013 06:30:32 +0200
+
+beignet (0.1+git20130426+0c8f6fe-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Fri, 26 Apr 2013 14:42:21 +0200
+
+beignet (0.1+git20130422+003fac5-2) experimental; urgency=low
+
+ * Add patch for select()
+ * Add patch for fmin() / fmax()
+
+ -- Simon Richter <sjr at debian.org> Mon, 22 Apr 2013 18:26:01 +0200
+
+beignet (0.1+git20130422+003fac5-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Mon, 22 Apr 2013 15:10:54 +0200
+
+beignet (0.1+git20130419+9c11c18-1) experimental; urgency=low
+
+ * Add more functionality patches
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Fri, 19 Apr 2013 14:14:39 +0200
+
+beignet (0.1+git20130418+0546d2e-2) experimental; urgency=low
+
+ * Add functionality patches
+ * Use clang 3.0 command line syntax
+
+ -- Simon Richter <sjr at debian.org> Fri, 19 Apr 2013 09:53:23 +0200
+
+beignet (0.1+git20130418+0546d2e-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Thu, 18 Apr 2013 11:51:37 +0200
+
+beignet (0.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Tue, 16 Apr 2013 17:16:18 +0200
+
+beignet (0.0.0+git2013.04.11+e6b503e-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Mon, 15 Apr 2013 18:22:45 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-4) unstable; urgency=low
+
+ * Build fix for kfreebsd-*
+
+ -- Simon Richter <sjr at debian.org> Fri, 12 Apr 2013 11:22:36 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-3) unstable; urgency=low
+
+ * Adjust Build-Depends, Architecture list
+
+ -- Simon Richter <sjr at debian.org> Fri, 12 Apr 2013 10:32:36 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-2) unstable; urgency=low
+
+ * Add patch to support size queries in device info
+
+ -- Simon Richter <sjr at debian.org> Thu, 11 Apr 2013 14:00:59 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Simon Richter <sjr at debian.org> Tue, 09 Apr 2013 17:14:00 +0200
diff --cc debian/clean
index 0000000,0000000..a841701
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,1 @@@
++kernels/compiler_ceil.bin
diff --cc debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch
index 0000000,0000000..00b208b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch
@@@ -1,0 -1,0 +1,26 @@@
++From b0c0f12711e3a370310c92c6406c06e4ddd5a81d Mon Sep 17 00:00:00 2001
++From: Simon Richter <Simon.Richter at hogyros.de>
++Date: Fri, 23 Aug 2013 17:14:43 +0200
++Subject: [PATCH 2/2] Revert "GBE: disable cl_khr_fp64."
++To: beignet at lists.freedesktop.org
++
++This reverts commit 6e4e01b7a0e15f454e0b5d05887cc2870be7f5a7.
++---
++ src/cl_extensions.c | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/src/cl_extensions.c b/src/cl_extensions.c
++index d07a525..cc361db 100644
++--- a/src/cl_extensions.c
+++++ b/src/cl_extensions.c
++@@ -26,7 +26,6 @@ void check_basic_extension(cl_extensions_t *extensions)
++ {
++ int id;
++ for(id = BASE_EXT_START_ID; id <= BASE_EXT_END_ID; id++)
++- if (id != EXT_ID(khr_fp64))
++ extensions->extensions[id].base.ext_enabled = 1;
++ }
++
++--
++1.7.10.4
++
diff --cc debian/patches/0003-ICD-dispatch-table-must-be-first.patch
index 0000000,0000000..c2c63ad
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-ICD-dispatch-table-must-be-first.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 47bde186856f3592ce71ba17db527a678477ed62 Mon Sep 17 00:00:00 2001
++From: Simon Richter <Simon.Richter at hogyros.de>
++Date: Sat, 28 Sep 2013 06:32:24 +0200
++Subject: [PATCH 3/3] ICD dispatch table must be first
++To: beignet at lists.freedesktop.org
++
++The ICD loader expects the first member of any dispatchable object to be
++the dispatch table.
++---
++ src/cl_mem.h | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++Index: beignet-0.2+git20130928+187c17e/src/cl_mem.h
++===================================================================
++--- beignet-0.2+git20130928+187c17e.orig/src/cl_mem.h 2013-09-26 10:55:59.000000000 +0200
+++++ beignet-0.2+git20130928+187c17e/src/cl_mem.h 2013-09-28 06:34:22.884556905 +0200
++@@ -73,8 +73,8 @@
++ #define IS_GL_IMAGE(mem) (mem->type == CL_MEM_GL_IMAGE_TYPE)
++
++ typedef struct _cl_mem {
++- uint64_t magic; /* To identify it as a memory object */
++ DEFINE_ICD(dispatch)
+++ uint64_t magic; /* To identify it as a memory object */
++ cl_mem prev, next; /* We chain the memory buffers together */
++ enum cl_mem_type type;
++ volatile int ref_n; /* This object is reference counted */
diff --cc debian/patches/private
index 759566d,0000000..9067723
mode 100644,000000..100644
--- a/debian/patches/private
+++ b/debian/patches/private
@@@ -1,42 -1,0 +1,42 @@@
+Description: Install as private library
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-05-21
+
- Index: beignet-0.2+git20130730+da26376/backend/src/CMakeLists.txt
++Index: beignet-0.2+git20130928+187c17e/backend/src/CMakeLists.txt
+===================================================================
- --- beignet-0.2+git20130730+da26376.orig/backend/src/CMakeLists.txt 2013-07-30 11:12:48.000000000 +0200
- +++ beignet-0.2+git20130730+da26376/backend/src/CMakeLists.txt 2013-07-30 13:45:45.987594708 +0200
- @@ -154,11 +154,11 @@
- ${CMAKE_THREAD_LIBS_INIT}
- ${CMAKE_DL_LIBS})
++--- beignet-0.2+git20130928+187c17e.orig/backend/src/CMakeLists.txt 2013-09-26 10:55:59.000000000 +0200
+++++ beignet-0.2+git20130928+187c17e/backend/src/CMakeLists.txt 2013-09-28 06:20:45.396509466 +0200
++@@ -159,11 +159,11 @@
++ ADD_EXECUTABLE(gbe_bin_generater gbe_bin_generater.cpp)
++ TARGET_LINK_LIBRARIES(gbe_bin_generater gbe)
+
+-install (TARGETS gbe LIBRARY DESTINATION lib)
+-install (FILES ${pch_object} DESTINATION lib)
++install (TARGETS gbe LIBRARY DESTINATION lib/beignet)
++install (FILES ${pch_object} DESTINATION lib/beignet)
+ install (FILES backend/program.h DESTINATION include/gen)
+
+-set (PCH_OBJECT_DIR "${pch_object};${CMAKE_INSTALL_PREFIX}/lib/ocl_stdlib.h.pch")
++set (PCH_OBJECT_DIR "${pch_object};${CMAKE_INSTALL_PREFIX}/lib/beignet/ocl_stdlib.h.pch")
+ configure_file (
+ "GBEConfig.h.in"
+ "GBEConfig.h"
- Index: beignet-0.2+git20130730+da26376/src/CMakeLists.txt
++Index: beignet-0.2+git20130928+187c17e/src/CMakeLists.txt
+===================================================================
- --- beignet-0.2+git20130730+da26376.orig/src/CMakeLists.txt 2013-07-30 11:12:48.000000000 +0200
- +++ beignet-0.2+git20130730+da26376/src/CMakeLists.txt 2013-07-30 13:44:56.743596438 +0200
++--- beignet-0.2+git20130928+187c17e.orig/src/CMakeLists.txt 2013-09-26 10:55:59.000000000 +0200
+++++ beignet-0.2+git20130928+187c17e/src/CMakeLists.txt 2013-09-28 06:21:15.052511187 +0200
+@@ -47,6 +47,8 @@
+
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
++ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic,--allow-shlib-undefined")
+
++SET(CMAKE_INSTALL_RPATH /usr/lib/beignet)
++
+ link_directories (${LLVM_LIBRARY_DIR})
+ add_library(cl SHARED ${OPENCL_SRC})
+ target_link_libraries(
- @@ -60,4 +62,4 @@
++@@ -59,4 +61,4 @@
++ ${DRM_LIBRARY}
+ ${OPENGL_LIBRARIES}
- ${OPTIONAL_EGL_LIBRARY}
- ${OPTIONAL_GBM_LIBRARY})
++ ${OPTIONAL_EGL_LIBRARY})
+-install (TARGETS cl LIBRARY DESTINATION lib)
++install (TARGETS cl LIBRARY DESTINATION lib/beignet)
diff --cc debian/patches/series
index dfd681e,0000000..578d9e4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,7 @@@
+debug
+flags
+khronos
+deprecated-in-utest
+private
++0002-Revert-GBE-disable-cl_khr_fp64.patch
++0003-ICD-dispatch-table-must-be-first.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-devel
mailing list