Author: awatry Date: Tue Feb 23 08:43:09 2016 New Revision: 261639 URL: http://llvm.org/viewvc/llvm-project?rev=261639&view=rev Log: math: Add ilogb ported from amd-builtins
The scalar float/double function bodies are a direct copy/paste with usage of the CLC wrappers to vectorize them. This commit also adds in the FP_ILOGB0 and FP_ILOGBNAN macros which are equal to the results of ilogb(0.0f) and ilogb(float nan) respectively. v2: Add FP_ILOGB0 and FP_ILOGBNAN definitions Signed-off-by: Aaron Watry <awa...@gmail.com> Reviewed-by: Jan Vesely <jan.ves...@rutgers.edu> v1 Reviewed-by: Tom Stellard <thomas.stell...@amd.com> Added: libclc/trunk/generic/include/clc/math/ilogb.h libclc/trunk/generic/include/clc/math/ilogb.inc libclc/trunk/generic/lib/math/ilogb.cl Modified: libclc/trunk/generic/include/clc/clc.h libclc/trunk/generic/include/clc/float/definitions.h libclc/trunk/generic/lib/SOURCES Modified: libclc/trunk/generic/include/clc/clc.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/clc.h?rev=261639&r1=261638&r2=261639&view=diff ============================================================================== --- libclc/trunk/generic/include/clc/clc.h (original) +++ libclc/trunk/generic/include/clc/clc.h Tue Feb 23 08:43:09 2016 @@ -62,6 +62,7 @@ #include <clc/math/half_rsqrt.h> #include <clc/math/half_sqrt.h> #include <clc/math/hypot.h> +#include <clc/math/ilogb.h> #include <clc/math/ldexp.h> #include <clc/math/log.h> #include <clc/math/log10.h> Modified: libclc/trunk/generic/include/clc/float/definitions.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/float/definitions.h?rev=261639&r1=261638&r2=261639&view=diff ============================================================================== --- libclc/trunk/generic/include/clc/float/definitions.h (original) +++ libclc/trunk/generic/include/clc/float/definitions.h Tue Feb 23 08:43:09 2016 @@ -14,6 +14,9 @@ #define FLT_MIN 0x1.0p-126f #define FLT_EPSILON 0x1.0p-23f +#define FP_ILOGB0 (-2147483647 - 1) +#define FP_ILOGBNAN (-2147483647 - 1) + #define M_E_F 0x1.5bf0a8p+1f #define M_LOG2E_F 0x1.715476p+0f #define M_LOG10E_F 0x1.bcb7b2p-2f Added: libclc/trunk/generic/include/clc/math/ilogb.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/ilogb.h?rev=261639&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/math/ilogb.h (added) +++ libclc/trunk/generic/include/clc/math/ilogb.h Tue Feb 23 08:43:09 2016 @@ -0,0 +1,5 @@ +#define __CLC_BODY <clc/math/ilogb.inc> + +#include <clc/math/gentype.inc> + +#undef __CLC_BODY Added: libclc/trunk/generic/include/clc/math/ilogb.inc URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/ilogb.inc?rev=261639&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/math/ilogb.inc (added) +++ libclc/trunk/generic/include/clc/math/ilogb.inc Tue Feb 23 08:43:09 2016 @@ -0,0 +1 @@ +_CLC_OVERLOAD _CLC_DECL __CLC_INTN ilogb(__CLC_GENTYPE x); Modified: libclc/trunk/generic/lib/SOURCES URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/SOURCES?rev=261639&r1=261638&r2=261639&view=diff ============================================================================== --- libclc/trunk/generic/lib/SOURCES (original) +++ libclc/trunk/generic/lib/SOURCES Tue Feb 23 08:43:09 2016 @@ -90,6 +90,7 @@ math/frexp.cl math/half_rsqrt.cl math/half_sqrt.cl math/hypot.cl +math/ilogb.cl math/clc_ldexp.cl math/ldexp.cl math/log.cl Added: libclc/trunk/generic/lib/math/ilogb.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/ilogb.cl?rev=261639&view=auto ============================================================================== --- libclc/trunk/generic/lib/math/ilogb.cl (added) +++ libclc/trunk/generic/lib/math/ilogb.cl Tue Feb 23 08:43:09 2016 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2015 Advanced Micro Devices, Inc. + * Copyright (c) 2016 Aaron Watry + * + * 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 "../clcmacro.h" +#include "math.h" + +_CLC_OVERLOAD _CLC_DEF int ilogb(float x) { + uint ux = as_uint(x); + uint ax = ux & EXSIGNBIT_SP32; + int rs = -118 - (int) clz(ux & MANTBITS_SP32); + int r = (int) (ax >> EXPSHIFTBITS_SP32) - EXPBIAS_SP32; + r = ax < 0x00800000U ? rs : r; + r = ax > EXPBITS_SP32 | ax == 0 ? 0x80000000 : r; + r = ax == EXPBITS_SP32 ? 0x7fffffff : r; + return r; +} + +_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, int, ilogb, float); + +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable + +_CLC_OVERLOAD _CLC_DEF ilogb(double x) { + ulong ux = as_ulong(x); + ulong ax = ux & ~SIGNBIT_DP64; + int r = (int) (ax >> EXPSHIFTBITS_DP64) - EXPBIAS_DP64; + int rs = -1011 - (int) clz(ax & MANTBITS_DP64); + r = ax < 0x0010000000000000UL ? rs : r; + r = ax > 0x7ff0000000000000UL | ax == 0UL ? 0x80000000 : r; + r = ax == 0x7ff0000000000000UL ? 0x7fffffff : r; + return r; +} + +_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, int, ilogb, double); + +#endif // cl_khr_fp64 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits