[beignet] 03/08: Drop patches applied upstream, refresh others
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Tue Aug 1 21:38:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
rnpalmer-guest pushed a commit to branch master
in repository beignet.
commit f8badc83a792e03e0d64b6435b47c49819159d92
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Sun Jul 30 14:45:27 2017 +0100
Drop patches applied upstream, refresh others
---
debian/changelog | 7 +
debian/patches/add-appstream-metadata.patch | 2 +-
debian/patches/docs-broken-links.patch | 11 +-
debian/patches/find-python35.patch | 2 +-
debian/patches/llvm39-support.patch | 22 --
debian/patches/opencl2-runtime-detection.patch | 369 -------------------------
debian/patches/reduce-notfound-output.patch | 2 +-
debian/patches/series | 3 -
debian/patches/ship-test-tool.patch | 6 +-
debian/patches/spelling.patch | 16 --
debian/patches/support-kfreebsd.patch | 2 +-
debian/patches/update-docs.patch | 40 ++-
12 files changed, 39 insertions(+), 443 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 25ce68a..545b40c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+beignet (1.3.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop patches applied upstream, refresh others.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com> Sun, 30 Jul 2017 14:30:54 +0100
+
beignet (1.3.0-4) unstable; urgency=medium
* Install OpenCL 2.0 libraries. (Closes: #863300)
diff --git a/debian/patches/add-appstream-metadata.patch b/debian/patches/add-appstream-metadata.patch
index bfe108b..d0c804f 100644
--- a/debian/patches/add-appstream-metadata.patch
+++ b/debian/patches/add-appstream-metadata.patch
@@ -8,7 +8,7 @@ Forwarded: https://lists.freedesktop.org/archives/beignet/2017-January/008464.ht
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -317,6 +317,10 @@ IF(BUILD_EXAMPLES)
+@@ -339,6 +339,10 @@ IF(BUILD_EXAMPLES)
ADD_SUBDIRECTORY(examples)
ENDIF(BUILD_EXAMPLES)
diff --git a/debian/patches/docs-broken-links.patch b/debian/patches/docs-broken-links.patch
index 22efbea..a3a120a 100644
--- a/debian/patches/docs-broken-links.patch
+++ b/debian/patches/docs-broken-links.patch
@@ -13,7 +13,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Prerequisite
------------
-@@ -138,6 +138,7 @@ need to refer the "Known Issues" section
+@@ -139,6 +139,7 @@ need to refer the "Known Issues" section
Normally, beignet needs to run under X server environment as normal user. If there isn't X server,
beignet provides two alternative to run:
@@ -21,7 +21,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
* Run as root without X.
* Enable the drm render nodes by passing drm.rnodes=1 to the kernel boot args, then you can run beignet with non-root and without X.
-@@ -297,14 +298,14 @@ Please specify your hardware when report
+@@ -296,15 +297,15 @@ Please specify your hardware when report
Documents for OpenCL application developers
-------------------------------------------
@@ -30,14 +30,15 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-- [[Kernel Optimization Guide|Beignet/optimization-guide]]
-- [[Libva Buffer Sharing|Beignet/howto/libva-buffer-sharing-howto]]
-- [[V4l2 Buffer Sharing|Beignet/howto/v4l2-buffer-sharing-howto]]
--- [[Video Motion Estimation|Beignet/howto/video-motion-estimation-howto]]
--- [[Stand Alone Unit Test|Beignet/howto/stand-alone-utest-howto]]
--- [[Android build|Beignet/android-build-howto]]
+- [[Cross compile (yocto)|howto/cross-compiler-howto]]
+- [[Work with old system without c++11|howto/oldgcc-howto]]
+- [[Kernel Optimization Guide|optimization-guide]]
+- [[Libva Buffer Sharing|howto/libva-buffer-sharing-howto]]
+- [[V4l2 Buffer Sharing|howto/v4l2-buffer-sharing-howto]]
+ - [[OpenGL Buffer Sharing|Beignet/howto/gl-buffer-sharing-howto]]
+-- [[Video Motion Estimation|Beignet/howto/video-motion-estimation-howto]]
+-- [[Stand Alone Unit Test|Beignet/howto/stand-alone-utest-howto]]
+-- [[Android build|Beignet/android-build-howto]]
+- [[Video Motion Estimation|howto/video-motion-estimation-howto]]
+- [[Stand Alone Unit Test|howto/stand-alone-utest-howto]]
+- [[Android build|howto/android-build-howto]]
diff --git a/debian/patches/find-python35.patch b/debian/patches/find-python35.patch
index fb3dff0..7d50a65 100644
--- a/debian/patches/find-python35.patch
+++ b/debian/patches/find-python35.patch
@@ -9,8 +9,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,7 @@ ELSE(OCLIcd_FOUND)
- MESSAGE(STATUS "Looking for OCL ICD header file - not found")
ENDIF(OCLIcd_FOUND)
+ ENDIF(OCLICD_COMPAT)
+set(Python_ADDITIONAL_VERSIONS 3.5)
Find_Package(PythonInterp)
diff --git a/debian/patches/llvm39-support.patch b/debian/patches/llvm39-support.patch
deleted file mode 100644
index b7b695f..0000000
--- a/debian/patches/llvm39-support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Accept LLVM 3.9
-
-Author: Rebecca Palmer
-Forwarded: https://lists.freedesktop.org/archives/beignet/2017-January/008491.html
-
---- a/CMake/FindLLVM.cmake
-+++ b/CMake/FindLLVM.cmake
-@@ -8,12 +8,12 @@
- # LLVM_FOUND - True if llvm found.
- if (LLVM_INSTALL_DIR)
- find_program(LLVM_CONFIG_EXECUTABLE
-- NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4
-+ NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config-39 llvm-config-3.9 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4
- DOC "llvm-config executable"
- PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
- else (LLVM_INSTALL_DIR)
- find_program(LLVM_CONFIG_EXECUTABLE
-- NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4
-+ NAMES llvm-config-37 llvm-config-3.7 llvm-config-36 llvm-config-3.6 llvm-config-38 llvm-config-3.8 llvm-config-39 llvm-config-3.9 llvm-config llvm-config-35 llvm-config-3.5 llvm-config-34 llvm-config-3.4
- DOC "llvm-config executable")
- endif (LLVM_INSTALL_DIR)
-
diff --git a/debian/patches/opencl2-runtime-detection.patch b/debian/patches/opencl2-runtime-detection.patch
deleted file mode 100644
index c4a67f0..0000000
--- a/debian/patches/opencl2-runtime-detection.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-Description: Enable OpenCL 2.0 only where supported
-
-This is needed because 2.0 uses 64 bit pointers, which
-assert-fail on Ivybridge (backend/src/backend/gen_context.cpp:2259).
-
-Also skip 2.0-only tests on non-2.0 hardware.
-
-Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -230,19 +230,8 @@ IF (EXPERIMENTAL_DOUBLE)
- ADD_DEFINITIONS(-DENABLE_FP64)
- ENDIF(EXPERIMENTAL_DOUBLE)
-
--OPTION(ENABLE_OPENCL_20 "Enable opencl 2.0 support" OFF)
-+OPTION(ENABLE_OPENCL_20 "Enable opencl 2.0 support" ON)
- IF (ENABLE_OPENCL_20)
-- Find_Program(LSPCI lspci)
-- IF (NOT LSPCI)
-- MESSAGE(FATAL_ERROR "Looking for lspci - not found")
-- ENDIF (NOT LSPCI)
-- EXECUTE_PROCESS(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/GetGenID.sh"
-- RESULT_VARIABLE SUPPORT_OCL20_DEVICE
-- OUTPUT_VARIABLE PCI_ID_NOT_USED)
--
-- IF (NOT SUPPORT_OCL20_DEVICE EQUAL 1)
-- MESSAGE(FATAL_ERROR "Only SKL and newer devices support OpenCL 2.0 now, your device don't support.")
-- ENDIF (NOT SUPPORT_OCL20_DEVICE EQUAL 1)
-
- IF (NOT HAVE_DRM_INTEL_BO_SET_SOFTPIN)
- MESSAGE(FATAL_ERROR "Please update libdrm to version 2.4.66 or later to enable OpenCL 2.0.")
---- a/backend/src/backend/program.cpp
-+++ b/backend/src/backend/program.cpp
-@@ -31,6 +31,7 @@
- #include "ir/value.hpp"
- #include "ir/unit.hpp"
- #include "ir/printf.hpp"
-+#include "../src/cl_device_data.h"
-
- #ifdef GBE_COMPILER_AVAILABLE
- #include "llvm/llvm_to_gen.hpp"
-@@ -855,6 +856,7 @@ namespace gbe {
- size_t *errSize,
- uint32_t &oclVersion)
- {
-+ uint32_t maxoclVersion = oclVersion;
- std::string pchFileName;
- bool findPCH = false;
- #if defined(__ANDROID__)
-@@ -1022,15 +1024,9 @@ EXTEND_QUOTE:
- }
-
- if (useDefaultCLCVersion) {
--#ifdef ENABLE_OPENCL_20
-- clOpt.push_back("-D__OPENCL_C_VERSION__=200");
-- clOpt.push_back("-cl-std=CL2.0");
-- oclVersion = 200;
--#else
- clOpt.push_back("-D__OPENCL_C_VERSION__=120");
- clOpt.push_back("-cl-std=CL1.2");
- oclVersion = 120;
--#endif
- }
- //for clCompilerProgram usage.
- if(temp_header_path){
-@@ -1061,7 +1057,12 @@ EXTEND_QUOTE:
- clOpt.push_back("-include-pch");
- clOpt.push_back(pchFileName);
- }
--
-+ if (oclVersion > maxoclVersion){
-+ if (err && stringSize > 0 && errSize) {
-+ *errSize = snprintf(err, stringSize, "Requested OpenCL version %lf is higher than maximum supported version %lf\n", (float)oclVersion/100.0,(float)maxoclVersion/100.0);
-+ }
-+ return false;
-+ }
- return true;
- }
-
-@@ -1076,7 +1077,7 @@ EXTEND_QUOTE:
- std::vector<std::string> clOpt;
- std::string dumpLLVMFileName, dumpASMFileName;
- std::string dumpSPIRBinaryName;
-- uint32_t oclVersion = 0;
-+ uint32_t oclVersion = MAX_OCLVERSION(deviceID);
- if (!processSourceAndOption(source, options, NULL, clOpt,
- dumpLLVMFileName, dumpASMFileName, dumpSPIRBinaryName,
- optLevel,
-@@ -1139,7 +1140,7 @@ EXTEND_QUOTE:
- std::vector<std::string> clOpt;
- std::string dumpLLVMFileName, dumpASMFileName;
- std::string dumpSPIRBinaryName;
-- uint32_t oclVersion = 0;
-+ uint32_t oclVersion = MAX_OCLVERSION(deviceID);
- if (!processSourceAndOption(source, options, temp_header_path, clOpt,
- dumpLLVMFileName, dumpASMFileName, dumpSPIRBinaryName,
- optLevel, stringSize, err, errSize, oclVersion))
---- a/src/cl_device_data.h
-+++ b/src/cl_device_data.h
-@@ -363,5 +363,7 @@
-
- #define IS_GEN9(devid) (IS_SKYLAKE(devid) || IS_BROXTON(devid) || IS_KABYLAKE(devid))
-
-+#define MAX_OCLVERSION(devid) (IS_GEN9(devid) ? 200 : 120)
-+
- #endif /* __CL_DEVICE_DATA_H__ */
-
---- a/src/cl_gen9_device.h
-+++ b/src/cl_gen9_device.h
-@@ -27,5 +27,7 @@
- .max_mem_alloc_size = 4 * 1024 * 1024 * 1024ul,
- .global_mem_size = 4 * 1024 * 1024 * 1024ul,
-
-+#define GEN9_DEVICE 1
- #include "cl_gt_device.h"
-+#undef GEN9_DEVICE
-
---- a/src/cl_gt_device.h
-+++ b/src/cl_gt_device.h
-@@ -16,7 +16,13 @@
- *
- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
- */
--
-+#ifdef GEN9_DEVICE
-+#define LIBCL_VERSION_STRING GEN9_LIBCL_VERSION_STRING
-+#define LIBCL_C_VERSION_STRING GEN9_LIBCL_C_VERSION_STRING
-+#else
-+#define LIBCL_VERSION_STRING NONGEN9_LIBCL_VERSION_STRING
-+#define LIBCL_C_VERSION_STRING NONGEN9_LIBCL_C_VERSION_STRING
-+#endif
- /* Common fields for both all GT devices (IVB / SNB) */
- .device_type = CL_DEVICE_TYPE_GPU,
- .device_id=0,/* == device_id (set when requested) */
-@@ -39,7 +45,7 @@
- .native_vector_width_float = 4,
- .native_vector_width_double = 2,
- .native_vector_width_half = 8,
--#ifdef ENABLE_OPENCL_20
-+#if defined(ENABLE_OPENCL_20) && defined (GEN9_DEVICE)
- .address_bits = 64,
- #else
- .address_bits = 32,
---- a/src/cl_platform_id.c
-+++ b/src/cl_platform_id.c
-@@ -32,7 +32,7 @@
-
- static struct _cl_platform_id intel_platform_data = {
- DECL_INFO_STRING(profile, "FULL_PROFILE")
-- DECL_INFO_STRING(version, LIBCL_VERSION_STRING)
-+ DECL_INFO_STRING(version, GEN9_LIBCL_VERSION_STRING)
- DECL_INFO_STRING(name, "Intel Gen OCL Driver")
- DECL_INFO_STRING(vendor, "Intel")
- DECL_INFO_STRING(icd_suffix_khr, "Intel")
---- a/src/cl_platform_id.h
-+++ b/src/cl_platform_id.h
-@@ -72,8 +72,10 @@ extern cl_int cl_get_platform_ids(cl_uin
- #else
- #define LIBCL_DRIVER_VERSION_STRING _JOINT(LIBCL_DRIVER_VERSION_MAJOR, LIBCL_DRIVER_VERSION_MINOR)
- #endif
--#define LIBCL_VERSION_STRING "OpenCL " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING BEIGNET_GIT_SHA1_STRING
--#define LIBCL_C_VERSION_STRING "OpenCL C " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING BEIGNET_GIT_SHA1_STRING
-+#define GEN9_LIBCL_VERSION_STRING "OpenCL " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING BEIGNET_GIT_SHA1_STRING
-+#define GEN9_LIBCL_C_VERSION_STRING "OpenCL C " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING BEIGNET_GIT_SHA1_STRING
-+#define NONGEN9_LIBCL_VERSION_STRING "OpenCL 1.2 beignet " LIBCL_DRIVER_VERSION_STRING BEIGNET_GIT_SHA1_STRING
-+#define NONGEN9_LIBCL_C_VERSION_STRING "OpenCL C 1.2 beignet " LIBCL_DRIVER_VERSION_STRING BEIGNET_GIT_SHA1_STRING
-
- #endif /* __CL_PLATFORM_ID_H__ */
-
---- a/utests/CMakeLists.txt
-+++ b/utests/CMakeLists.txt
-@@ -297,7 +297,6 @@ if (LLVM_VERSION_NODOT VERSION_GREATER 34)
- compiler_overflow.cpp)
- endif (LLVM_VERSION_NODOT VERSION_GREATER 34)
-
--if (ENABLE_OPENCL_20)
- SET(utests_sources
- ${utests_sources}
- compiler_program_global.cpp
-@@ -308,7 +307,6 @@ if (ENABLE_OPENCL_20)
- runtime_pipe_query.cpp
- compiler_pipe_builtin.cpp
- compiler_device_enqueue.cpp)
--endif (ENABLE_OPENCL_20)
-
- if (NOT_BUILD_STAND_ALONE_UTEST)
- if (X11_FOUND)
---- a/utests/compiler_atomic_functions_20.cpp
-+++ b/utests/compiler_atomic_functions_20.cpp
-@@ -64,8 +64,9 @@ static void compiler_atomic_functions(co
- globals[0] = n;
- locals[0] = LOCAL_SIZE;
-
-+ if(!cl_check_ocl20(false)){return;}
- // Setup kernel and buffers
-- OCL_CREATE_KERNEL_FROM_FILE("compiler_atomic_functions_20", kernel_name);
-+ OCL_CALL(cl_kernel_init, "compiler_atomic_functions_20.cl", kernel_name, SOURCE, "-cl-std=CL2.0");
- OCL_CREATE_BUFFER(buf[0], 0, 24 * sizeof(int), NULL);
- OCL_CREATE_BUFFER(buf[1], 0, locals[0] * sizeof(int), NULL);
- OCL_SET_ARG(0, sizeof(cl_mem), &buf[0]);
---- a/utests/compiler_device_enqueue.cpp
-+++ b/utests/compiler_device_enqueue.cpp
-@@ -6,8 +6,9 @@ void compiler_device_enqueue(void)
- const uint32_t global_sz = 3;
- uint32_t result = 0;
-
-+ if(!cl_check_ocl20(false)){return;}
- // Setup kernel and buffers
-- OCL_CREATE_KERNEL("compiler_device_enqueue");
-+ OCL_CALL(cl_kernel_init, "compiler_device_enqueue.cl", "compiler_device_enqueue", SOURCE, "-cl-std=CL2.0");
- OCL_CREATE_BUFFER(buf[0], 0, n * sizeof(uint32_t), NULL);
- OCL_SET_ARG(0, sizeof(uint32_t), &global_sz);
- OCL_SET_ARG(1, sizeof(cl_mem), &buf[0]);
---- a/utests/compiler_generic_atomic.cpp
-+++ b/utests/compiler_generic_atomic.cpp
-@@ -6,6 +6,7 @@ void test_atomic(const char* kernelName)
- const int n = 16;
- T cpu_src[16];
-
-+ if(!cl_check_ocl20(false)){return;}
- // Setup kernel and buffers
- OCL_CALL(cl_kernel_init, "compiler_generic_atomic.cl", kernelName, SOURCE, "-cl-std=CL2.0");
- OCL_CREATE_BUFFER(buf[0], 0, n * sizeof(T), NULL);
---- a/utests/compiler_generic_pointer.cpp
-+++ b/utests/compiler_generic_pointer.cpp
-@@ -6,6 +6,7 @@ void test(const char* kernelName)
- const int n = 16;
- T cpu_src[16];
-
-+ if(!cl_check_ocl20(false)){return;}
- // Setup kernel and buffers
- OCL_CALL(cl_kernel_init, "compiler_generic_pointer.cl", kernelName, SOURCE, "-cl-std=CL2.0");
- OCL_CREATE_BUFFER(buf[0], 0, n * sizeof(T), NULL);
---- a/utests/compiler_pipe_builtin.cpp
-+++ b/utests/compiler_pipe_builtin.cpp
-@@ -11,8 +11,9 @@ static void compiler_pipe_##GROUP##_##TYPE(void) \
- const size_t w = 16; \
- uint32_t ans_host = 0; \
- uint32_t ans_device = 0; \
-+ if(!cl_check_ocl20(false)){return;}\
- /* pipe write kernel*/ \
-- OCL_CREATE_KERNEL_FROM_FILE("compiler_pipe_builtin", "compiler_pipe_"#GROUP"_write_"#TYPE); \
-+ OCL_CALL(cl_kernel_init, "compiler_pipe_builtin.cl", "compiler_pipe_"#GROUP"_write_"#TYPE, SOURCE, "-cl-std=CL2.0");\
- OCL_CALL2(clCreatePipe, buf[0], ctx, 0, sizeof(TYPE), w, NULL);\
- OCL_CREATE_BUFFER(buf[1], CL_MEM_READ_WRITE, w * sizeof(TYPE), NULL);\
- OCL_MAP_BUFFER(1);\
-@@ -26,7 +27,7 @@ static void compiler_pipe_##GROUP##_##TYPE(void) \
- OCL_NDRANGE(1);\
- OCL_CALL(clReleaseKernel, kernel);\
- /* pipe read kernel */\
-- OCL_CREATE_KERNEL_FROM_FILE("compiler_pipe_builtin", "compiler_pipe_"#GROUP"_read_"#TYPE);\
-+ OCL_CALL(cl_kernel_init, "compiler_pipe_builtin.cl", "compiler_pipe_"#GROUP"_read_"#TYPE, SOURCE, "-cl-std=CL2.0");\
- OCL_CREATE_BUFFER(buf[2], CL_MEM_READ_WRITE, w * sizeof(TYPE), NULL);\
- OCL_SET_ARG(0, sizeof(cl_mem), &buf[0]);\
- OCL_SET_ARG(1, sizeof(cl_mem), &buf[2]);\
-@@ -52,8 +53,9 @@ PIPE_BUILTIN(mystruct, workgroup)
- static void compiler_pipe_query(void) {
- const size_t w = 32;
- const size_t sz = 16;
-+ if(!cl_check_ocl20(false)){return;}
- /* pipe write kernel */
-- OCL_CREATE_KERNEL_FROM_FILE("compiler_pipe_builtin", "compiler_pipe_query");
-+ OCL_CALL(cl_kernel_init, "compiler_pipe_builtin.cl", "compiler_pipe_query", SOURCE, "-cl-std=CL2.0");
- OCL_CALL2(clCreatePipe, buf[0], ctx, 0, sizeof(uint32_t), w, NULL);
- OCL_CREATE_BUFFER(buf[1], CL_MEM_READ_WRITE, sz * sizeof(uint32_t), NULL);
- OCL_SET_ARG(0, sizeof(cl_mem), &buf[0]);
---- a/utests/compiler_program_global.cpp
-+++ b/utests/compiler_program_global.cpp
-@@ -25,6 +25,7 @@ void compiler_program_global()
- int cpu_src[16];
- cl_int err;
-
-+ if(!cl_check_ocl20(false)){return;}
- // Setup kernel and buffers
- cl_program program;
- init_program("compiler_program_global.cl", ctx, &program);
---- a/utests/runtime_pipe_query.cpp
-+++ b/utests/runtime_pipe_query.cpp
-@@ -4,6 +4,7 @@ static void runtime_pipe_query(void) {
- const size_t w = 16;
- const size_t sz = 8;
- cl_uint retnum, retsz;
-+ if(!cl_check_ocl20(false)){return;}
- /* pipe write kernel */
- OCL_CALL2(clCreatePipe, buf[0], ctx, 0, sz, w, NULL);
- OCL_CALL(clGetPipeInfo, buf[0], CL_PIPE_MAX_PACKETS, sizeof(retnum), &retnum, NULL);
---- a/utests/utest_helper.hpp
-+++ b/utests/utest_helper.hpp
-@@ -310,8 +310,8 @@ extern clGetKernelSubGroupInfoKHR_cb* ut
- /* Check if cl_intel_motion_estimation enabled. */
- extern int cl_check_motion_estimation(void);
-
--/* Check is cl version 2.0. */
--extern int cl_check_ocl20(void);
-+/* Check is cl version 2.0. (if or_beignet is set, also accept any beignet device, whatever its CL version)*/
-+extern int cl_check_ocl20(bool or_beignet=true);
-
- /* Check is FP16 enabled. */
- extern int cl_check_half(void);
---- a/utests/utest_helper.cpp
-+++ b/utests/utest_helper.cpp
-@@ -939,13 +939,14 @@ int cl_check_subgroups_short(void)
- return 1;
- }
-
--int cl_check_ocl20(void)
-+int cl_check_ocl20(bool or_beignet)
- {
- size_t param_value_size;
- size_t ret_sz;
- OCL_CALL(clGetDeviceInfo, device, CL_DEVICE_OPENCL_C_VERSION, 0, 0, ¶m_value_size);
- if(param_value_size == 0) {
- printf("Not OpenCL 2.0 device, ");
-+ if(or_beignet){
- if(cl_check_beignet()) {
- printf("Beignet extension test!");
- return 1;
-@@ -953,6 +954,10 @@ int cl_check_ocl20(void)
- printf("Not beignet device , Skip!");
- return 0;
- }
-+ }else{
-+ printf("Skip!");
-+ return 0;
-+ }
- }
- char* device_version_str = (char* )malloc(param_value_size * sizeof(char) );
- OCL_CALL(clGetDeviceInfo, device, CL_DEVICE_OPENCL_C_VERSION, param_value_size, (void*)device_version_str, &ret_sz);
-@@ -961,6 +966,7 @@ int cl_check_ocl20(void)
- if(!strstr(device_version_str, "2.0")) {
- free(device_version_str);
- printf("Not OpenCL 2.0 device, ");
-+ if(or_beignet){
- if(cl_check_beignet()) {
- printf("Beignet extension test!");
- return 1;
-@@ -968,6 +974,10 @@ int cl_check_ocl20(void)
- printf("Not beignet device , Skip!");
- return 0;
- }
-+ }else{
-+ printf("Skip!");
-+ return 0;
-+ }
- }
- free(device_version_str);
- return 1;
---- a/docs/Beignet.mdwn
-+++ b/docs/Beignet.mdwn
-@@ -156,15 +156,9 @@ Supported Targets
-
- OpenCL 2.0
- ----------
--From release v1.3.0, beignet support OpenCL 2.0. By default, OpenCL 2.0 support is disabled, you can enable it when cmake with option
---DENABLE_OPENCL_20=1. Please remember that to enable OpenCL 2.0, there are some dependencies. First, OpenCL 2.0 only support the targets
--from Skylake, include Skylake, Kabylake and Apollolake. Then, clang supports all OpenCL 2.0 feature from 3.9. So to enable OpenCL 2.0,
--you must update LLVM/clang to 3.9 or later. And also requeires libdrm at least 2.4.66.
--After enable OpenCL 2.0, beignet complies with OpenCL 2.0 spec, but some OpenCL 2.0 features are simulated by software, there is no performance
--gain, such as pipe and device queues, especially device queues.
--If you build beignet with OpenCL 2.0 enabled and your kernel don't use the OpenCL 2.0 features, please pass a build option -cl-std=CL1.2 for
--performance, the OpenCL 2.0 uses more registers and has lots of int64 operations, which may hurt performance, and beignet will continue to improve
--OpenCL 2.0 performance.
-+From release v1.3.0, beignet supports OpenCL 2.0 on Skylake and later hardware.
-+This requires LLVM/Clang 3.9 or later and libdrm 2.4.66 or later; because of this, it is not available in jessie-backports.
-+As required by the OpenCL specification, kernels are compiled as OpenCL C 1.2 by default; to use 2.0 they must explicitly request it with the -cl-std=CL2.0 build option. As OpenCL 2.0 is likely to be slower than 1.2, we recommend that this is used only where needed. (This is because 2.0 uses more registers and has lots of int64 operations, and some of the 2.0 features (pipes and especially device queues) are implemented in software so do not provide any performance gain.) Beignet wil [...]
-
- Known Issues
- ------------
diff --git a/debian/patches/reduce-notfound-output.patch b/debian/patches/reduce-notfound-output.patch
index 6e0c8b5..4247ed8 100644
--- a/debian/patches/reduce-notfound-output.patch
+++ b/debian/patches/reduce-notfound-output.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
--- a/src/cl_device_id.c
+++ b/src/cl_device_id.c
-@@ -749,10 +749,10 @@ kbl_gt4_break:
+@@ -753,10 +753,10 @@ kbl_gt4_break:
case PCI_CHIP_SANDYBRIDGE_BRIDGE_S:
case PCI_CHIP_SANDYBRIDGE_S_GT:
// Intel(R) HD Graphics SandyBridge not supported yet
diff --git a/debian/patches/series b/debian/patches/series
index 13ea02b..c8bccbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,9 +6,6 @@ ship-test-tool.patch
find-python35.patch
docs-broken-links.patch
cl_accelerator_intel.patch
-llvm39-support.patch
add-appstream-metadata.patch
-spelling.patch
-opencl2-runtime-detection.patch
static-llvm.patch
zerooffset.patch
diff --git a/debian/patches/ship-test-tool.patch b/debian/patches/ship-test-tool.patch
index dc34778..b76c917 100644
--- a/debian/patches/ship-test-tool.patch
+++ b/debian/patches/ship-test-tool.patch
@@ -19,7 +19,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include)
-@@ -306,7 +305,7 @@ ENDIF(BUILD_EXAMPLES)
+@@ -328,7 +327,7 @@ ENDIF(BUILD_EXAMPLES)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(backend)
ADD_SUBDIRECTORY(src)
@@ -50,7 +50,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
GET_DEVICE_STR_INFO(profile, PROFILE);
--- a/utests/CMakeLists.txt
+++ b/utests/CMakeLists.txt
-@@ -342,9 +342,7 @@ else(GEN_PCI_ID)
+@@ -338,9 +338,7 @@ else(GEN_PCI_ID)
DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl)
endif(GEN_PCI_ID)
@@ -60,7 +60,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/generated
COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/generated -p
-@@ -393,6 +391,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
+@@ -389,6 +387,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
endif (NOT_BUILD_STAND_ALONE_UTEST)
ADD_DEPENDENCIES (utests utest_generator)
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 32e7c11..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix spelling
-
-Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-Forwarded: https://lists.freedesktop.org/archives/beignet/2017-January/008492.html
-
---- a/backend/src/llvm/llvm_gen_backend.cpp
-+++ b/backend/src/llvm/llvm_gen_backend.cpp
-@@ -308,7 +308,7 @@ namespace gbe
- if(StrTy)
- return getTypeByteSize(unit,StrTy);
- }
-- GBE_ASSERTM(false, "Unspported type name");
-+ GBE_ASSERTM(false, "Unsupported type name");
- return 0;
- }
- #undef TYPESIZEVEC
diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index af724bd..0c757c4 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -22,7 +22,7 @@ Author: Koop Mast, Rebecca Palmer
#ifndef CL_VERSION_1_2
#define CL_DEVICE_BUILT_IN_KERNELS 0x103F
-@@ -767,11 +772,24 @@ kbl_gt4_break:
+@@ -771,11 +776,24 @@ kbl_gt4_break:
#define toMB(size) (size)&(UINT64_MAX<<20)
/* Get the global_mem_size and max_mem_alloc size from
* driver, system ram and hardware*/
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index fbf712c..e6e70ba 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
--- a/src/cl_device_id.c
+++ b/src/cl_device_id.c
-@@ -859,7 +859,7 @@ cl_self_test(cl_device_id device, cl_sel
+@@ -863,7 +863,7 @@ cl_self_test(cl_device_id device, cl_sel
} else {
ret = SELF_TEST_SLM_FAIL;
printf("Beignet: self-test failed: (3, 7, 5) + (5, 7, 3) returned (%i, %i, %i)\n"
@@ -45,7 +45,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
The project depends on the following external libraries:
- libdrm libraries (libdrm and libdrm\_intel)
-@@ -83,7 +85,7 @@ you need to configure it as below:
+@@ -84,7 +86,7 @@ you need to configure it as below:
CMake will check the dependencies and will complain if it does not find them.
@@ -54,7 +54,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
The cmake will build the backend firstly. Please refer to:
[[OpenCL Gen Backend|Beignet/Backend]] to get more dependencies.
-@@ -122,25 +124,17 @@ platform. Beignet also produces various
+@@ -123,25 +125,17 @@ platform. Beignet also produces various
consistency. This small test framework uses a simple c++ registration system to
register all the unit tests.
@@ -62,19 +62,19 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-firstly as below:
-
-`> . setenv.sh`
--
--Then in `utests/`:
+In Debian beignet, the testing tool is in the _beignet-dev_ package, and is run with:
--`> ./utest_run`
+-Then in `utests/`:
+`> /usr/lib/\`dpkg-architecture -qDEB_HOST_MULTIARCH\`/beignet/utest_run`
--will run all the unit tests one after the others
+-`> ./utest_run`
+(this name and path may change in future releases - please do not rely on it). It will test the first OpenCL GPU device it finds (which does _not_ have to be a Beignet device). If you want to test a different device, uninstall all other ICDs. To see more options, pass `-h`.
--`> ./utest_run some_unit_test`
+-will run all the unit tests one after the others
+If you compiled Beignet yourself, you will find this tool in `utests`, and will need to set some environment variables to use it (see `setenv.sh`).
+-`> ./utest_run some_unit_test`
+-
-will only run `some_unit_test` test.
On all supported target platform, the pass rate should be 100%. If it is not, you may
@@ -85,7 +85,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Normally, beignet needs to run under X server environment as normal user. If there isn't X server,
beignet provides two alternative to run:
-@@ -150,6 +144,8 @@ beignet provides two alternative to run:
+@@ -151,6 +145,8 @@ beignet provides two alternative to run:
Supported Targets
-----------------
@@ -94,7 +94,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
* 3rd Generation Intel Core Processors "Ivybridge".
* 3rd Generation Intel Atom Processors "BayTrail".
* 4th Generation Intel Core Processors "Haswell", need kernel patch if your linux kernel older than 4.2, see the "Known Issues" section.
-@@ -158,6 +154,12 @@
+@@ -159,6 +155,12 @@ Supported Targets
* 6th Generation Intel Core Processors "Skylake" and "Kabylake".
* 5th Generation Intel Atom Processors "Broxten" or "Apollolake".
@@ -106,8 +106,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+
OpenCL 2.0
----------
- From release v1.3.0, beignet support OpenCL 2.0. By default, OpenCL 2.0 support is disabled, you can enable it when cmake with option
-@@ -189,7 +191,7 @@ Known Issues
+ From release v1.3.0, beignet supports OpenCL 2.0 on Skylake and later hardware.
+@@ -188,7 +190,7 @@ Known Issues
forever until a reboot.
* "Beignet: self-test failed" and almost all unit tests fail.
@@ -116,29 +116,27 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
to [c9224fa](https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c9224faa59c3071ecfa2d4b24592f4eb61e57069))
enable the register whitelist by default but miss some registers needed
for Beignet.
-@@ -203,10 +205,11 @@ Known Issues
+@@ -202,10 +204,11 @@ Known Issues
Linux <= 4.0, and requires the i915.enable_ppgtt=2 [boot parameter](https://wiki.ubuntu.com/Kernel/KernelBootParameters)
on Linux 4.1.
- This is fixed in Linux 4.2; older versions can be fixed with
- [this patch](https://01.org/zh/beignet/downloads/linux-kernel-patch-hsw-support).
+ This is fixed in Linux >= 4.2, which is the default in sid/stretch, and available from -backports in jessie:
++
++ `sudo apt-get install -t jessie-backports linux-image-amd64`
- If you do not need \_\_local, you can override the self-test with
-+ `sudo apt-get install -t jessie-backports linux-image-amd64`
-+
+ (or -i686-pae). If you do not need \_\_local, you can override the self-test with
`export OCL_IGNORE_SELF_TEST=1`
-@@ -222,10 +225,26 @@ Known Issues
+@@ -221,8 +224,26 @@ Known Issues
This loses some precision but gains performance.
* cl\_khr\_gl\_sharing.
-- This extension highly depends on mesa support. It seems that mesa would not provide
-- such type of extensions, we may have to hack with mesa source code to support this
-- extension. This feature used to work with a previous mesa git version. But now, it's
-- simply broken.
+- This extension is partially implemented(the most commonly used part), and we will implement
+- other parts based on requirement.
+
+ This extension is disabled by default, as it is only partially implemented.
+ Enabling it requires recompiling with cmake -DENABLE\_GL\_SHARING=ON.
@@ -162,7 +160,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Project repository
------------------
-@@ -272,9 +291,9 @@ The official mail list is as below:
+@@ -269,9 +290,9 @@ The official mail list is as below:
[http://lists.freedesktop.org/mailman/listinfo/beignet](http://lists.freedesktop.org/mailman/listinfo/beignet)
The official bugzilla is at:
[https://bugs.freedesktop.org/enter_bug.cgi?product=Beignet](https://bugs.freedesktop.org/enter_bug.cgi?product=Beignet)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-commits
mailing list