Author: jvesely Date: Fri Apr 6 10:43:08 2018 New Revision: 329433 URL: http://llvm.org/viewvc/llvm-project?rev=329433&view=rev Log: fmod: Port from amd_builtins
Uses only denormal path for fp32. Passes CTS on carrizo and turks. v2: whitespace fix Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> Reviewer: Aaron Watry <awa...@gmail.com> Added: libclc/trunk/generic/include/math/clc_fmod.h libclc/trunk/generic/lib/math/clc_fmod.cl Removed: libclc/trunk/generic/include/clc/math/fmod.inc Modified: libclc/trunk/generic/include/clc/math/fmod.h libclc/trunk/generic/lib/SOURCES libclc/trunk/generic/lib/math/fmod.cl Modified: libclc/trunk/generic/include/clc/math/fmod.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/fmod.h?rev=329433&r1=329432&r2=329433&view=diff ============================================================================== --- libclc/trunk/generic/include/clc/math/fmod.h (original) +++ libclc/trunk/generic/include/clc/math/fmod.h Fri Apr 6 10:43:08 2018 @@ -1,2 +1,4 @@ -#define __CLC_BODY <clc/math/fmod.inc> +#define __CLC_FUNCTION fmod +#define __CLC_BODY <clc/math/binary_decl_tt.inc> #include <clc/math/gentype.inc> +#undef __CLC_FUNCTION Removed: libclc/trunk/generic/include/clc/math/fmod.inc URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/fmod.inc?rev=329432&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/math/fmod.inc (original) +++ libclc/trunk/generic/include/clc/math/fmod.inc (removed) @@ -1 +0,0 @@ -_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE fmod(__CLC_GENTYPE a, __CLC_GENTYPE b); Added: libclc/trunk/generic/include/math/clc_fmod.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/math/clc_fmod.h?rev=329433&view=auto ============================================================================== --- libclc/trunk/generic/include/math/clc_fmod.h (added) +++ libclc/trunk/generic/include/math/clc_fmod.h Fri Apr 6 10:43:08 2018 @@ -0,0 +1,4 @@ +#define __CLC_FUNCTION __clc_fmod +#define __CLC_BODY <clc/math/binary_decl_tt.inc> +#include <clc/math/gentype.inc> +#undef __CLC_FUNCTION Modified: libclc/trunk/generic/lib/SOURCES URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/SOURCES?rev=329433&r1=329432&r2=329433&view=diff ============================================================================== --- libclc/trunk/generic/lib/SOURCES (original) +++ libclc/trunk/generic/lib/SOURCES Fri Apr 6 10:43:08 2018 @@ -102,6 +102,7 @@ math/exp10.cl math/fdim.cl math/fmax.cl math/fmin.cl +math/clc_fmod.cl math/fmod.cl math/fract.cl math/frexp.cl Added: libclc/trunk/generic/lib/math/clc_fmod.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/clc_fmod.cl?rev=329433&view=auto ============================================================================== --- libclc/trunk/generic/lib/math/clc_fmod.cl (added) +++ libclc/trunk/generic/lib/math/clc_fmod.cl Fri Apr 6 10:43:08 2018 @@ -0,0 +1,184 @@ +/* + * Copyright (c) 2014 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include <clc/clc.h> + +#include <math/clc_remainder.h> +#include "../clcmacro.h" +#include "config.h" +#include "math.h" + +_CLC_DEF _CLC_OVERLOAD float __clc_fmod(float x, float y) +{ + int ux = as_int(x); + int ax = ux & EXSIGNBIT_SP32; + float xa = as_float(ax); + int sx = ux ^ ax; + int ex = ax >> EXPSHIFTBITS_SP32; + + int uy = as_int(y); + int ay = uy & EXSIGNBIT_SP32; + float ya = as_float(ay); + int ey = ay >> EXPSHIFTBITS_SP32; + + float xr = as_float(0x3f800000 | (ax & 0x007fffff)); + float yr = as_float(0x3f800000 | (ay & 0x007fffff)); + int c; + int k = ex - ey; + + while (k > 0) { + c = xr >= yr; + xr -= c ? yr : 0.0f; + xr += xr; + --k; + } + + c = xr >= yr; + xr -= c ? yr : 0.0f; + + int lt = ex < ey; + + xr = lt ? xa : xr; + yr = lt ? ya : yr; + + + float s = as_float(ey << EXPSHIFTBITS_SP32); + xr *= lt ? 1.0f : s; + + c = ax == ay; + xr = c ? 0.0f : xr; + + xr = as_float(sx ^ as_int(xr)); + + c = ax > PINFBITPATT_SP32 | ay > PINFBITPATT_SP32 | ax == PINFBITPATT_SP32 | ay == 0; + xr = c ? as_float(QNANBITPATT_SP32) : xr; + + return xr; + +} +_CLC_BINARY_VECTORIZE(_CLC_DEF _CLC_OVERLOAD, float, __clc_fmod, float, float); + +#ifdef cl_khr_fp64 +_CLC_DEF _CLC_OVERLOAD double __clc_fmod(double x, double y) +{ + ulong ux = as_ulong(x); + ulong ax = ux & ~SIGNBIT_DP64; + ulong xsgn = ux ^ ax; + double dx = as_double(ax); + int xexp = convert_int(ax >> EXPSHIFTBITS_DP64); + int xexp1 = 11 - (int) clz(ax & MANTBITS_DP64); + xexp1 = xexp < 1 ? xexp1 : xexp; + + ulong uy = as_ulong(y); + ulong ay = uy & ~SIGNBIT_DP64; + double dy = as_double(ay); + int yexp = convert_int(ay >> EXPSHIFTBITS_DP64); + int yexp1 = 11 - (int) clz(ay & MANTBITS_DP64); + yexp1 = yexp < 1 ? yexp1 : yexp; + + // First assume |x| > |y| + + // Set ntimes to the number of times we need to do a + // partial remainder. If the exponent of x is an exact multiple + // of 53 larger than the exponent of y, and the mantissa of x is + // less than the mantissa of y, ntimes will be one too large + // but it doesn't matter - it just means that we'll go round + // the loop below one extra time. + int ntimes = max(0, (xexp1 - yexp1) / 53); + double w = ldexp(dy, ntimes * 53); + w = ntimes == 0 ? dy : w; + double scale = ntimes == 0 ? 1.0 : 0x1.0p-53; + + // Each time round the loop we compute a partial remainder. + // This is done by subtracting a large multiple of w + // from x each time, where w is a scaled up version of y. + // The subtraction must be performed exactly in quad + // precision, though the result at each stage can + // fit exactly in a double precision number. + int i; + double t, v, p, pp; + + for (i = 0; i < ntimes; i++) { + // Compute integral multiplier + t = trunc(dx / w); + + // Compute w * t in quad precision + p = w * t; + pp = fma(w, t, -p); + + // Subtract w * t from dx + v = dx - p; + dx = v + (((dx - v) - p) - pp); + + // If t was one too large, dx will be negative. Add back one w. + dx += dx < 0.0 ? w : 0.0; + + // Scale w down by 2^(-53) for the next iteration + w *= scale; + } + + // One more time + // Variable todd says whether the integer t is odd or not + t = floor(dx / w); + long lt = (long)t; + int todd = lt & 1; + + p = w * t; + pp = fma(w, t, -p); + v = dx - p; + dx = v + (((dx - v) - p) - pp); + i = dx < 0.0; + todd ^= i; + dx += i ? w : 0.0; + + // At this point, dx lies in the range [0,dy) + double ret = as_double(xsgn ^ as_ulong(dx)); + dx = as_double(ax); + + // Now handle |x| == |y| + int c = dx == dy; + t = as_double(xsgn); + ret = c ? t : ret; + + // Next, handle |x| < |y| + c = dx < dy; + ret = c ? x : ret; + + // We don't need anything special for |x| == 0 + + // |y| is 0 + c = dy == 0.0; + ret = c ? as_double(QNANBITPATT_DP64) : ret; + + // y is +-Inf, NaN + c = yexp > BIASEDEMAX_DP64; + t = y == y ? x : y; + ret = c ? t : ret; + + // x is +=Inf, NaN + c = xexp > BIASEDEMAX_DP64; + ret = c ? as_double(QNANBITPATT_DP64) : ret; + + return ret; +} +_CLC_BINARY_VECTORIZE(_CLC_DEF _CLC_OVERLOAD, double, __clc_fmod, double, double); +#endif Modified: libclc/trunk/generic/lib/math/fmod.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/fmod.cl?rev=329433&r1=329432&r2=329433&view=diff ============================================================================== --- libclc/trunk/generic/lib/math/fmod.cl (original) +++ libclc/trunk/generic/lib/math/fmod.cl Fri Apr 6 10:43:08 2018 @@ -1,12 +1,6 @@ #include <clc/clc.h> -#include "../clcmacro.h" +#include <math/clc_fmod.h> -_CLC_DEFINE_BINARY_BUILTIN(float, fmod, __builtin_fmodf, float, float) - -#ifdef cl_khr_fp64 - -#pragma OPENCL EXTENSION cl_khr_fp64 : enable - -_CLC_DEFINE_BINARY_BUILTIN(double, fmod, __builtin_fmod, double, double) - -#endif +#define __CLC_FUNC fmod +#define __CLC_BODY <clc_sw_binary.inc> +#include <clc/math/gentype.inc> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits