[beignet] 03/04: refresh and drop some more patches
Andreas Beckmann
anbe at moszumanska.debian.org
Mon Nov 17 14:15:20 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 a9128b5f03e59e9721f300ce5e796795e071923f
Author: Andreas Beckmann <anbe at debian.org>
Date: Mon Nov 17 07:28:07 2014 +0100
refresh and drop some more patches
---
debian/changelog | 1 +
.../Debian-compliant-compiler-flags-handling.patch | 82 +---------------------
debian/patches/Enable-test-debug.patch | 48 ++++++-------
debian/patches/Fix-build-failure.patch | 38 ----------
debian/patches/series | 1 -
5 files changed, 26 insertions(+), 144 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0aa7bc4..390b93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ beignet (1.0.0-1) UNRELEASED; urgency=medium
* New upstream release.
- Fix tgamma, pow, pown, erf, erfc (Closes: #768090)
- Drop upstream patches.
+ - Refresh patches.
[ Rebecca N. Palmer ]
* Re-enable GBE_DEBUG (lost when debhelper switched to
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index 2e44627..a9762a0 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -7,11 +7,9 @@ Subject: Debian compliant compiler flags handling
backend/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
2 files changed, 23 insertions(+), 24 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac5985954478..963f9f14aceb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -16,7 +16,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -30,7 +30,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
INCLUDE (FindPkgConfig)
@@ -19,81 +17,3 @@ index ac5985954478..963f9f14aceb 100644
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
if (NOT LIB_INSTALL_DIR)
set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
-index 6a31c68d957c..547f8ede9e32 100644
---- a/backend/CMakeLists.txt
-+++ b/backend/CMakeLists.txt
-@@ -39,39 +39,39 @@ set (CMAKE_C_CXX_FLAGS "-fvisibility=hidden -DGBE_COMPILER_AVAILABLE=1 ${CMAKE_C
- if (COMPILER STREQUAL "GCC")
- set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -funroll-loops -Wstrict-aliasing=2 -fstrict-aliasing -msse2 -msse3 -mssse3 -msse4.1 -fPIC -Wall")
- set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} ${LLVM_CFLAGS}")
-- set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -Wno-invalid-offsetof -fno-rtti -std=c++0x")
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -Wno-invalid-offsetof -fno-rtti -std=c++0x")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_DEBUG_MEMORY_FLAG}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-E")
-- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LFLAGS}")
-- set (CMAKE_CXX_FLAGS_DEBUG "-g -DGBE_DEBUG=1")
-- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
-- set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0")
-- set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DGBE_DEBUG=0")
-- set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")
-+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined ${LLVM_LFLAGS}")
-+ set (CMAKE_CXX_FLAGS_DEBUG "-DGBE_DEBUG=1")
-+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
-+ set (CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GBE_DEBUG_MEMORY_FLAG}")
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-E")
-- set (CMAKE_C_FLAGS_DEBUG "-g -DGBE_DEBUG=1")
-- set (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
-- set (CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0")
-- set (CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_C_FLAGS_DEBUG "-DGBE_DEBUG=1")
-+ set (CMAKE_C_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
-+ set (CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DGBE_DEBUG=0")
- elseif (COMPILER STREQUAL "CLANG")
- set (CMAKE_C_COMPILER "clang")
- set (CMAKE_C_FLAGS "-Wall -std=c99")
-- set (CMAKE_C_FLAGS_DEBUG "-g -DGBE_DEBUG=1")
-- set (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
-- set (CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0")
-- set (CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_C_FLAGS_DEBUG "-DGBE_DEBUG=1")
-+ set (CMAKE_C_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
-+ set (CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DGBE_DEBUG=0")
- set (CMAKE_CXX_COMPILER "clang++")
- set (CMAKE_CXX_FLAGS "-fstrict-aliasing -msse2 -fPIC -Wall -Wno-format-security -Wno-invalid-offsetof -std=c++0x")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_DEBUG_MEMORY_FLAG}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VISIBILITY_FLAG}")
-- set (CMAKE_CXX_FLAGS_DEBUG "-g -DGBE_DEBUG=1")
-- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
-- set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0")
-- set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_CXX_FLAGS_DEBUG "-DGBE_DEBUG=1")
-+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
-+ set (CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -DGBE_DEBUG=0")
-+ set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DGBE_DEBUG=0")
- set (CMAKE_AR "/usr/bin/llvm-ar")
- set (CMAKE_LINKER "/usr/bin/llvm-ld")
- set (CMAKE_NM "/usr/bin/llvm-nm")
-@@ -85,10 +85,10 @@ elseif (COMPILER STREQUAL "ICC")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VISIBILITY_FLAG} -Wl,-E")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_DEBUG_MODE_FLAG}")
-- set (CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DGBE_DEBUG=1")
-- set (CCMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2 -DGBE_DEBUG=1")
-- set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O2 -DGBE_DEBUG=0")
-- set (CCMAKE_CXX_FLAGS_MINSIZEREL "-Os -DGBE_DEBUG=0")
-+ set (CMAKE_CXX_FLAGS_DEBUG "-DGBE_DEBUG=1")
-+ set (CCMAKE_CXX_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
-+ set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DGBE_DEBUG=0")
-+ set (CCMAKE_CXX_FLAGS_MINSIZEREL "-DGBE_DEBUG=0")
- set (CMAKE_EXE_LINKER_FLAGS "")
- endif ()
-
diff --git a/debian/patches/Enable-test-debug.patch b/debian/patches/Enable-test-debug.patch
index 4927a48..aa5ec80 100644
--- a/debian/patches/Enable-test-debug.patch
+++ b/debian/patches/Enable-test-debug.patch
@@ -9,8 +9,8 @@ does not need to stay compatible).
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
---- beignet-0.9.3~dfsg.orig/utests/builtin_acos_asin.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_acos_asin.cpp
+--- a/utests/builtin_acos_asin.cpp
++++ b/utests/builtin_acos_asin.cpp
@@ -2,12 +2,12 @@
#include <cmath>
#include <algorithm>
@@ -43,8 +43,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
}
MAKE_UTEST_FROM_FUNCTION(builtin_acos_asin)
---- beignet-0.9.3~dfsg.orig/utests/builtin_exp.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_exp.cpp
+--- a/utests/builtin_exp.cpp
++++ b/utests/builtin_exp.cpp
@@ -2,7 +2,7 @@
#include <cmath>
#include <algorithm>
@@ -107,8 +107,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
}
MAKE_UTEST_FROM_FUNCTION(builtin_exp)
---- beignet-0.9.3~dfsg.orig/utests/builtin_global_id.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_global_id.cpp
+--- a/utests/builtin_global_id.cpp
++++ b/utests/builtin_global_id.cpp
@@ -22,7 +22,7 @@ dimension:3
9 10 11 21 22 23 33 34 35 45 46 47 57 58 59
*/
@@ -118,8 +118,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
#include "utest_helper.hpp"
static void builtin_global_id(void)
{
---- beignet-0.9.3~dfsg.orig/utests/builtin_local_id.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_local_id.cpp
+--- a/utests/builtin_local_id.cpp
++++ b/utests/builtin_local_id.cpp
@@ -26,7 +26,7 @@ dimension:3
429 430 431 432 433 434 ... 571 572 573 574 575
*/
@@ -129,8 +129,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
#include "utest_helper.hpp"
static void builtin_local_id(void)
{
---- beignet-0.9.3~dfsg.orig/utests/builtin_local_size.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_local_size.cpp
+--- a/utests/builtin_local_size.cpp
++++ b/utests/builtin_local_size.cpp
@@ -28,7 +28,7 @@ get_local_size(4) = 1 (dimension:3)
*/
@@ -140,8 +140,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
static void builtin_local_size(void)
{
---- beignet-0.9.3~dfsg.orig/utests/builtin_num_groups.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_num_groups.cpp
+--- a/utests/builtin_num_groups.cpp
++++ b/utests/builtin_num_groups.cpp
@@ -25,7 +25,7 @@ get_num_groups(2) = 3 (dimension:3)
get_num_groups(3) = 1 (dimension:3)
*/
@@ -151,11 +151,11 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
#include "utest_helper.hpp"
static void builtin_num_groups(void)
{
---- beignet-0.9.3~dfsg.orig/utests/builtin_pow.cpp
-+++ beignet-0.9.3~dfsg/utests/builtin_pow.cpp
-@@ -2,12 +2,12 @@
- #include <cmath>
+--- a/utests/builtin_pow.cpp
++++ b/utests/builtin_pow.cpp
+@@ -3,12 +3,12 @@
#include <algorithm>
+ #include <string.h>
-#define udebug 0
+#define udebug 1
@@ -169,7 +169,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
}
const float ori_data[] = {-20.5, -1, -0.9, -0.01, 0, 0.01, 0.9, 1.0, 20.5};
const int count_input_ori = sizeof(ori_data) / sizeof(ori_data[0]);
-@@ -27,6 +27,7 @@ static void builtin_pow(void)
+@@ -28,6 +28,7 @@ static void builtin_pow(void)
{
// Setup kernel and buffers
int k, i, index_cur;
@@ -177,25 +177,25 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
float gpu_data[max_function * count_input] = {0}, cpu_data[max_function * count_input] = {0};
for(i=0; i<count_input_ori;i++)
-@@ -87,6 +88,7 @@ static void builtin_pow(void)
+@@ -93,6 +94,7 @@ static void builtin_pow(void)
#endif
}
}
+ OCL_ASSERT(status == 0);
}
- MAKE_UTEST_FROM_FUNCTION_WITH_ISSUE(builtin_pow)
---- beignet-0.9.3~dfsg.orig/utests/setenv.sh.in
-+++ beignet-0.9.3~dfsg/utests/setenv.sh.in
-@@ -5,3 +5,6 @@ export OCL_PCH_PATH=@LOCAL_PCH_OBJECT_DI
+ MAKE_UTEST_FROM_FUNCTION(builtin_pow)
+--- a/utests/setenv.sh.in
++++ b/utests/setenv.sh.in
+@@ -6,3 +6,6 @@ export OCL_PCH_PATH=@LOCAL_OCL_PCH_OBJEC
export OCL_KERNEL_PATH=@CMAKE_CURRENT_SOURCE_DIR@/../kernels
export OCL_GBE_PATH=@LOCAL_GBE_OBJECT_DIR@
export OCL_INTERP_PATH=@LOCAL_INTERP_OBJECT_DIR@
+obj-`dpkg-architecture -qDEB_HOST_MULTIARCH`/utests/utest_run -a
+export OCL_STRICT_CONFORMANCE=1
+obj-`dpkg-architecture -qDEB_HOST_MULTIARCH`/utests/utest_run -a
---- beignet-0.9.3~dfsg.orig/utests/utest_generator.py
-+++ beignet-0.9.3~dfsg/utests/utest_generator.py
+--- a/utests/utest_generator.py
++++ b/utests/utest_generator.py
@@ -73,6 +73,7 @@ def udebug(ulpSize,returnType):
}
#endif
diff --git a/debian/patches/Fix-build-failure.patch b/debian/patches/Fix-build-failure.patch
deleted file mode 100644
index eace6ce..0000000
--- a/debian/patches/Fix-build-failure.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Julian Wollrath <jwollrath at web.de>
-Date: Fri, 29 Aug 2014 17:08:17 +0200
-Subject: Fix build failure.
-
----
- backend/src/backend/gen_insn_selection.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/backend/src/backend/gen_insn_selection.cpp b/backend/src/backend/gen_insn_selection.cpp
-index 96d39652a90f..c51798aa7b96 100644
---- a/backend/src/backend/gen_insn_selection.cpp
-+++ b/backend/src/backend/gen_insn_selection.cpp
-@@ -791,10 +791,11 @@ namespace gbe
- }
-
- if (poolOffset > ctx.reservedSpillRegs) {
-- if (GBE_DEBUG)
-+#if GBE_DEBUG
- std::cerr << "Instruction (#" << (uint32_t)insn.opcode
- << ") src too large pooloffset "
- << (uint32_t)poolOffset << std::endl;
-+#endif /* GBE_DEBUG */
- return false;
- }
- // FIXME, to support post register allocation scheduling,
-@@ -861,10 +862,11 @@ namespace gbe
- }
-
- if (poolOffset > ctx.reservedSpillRegs){
-- if (GBE_DEBUG)
-+#if GBE_DEBUG
- std::cerr << "Instruction (#" << (uint32_t)insn.opcode
- << ") dst too large pooloffset "
- << (uint32_t)poolOffset << std::endl;
-+#endif /* GBE_DEBUG */
- return false;
- }
- while(!regSet.empty()) {
diff --git a/debian/patches/series b/debian/patches/series
index 6512d79..b6a698d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ Enhance-debug-output.patch
Debian-compliant-compiler-flags-handling.patch
Utest-requires-deprecated-function-names.patch
Link-against-terminfo.patch
-Fix-build-failure.patch
Enable-test-debug.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-commits
mailing list