Hello community, here is the log from the commit of package beignet for openSUSE:Factory checked in at 2015-12-21 12:04:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/beignet (Old) and /work/SRC/openSUSE:Factory/.beignet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "beignet" Changes: -------- --- /work/SRC/openSUSE:Factory/beignet/beignet.changes 2015-10-26 12:48:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.beignet.new/beignet.changes 2015-12-21 12:05:00.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Dec 18 12:48:30 UTC 2015 - [email protected] + +- Update to 1.1.1 + * Dump asm to a file. + * Use addRemappedFile to avoid creating temporary cl source file. + * add collectInsnNum to collect block instruction number. + * Fix piglit clLinkProgram fail. + * Calculate appropriate timestamps for cl profile. +- Use cmake macros + +------------------------------------------------------------------- Old: ---- beignet-1.1.0-source.tar.gz New: ---- beignet-1.1.1-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beignet.spec ++++++ --- /var/tmp/diff_new_pack.Qr5w6a/_old 2015-12-21 12:05:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Qr5w6a/_new 2015-12-21 12:05:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: beignet -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: Open source implementation of the OpenCL for Intel GPUs License: LGPL-2.1+ @@ -25,8 +25,6 @@ Url: https://01.org/beignet/ Source0: https://01.org/sites/default/files/%{name}-%{version}-source.tar.gz Source99: beignet-rpmlintrc -# exclusive to Intel GPU -ExclusiveArch: %{ix86} x86_64 Patch0: beignet-llvm37.diff BuildRequires: cmake BuildRequires: gcc-c++ @@ -42,6 +40,8 @@ BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(ocl-icd) BuildRequires: pkgconfig(zlib) +# exclusive to Intel GPU +ExclusiveArch: %ix86 x86_64 %description Beignet is an open source implementation of the OpenCL specification - a generic @@ -65,14 +65,13 @@ %patch0 -p1 %build -%cmake .. \ +%cmake \ -DLLVM_INSTALL_DIR=%{_bindir}/ \ -DCMAKE_BUILD_TYPE=Release make VERBOSE=1 %{?_smp_mflags} %install -cd build -%make_install +%cmake_install find %{buildroot}%{_includedir}/CL/ -regextype posix-egrep -not -regex ".*(cl_intel.h)" -type f -delete %files ++++++ beignet-1.1.0-source.tar.gz -> beignet-1.1.1-source.tar.gz ++++++ ++++ 1951 lines of diff (skipped) ++++++ beignet-llvm37.diff ++++++ --- /var/tmp/diff_new_pack.Qr5w6a/_old 2015-12-21 12:05:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Qr5w6a/_new 2015-12-21 12:05:02.000000000 +0100 @@ -1,7 +1,7 @@ -diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp -index 04da692..292b7b5 100644 ---- a/backend/src/backend/gen_program.cpp -+++ b/backend/src/backend/gen_program.cpp +Index: Beignet-1.1.1-Source/backend/src/backend/gen_program.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/backend/gen_program.cpp ++++ Beignet-1.1.1-Source/backend/src/backend/gen_program.cpp @@ -402,7 +402,11 @@ namespace gbe { llvm::Module* src = (llvm::Module*)((GenProgram*)src_program)->module; llvm::Module* dst = (llvm::Module*)((GenProgram*)dst_program)->module; @@ -14,10 +14,10 @@ if (err != NULL && errSize != NULL && stringSize > 0u) { strncpy(err, errMsg, stringSize-1); err[stringSize-1] = '\0'; -diff --git a/backend/src/libocl/CMakeLists.txt b/backend/src/libocl/CMakeLists.txt -index 0cd1eef..0fffd9b 100644 ---- a/backend/src/libocl/CMakeLists.txt -+++ b/backend/src/libocl/CMakeLists.txt +Index: Beignet-1.1.1-Source/backend/src/libocl/CMakeLists.txt +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/libocl/CMakeLists.txt ++++ Beignet-1.1.1-Source/backend/src/libocl/CMakeLists.txt @@ -52,7 +52,8 @@ FOREACH(M ${OCL_COPY_HEADERS}) COPY_THE_HEADER(${M}) ENDFOREACH(M) @@ -37,10 +37,10 @@ FOREACH(f ${OCL_LL_MODULES}) COPY_THE_LL(${f}) ADD_LL_TO_BC_TARGET(${f}) -diff --git a/backend/src/libocl/include/ocl.h b/backend/src/libocl/include/ocl.h -index a4af4aa..7897567 100644 ---- a/backend/src/libocl/include/ocl.h -+++ b/backend/src/libocl/include/ocl.h +Index: Beignet-1.1.1-Source/backend/src/libocl/include/ocl.h +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/libocl/include/ocl.h ++++ Beignet-1.1.1-Source/backend/src/libocl/include/ocl.h @@ -30,6 +30,7 @@ #include "ocl_image.h" #include "ocl_integer.h" @@ -49,11 +49,10 @@ #include "ocl_misc.h" #include "ocl_printf.h" #include "ocl_relational.h" -diff --git a/backend/src/libocl/include/ocl_memcpy.h b/backend/src/libocl/include/ocl_memcpy.h -new file mode 100644 -index 0000000..2672298 +Index: Beignet-1.1.1-Source/backend/src/libocl/include/ocl_memcpy.h +=================================================================== --- /dev/null -+++ b/backend/src/libocl/include/ocl_memcpy.h ++++ Beignet-1.1.1-Source/backend/src/libocl/include/ocl_memcpy.h @@ -0,0 +1,51 @@ +/* + * Copyright © 2012 - 2014 Intel Corporation @@ -106,11 +105,10 @@ +void __gen_memcpy_lc(__local uchar* dst, __constant uchar* src, size_t size); + +#endif /* __OCL_MEMCPY_H__ */ -diff --git a/backend/src/libocl/include/ocl_memset.h b/backend/src/libocl/include/ocl_memset.h -new file mode 100644 -index 0000000..2d444ad +Index: Beignet-1.1.1-Source/backend/src/libocl/include/ocl_memset.h +=================================================================== --- /dev/null -+++ b/backend/src/libocl/include/ocl_memset.h ++++ Beignet-1.1.1-Source/backend/src/libocl/include/ocl_memset.h @@ -0,0 +1,33 @@ +/* + * Copyright © 2012 - 2014 Intel Corporation @@ -145,10 +143,10 @@ +void __gen_memset_l(__local uchar* dst, uchar val, size_t size); + +#endif /* __OCL_MEMSET_H__ */ -diff --git a/backend/src/libocl/src/ocl_barrier.ll b/backend/src/libocl/src/ocl_barrier.ll -index dc3579c..2765a71 100644 ---- a/backend/src/libocl/src/ocl_barrier.ll -+++ b/backend/src/libocl/src/ocl_barrier.ll +Index: Beignet-1.1.1-Source/backend/src/libocl/src/ocl_barrier.ll +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/libocl/src/ocl_barrier.ll ++++ Beignet-1.1.1-Source/backend/src/libocl/src/ocl_barrier.ll @@ -4,6 +4,9 @@ ;#define CLK_LOCAL_MEM_FENCE (1 << 0) ;#define CLK_GLOBAL_MEM_FENCE (1 << 1) @@ -159,10 +157,10 @@ declare i32 @_get_local_mem_fence() nounwind alwaysinline declare i32 @_get_global_mem_fence() nounwind alwaysinline declare void @__gen_ocl_barrier_local() nounwind alwaysinline noduplicate -diff --git a/backend/src/libocl/src/ocl_clz.ll b/backend/src/libocl/src/ocl_clz.ll -index a274cde..9522881 100644 ---- a/backend/src/libocl/src/ocl_clz.ll -+++ b/backend/src/libocl/src/ocl_clz.ll +Index: Beignet-1.1.1-Source/backend/src/libocl/src/ocl_clz.ll +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/libocl/src/ocl_clz.ll ++++ Beignet-1.1.1-Source/backend/src/libocl/src/ocl_clz.ll @@ -1,3 +1,6 @@ +target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024" +target triple = "spir" @@ -170,11 +168,10 @@ declare i8 @llvm.ctlz.i8(i8, i1) declare i16 @llvm.ctlz.i16(i16, i1) declare i32 @llvm.ctlz.i32(i32, i1) -diff --git a/backend/src/libocl/src/ocl_memcpy.cl b/backend/src/libocl/src/ocl_memcpy.cl -new file mode 100644 -index 0000000..85f490f +Index: Beignet-1.1.1-Source/backend/src/libocl/src/ocl_memcpy.cl +=================================================================== --- /dev/null -+++ b/backend/src/libocl/src/ocl_memcpy.cl ++++ Beignet-1.1.1-Source/backend/src/libocl/src/ocl_memcpy.cl @@ -0,0 +1,49 @@ +/* + * Copyright © 2012 - 2014 Intel Corporation @@ -225,10 +222,9 @@ +DECL_ONE_SPACE_MEMCOPY_FN(l, __local) +DECL_ONE_SPACE_MEMCOPY_FN(p, __private) + -diff --git a/backend/src/libocl/src/ocl_memcpy.ll b/backend/src/libocl/src/ocl_memcpy.ll -deleted file mode 100644 -index b3fadb2..0000000 ---- a/backend/src/libocl/src/ocl_memcpy.ll +Index: Beignet-1.1.1-Source/backend/src/libocl/src/ocl_memcpy.ll +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/libocl/src/ocl_memcpy.ll +++ /dev/null @@ -1,729 +0,0 @@ -;The memcpy's source code. @@ -960,11 +956,10 @@ -while.end: ; preds = %while.body, %entry - ret void -} -diff --git a/backend/src/libocl/src/ocl_memset.cl b/backend/src/libocl/src/ocl_memset.cl -new file mode 100644 -index 0000000..b41851a +Index: Beignet-1.1.1-Source/backend/src/libocl/src/ocl_memset.cl +=================================================================== --- /dev/null -+++ b/backend/src/libocl/src/ocl_memset.cl ++++ Beignet-1.1.1-Source/backend/src/libocl/src/ocl_memset.cl @@ -0,0 +1,44 @@ +/* + * Copyright © 2012 - 2014 Intel Corporation @@ -1010,10 +1005,9 @@ +DECL_MEMSET_FN(l, __local) +DECL_MEMSET_FN(p, __private) + -diff --git a/backend/src/libocl/src/ocl_memset.ll b/backend/src/libocl/src/ocl_memset.ll -deleted file mode 100644 -index 665eac4..0000000 ---- a/backend/src/libocl/src/ocl_memset.ll +Index: Beignet-1.1.1-Source/backend/src/libocl/src/ocl_memset.ll +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/libocl/src/ocl_memset.ll +++ /dev/null @@ -1,193 +0,0 @@ -;The memset's source code. @@ -1209,10 +1203,10 @@ -while.end: ; preds = %while.body, %entry - ret void -} -diff --git a/backend/src/llvm/ExpandConstantExpr.cpp b/backend/src/llvm/ExpandConstantExpr.cpp -index 5c5934a..c6f57b8 100644 ---- a/backend/src/llvm/ExpandConstantExpr.cpp -+++ b/backend/src/llvm/ExpandConstantExpr.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/ExpandConstantExpr.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/ExpandConstantExpr.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/ExpandConstantExpr.cpp @@ -77,12 +77,7 @@ //===----------------------------------------------------------------------===// @@ -1227,10 +1221,10 @@ #include "llvm_gen_backend.hpp" using namespace llvm; -diff --git a/backend/src/llvm/ExpandLargeIntegers.cpp b/backend/src/llvm/ExpandLargeIntegers.cpp -index f7e59a5..20fdda9 100644 ---- a/backend/src/llvm/ExpandLargeIntegers.cpp -+++ b/backend/src/llvm/ExpandLargeIntegers.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/ExpandLargeIntegers.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/ExpandLargeIntegers.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/ExpandLargeIntegers.cpp @@ -86,24 +86,9 @@ // 2. OR x, 0 can be optimized as x. And x, 0 can be optimized as 0. //===----------------------------------------------------------------------===// @@ -1259,10 +1253,10 @@ #include "llvm_gen_backend.hpp" using namespace llvm; -diff --git a/backend/src/llvm/ExpandUtils.cpp b/backend/src/llvm/ExpandUtils.cpp -index e6dfb52..801f969 100644 ---- a/backend/src/llvm/ExpandUtils.cpp -+++ b/backend/src/llvm/ExpandUtils.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/ExpandUtils.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/ExpandUtils.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/ExpandUtils.cpp @@ -64,12 +64,8 @@ // //===----------------------------------------------------------------------===// @@ -1278,10 +1272,10 @@ #include "llvm_gen_backend.hpp" using namespace llvm; -diff --git a/backend/src/llvm/PromoteIntegers.cpp b/backend/src/llvm/PromoteIntegers.cpp -index aba42b9..b65440f 100644 ---- a/backend/src/llvm/PromoteIntegers.cpp -+++ b/backend/src/llvm/PromoteIntegers.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/PromoteIntegers.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/PromoteIntegers.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/PromoteIntegers.cpp @@ -84,14 +84,8 @@ //===----------------------------------------------------------------------===// @@ -1299,10 +1293,10 @@ #include "llvm_gen_backend.hpp" using namespace llvm; -diff --git a/backend/src/llvm/StripAttributes.cpp b/backend/src/llvm/StripAttributes.cpp -index 05cac17..e6df312 100644 ---- a/backend/src/llvm/StripAttributes.cpp -+++ b/backend/src/llvm/StripAttributes.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/StripAttributes.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/StripAttributes.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/StripAttributes.cpp @@ -69,14 +69,7 @@ // * Calling conventions from functions and function calls. // @@ -1319,10 +1313,10 @@ #include "llvm_gen_backend.hpp" -diff --git a/backend/src/llvm/llvm_barrier_nodup.cpp b/backend/src/llvm/llvm_barrier_nodup.cpp -index 19deafc..727e6bd 100644 ---- a/backend/src/llvm/llvm_barrier_nodup.cpp -+++ b/backend/src/llvm/llvm_barrier_nodup.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_barrier_nodup.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_barrier_nodup.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_barrier_nodup.cpp @@ -28,30 +28,7 @@ * */ @@ -1355,10 +1349,10 @@ #include "llvm/llvm_gen_backend.hpp" #include "sys/map.hpp" -diff --git a/backend/src/llvm/llvm_bitcode_link.cpp b/backend/src/llvm/llvm_bitcode_link.cpp -index ebf4386..56205bb 100644 ---- a/backend/src/llvm/llvm_bitcode_link.cpp -+++ b/backend/src/llvm/llvm_bitcode_link.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_bitcode_link.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_bitcode_link.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_bitcode_link.cpp @@ -21,24 +21,11 @@ #include <iostream> #include <sstream> @@ -1398,10 +1392,10 @@ passes.add(createInternalizePass(kernels)); passes.add(createGlobalDCEPass()); -diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp -index 4905415..4f2fe89 100644 ---- a/backend/src/llvm/llvm_gen_backend.cpp -+++ b/backend/src/llvm/llvm_gen_backend.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_gen_backend.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_gen_backend.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_gen_backend.cpp @@ -71,86 +71,7 @@ * is intercepted, we just abort */ @@ -1525,10 +1519,10 @@ emitFunction(F); phiMap.clear(); globalPointer.clear(); -diff --git a/backend/src/llvm/llvm_gen_backend.hpp b/backend/src/llvm/llvm_gen_backend.hpp -index 1f16557..94a377b 100644 ---- a/backend/src/llvm/llvm_gen_backend.hpp -+++ b/backend/src/llvm/llvm_gen_backend.hpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_gen_backend.hpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_gen_backend.hpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_gen_backend.hpp @@ -30,11 +30,7 @@ #include "llvm/Config/llvm-config.h" #include "llvm/Pass.h" @@ -1541,11 +1535,10 @@ #include "sys/platform.hpp" #include "sys/map.hpp" #include <algorithm> -diff --git a/backend/src/llvm/llvm_includes.hpp b/backend/src/llvm/llvm_includes.hpp -new file mode 100644 -index 0000000..fed3a18 +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_includes.hpp +=================================================================== --- /dev/null -+++ b/backend/src/llvm/llvm_includes.hpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_includes.hpp @@ -0,0 +1,125 @@ +/* + * Copyright © 2012 Intel Corporation @@ -1672,10 +1665,10 @@ +#include <clang/CodeGen/CodeGenAction.h> + +#endif /* __GBE_IR_LLVM_INCLUDES_HPP__ */ -diff --git a/backend/src/llvm/llvm_intrinsic_lowering.cpp b/backend/src/llvm/llvm_intrinsic_lowering.cpp -index 7d1f8f0..b35d1e6 100644 ---- a/backend/src/llvm/llvm_intrinsic_lowering.cpp -+++ b/backend/src/llvm/llvm_intrinsic_lowering.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_intrinsic_lowering.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_intrinsic_lowering.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_intrinsic_lowering.cpp @@ -20,29 +20,7 @@ * \author Yang Rong <[email protected]> */ @@ -1707,10 +1700,10 @@ #include "llvm/llvm_gen_backend.hpp" #include "sys/map.hpp" -diff --git a/backend/src/llvm/llvm_loadstore_optimization.cpp b/backend/src/llvm/llvm_loadstore_optimization.cpp -index c6349fa..698fdc2 100644 ---- a/backend/src/llvm/llvm_loadstore_optimization.cpp -+++ b/backend/src/llvm/llvm_loadstore_optimization.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_loadstore_optimization.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_loadstore_optimization.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_loadstore_optimization.cpp @@ -22,37 +22,7 @@ * from Vectorize passes in llvm. */ @@ -1761,10 +1754,10 @@ DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>(); TD = DLP ? &DLP->getDataLayout() : nullptr; #else -diff --git a/backend/src/llvm/llvm_passes.cpp b/backend/src/llvm/llvm_passes.cpp -index 223f61b..d5d965b 100644 ---- a/backend/src/llvm/llvm_passes.cpp -+++ b/backend/src/llvm/llvm_passes.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_passes.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_passes.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_passes.cpp @@ -30,75 +30,7 @@ * Segovia) the right to use another license for it (MIT here) */ @@ -1842,10 +1835,10 @@ #include "llvm/llvm_gen_backend.hpp" #include "ir/unit.hpp" -diff --git a/backend/src/llvm/llvm_printf_parser.cpp b/backend/src/llvm/llvm_printf_parser.cpp -index 3d84457..1e8427c 100644 ---- a/backend/src/llvm/llvm_printf_parser.cpp -+++ b/backend/src/llvm/llvm_printf_parser.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_printf_parser.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_printf_parser.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_printf_parser.cpp @@ -33,39 +33,7 @@ #include <stdio.h> #include <stdlib.h> @@ -1887,10 +1880,10 @@ #include "llvm/llvm_gen_backend.hpp" #include "sys/map.hpp" -diff --git a/backend/src/llvm/llvm_sampler_fix.cpp b/backend/src/llvm/llvm_sampler_fix.cpp -index 8c76324..01db8fe 100644 ---- a/backend/src/llvm/llvm_sampler_fix.cpp -+++ b/backend/src/llvm/llvm_sampler_fix.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_sampler_fix.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_sampler_fix.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_sampler_fix.cpp @@ -20,27 +20,8 @@ * make sure to get correct pixel value. But for some other * sampler, we don't need those work around code. @@ -1920,10 +1913,10 @@ #include "llvm_gen_backend.hpp" #include "ocl_common_defines.h" -diff --git a/backend/src/llvm/llvm_scalarize.cpp b/backend/src/llvm/llvm_scalarize.cpp -index bc985c6..7ee5259 100644 ---- a/backend/src/llvm/llvm_scalarize.cpp -+++ b/backend/src/llvm/llvm_scalarize.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_scalarize.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_scalarize.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_scalarize.cpp @@ -59,39 +59,7 @@ // //===----------------------------------------------------------------------===// @@ -1973,10 +1966,10 @@ #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5 initializeDominatorTreeWrapperPassPass(*PassRegistry::getPassRegistry()); #else -diff --git a/backend/src/llvm/llvm_to_gen.cpp b/backend/src/llvm/llvm_to_gen.cpp -index 891f2a1..24d4be7 100644 ---- a/backend/src/llvm/llvm_to_gen.cpp -+++ b/backend/src/llvm/llvm_to_gen.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_to_gen.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_to_gen.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_to_gen.cpp @@ -22,40 +22,8 @@ * \author Benjamin Segovia <[email protected]> */ @@ -2005,7 +1998,8 @@ -#endif /* LLVM_VERSION_MINOR <= 2 */ -#include "llvm/Support/raw_ostream.h" -#include "llvm/Transforms/Scalar.h" -- ++#include "llvm_includes.hpp" + -#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >=5 -#include "llvm/IR/IRPrintingPasses.h" -#include "llvm/IR/Verifier.h" @@ -2013,8 +2007,7 @@ -#include "llvm/Analysis/Verifier.h" -#include "llvm/Assembly/PrintModulePass.h" -#endif -+#include "llvm_includes.hpp" - +- -#include "llvm/Analysis/CFGPrinter.h" #include "llvm/llvm_gen_backend.hpp" #include "llvm/llvm_to_gen.hpp" @@ -2144,10 +2137,10 @@ passes.add(new DataLayoutPass()); #elif LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR == 5 passes.add(new DataLayoutPass(DL)); -diff --git a/backend/src/llvm/llvm_unroll.cpp b/backend/src/llvm/llvm_unroll.cpp -index 5d3fad8..6990e39 100644 ---- a/backend/src/llvm/llvm_unroll.cpp -+++ b/backend/src/llvm/llvm_unroll.cpp +Index: Beignet-1.1.1-Source/backend/src/llvm/llvm_unroll.cpp +=================================================================== +--- Beignet-1.1.1-Source.orig/backend/src/llvm/llvm_unroll.cpp ++++ Beignet-1.1.1-Source/backend/src/llvm/llvm_unroll.cpp @@ -18,34 +18,9 @@ #include "llvm/Config/llvm-config.h" #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5 @@ -2200,10 +2193,10 @@ AU.addRequiredID(LoopSimplifyID); AU.addPreservedID(LoopSimplifyID); AU.addRequiredID(LCSSAID); -diff --git a/kernels/compiler_function_qualifiers.cl b/kernels/compiler_function_qualifiers.cl -index c904c84..c9f7e5d 100644 ---- a/kernels/compiler_function_qualifiers.cl -+++ b/kernels/compiler_function_qualifiers.cl +Index: Beignet-1.1.1-Source/kernels/compiler_function_qualifiers.cl +=================================================================== +--- Beignet-1.1.1-Source.orig/kernels/compiler_function_qualifiers.cl ++++ Beignet-1.1.1-Source/kernels/compiler_function_qualifiers.cl @@ -1,9 +1,9 @@ /* test OpenCL 1.1 Function Qualifiers (section 6.7) */ -kernel void compiler_function_qualifiers()
