[Pkg-opencl-devel] [beignet] 12/47: Imported Debian patch 0.1+git20130426+0c8f6fe-1
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Oct 31 21:45:47 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 ff23a2b833a94cb24df006ca02e55d72c4851bbe
Author: Simon Richter <sjr at debian.org>
Date: Fri Apr 26 14:42:21 2013 +0200
Imported Debian patch 0.1+git20130426+0c8f6fe-1
---
debian/changelog | 6 +++
debian/patches/driver_version | 86 -------------------------------
debian/patches/fminmax | 19 -------
debian/patches/gdi | 76 ---------------------------
debian/patches/gmoi | 117 ------------------------------------------
debian/patches/pitch2d | 30 -----------
debian/patches/select | 48 -----------------
debian/patches/series | 4 --
8 files changed, 6 insertions(+), 380 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a53f592..883378e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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()
diff --git a/debian/patches/driver_version b/debian/patches/driver_version
deleted file mode 100644
index 89f448d..0000000
--- a/debian/patches/driver_version
+++ /dev/null
@@ -1,86 +0,0 @@
-commit 7f79b7428cb40bc6c915ce0b7d746c9d6658f6b9
-Author: Simon Richter <Simon.Richter at hogyros.de>
-Date: Fri Apr 19 12:48:00 2013 +0200
-
- Implement clGetDeviceInfo(..., CL_DRIVER_VERSION, ...)
-
-diff --git a/src/cl_device_id.c b/src/cl_device_id.c
-index 114a0ce..6300b41 100644
---- a/src/cl_device_id.c
-+++ b/src/cl_device_id.c
-@@ -230,6 +230,18 @@ cl_get_device_info(cl_device_id device,
- DECL_STRING_FIELD(PROFILE, profile)
- DECL_STRING_FIELD(OPENCL_C_VERSION, opencl_c_version)
- DECL_STRING_FIELD(EXTENSIONS, extensions);
-+
-+ case CL_DRIVER_VERSION:
-+ if (param_value_size_ret) {
-+ *param_value_size_ret = device->driver_version_sz;
-+ if (!param_value)
-+ return CL_SUCCESS;
-+ }
-+ if (param_value_size < device->driver_version_sz)
-+ return CL_INVALID_VALUE;
-+ memcpy(param_value, device->driver_version, device->driver_version_sz);
-+ return CL_SUCCESS;
-+
- default: return CL_INVALID_VALUE;
- };
- }
-diff --git a/src/cl_device_id.h b/src/cl_device_id.h
-index 610eaf6..d199ecb 100644
---- a/src/cl_device_id.h
-+++ b/src/cl_device_id.h
-@@ -83,12 +83,14 @@ struct _cl_device_id {
- const char *profile;
- const char *opencl_c_version;
- const char *extensions;
-+ const char *driver_version;
- size_t name_sz;
- size_t vendor_sz;
- size_t version_sz;
- size_t profile_sz;
- size_t opencl_c_version_sz;
- size_t extensions_sz;
-+ size_t driver_version_sz;
- /* Kernel specific info that we're assigning statically */
- size_t wg_sz;
- size_t compile_wg_sz[3];
-diff --git a/src/cl_gt_device.h b/src/cl_gt_device.h
-index 993017b..f26cd8a 100644
---- a/src/cl_gt_device.h
-+++ b/src/cl_gt_device.h
-@@ -72,6 +72,7 @@ DECL_INFO_STRING(version, OCL_VERSION_STRING)
- DECL_INFO_STRING(profile, "FULL_PROFILE")
- DECL_INFO_STRING(opencl_c_version, "OpenCL 1.10")
- DECL_INFO_STRING(extensions, "")
-+DECL_INFO_STRING(driver_version, LIBCL_VERSION_STRING)
- #undef DECL_INFO_STRING
-
-
-diff --git a/src/cl_platform_id.h b/src/cl_platform_id.h
-index edd3aae..3a74028 100644
---- a/src/cl_platform_id.h
-+++ b/src/cl_platform_id.h
-@@ -25,6 +25,8 @@
- #include "cl_khr_icd.h"
- #include "CL/cl.h"
-
-+#include "src/OCLConfig.h"
-+
- struct _cl_platform_id {
- DEFINE_ICD(dispatch)
- const char *profile;
-@@ -61,9 +63,10 @@ extern cl_int cl_get_platform_info(cl_platform_id platform,
- #define OCL_VERSION_MINOR 0
-
- #define _STR(x) #x
--#define _JOINT(x, y) "OpenCL " _STR(x) "." _STR(y)
-+#define _JOINT(x, y) _STR(x) "." _STR(y)
-
--#define OCL_VERSION_STRING _JOINT(OCL_VERSION_MAJOR, OCL_VERSION_MINOR)
-+#define OCL_VERSION_STRING "OpenCL " _JOINT(OCL_VERSION_MAJOR, OCL_VERSION_MINOR)
-+#define LIBCL_VERSION_STRING _JOINT(LIBCL_VERSION_MAJOR, LIBCL_VERSION_MINOR)
-
- #endif /* __CL_PLATFORM_ID_H__ */
-
diff --git a/debian/patches/fminmax b/debian/patches/fminmax
deleted file mode 100644
index 03db57c..0000000
--- a/debian/patches/fminmax
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 09d513910bd7a4d523424a0666494c691aa4c824
-Author: Simon Richter <Simon.Richter at hogyros.de>
-Date: Mon Apr 22 18:59:33 2013 +0200
-
- Add vector fmin/fmax
-
-diff --git a/backend/src/ocl_stdlib.h b/backend/src/ocl_stdlib.h
-index ce0c5f9..79616b8 100644
---- a/backend/src/ocl_stdlib.h
-+++ b/backend/src/ocl_stdlib.h
-@@ -684,6 +684,8 @@ DECL_VECTOR_1OP(__gen_ocl_internal_log10, float);
- }
- DECL_VECTOR_2OP(min, float);
- DECL_VECTOR_2OP(max, float);
-+DECL_VECTOR_2OP(__gen_ocl_internal_fmin, float);
-+DECL_VECTOR_2OP(__gen_ocl_internal_fmax, float);
- DECL_VECTOR_2OP(fmod, float);
- DECL_VECTOR_2OP(powr, float);
- #undef DECL_VECTOR_2OP
diff --git a/debian/patches/gdi b/debian/patches/gdi
deleted file mode 100644
index f707901..0000000
--- a/debian/patches/gdi
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 8f07d9ad35e0313c615c836d42b613ca0d9e9c90
-Author: Simon Richter <Simon.Richter at hogyros.de>
-Date: Fri Apr 19 11:11:21 2013 +0200
-
- Handle size queries in clGetDeviceInfo better
-
- This allows size queries on all fields.
-
-Index: beignet-0.1+git20130418+0546d2e/src/cl_device_id.c
-===================================================================
---- beignet-0.1+git20130418+0546d2e.orig/src/cl_device_id.c 2013-04-19 12:25:33.606705836 +0200
-+++ beignet-0.1+git20130418+0546d2e/src/cl_device_id.c 2013-04-19 12:25:55.978704839 +0200
-@@ -135,30 +135,28 @@
-
- #define DECL_FIELD(CASE,FIELD) \
- case JOIN(CL_DEVICE_,CASE): \
-- if (param_value_size < sizeof(((cl_device_id)NULL)->FIELD)) \
-- return CL_INVALID_VALUE; \
-- if (param_value_size_ret != NULL) \
-- *param_value_size_ret = sizeof(((cl_device_id)NULL)->FIELD);\
-- memcpy(param_value, \
-- &device->FIELD, \
-- sizeof(((cl_device_id)NULL)->FIELD)); \
-- return CL_SUCCESS;
-+ if (param_value_size_ret) { \
-+ *param_value_size_ret = sizeof device->FIELD; \
-+ if (!param_value) \
-+ return CL_SUCCESS; \
-+ } \
-+ if (param_value_size < sizeof device->FIELD) \
-+ return CL_INVALID_VALUE; \
-+ memcpy(param_value, &device->FIELD, sizeof device->FIELD); \
-+ return CL_SUCCESS;
-
- #define DECL_STRING_FIELD(CASE,FIELD) \
- case JOIN(CL_DEVICE_,CASE): \
-+ if (param_value_size_ret) { \
-+ *param_value_size_ret = device->JOIN(FIELD,_sz); \
-+ if (!param_value) \
-+ return CL_SUCCESS; \
-+ } \
- if (param_value_size < device->JOIN(FIELD,_sz)) \
- return CL_INVALID_VALUE; \
-- if (param_value_size_ret != NULL) \
-- *param_value_size_ret = device->JOIN(FIELD,_sz); \
- memcpy(param_value, device->FIELD, device->JOIN(FIELD,_sz)); \
- return CL_SUCCESS;
-
--#define GET_STRING_FIELD_SIZE(CASE,FIELD) \
-- case JOIN(CL_DEVICE_,CASE): \
-- if (param_value_size_ret != NULL) \
-- *param_value_size_ret = device->JOIN(FIELD,_sz); \
-- return CL_SUCCESS;
--
- LOCAL cl_int
- cl_get_device_info(cl_device_id device,
- cl_device_info param_name,
-@@ -171,18 +169,6 @@
- device != &intel_hsw_device))
- return CL_INVALID_DEVICE;
-
-- if (param_value == NULL) {
-- switch (param_name) {
-- GET_STRING_FIELD_SIZE(NAME, name)
-- GET_STRING_FIELD_SIZE(VENDOR, vendor)
-- GET_STRING_FIELD_SIZE(VERSION, version)
-- GET_STRING_FIELD_SIZE(PROFILE, profile)
-- GET_STRING_FIELD_SIZE(OPENCL_C_VERSION, opencl_c_version)
-- GET_STRING_FIELD_SIZE(EXTENSIONS, extensions)
-- default: return CL_INVALID_VALUE;
-- }
-- }
--
- /* Find the correct parameter */
- switch (param_name) {
- DECL_FIELD(TYPE, device_type)
diff --git a/debian/patches/gmoi b/debian/patches/gmoi
deleted file mode 100644
index 200ba8f..0000000
--- a/debian/patches/gmoi
+++ /dev/null
@@ -1,117 +0,0 @@
-commit c60c0bfa3347aa4f89877743cbeeb1ae998ebb12
-Author: Simon Richter <Simon.Richter at hogyros.de>
-Date: Thu Apr 18 20:01:35 2013 +0200
-
- Implement clGetMemObjectInfo
-
- Currently, only the properties
-
- - CL_MEM_TYPE
- - CL_MEM_FLAGS
- - CL_MEM_SIZE
-
- are implemented.
-
-Index: beignet-0.1+git20130419+9c11c18/src/cl_api.c
-===================================================================
---- beignet-0.1+git20130419+9c11c18.orig/src/cl_api.c 2013-04-19 14:15:05.000000000 +0200
-+++ beignet-0.1+git20130419+9c11c18/src/cl_api.c 2013-04-19 14:17:57.190405178 +0200
-@@ -400,8 +400,11 @@
- void * param_value,
- size_t * param_value_size_ret)
- {
-- NOT_IMPLEMENTED;
-- return 0;
-+ return cl_get_mem_object_info(memobj,
-+ param_name,
-+ param_value_size,
-+ param_value,
-+ param_value_size_ret);
- }
-
- cl_int
-Index: beignet-0.1+git20130419+9c11c18/src/cl_mem.c
-===================================================================
---- beignet-0.1+git20130419+9c11c18.orig/src/cl_mem.c 2013-04-19 10:28:49.000000000 +0200
-+++ beignet-0.1+git20130419+9c11c18/src/cl_mem.c 2013-04-19 14:17:57.190405178 +0200
-@@ -91,6 +91,66 @@
-
- #undef FIELD_SIZE
-
-+#define FIELD_SIZE(CASE,TYPE) \
-+ case JOIN(CL_,CASE): \
-+ if(param_value_size_ret) \
-+ *param_value_size_ret = sizeof(TYPE); \
-+ if(!param_value) \
-+ return CL_SUCCESS; \
-+ if(param_value_size < sizeof(TYPE)) \
-+ return CL_INVALID_VALUE; \
-+ break;
-+
-+LOCAL cl_int
-+cl_get_mem_object_info(cl_mem mem,
-+ cl_mem_info param_name,
-+ size_t param_value_size,
-+ void *param_value,
-+ size_t *param_value_size_ret)
-+{
-+ switch(param_name)
-+ {
-+ FIELD_SIZE(MEM_TYPE, cl_mem_object_type);
-+ FIELD_SIZE(MEM_FLAGS, cl_mem_flags);
-+ FIELD_SIZE(MEM_SIZE, size_t);
-+ FIELD_SIZE(MEM_HOST_PTR, void *);
-+ FIELD_SIZE(MEM_MAP_COUNT, cl_uint);
-+ FIELD_SIZE(MEM_REFERENCE_COUNT, cl_uint);
-+ FIELD_SIZE(MEM_CONTEXT, cl_context);
-+ default:
-+ return CL_INVALID_VALUE;
-+ }
-+
-+ switch(param_name)
-+ {
-+ case CL_MEM_TYPE:
-+ *((cl_mem_object_type *)param_value) = mem->type;
-+ break;
-+ case CL_MEM_FLAGS:
-+ *((cl_mem_flags *)param_value) = mem->flags;
-+ break;
-+ case CL_MEM_SIZE:
-+ *((size_t *)param_value) = cl_buffer_get_size(mem->bo);
-+ break;
-+ case CL_MEM_HOST_PTR:
-+ NOT_IMPLEMENTED;
-+ break;
-+ case CL_MEM_MAP_COUNT:
-+ NOT_IMPLEMENTED;
-+ break;
-+ case CL_MEM_REFERENCE_COUNT:
-+ NOT_IMPLEMENTED;
-+ break;
-+ case CL_MEM_CONTEXT:
-+ NOT_IMPLEMENTED;
-+ break;
-+ }
-+
-+ return CL_SUCCESS;
-+}
-+
-+#undef FIELD_SIZE
-+
- static cl_mem
- cl_mem_allocate(cl_context ctx,
- cl_mem_flags flags,
-Index: beignet-0.1+git20130419+9c11c18/src/cl_mem.h
-===================================================================
---- beignet-0.1+git20130419+9c11c18.orig/src/cl_mem.h 2013-04-19 10:28:49.000000000 +0200
-+++ beignet-0.1+git20130419+9c11c18/src/cl_mem.h 2013-04-19 14:17:57.190405178 +0200
-@@ -51,6 +51,9 @@
- /* Query information about a memory object */
- extern cl_int cl_get_mem_object_info(cl_mem, cl_mem_info, size_t, void *, size_t *);
-
-+/* Query information about a memory object */
-+extern cl_int cl_get_mem_object_info(cl_mem, cl_mem_info, size_t, void *, size_t *);
-+
- /* Create a new memory object and initialize it with possible user data */
- extern cl_mem cl_mem_new(cl_context, cl_mem_flags, size_t, void*, cl_int*);
-
diff --git a/debian/patches/pitch2d b/debian/patches/pitch2d
deleted file mode 100644
index 7ebf5b8..0000000
--- a/debian/patches/pitch2d
+++ /dev/null
@@ -1,30 +0,0 @@
-commit ab57856a5278c25748d8a2d261f31b8c29f146f9
-Author: Simon Richter <Simon.Richter at hogyros.de>
-Date: Thu Apr 18 17:50:05 2013 +0200
-
- Fix pitch parameter in clCreateImage2D
-
- If the host_ptr is NULL, the pitch parameter must be 0.
-
- The pitch parameter gives the number of bytes per scanline. Specifying 0
- selects the minimum possible.
-
-Index: beignet-0.1+git20130418+0546d2e/src/cl_mem.c
-===================================================================
---- beignet-0.1+git20130418+0546d2e.orig/src/cl_mem.c 2013-04-18 05:21:35.000000000 +0200
-+++ beignet-0.1+git20130418+0546d2e/src/cl_mem.c 2013-04-18 17:54:09.970688265 +0200
-@@ -284,9 +284,13 @@
- if (UNLIKELY(h == 0)) DO_IMAGE_ERROR;
-
- if (image_type == CL_MEM_OBJECT_IMAGE2D) {
-+ size_t min_pitch = bpp * w;
-+ if (data && pitch == 0)
-+ pitch = min_pitch;
- if (UNLIKELY(w > ctx->device->image2d_max_width)) DO_IMAGE_ERROR;
- if (UNLIKELY(h > ctx->device->image2d_max_height)) DO_IMAGE_ERROR;
-- if (UNLIKELY(data && (bpp*w > pitch))) DO_IMAGE_ERROR;
-+ if (UNLIKELY(data && min_pitch > pitch)) DO_IMAGE_ERROR;
-+ if (UNLIKELY(!data && pitch != 0)) DO_IMAGE_ERROR;
-
- /* Pick up tiling mode (we do only linear on SNB) */
- if (cl_driver_get_ver(ctx->drv) != 6)
diff --git a/debian/patches/select b/debian/patches/select
deleted file mode 100644
index a31839e..0000000
--- a/debian/patches/select
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 17fbbe5119e5d356d2df5b72fa04abbd2c1f5b3b
-Author: Simon Richter <Simon.Richter at hogyros.de>
-Date: Mon Apr 22 18:19:07 2013 +0200
-
- Add missing select() overloads
-
- Both signed and unsigned types are allowed as the condition type,
- regardless of the true/false branch types.
-
-Index: beignet-0.1+git20130422+003fac5/backend/src/ocl_stdlib.h
-===================================================================
---- beignet-0.1+git20130422+003fac5.orig/backend/src/ocl_stdlib.h 2013-04-22 12:04:32.000000000 +0200
-+++ beignet-0.1+git20130422+003fac5/backend/src/ocl_stdlib.h 2013-04-22 18:25:49.509225930 +0200
-@@ -438,15 +438,24 @@
- return a*b+c;
- }
-
-+INLINE OVERLOADABLE uint select(uint src0, uint src1, int cond) {
-+ return cond ? src1 : src0;
-+}
- INLINE OVERLOADABLE uint select(uint src0, uint src1, uint cond) {
- return cond ? src1 : src0;
- }
- INLINE OVERLOADABLE int select(int src0, int src1, int cond) {
- return cond ? src1 : src0;
- }
-+INLINE OVERLOADABLE int select(int src0, int src1, uint cond) {
-+ return cond ? src1 : src0;
-+}
- INLINE OVERLOADABLE float select(float src0, float src1, int cond) {
- return cond ? src1 : src0;
- }
-+INLINE OVERLOADABLE float select(float src0, float src1, uint cond) {
-+ return cond ? src1 : src0;
-+}
-
- // This will be optimized out by LLVM and will output LLVM select instructions
- #define DECL_SELECT4(TYPE4, TYPE, COND_TYPE4, MASK) \
-@@ -467,7 +476,9 @@
- return dst; \
- }
- DECL_SELECT4(int4, int, int4, 0x80000000)
-+DECL_SELECT4(int4, int, uint4, 0x80000000)
- DECL_SELECT4(float4, float, int4, 0x80000000)
-+DECL_SELECT4(float4, float, uint4, 0x80000000)
- #undef DECL_SELECT4
-
- /////////////////////////////////////////////////////////////////////////////
diff --git a/debian/patches/series b/debian/patches/series
index dffc483..d1dc3a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,8 +5,4 @@ missing-header
soname
respect-flags
clang-3.0
-gdi
-driver_version
const64
-select
-fminmax
--
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