[oclgrind] 02/07: Refresh patches, drop those applied upstream
James Price
jprice-guest at moszumanska.debian.org
Sat Mar 10 08:42:23 UTC 2018
This is an automated email from the git hooks/post-receive script.
jprice-guest pushed a commit to branch master
in repository oclgrind.
commit cfb7235e80435c7a577c177df4e58fc75c9dbef3
Author: James Price <j.price at bristol.ac.uk>
Date: Fri Mar 9 21:53:49 2018 +0000
Refresh patches, drop those applied upstream
---
debian/patches/align-alloc.patch | 39 -----
debian/patches/altivec-fix.patch | 2 +-
debian/patches/big-endian.patch | 239 --------------------------
debian/patches/library-versions.patch | 2 +-
debian/patches/pch-location.patch | 12 +-
debian/patches/private-library-location.patch | 12 +-
debian/patches/series | 3 -
debian/patches/signed-char.patch | 15 --
debian/patches/use-opencl-headers.patch | 4 +-
9 files changed, 16 insertions(+), 312 deletions(-)
diff --git a/debian/patches/align-alloc.patch b/debian/patches/align-alloc.patch
deleted file mode 100644
index 9e3232c..0000000
--- a/debian/patches/align-alloc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: James Price <j.price at bristol.ac.uk>
-Description: Align offsets in pool allocator
-Origin: upstream commit c19cb13
-Last-Update: 2017-01-19
---- a/src/core/common.cpp
-+++ b/src/core/common.cpp
-@@ -808,6 +808,9 @@
-
- uint8_t* MemoryPool::alloc(size_t size)
- {
-+ if (size == 0)
-+ return NULL;
-+
- // Check if requested size larger than block size
- if (size > m_blockSize)
- {
-@@ -817,6 +820,22 @@
- return buffer;
- }
-
-+ // Round up size to nearest power of two for alignment
-+ // Taken from here:
-+ // http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
-+ unsigned align = size;
-+ align--;
-+ align |= align >> 1;
-+ align |= align >> 2;
-+ align |= align >> 4;
-+ align |= align >> 8;
-+ align |= align >> 16;
-+ align++;
-+
-+ // Align offset to size of requested allocation
-+ if (m_offset & (align-1))
-+ m_offset += (align - (m_offset & (align-1)));
-+
- // Check if enough space in current block
- if (m_offset + size > m_blockSize)
- {
diff --git a/debian/patches/altivec-fix.patch b/debian/patches/altivec-fix.patch
index c3ffcb0..1425fb1 100644
--- a/debian/patches/altivec-fix.patch
+++ b/debian/patches/altivec-fix.patch
@@ -3,7 +3,7 @@ Description: Use -std=gnu++11 instead of -std=c++11 to fix altivec issues
Last-Update: 2015-12-09
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
set(CMAKE_MACOSX_RPATH 1)
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
diff --git a/debian/patches/big-endian.patch b/debian/patches/big-endian.patch
deleted file mode 100644
index 86ce95a..0000000
--- a/debian/patches/big-endian.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-Author: James Price <j.price at bristol.ac.uk>
-Description: Fix big-endian issues
-Origin: upstream commits bccc640 and 2e138bc
-Last-Update: 2017-01-19
---- a/src/core/WorkItem.cpp
-+++ b/src/core/WorkItem.cpp
-@@ -1135,7 +1135,7 @@
- TypedValue op = getOperand(instruction->getOperand(0));
- for (unsigned i = 0; i < result.num; i++)
- {
-- memcpy(result.data+i*result.size, op.data+i*op.size, result.size);
-+ result.setUInt(op.getUInt(i), i);
- }
- }
-
---- a/tests/kernels/atomics/atomic_cmpxchg_read_race.cl
-+++ b/tests/kernels/atomics/atomic_cmpxchg_read_race.cl
-@@ -7,6 +7,6 @@
- }
- else
- {
-- atomic_cmpxchg(data, 0, i);
-+ atomic_cmpxchg(data, 0, 0x01000001);
- }
- }
---- a/tests/kernels/atomics/atomic_cmpxchg_read_race.ref
-+++ b/tests/kernels/atomics/atomic_cmpxchg_read_race.ref
-@@ -2,4 +2,4 @@
- ERROR Write-write data race at global memory
-
- EXACT Argument 'data': 4 bytes
--EXACT data[0] = 1
-+MATCH data[0] =
---- a/tests/kernels/atomics/atomic_race_after.cl
-+++ b/tests/kernels/atomics/atomic_race_after.cl
-@@ -1,8 +1,8 @@
--kernel void atomic_race_after(global int *data)
-+kernel void atomic_race_after(global int *data, global int *output)
- {
- atomic_inc(data);
- if (get_global_id(0) == get_global_size(0)-1)
- {
-- (*data)++;
-+ *output = *data;
- }
- }
---- a/tests/kernels/atomics/atomic_race_after.ref
-+++ b/tests/kernels/atomics/atomic_race_after.ref
-@@ -1,6 +1,4 @@
- ERROR Read-write data race at global memory
--ERROR Read-write data race at global memory
--ERROR Write-write data race at global memory
-
--EXACT Argument 'data': 4 bytes
--EXACT data[0] = 5
-+EXACT Argument 'output': 4 bytes
-+MATCH output[0] =
---- a/tests/kernels/atomics/atomic_race_after.sim
-+++ b/tests/kernels/atomics/atomic_race_after.sim
-@@ -3,4 +3,5 @@
- 4 1 1
- 4 1 1
-
-+<size=4 fill=0>
- <size=4 fill=0 dump>
---- a/tests/kernels/atomics/atomic_race_before.cl
-+++ b/tests/kernels/atomics/atomic_race_before.cl
-@@ -4,5 +4,5 @@
- {
- *data = 0;
- }
-- atomic_inc(data);
-+ atomic_dec(data);
- }
---- a/tests/kernels/atomics/atomic_race_before.ref
-+++ b/tests/kernels/atomics/atomic_race_before.ref
-@@ -6,4 +6,4 @@
- ERROR Write-write data race at global memory address
-
- EXACT Argument 'data': 4 bytes
--EXACT data[0] = 4
-+EXACT data[0] = -4
---- a/tests/kernels/uninitialized/padded_nested_struct_memcpy.cl
-+++ b/tests/kernels/uninitialized/padded_nested_struct_memcpy.cl
-@@ -17,10 +17,10 @@
- {
- struct S s;
- s.a = 1;
-- s.b = 2;
-+ s.b = 0x02000002;
- s.c = 3;
- s.d.a = 4;
-- s.d.b = 5;
-+ s.d.b = 0x05000005;
- s.d.c = 6;
-
- *output = s;
---- a/tests/kernels/uninitialized/padded_nested_struct_memcpy.ref
-+++ b/tests/kernels/uninitialized/padded_nested_struct_memcpy.ref
-@@ -6,7 +6,7 @@
- EXACT output[4] = 2
- EXACT output[5] = 0
- EXACT output[6] = 0
--EXACT output[7] = 0
-+EXACT output[7] = 2
- EXACT output[8] = 3
- MATCH output[9] =
- MATCH output[10] =
-@@ -18,7 +18,7 @@
- EXACT output[16] = 5
- EXACT output[17] = 0
- EXACT output[18] = 0
--EXACT output[19] = 0
-+EXACT output[19] = 5
- EXACT output[20] = 6
- MATCH output[21] =
- MATCH output[22] =
---- a/tests/kernels/uninitialized/padded_struct_alloca_fp.cl
-+++ b/tests/kernels/uninitialized/padded_struct_alloca_fp.cl
-@@ -9,7 +9,7 @@
- {
- struct S s;
- s.a = 42;
-- s.b = -7;
-+ s.b = 0xF9FFFFF9;
- s.c = 127;
-
- *output = s;
---- a/tests/kernels/uninitialized/padded_struct_alloca_fp.ref
-+++ b/tests/kernels/uninitialized/padded_struct_alloca_fp.ref
-@@ -1,4 +1,13 @@
- EXACT Argument 'output': 12 bytes
- EXACT output[0] = 42
--EXACT output[1] = -7
--EXACT output[2] = 127
-+EXACT output[1] = 0
-+EXACT output[2] = 0
-+EXACT output[3] = 0
-+EXACT output[4] = -7
-+EXACT output[5] = -1
-+EXACT output[6] = -1
-+EXACT output[7] = -7
-+EXACT output[8] = 127
-+EXACT output[9] = 0
-+EXACT output[10] = 0
-+EXACT output[11] = 0
---- a/tests/kernels/uninitialized/padded_struct_alloca_fp.sim
-+++ b/tests/kernels/uninitialized/padded_struct_alloca_fp.sim
-@@ -3,4 +3,4 @@
- 1 1 1
- 1 1 1
-
--<size=12 int fill=0 dump>
-+<size=12 char fill=0 dump>
---- a/tests/kernels/uninitialized/padded_struct_memcpy_fp.cl
-+++ b/tests/kernels/uninitialized/padded_struct_memcpy_fp.cl
-@@ -12,7 +12,7 @@
-
- struct S s;
- s.a = 42;
-- s.b = -7;
-+ s.b = 0xF9FFFFF9;
- s.c = 127;
-
- if (lid == 0)
---- a/tests/kernels/uninitialized/padded_struct_memcpy_fp.ref
-+++ b/tests/kernels/uninitialized/padded_struct_memcpy_fp.ref
-@@ -1,4 +1,13 @@
- EXACT Argument 'output': 12 bytes
- EXACT output[0] = 42
--EXACT output[1] = -7
--EXACT output[2] = 127
-+EXACT output[1] = 0
-+EXACT output[2] = 0
-+EXACT output[3] = 0
-+EXACT output[4] = -7
-+EXACT output[5] = -1
-+EXACT output[6] = -1
-+EXACT output[7] = -7
-+EXACT output[8] = 127
-+EXACT output[9] = 0
-+EXACT output[10] = 0
-+EXACT output[11] = 0
---- a/tests/kernels/uninitialized/padded_struct_memcpy_fp.sim
-+++ b/tests/kernels/uninitialized/padded_struct_memcpy_fp.sim
-@@ -5,4 +5,4 @@
-
- <size=12 char>
-
--<size=12 int fill=0 dump>
-+<size=12 char fill=0 dump>
---- a/tests/kernels/uninitialized/uninitialized_padded_nested_struct_memcpy.cl
-+++ b/tests/kernels/uninitialized/uninitialized_padded_nested_struct_memcpy.cl
-@@ -15,6 +15,6 @@
-
- kernel void uninitialized_padded_nested_struct_memcpy(local int *scratch, global struct S *output)
- {
-- struct S s = {1, 2, 3, {4, *scratch, 5}};
-+ struct S s = {1, 0x02000002, 3, {4, *scratch, 5}};
- *output = s;
- }
---- a/tests/kernels/uninitialized/uninitialized_padded_nested_struct_memcpy.ref
-+++ b/tests/kernels/uninitialized/uninitialized_padded_nested_struct_memcpy.ref
-@@ -8,7 +8,7 @@
- EXACT output[4] = 2
- EXACT output[5] = 0
- EXACT output[6] = 0
--EXACT output[7] = 0
-+EXACT output[7] = 2
- EXACT output[8] = 3
- MATCH output[9] =
- MATCH output[10] =
---- a/tests/kernels/uninitialized/uninitialized_padded_struct_memcpy.ref
-+++ b/tests/kernels/uninitialized/uninitialized_padded_struct_memcpy.ref
-@@ -2,5 +2,14 @@
-
- EXACT Argument 'output': 12 bytes
- EXACT output[0] = 1
--MATCH output[1] =
--EXACT output[2] = 2
-+EXACT output[1] = 0
-+EXACT output[2] = 0
-+EXACT output[3] = 0
-+MATCH output[4] =
-+MATCH output[5] =
-+MATCH output[6] =
-+MATCH output[7] =
-+EXACT output[8] = 2
-+EXACT output[9] = 0
-+EXACT output[10] = 0
-+EXACT output[11] = 0
---- a/tests/kernels/uninitialized/uninitialized_padded_struct_memcpy.sim
-+++ b/tests/kernels/uninitialized/uninitialized_padded_struct_memcpy.sim
-@@ -5,4 +5,4 @@
-
- <size=8>
-
--<size=12 int fill=0 dump>
-+<size=12 char fill=0 dump>
diff --git a/debian/patches/library-versions.patch b/debian/patches/library-versions.patch
index 2d1380f..e499a42 100644
--- a/debian/patches/library-versions.patch
+++ b/debian/patches/library-versions.patch
@@ -3,7 +3,7 @@ Author: James Price <j.price at bristol.ac.uk>
Last-Update: 2015-08-07
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -215,6 +215,7 @@
+@@ -232,6 +232,7 @@
clangFrontend clangSerialization clangDriver clangCodeGen
clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic
${LLVM_LIBS})
diff --git a/debian/patches/pch-location.patch b/debian/patches/pch-location.patch
index 6f130e4..78edf96 100644
--- a/debian/patches/pch-location.patch
+++ b/debian/patches/pch-location.patch
@@ -6,26 +6,26 @@ Last-Update: 2015-08-07
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@
project(Oclgrind)
- set(Oclgrind_VERSION_MAJOR 16)
- set(Oclgrind_VERSION_MINOR 10)
+ set(Oclgrind_VERSION_MAJOR 18)
+ set(Oclgrind_VERSION_MINOR 3)
+set(Oclgrind_VERSION "${Oclgrind_VERSION_MAJOR}.${Oclgrind_VERSION_MINOR}")
include(CheckIncludeFiles)
include(CheckIncludeFileCXX)
-@@ -319,8 +320,9 @@
+@@ -370,8 +371,9 @@
oclgrind oclgrind-rt oclgrind-rt-icd
DESTINATION "lib${LIBDIR_SUFFIX}")
install(FILES
-- ${CORE_HEADERS} ${CLC_HEADERS}
+- ${CORE_HEADERS} ${OPENCL_C_H}
+ ${CORE_HEADERS}
DESTINATION include/oclgrind)
-+install(FILES ${CLC_HEADERS} DESTINATION lib/oclgrind/${Oclgrind_VERSION})
++install(FILES ${OPENCL_C_H} DESTINATION lib/oclgrind/${Oclgrind_VERSION})
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
install(FILES
src/CL/cl.h
--- a/src/core/Program.cpp
+++ b/src/core/Program.cpp
-@@ -254,11 +254,11 @@
+@@ -416,11 +416,11 @@
if ((dirend = strrchr(libpath, '/')))
#endif
{
diff --git a/debian/patches/private-library-location.patch b/debian/patches/private-library-location.patch
index a321f92..f4c9288 100644
--- a/debian/patches/private-library-location.patch
+++ b/debian/patches/private-library-location.patch
@@ -3,12 +3,12 @@ Author: James Price <j.price at bristol.ac.uk>
Last-Update: 2015-08-07
--- a/src/runtime/oclgrind.cpp
+++ b/src/runtime/oclgrind.cpp
-@@ -391,7 +391,7 @@
+@@ -436,7 +436,7 @@
+ {
+ // Remove containing directory and append library directory
+ stripLastComponent(libdir);
+- libdir += "/lib" LIBDIR_SUFFIX;
++ libdir += "/lib" LIBDIR_SUFFIX "/oclgrind";
}
- // Append library directory
-- libdir += "/lib" LIBDIR_SUFFIX;
-+ libdir += "/lib" LIBDIR_SUFFIX "/oclgrind";
-
return libdir;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 719d209..74fb111 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,3 @@ library-versions.patch
pch-location.patch
use-opencl-headers.patch
altivec-fix.patch
-align-alloc.patch
-big-endian.patch
-signed-char.patch
diff --git a/debian/patches/signed-char.patch b/debian/patches/signed-char.patch
deleted file mode 100644
index ba9c6e2..0000000
--- a/debian/patches/signed-char.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: James Price <j.price at bristol.ac.uk>
-Description: Fix signed char issue
-Origin: upstream commit 9df2d17
-Last-Update: 2017-01-20
---- a/src/kernel/Simulation.cpp
-+++ b/src/kernel/Simulation.cpp
-@@ -748,7 +748,7 @@
-
- switch (itr->type)
- {
-- DUMP_TYPE(TYPE_CHAR, char);
-+ DUMP_TYPE(TYPE_CHAR, int8_t);
- DUMP_TYPE(TYPE_UCHAR, uint8_t);
- DUMP_TYPE(TYPE_SHORT, int16_t);
- DUMP_TYPE(TYPE_USHORT, uint16_t);
diff --git a/debian/patches/use-opencl-headers.patch b/debian/patches/use-opencl-headers.patch
index fab45ae..7f2f99b 100644
--- a/debian/patches/use-opencl-headers.patch
+++ b/debian/patches/use-opencl-headers.patch
@@ -3,9 +3,9 @@ Description: Don't use local copy of CL/ headers
Last-Update: 2015-12-08
--- a/src/core/WorkItemBuiltins.cpp
+++ b/src/core/WorkItemBuiltins.cpp
-@@ -22,7 +22,7 @@
+@@ -20,7 +20,7 @@
+ #include "llvm/IR/Metadata.h"
#include "llvm/IR/DebugInfoMetadata.h"
- #endif
-#include "CL/cl.h"
+#include <CL/cl.h>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git
More information about the Pkg-opencl-commits
mailing list