Author: jvesely Date: Fri Apr 24 14:54:17 2015 New Revision: 235762 URL: http://llvm.org/viewvc/llvm-project?rev=235762&view=rev Log: Fix compilation warnings without cl_khr_fp64
Signed-off-by: Jan Vesely <[email protected]> Reviewed-by: Tom Stellard <[email protected]> Modified: libclc/trunk/generic/lib/math/acos.inc libclc/trunk/generic/lib/math/asin.inc libclc/trunk/generic/lib/math/tan.inc Modified: libclc/trunk/generic/lib/math/acos.inc URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/acos.inc?rev=235762&r1=235761&r2=235762&view=diff ============================================================================== --- libclc/trunk/generic/lib/math/acos.inc (original) +++ libclc/trunk/generic/lib/math/acos.inc Fri Apr 24 14:54:17 2015 @@ -11,11 +11,19 @@ * precision of #4 may be better. */ +#if __CLC_FPSIZE == 32 +#define __CLC_CONST(x) x ## f +#else +#define __CLC_CONST(x) x +#endif + _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE acos(__CLC_GENTYPE x) { return ( - (__CLC_GENTYPE) 2.0 * atan2( - sqrt((__CLC_GENTYPE) 1.0 - x), - sqrt((__CLC_GENTYPE) 1.0 + x) + (__CLC_GENTYPE) __CLC_CONST(2.0) * atan2( + sqrt((__CLC_GENTYPE) __CLC_CONST(1.0) - x), + sqrt((__CLC_GENTYPE) __CLC_CONST(1.0) + x) ) ); } + +#undef __CLC_CONST Modified: libclc/trunk/generic/lib/math/asin.inc URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/asin.inc?rev=235762&r1=235761&r2=235762&view=diff ============================================================================== --- libclc/trunk/generic/lib/math/asin.inc (original) +++ libclc/trunk/generic/lib/math/asin.inc Fri Apr 24 14:54:17 2015 @@ -1,3 +1,12 @@ + +#if __CLC_FPSIZE == 32 +#define __CLC_CONST(x) x ## f +#else +#define __CLC_CONST(x) x +#endif + _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE asin(__CLC_GENTYPE x) { - return atan2(x, sqrt( (__CLC_GENTYPE)1.0 -(x*x) )); -} \ No newline at end of file + return atan2(x, sqrt( (__CLC_GENTYPE)__CLC_CONST(1.0) -(x*x) )); +} + +#undef __CLC_CONST Modified: libclc/trunk/generic/lib/math/tan.inc URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/tan.inc?rev=235762&r1=235761&r2=235762&view=diff ============================================================================== --- libclc/trunk/generic/lib/math/tan.inc (original) +++ libclc/trunk/generic/lib/math/tan.inc Fri Apr 24 14:54:17 2015 @@ -2,7 +2,16 @@ * Note: tan(x) = sin(x)/cos(x) also, but the final assembly ends up being * twice as long for R600 (maybe for others as well). */ + +#if __CLC_FPSIZE == 32 +#define __CLC_CONST(x) x ## f +#else +#define __CLC_CONST(x) x +#endif + _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE tan(__CLC_GENTYPE x) { __CLC_GENTYPE sinx = sin(x); - return sinx / sqrt( (__CLC_GENTYPE) 1.0 - (sinx*sinx) ); + return sinx / sqrt( (__CLC_GENTYPE) __CLC_CONST(1.0) - (sinx*sinx) ); } + +#undef __CLC_CONST _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
