Author: awatry Date: Thu Jul 17 17:05:25 2014 New Revision: 213317 URL: http://llvm.org/viewvc/llvm-project?rev=213317&view=rev Log: relational/signbit: Refactor to use relational macros
Signed-off-by: Aaron Watry <[email protected]> Reviewed-by: Tom Stellard <[email protected]> Modified: libclc/trunk/generic/include/clc/relational/signbit.h libclc/trunk/generic/lib/relational/signbit.cl Modified: libclc/trunk/generic/include/clc/relational/signbit.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/relational/signbit.h?rev=213317&r1=213316&r2=213317&view=diff ============================================================================== --- libclc/trunk/generic/include/clc/relational/signbit.h (original) +++ libclc/trunk/generic/include/clc/relational/signbit.h Thu Jul 17 17:05:25 2014 @@ -1,18 +1,9 @@ +#undef signbit -#define _CLC_SIGNBIT_DECL(TYPE, RETTYPE) \ - _CLC_OVERLOAD _CLC_DECL RETTYPE signbit(TYPE x); +#define __CLC_FUNCTION signbit +#define __CLC_BODY <clc/relational/unary_decl.inc> -#define _CLC_VECTOR_SIGNBIT_DECL(TYPE, RETTYPE) \ - _CLC_SIGNBIT_DECL(TYPE##2, RETTYPE##2) \ - _CLC_SIGNBIT_DECL(TYPE##3, RETTYPE##3) \ - _CLC_SIGNBIT_DECL(TYPE##4, RETTYPE##4) \ - _CLC_SIGNBIT_DECL(TYPE##8, RETTYPE##8) \ - _CLC_SIGNBIT_DECL(TYPE##16, RETTYPE##16) +#include <clc/relational/floatn.inc> -_CLC_SIGNBIT_DECL(float, int) -_CLC_VECTOR_SIGNBIT_DECL(float, int) - -#ifdef cl_khr_fp64 -_CLC_SIGNBIT_DECL(double, int) -_CLC_VECTOR_SIGNBIT_DECL(double, long) -#endif \ No newline at end of file +#undef __CLC_BODY +#undef __CLC_FUNCTION Modified: libclc/trunk/generic/lib/relational/signbit.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/relational/signbit.cl?rev=213317&r1=213316&r2=213317&view=diff ============================================================================== --- libclc/trunk/generic/lib/relational/signbit.cl (original) +++ libclc/trunk/generic/lib/relational/signbit.cl Thu Jul 17 17:05:25 2014 @@ -1,61 +1,5 @@ #include <clc/clc.h> - -#define _CLC_DEFINE_RELATIONAL_UNARY_SCALAR(RET_TYPE, FUNCTION, BUILTIN_NAME, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x){ \ - return BUILTIN_NAME(x); \ -} \ - -#define _CLC_DEFINE_RELATIONAL_UNARY_VEC(RET_TYPE, FUNCTION, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x) { \ - return (RET_TYPE)( (RET_TYPE){FUNCTION(x.lo), FUNCTION(x.hi)} != (RET_TYPE)0); \ -} \ - -#define _CLC_DEFINE_RELATIONAL_UNARY_VEC2(RET_TYPE, FUNCTION, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x) { \ - return (RET_TYPE)( (RET_TYPE){FUNCTION(x.lo), FUNCTION(x.hi)} != (RET_TYPE)0); \ -} \ - -#define _CLC_DEFINE_RELATIONAL_UNARY_VEC3(RET_TYPE, FUNCTION, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x) { \ - return (RET_TYPE)( (RET_TYPE){FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2)} != (RET_TYPE)0); \ -} \ - -#define _CLC_DEFINE_RELATIONAL_UNARY_VEC4(RET_TYPE, FUNCTION, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x) { \ - return (RET_TYPE)( \ - (RET_TYPE){ \ - FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2), FUNCTION(x.s3) \ - } != (RET_TYPE)0); \ -} \ - -#define _CLC_DEFINE_RELATIONAL_UNARY_VEC8(RET_TYPE, FUNCTION, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x) { \ - return (RET_TYPE)( \ - (RET_TYPE){ \ - FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2), FUNCTION(x.s3), \ - FUNCTION(x.s4), FUNCTION(x.s5), FUNCTION(x.s6), FUNCTION(x.s7) \ - } != (RET_TYPE)0); \ -} \ - -#define _CLC_DEFINE_RELATIONAL_UNARY_VEC16(RET_TYPE, FUNCTION, ARG_TYPE) \ -_CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG_TYPE x) { \ - return (RET_TYPE)( \ - (RET_TYPE){ \ - FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2), FUNCTION(x.s3), \ - FUNCTION(x.s4), FUNCTION(x.s5), FUNCTION(x.s6), FUNCTION(x.s7), \ - FUNCTION(x.s8), FUNCTION(x.s9), FUNCTION(x.sa), FUNCTION(x.sb), \ - FUNCTION(x.sc), FUNCTION(x.sd), FUNCTION(x.se), FUNCTION(x.sf) \ - } != (RET_TYPE)0); \ -} \ - - -#define _CLC_DEFINE_RELATIONAL_UNARY(RET_TYPE, FUNCTION, BUILTIN_FUNCTION, ARG_TYPE) \ -_CLC_DEFINE_RELATIONAL_UNARY_SCALAR(RET_TYPE, FUNCTION, BUILTIN_FUNCTION, ARG_TYPE) \ -_CLC_DEFINE_RELATIONAL_UNARY_VEC2(RET_TYPE##2, FUNCTION, ARG_TYPE##2) \ -_CLC_DEFINE_RELATIONAL_UNARY_VEC3(RET_TYPE##3, FUNCTION, ARG_TYPE##3) \ -_CLC_DEFINE_RELATIONAL_UNARY_VEC4(RET_TYPE##4, FUNCTION, ARG_TYPE##4) \ -_CLC_DEFINE_RELATIONAL_UNARY_VEC8(RET_TYPE##8, FUNCTION, ARG_TYPE##8) \ -_CLC_DEFINE_RELATIONAL_UNARY_VEC16(RET_TYPE##16, FUNCTION, ARG_TYPE##16) \ +#include "relational.h" _CLC_DEFINE_RELATIONAL_UNARY(int, signbit, __builtin_signbitf, float) @@ -70,18 +14,6 @@ _CLC_DEF _CLC_OVERLOAD int signbit(doubl return __builtin_signbit(x); } -_CLC_DEFINE_RELATIONAL_UNARY_VEC2(long2, signbit, double2) -_CLC_DEFINE_RELATIONAL_UNARY_VEC3(long3, signbit, double3) -_CLC_DEFINE_RELATIONAL_UNARY_VEC4(long4, signbit, double4) -_CLC_DEFINE_RELATIONAL_UNARY_VEC8(long8, signbit, double8) -_CLC_DEFINE_RELATIONAL_UNARY_VEC16(long16, signbit, double16) +_CLC_DEFINE_RELATIONAL_UNARY_VEC_ALL(long, signbit, double) #endif - -#undef _CLC_DEFINE_RELATIONAL_UNARY -#undef _CLC_DEFINE_RELATIONAL_UNARY_SCALAR -#undef _CLC_DEFINE_RELATIONAL_UNARY_VEC2 -#undef _CLC_DEFINE_RELATIONAL_UNARY_VEC3 -#undef _CLC_DEFINE_RELATIONAL_UNARY_VEC4 -#undef _CLC_DEFINE_RELATIONAL_UNARY_VEC8 -#undef _CLC_DEFINE_RELATIONAL_UNARY_VEC16 \ No newline at end of file _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
