Hello community, here is the log from the commit of package beignet for openSUSE:Factory checked in at 2016-07-14 09:49:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-21 12:05:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.beignet.new/beignet.changes 2016-07-14 09:49:29.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Jul 4 18:29:03 UTC 2016 - mar...@gmx.de + +- Add patches to support build with GCC6.1 + * gcc6-support.patch + * llvm38-support.patch + * std-isnan-isinf.patch + +------------------------------------------------------------------- +Sun May 8 13:10:31 UTC 2016 - mplus...@suse.com + +- Update to 1.1.2 + * Add Broxton support. + * Add llvm3.7 support. + * Fix event bugs. + * Fix the annoying "Failed to release userptr..." error message. + * Fix printf bugs. +- Drop no longer needed beignet-llvm37.diff + +------------------------------------------------------------------- Old: ---- beignet-1.1.1-source.tar.gz beignet-llvm37.diff New: ---- beignet-1.1.2-source.tar.gz gcc6-support.patch llvm38-support.patch std-isnan-isinf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beignet.spec ++++++ --- /var/tmp/diff_new_pack.KPYRe8/_old 2016-07-14 09:49:32.000000000 +0200 +++ /var/tmp/diff_new_pack.KPYRe8/_new 2016-07-14 09:49:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package beignet # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: beignet -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Open source implementation of the OpenCL for Intel GPUs License: LGPL-2.1+ @@ -25,7 +25,9 @@ Url: https://01.org/beignet/ Source0: https://01.org/sites/default/files/%{name}-%{version}-source.tar.gz Source99: beignet-rpmlintrc -Patch0: beignet-llvm37.diff +Patch0: gcc6-support.patch +Patch1: llvm38-support.patch +Patch2: std-isnan-isinf.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: llvm >= 3.3 @@ -63,6 +65,8 @@ %prep %setup -q -n Beignet-%{version}-Source %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %cmake \ ++++++ beignet-1.1.1-source.tar.gz -> beignet-1.1.2-source.tar.gz ++++++ ++++ 3517 lines of diff (skipped) ++++++ gcc6-support.patch ++++++ >From 356c856479207e2514d44d28456a70766691fccc Mon Sep 17 00:00:00 2001 From: Pan Xiuli <xiuli....@intel.com> Date: Tue, 3 May 2016 10:58:10 +0800 Subject: Add support for gcc 6 Signed-off-by: Pan Xiuli <xiuli....@intel.com> Reviewed-by: Yang Rong <rong.r.y...@intel.com> diff --git a/backend/src/ir/immediate.hpp b/backend/src/ir/immediate.hpp index 3141643..6bc60d5 100644 --- a/backend/src/ir/immediate.hpp +++ b/backend/src/ir/immediate.hpp @@ -343,7 +343,7 @@ namespace ir { float *f32; double *f64; half *f16; - const Immediate *immVec[]; + const Immediate **immVec; void *p; } data; //!< Value to store Immediate operator+ (const Immediate &) const; diff --git a/utests/builtin_exp.cpp b/utests/builtin_exp.cpp index 406d223..1eaa187 100644 --- a/utests/builtin_exp.cpp +++ b/utests/builtin_exp.cpp @@ -5,7 +5,7 @@ #define udebug 0 #define FLT_MAX 0x1.fffffep127f -#define FLT_MIN 0x1.0p-126f +#define FLT_MIN ldexp(1.0,-126) #define FLT_ULP (1.0e-6f) #define printf_c(...) \ diff --git a/utests/utest_generator.py b/utests/utest_generator.py index 84029da..38d9ea0 100644 --- a/utests/utest_generator.py +++ b/utests/utest_generator.py @@ -4,8 +4,8 @@ import os,sys,re FLT_MAX_POSI='0x1.fffffep127f' FLT_MIN_NEGA='-0x1.fffffep127f' -FLT_MIN_POSI='0x1.0p-126f' -FLT_MAX_NEGA='-0x1.0p-126f' +FLT_MIN_POSI='ldexp(1.0, -126)' +FLT_MAX_NEGA='ldexp(-1.0, -126)' paraTypeList={'float':'%e','int':'%d','double':'%lf','uint':'%d','string':'%s'} -- cgit v0.10.2 ++++++ llvm38-support.patch ++++++ ++++ 676 lines (skipped) ++++++ std-isnan-isinf.patch ++++++ Description: Prepend std namespace to isnan and isinf calls. Needed in Ubuntu to avoid FTBFS. Origin: upstream 14bd8855dddcf683df8138c1062bc65b05d46f94 Author: Sean Lynch diff --git a/utests/builtin_acos_asin.cpp b/utests/builtin_acos_asin.cpp index 0187226..395460b 100644 --- a/utests/builtin_acos_asin.cpp +++ b/utests/builtin_acos_asin.cpp @@ -59,10 +59,10 @@ static void builtin_acos_asin(void) { index_cur = k * max_function + i; #if udebug - if (isinf(cpu_data[index_cur]) && !isinf(gpu_data[index_cur])){ + if (std::isinf(cpu_data[index_cur]) && !std::isinf(gpu_data[index_cur])){ printf_c("%d/%d: %f -> gpu:%f cpu:%f\n", k, i, input_data[k], gpu_data[index_cur], cpu_data[index_cur]); } - else if (isnan(cpu_data[index_cur]) && !isnan(gpu_data[index_cur])){ + else if (std::isnan(cpu_data[index_cur]) && !std::isnan(gpu_data[index_cur])){ printf_c("%d/%d: %f -> gpu:%f cpu:%f\n", k, i, input_data[k], gpu_data[index_cur], cpu_data[index_cur]); } else if(fabs(gpu_data[index_cur] - cpu_data[index_cur]) > 1e-3f){ @@ -71,10 +71,10 @@ static void builtin_acos_asin(void) else printf("%d/%d: %f -> gpu:%f cpu:%f\n", k, i, input_data[k], gpu_data[index_cur], cpu_data[index_cur]); #else - if (isinf(cpu_data[index_cur])) - OCL_ASSERT(isinf(gpu_data[index_cur])); - else if (isnan(cpu_data[index_cur])) - OCL_ASSERT(isnan(gpu_data[index_cur])); + if (std::isinf(cpu_data[index_cur])) + OCL_ASSERT(std::isinf(gpu_data[index_cur])); + else if (std::isnan(cpu_data[index_cur])) + OCL_ASSERT(std::isnan(gpu_data[index_cur])); else { OCL_ASSERT(fabs(gpu_data[index_cur] - cpu_data[index_cur]) < 1e-3f); diff --git a/utests/builtin_exp.cpp b/utests/builtin_exp.cpp index d5288c8..406d223 100644 --- a/utests/builtin_exp.cpp +++ b/utests/builtin_exp.cpp @@ -71,10 +71,10 @@ static void builtin_exp(void) diff/gpu_data[index_cur], 3 * FLT_ULP); #if udebug - if (isinf(cpu_data[index_cur]) && isinf(gpu_data[index_cur])){ + if (std::isinf(cpu_data[index_cur]) && std::isinf(gpu_data[index_cur])){ printf(log); } - else if (isnan(cpu_data[index_cur]) && isnan(gpu_data[index_cur])){ + else if (std::isnan(cpu_data[index_cur]) && std::isnan(gpu_data[index_cur])){ printf(log); } else if( diff / cpu_data[index_cur] < 3 * FLT_ULP \ @@ -86,10 +86,10 @@ static void builtin_exp(void) else printf_c(log); #else - if (isinf(cpu_data[index_cur])) - OCL_ASSERTM(isinf(gpu_data[index_cur]), log); - else if (isnan(cpu_data[index_cur])) - OCL_ASSERTM(isnan(gpu_data[index_cur]), log); + if (std::isinf(cpu_data[index_cur])) + OCL_ASSERTM(std::isinf(gpu_data[index_cur]), log); + else if (std::isnan(cpu_data[index_cur])) + OCL_ASSERTM(std::isnan(gpu_data[index_cur]), log); else if ( gpu_data[index_cur] > FLT_ULP || cpu_data[index_cur] > FLT_ULP) OCL_ASSERTM(fabs( diff / cpu_data[index_cur]) < 3 * FLT_ULP, log); else diff --git a/utests/builtin_pow.cpp b/utests/builtin_pow.cpp index f586448..21fa895 100644 --- a/utests/builtin_pow.cpp +++ b/utests/builtin_pow.cpp @@ -74,8 +74,8 @@ static void builtin_pow(void) { index_cur = k * max_function + i; #if udebug - if ( (isinf(cpu_data[index_cur]) && !isinf(gpu_data[index_cur])) || - (isnan(cpu_data[index_cur]) && !isnan(gpu_data[index_cur])) || + if ( (std::isinf(cpu_data[index_cur]) && !std::isinf(gpu_data[index_cur])) || + (std::isnan(cpu_data[index_cur]) && !std::isnan(gpu_data[index_cur])) || (fabs(gpu_data[index_cur] - cpu_data[index_cur]) > cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR && (denormals_supported || gpu_data[index_cur]!=0 || std::fpclassify(cpu_data[index_cur])!=FP_SUBNORMAL) ) ) @@ -85,10 +85,10 @@ static void builtin_pow(void) else printf("%d/%d: x:%f, y:%f -> gpu:%f cpu:%f\n", k, i, input_data1[k], input_data2[k], gpu_data[index_cur], cpu_data[index_cur]); #else - if (isinf(cpu_data[index_cur])) - OCL_ASSERT(isinf(gpu_data[index_cur])); - else if (isnan(cpu_data[index_cur])) - OCL_ASSERT(isnan(gpu_data[index_cur])); + if (std::isinf(cpu_data[index_cur])) + OCL_ASSERT(std::isinf(gpu_data[index_cur])); + else if (std::isnan(cpu_data[index_cur])) + OCL_ASSERT(std::isnan(gpu_data[index_cur])); else { OCL_ASSERT((fabs(gpu_data[index_cur] - cpu_data[index_cur]) < cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR) || diff --git a/utests/builtin_tgamma.cpp b/utests/builtin_tgamma.cpp index db9ab3c..204f49e 100644 --- a/utests/builtin_tgamma.cpp +++ b/utests/builtin_tgamma.cpp @@ -43,8 +43,8 @@ void builtin_tgamma(void) max_ulp = fabsf(cpu - dst[i]) / cl_FLT_ULP(cpu); max_ulp_at = src[i]; } - if (isinf(cpu)) { - OCL_ASSERT(isinf(dst[i])); + if (std::isinf(cpu)) { + OCL_ASSERT(std::isinf(dst[i])); } else if (fabsf(cpu - dst[i]) >= cl_FLT_ULP(cpu) * ULPSIZE_FACTOR) { printf("%f %f %f\n", src[i], cpu, dst[i]); OCL_ASSERT(0); diff --git a/utests/compiler_half.cpp b/utests/compiler_half.cpp index d486193..3af1925 100644 --- a/utests/compiler_half.cpp +++ b/utests/compiler_half.cpp @@ -229,7 +229,7 @@ static float half_test_src[half_n] = { OCL_ASSERT(((fabs(fdst[i]) < 6e-8f) && (fabs(f) < 6e-8f)) || \ (fabs(f - fdst[i]) <= 0.03 * fabs(fdst[i])) || \ (isInf && ((infSign && fdst[i] > 65504.0f) || (!infSign && fdst[i] < -65504.0f))) || \ - (isnan(f) && isnan(fdst[i]))); \ + (std::isnan(f) && std::isnan(fdst[i]))); \ } \ OCL_UNMAP_BUFFER(1); \ } \ @@ -303,7 +303,7 @@ HALF_MATH_TEST_1ARG(ceil, ceilf); OCL_ASSERT(((fabs(fdst[i]) < 6e-8f) && (fabs(f) < 6e-8f)) || \ (fabs(f - fdst[i]) <= 0.03 * fabs(fdst[i])) || \ (isInf && ((infSign && fdst[i] > 65504.0f) || (!infSign && fdst[i] < -65504.0f))) || \ - (isnan(f) && isnan(fdst[i]))); \ + (std::isnan(f) && std::isnan(fdst[i]))); \ } \ OCL_UNMAP_BUFFER(2); \ } \ diff --git a/utests/compiler_math.cpp b/utests/compiler_math.cpp index e0c4487..0c238c9 100644 --- a/utests/compiler_math.cpp +++ b/utests/compiler_math.cpp @@ -72,10 +72,10 @@ static void compiler_math(void) for (int i = 0; i < 16; ++i) { const float cpu = cpu_dst[i]; const float gpu = ((float*)buf_data[0])[i]; - if (isinf(cpu)) - OCL_ASSERT(isinf(gpu)); - else if (isnan(cpu)) - OCL_ASSERT(isnan(gpu)); + if (std::isinf(cpu)) + OCL_ASSERT(std::isinf(gpu)); + else if (std::isnan(cpu)) + OCL_ASSERT(std::isnan(gpu)); else OCL_ASSERT(fabs(gpu-cpu) < 1e-3f); } diff --git a/utests/compiler_math_2op.cpp b/utests/compiler_math_2op.cpp index 454967d..d771dba 100644 --- a/utests/compiler_math_2op.cpp +++ b/utests/compiler_math_2op.cpp @@ -65,10 +65,10 @@ static void compiler_math_2op(void) for (int i = 0; i < 16; ++i) { const float cpu = cpu_dst[i]; const float gpu = ((float*)buf_data[0])[i]; - if (isinf(cpu)) - OCL_ASSERT(isinf(gpu)); - else if (isnan(cpu)) - OCL_ASSERT(isnan(gpu)); + if (std::isinf(cpu)) + OCL_ASSERT(std::isinf(gpu)); + else if (std::isnan(cpu)) + OCL_ASSERT(std::isnan(gpu)); else { OCL_ASSERT(fabs(gpu-cpu) < 1e-3f); } diff --git a/utests/compiler_math_3op.cpp b/utests/compiler_math_3op.cpp index a382b0a..f90f9d6 100644 --- a/utests/compiler_math_3op.cpp +++ b/utests/compiler_math_3op.cpp @@ -50,10 +50,10 @@ static void compiler_math_3op(void) for (int i = 0; i < 16; ++i) { const float cpu = cpu_dst[i]; const float gpu = ((float*)buf_data[0])[i]; - if (isinf(cpu)) - OCL_ASSERT(isinf(gpu)); - else if (isnan(cpu)) - OCL_ASSERT(isnan(gpu)); + if (std::isinf(cpu)) + OCL_ASSERT(std::isinf(gpu)); + else if (std::isnan(cpu)) + OCL_ASSERT(std::isnan(gpu)); else OCL_ASSERT(fabs(gpu-cpu) < 1e-3f); } diff --git a/utests/utest_generator.py b/utests/utest_generator.py index 91cc938..25f18c7 100644 --- a/utests/utest_generator.py +++ b/utests/utest_generator.py @@ -112,10 +112,10 @@ def udebug(ulpSize,returnType,function): ULPSIZE_FACTOR = select_ulpsize(ULPSIZE_FAST_MATH,ULPSIZE_NO_FAST_MATH); bool fast_math = ULPSIZE_FACTOR == ULPSIZE_FAST_MATH; - if (isinf(cpu_data[index])){ + if (std::isinf(cpu_data[index])){ INFORNAN="INF"; } - else if (isnan(cpu_data[index])){ + else if (std::isnan(cpu_data[index])){ INFORNAN="NAN"; } else{ @@ -124,14 +124,14 @@ def udebug(ulpSize,returnType,function): } #if udebug - if (isinf(cpu_data[index])){ - if (isinf(gpu_data[index])) + if (std::isinf(cpu_data[index])){ + if (std::isinf(gpu_data[index])) printf("%s expect:%s\\n", log, INFORNAN); else printf_c("%s expect:%s\\n", log, INFORNAN); } - else if (isnan(cpu_data[index])){ - if (isnan(gpu_data[index])) + else if (std::isnan(cpu_data[index])){ + if (std::isnan(gpu_data[index])) printf("%s expect:%s\\n", log, INFORNAN); else printf_c("%s expect:%s\\n", log, INFORNAN); @@ -142,13 +142,13 @@ def udebug(ulpSize,returnType,function): else printf_c("%s expect:%s\\n", log, ULPSIZE); #else - if (isinf(cpu_data[index])){ + if (std::isinf(cpu_data[index])){ sprintf(log, "%s expect:%s\\n", log, INFORNAN); - OCL_ASSERTM(isinf(gpu_data[index]) || fast_math,log); + OCL_ASSERTM(std::isinf(gpu_data[index]) || fast_math,log); } - else if (isnan(cpu_data[index])){ + else if (std::isnan(cpu_data[index])){ sprintf(log, "%s expect:%s\\n", log, INFORNAN); - OCL_ASSERTM(isnan(gpu_data[index]) || fast_math,log); + OCL_ASSERTM(std::isnan(gpu_data[index]) || fast_math,log); } else{ sprintf(log, "%s expect:%s\\n", log, ULPSIZE);
