[beignet] 04/05: Refresh patches

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Tue Nov 15 07:27:47 UTC 2016 

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

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit b860408aa27c628d9b49730e387f5bd00461cdf2
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sun Nov 13 22:27:01 2016 +0000

    Refresh patches
---
 debian/changelog                                   |  2 +-
 .../Debian-compliant-compiler-flags-handling.patch |  6 +--
 debian/patches/docs-broken-links.patch             | 10 ++---
 debian/patches/find-python35.patch                 |  6 +--
 debian/patches/reduce-notfound-output.patch        | 10 ++---
 debian/patches/ship-test-tool.patch                | 24 ++---------
 debian/patches/support-kfreebsd.patch              | 21 +++++----
 debian/patches/update-docs.patch                   | 50 +++++++++++-----------
 8 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3335f46..d125ac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 beignet (1.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Drop patches applied upstream.
+  * Drop patches applied upstream, refresh others.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 13 Nov 2016 21:56:59 +0000
 
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index c93c56f..ef248f5 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -6,8 +6,6 @@ Disable non-policy-compliant instruction set assumptions (slows the
 OpenCL compiler by ~few%, no effect on OpenCL execution speed)
 
 Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
-
-Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/008060.html
 --- beignet.orig/CMakeLists.txt
 +++ beignet/CMakeLists.txt
 @@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
@@ -54,8 +52,8 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
    # Threads
    Find_Package(Threads)
  
--  set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof")
--  set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")
+-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof")
+-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")
 +  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof -ffloat-store")
 +  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS} -ffloat-store") #compiler_{degrees,radians,function_argument2} use equality comparison of floats
    set (CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DGBE_DEBUG=1")
diff --git a/debian/patches/docs-broken-links.patch b/debian/patches/docs-broken-links.patch
index 88389be..5ca070e 100644
--- a/debian/patches/docs-broken-links.patch
+++ b/debian/patches/docs-broken-links.patch
@@ -2,9 +2,9 @@ Description: Fix broken links and list syntax in documentation
 
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
---- beignet.orig/docs/Beignet.mdwn
-+++ beignet/docs/Beignet.mdwn
-@@ -24,7 +24,7 @@ Attempting to run Beignet on unsupported
+--- a/docs/Beignet.mdwn
++++ b/docs/Beignet.mdwn
+@@ -11,7 +11,7 @@ about the compiler, please refer to `bac
  
  News
  ----
@@ -13,7 +13,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  
  Prerequisite
  ------------
-@@ -144,6 +144,7 @@ command.
+@@ -138,6 +138,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.
  
-@@ -276,13 +278,13 @@ Please specify your hardware when report
+@@ -285,13 +286,13 @@ Please specify your hardware when report
  
  Documents for OpenCL application developers
  -------------------------------------------
diff --git a/debian/patches/find-python35.patch b/debian/patches/find-python35.patch
index 0b30fd8..2284d19 100644
--- a/debian/patches/find-python35.patch
+++ b/debian/patches/find-python35.patch
@@ -6,9 +6,9 @@ https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/1515419
 
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
---- beignet.orig/CMakeLists.txt
-+++ beignet/CMakeLists.txt
-@@ -234,6 +234,7 @@ ELSE(OCLIcd_FOUND)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,6 +233,7 @@ ELSE(OCLIcd_FOUND)
    MESSAGE(STATUS "Looking for OCL ICD header file - not found")
  ENDIF(OCLIcd_FOUND)
  
diff --git a/debian/patches/reduce-notfound-output.patch b/debian/patches/reduce-notfound-output.patch
index 47285c8..9de29f5 100644
--- a/debian/patches/reduce-notfound-output.patch
+++ b/debian/patches/reduce-notfound-output.patch
@@ -6,9 +6,9 @@ Replace these with one message that explicitly says what to do.
 
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
---- beignet.orig/src/cl_device_id.c
-+++ beignet/src/cl_device_id.c
-@@ -743,10 +743,10 @@ kbl_gt4_break:
+--- a/src/cl_device_id.c
++++ b/src/cl_device_id.c
+@@ -770,10 +770,10 @@ kbl_gt4_break:
      case PCI_CHIP_SANDYBRIDGE_BRIDGE_S:
      case PCI_CHIP_SANDYBRIDGE_S_GT:
        // Intel(R) HD Graphics SandyBridge not supported yet
@@ -21,8 +21,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    }
  
    if (ret == NULL)
---- beignet.orig/src/intel/intel_driver.c
-+++ beignet/src/intel/intel_driver.c
+--- a/src/intel/intel_driver.c
++++ b/src/intel/intel_driver.c
 @@ -240,7 +240,6 @@ intel_driver_open(intel_driver_t *intel,
    }
  
diff --git a/debian/patches/ship-test-tool.patch b/debian/patches/ship-test-tool.patch
index 88087db..3966187 100644
--- a/debian/patches/ship-test-tool.patch
+++ b/debian/patches/ship-test-tool.patch
@@ -9,8 +9,6 @@ comment appears to refer to beignet-the-ICD, not this test tool).
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/008057.html https://lists.freedesktop.org/archives/beignet/2016-October/008059.html
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2bc2100..562a62f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -33,7 +33,6 @@ configure_file (
@@ -21,7 +19,7 @@ index 2bc2100..562a62f 100644
  
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}/include)
-@@ -277,7 +276,7 @@ ENDIF(BUILD_EXAMPLES)
+@@ -276,7 +275,7 @@ ENDIF(BUILD_EXAMPLES)
  ADD_SUBDIRECTORY(include)
  ADD_SUBDIRECTORY(backend)
  ADD_SUBDIRECTORY(src)
@@ -32,7 +30,7 @@ index 2bc2100..562a62f 100644
  IF (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true"))
 --- a/utests/utest_helper.cpp
 +++ b/utests/utest_helper.cpp
-@@ -219,7 +219,7 @@ cl_do_kiss_path(const char *file, cl_device_id device)
+@@ -219,7 +219,7 @@ cl_do_kiss_path(const char *file, cl_dev
    sub_path = "";
  
    if (kiss_path == NULL)
@@ -50,33 +48,19 @@ index 2bc2100..562a62f 100644
      {
        size_t param_value_size;
        GET_DEVICE_STR_INFO(profile, PROFILE);
-@@ -891,7 +891,11 @@ int cl_check_subgroups(void)
-     return 0;
-   }
-   if(utestclGetKernelSubGroupInfoKHR == NULL)
--    utestclGetKernelSubGroupInfoKHR  = (clGetKernelSubGroupInfoKHR_cb*) clGetExtensionFunctionAddress("clGetKernelSubGroupInfoKHR");
-+    utestclGetKernelSubGroupInfoKHR  = (clGetKernelSubGroupInfoKHR_cb*) clGetExtensionFunctionAddressForPlatform(platform,"clGetKernelSubGroupInfoKHR");
-+  if(utestclGetKernelSubGroupInfoKHR == NULL){
-+    printf("Can't find clGetKernelSubGroupInfoKHR");
-+    OCL_ASSERT(0);
-+  }
-   return 1;
- }
- 
 --- a/utests/CMakeLists.txt
 +++ b/utests/CMakeLists.txt
-@@ -324,10 +324,8 @@ else(GEN_PCI_ID)
+@@ -324,9 +324,7 @@ else(GEN_PCI_ID)
    DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl)
  endif(GEN_PCI_ID)
  
 -if (NOT_BUILD_STAND_ALONE_UTEST)
-   SET(utests_sources ${utests_sources} builtin_kernel_block_motion_estimate_intel.cpp)
    ADD_CUSTOM_TARGET(kernel_bin.bin DEPENDS ${kernel_bin}.bin)
 -endif (NOT_BUILD_STAND_ALONE_UTEST)
  
  add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/generated
      COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/generated -p
-@@ -375,6 +373,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
+@@ -374,6 +372,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
  endif (NOT_BUILD_STAND_ALONE_UTEST)
  
  ADD_DEPENDENCIES (utests utest_generator)
diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index f1a925e..b5603f2 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -7,8 +7,8 @@ https://buildd.debian.org/status/fetch.php?pkg=beignet&arch=kfreebsd-amd64&ver=1
 Origin: https://github.com/freebsd/freebsd-ports-graphics/blob/opencl/lang/beignet/files/patch-src_cl__device__id.c https://github.com/freebsd/freebsd-ports-graphics/blob/master/lang/beignet/files/patch-src_cl__event.c
 Author: Koop Mast, Rebecca Palmer
 
---- beignet.orig/src/cl_device_id.c
-+++ beignet/src/cl_device_id.c
+--- a/src/cl_device_id.c
++++ b/src/cl_device_id.c
 @@ -35,7 +35,12 @@
  #include <stdio.h>
  #include <string.h>
@@ -22,16 +22,14 @@ Author: Koop Mast, Rebecca Palmer
  
  #ifndef CL_VERSION_1_2
  #define CL_DEVICE_BUILT_IN_KERNELS 0x103F
-@@ -760,11 +765,24 @@ kbl_gt4_break:
-   #define toMB(size) (size)&(0xfffffffffffffff<<20)
+@@ -787,11 +792,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*/
 +#if defined(linux) || defined(__linux__) || defined(__LINUX__)
    struct sysinfo info;
    if (sysinfo(&info) == 0) {
--    uint64_t totalgpumem = ret->global_mem_size;
--	uint64_t maxallocmem = ret->max_mem_alloc_size;
-     uint64_t totalram = info.totalram * info.mem_unit;
++    uint64_t totalram = info.totalram * info.mem_unit;
 +#else
 +  {
 +  int mib[2];
@@ -44,13 +42,14 @@ Author: Koop Mast, Rebecca Palmer
 +  len = sizeof(totalram);
 +  sysctl(mib, 2, &totalram, &len, NULL, 0);
 +#endif
-+    uint64_t totalgpumem = ret->global_mem_size;
-+	uint64_t maxallocmem = ret->max_mem_alloc_size;
+     uint64_t totalgpumem = ret->global_mem_size;
+ 	uint64_t maxallocmem = ret->max_mem_alloc_size;
+-    uint64_t totalram = info.totalram * info.mem_unit;
  	/* In case to keep system stable we just use half
  	 * of the raw as global mem */
      ret->global_mem_size = toMB((totalram / 2 > totalgpumem) ?
---- beignet.orig/src/cl_event.c
-+++ beignet/src/cl_event.c
+--- a/src/cl_event.c
++++ b/src/cl_event.c
 @@ -27,6 +27,7 @@
  
  #include <assert.h>
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index 597e966..d32c8a4 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -6,9 +6,9 @@ Add Debian specific information.
 
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
---- beignet.orig/src/cl_device_id.c
-+++ beignet/src/cl_device_id.c
-@@ -852,7 +852,7 @@ cl_self_test(cl_device_id device, cl_sel
+--- a/src/cl_device_id.c
++++ b/src/cl_device_id.c
+@@ -879,7 +879,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"
@@ -17,8 +17,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
                               test_data[0], test_data[1], test_data[2]);
  
                      }
---- beignet.orig/docs/Beignet/Backend.mdwn
-+++ beignet/docs/Beignet/Backend.mdwn
+--- a/docs/Beignet/Backend.mdwn
++++ b/docs/Beignet/Backend.mdwn
 @@ -37,9 +37,7 @@ Environment variables are used all over
    precision math instructions compliant with OpenCL Spec. So we provide a
    software version to meet the high precision requirement. Obviously the
@@ -31,30 +31,30 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  - `OCL_SIMD_WIDTH` `(8 or 16)`. Select the number of lanes per hardware thread,
    Normally, you don't need to set it, we will select suitable simd width for
 --- /dev/null
-+++ beignet/docs/index.mdwn
++++ b/docs/index.mdwn
 @@ -0,0 +1 @@
 +[[!map pages="* and !ikiwiki/*" show=title]]
---- beignet.orig/docs/Beignet.mdwn
-+++ beignet/docs/Beignet.mdwn
+--- a/docs/Beignet.mdwn
++++ b/docs/Beignet.mdwn
 @@ -16,6 +16,8 @@ News
  Prerequisite
  ------------
  
 +(for building the upstream source; Debian packages handle this automatically)
 +
- The project depends on the following external libaries:
+ The project depends on the following external libraries:
  
  - libdrm libraries (libdrm and libdrm\_intel)
-@@ -91,7 +93,7 @@ The cmake will build the backend firstly. Please refer to:
- Once built, the run-time produces a shared object libcl.so which basically
- directly implements the OpenCL API.
+@@ -83,7 +85,7 @@ you need to configure it as below:
+ 
+ CMake will check the dependencies and will complain if it does not find them.
  
 -`> make`
 +`> make utest`
  
- A set of tests are also produced. They may be found in `utests/`.
- 
-@@ -122,25 +124,17 @@ platform. Beignet also produces various tests to ensure the compiler and the run
+ 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
  consistency. This small test framework uses a simple c++ registration system to
  register all the unit tests.
  
@@ -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,14 +144,22 @@
+@@ -150,6 +144,8 @@ beignet provides two alternative to run:
  Supported Targets
  -----------------
  
@@ -94,8 +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.
-  * 5th Generation Intel Core Processors "Broadwell".
-  * 5th Generation Intel Atom Processors "Braswell".
+@@ -158,6 +154,12 @@ Supported Targets
   * 6th Generation Intel Core Processors "Skylake" and "Kabylake".
   * 5th Generation Intel Atom Processors "Broxten" or "Apollolake".
  
@@ -108,7 +107,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  Known Issues
  ------------
  
-@@ -177,7 +185,7 @@ Known Issues
+@@ -177,7 +179,7 @@ Known Issues
    forever until a reboot.
  
  * "Beignet: self-test failed" and almost all unit tests fail.
@@ -117,7 +116,7 @@ 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.
-@@ -191,10 +199,11 @@ Known Issues
+@@ -191,10 +193,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.
    
@@ -132,8 +131,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    
    `export OCL_IGNORE_SELF_TEST=1`
    
-@@ -210,11 +219,27 @@ Known Issues
-   This would lost some precision but gain performance.
+@@ -210,10 +213,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
@@ -143,7 +142,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +  This extension is not supported in this version of Beignet.  It
 +  [was recently re-added](https://cgit.freedesktop.org/beignet/commit/?id=a892148ee12cbaa021b680c4d770e53fab511366)
 +  to upstream Beignet, but might not be fully working yet.
- 
++
 +* Crash when the same program uses both Beignet and OpenGL (mesa).
 +  
 +  This has been reported to happen if Beignet and Mesa use different LLVM versions,
@@ -160,11 +159,10 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +  
 +  Debian uses the Khronos cl_ext.h, which does not yet include this extension.  It is available
 +  by including first cl_ext.h then cl_intel.h.
-+
+ 
  Project repository
  ------------------
- Right now, we host our project on fdo at:
-@@ -260,9 +285,9 @@ The official mail list is as below:
+@@ -260,9 +279,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