From 1de8147816444a98f77eccebcb88df358a36876d Mon Sep 17 00:00:00 2001 From: svn_bwardell Date: Sun, 7 Aug 2011 12:43:34 +0000 Subject: Rename kifthen to kifpos as it more accurately reflects what it actually does. git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/Vectors/trunk@24 105869f7-3296-0410-a4ea-f4349344b45a --- src/test.c | 8 ++++---- src/vectors-4-Altivec.h | 2 +- src/vectors-4-SSE.h | 4 ++-- src/vectors-4-default.h | 2 +- src/vectors-8-AVX.h | 2 +- src/vectors-8-DoubleHummer.h | 2 +- src/vectors-8-SSE2.h | 6 +++--- src/vectors-8-VSX.h | 2 +- src/vectors-8-default.h | 2 +- src/vectors.h | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/test.c b/src/test.c index 7360a60..680e775 100644 --- a/src/test.c +++ b/src/test.c @@ -68,10 +68,10 @@ void Vectors_Test(CCTK_ARGUMENTS) VECTEST("kpow", kpow(av, 3.14159), pow(a[i], 3.14159) ); VECTEST("ksqrt", ksqrt(av), sqrt(a[i]) ); - VECTEST("kifthen positive", kifthen(av, bv, cv), signbit(a[i]) ? c[i] : b[i]); - VECTEST("kifthen negative", kifthen(bv, bv, cv), signbit(b[i]) ? c[i] : b[i]); - VECTEST("kifthen 0", kifthen(ToReal(0.),bv,cv), signbit(0.)?c[i]:b[i]); - VECTEST("kifthen -0", kifthen(ToReal(-0.),bv,cv), signbit(-0.)?c[i]:b[i]); + VECTEST("kifpos positive", kifpos(av, bv, cv), signbit(a[i]) ? c[i] : b[i]); + VECTEST("kifpos negative", kifpos(bv, bv, cv), signbit(b[i]) ? c[i] : b[i]); + VECTEST("kifpos 0", kifpos(ToReal(0.),bv,cv), signbit(0.)?c[i]:b[i]); + VECTEST("kifpos -0", kifpos(ToReal(-0.),bv,cv), signbit(-0.)?c[i]:b[i]); if (passed != numtests) CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, diff --git a/src/vectors-4-Altivec.h b/src/vectors-4-Altivec.h index 1544504..d6f5b89 100644 --- a/src/vectors-4-Altivec.h +++ b/src/vectors-4-Altivec.h @@ -161,5 +161,5 @@ #define k4pow(x,a) K4REPL2(pow,x,a) #define k4sqrt(x) K4REPL(sqrt,x) -#define k4ifthen(x,y,z) \ +#define k4ifpos(x,y,z) \ vec_sel(vec_sra(vec_convert((x), &(vector int*)0, 31), (y), (z)) diff --git a/src/vectors-4-SSE.h b/src/vectors-4-SSE.h index 4bda22b..d04d0b7 100644 --- a/src/vectors-4-SSE.h +++ b/src/vectors-4-SSE.h @@ -307,7 +307,7 @@ static const union { // Choice [sign(x)>0 ? y : z] #ifdef __SSE4_1__ -# define k4ifthen(x,y,z) (_mm_blendv_ps(y,z,x)) +# define k4ifpos(x,y,z) (_mm_blendv_ps(y,z,x)) #else #include #ifdef __cplusplus @@ -315,7 +315,7 @@ static const union { #else #define SGN(x) signbit(x) #endif -# define k4ifthen(x,y,z) \ +# define k4ifpos(x,y,z) \ ({ \ CCTK_REAL4_VEC const xx=(x_); \ CCTK_REAL4_VEC const x=xx; \ diff --git a/src/vectors-4-default.h b/src/vectors-4-default.h index f9fccd3..ac1f1a4 100644 --- a/src/vectors-4-default.h +++ b/src/vectors-4-default.h @@ -88,4 +88,4 @@ #define SGN(x) signbit(x) #endif -#define k4ifthen(x,y,z) (SGN(x)?(z):(y)) +#define k4ifpos(x,y,z) (SGN(x)?(z):(y)) diff --git a/src/vectors-8-AVX.h b/src/vectors-8-AVX.h index ae7a4d5..0408c82 100644 --- a/src/vectors-8-AVX.h +++ b/src/vectors-8-AVX.h @@ -197,4 +197,4 @@ static const k8const_t k8abs_mask_union = #define k8log(x) K8REPL(log,x) #define k8pow(x,a) K8REPL2(pow,x,a) -#define k8ifthen(x,y,z) (_mm256_blendv_pd(y,z,x)) +#define k8ifpos(x,y,z) (_mm256_blendv_pd(y,z,x)) diff --git a/src/vectors-8-DoubleHummer.h b/src/vectors-8-DoubleHummer.h index 62b5f93..d5423bb 100644 --- a/src/vectors-8-DoubleHummer.h +++ b/src/vectors-8-DoubleHummer.h @@ -207,4 +207,4 @@ #define k8pow(x,a) K8REPL2(pow,x,a) #define k8sqrt(x) K8REPL(sqrt,x) -#define k8ifthen(x,y,z) fpsel(y,z,x) +#define k8ifpos(x,y,z) fpsel(y,z,x) diff --git a/src/vectors-8-SSE2.h b/src/vectors-8-SSE2.h index e0b9600..ed84f8b 100644 --- a/src/vectors-8-SSE2.h +++ b/src/vectors-8-SSE2.h @@ -210,9 +210,9 @@ static const union { // Choice [sign(x)>0 ? y : z] #ifdef __SSE4_1__ -# define k8ifthen(x,y,z) (_mm_blendv_pd(y,z,x)) +# define k8ifpos(x,y,z) (_mm_blendv_pd(y,z,x)) #elif 0 -# define k8ifthen(x_,y_,z_) \ +# define k8ifpos(x_,y_,z_) \ ({ \ CCTK_REAL8_VEC const xx=(x_); \ CCTK_REAL8_VEC const x=xx; \ @@ -237,7 +237,7 @@ static const union { #else #define SGN(x) signbit(x) #endif -# define k8ifthen(x_,y_,z_) \ +# define k8ifpos(x_,y_,z_) \ ({ \ CCTK_REAL8_VEC const xx=(x_); \ CCTK_REAL8_VEC const x=xx; \ diff --git a/src/vectors-8-VSX.h b/src/vectors-8-VSX.h index d01c22a..8b24c1b 100644 --- a/src/vectors-8-VSX.h +++ b/src/vectors-8-VSX.h @@ -109,5 +109,5 @@ #define k8pow(x,a) K8REPL2(pow,x,a) #define k8sqrt(x) K8REPL(sqrt,x) -#define k8ifthen(x,y,z) \ +#define k8ifpos(x,y,z) \ vec_sel(vec_sra(vec_convert((x), &(vector long long*)0, 63), (y), (z)) diff --git a/src/vectors-8-default.h b/src/vectors-8-default.h index c45ebe6..279cdb2 100644 --- a/src/vectors-8-default.h +++ b/src/vectors-8-default.h @@ -88,4 +88,4 @@ #define SGN(x) signbit(x) #endif -#define k8ifthen(x,y,z) (SGN(x)?(z):(y)) +#define k8ifpos(x,y,z) (SGN(x)?(z):(y)) diff --git a/src/vectors.h b/src/vectors.h index 2dec4b1..d609e42 100644 --- a/src/vectors.h +++ b/src/vectors.h @@ -87,7 +87,7 @@ # define kpow k4pow # define ksqrt k4sqrt -# define kifthen k4ifthen +# define kifpos k4ifpos #elif defined(CCTK_REAL_PRECISION_8) @@ -134,7 +134,7 @@ # define kpow k8pow # define ksqrt k8sqrt -# define kifthen k8ifthen +# define kifpos k8ifpos #else -- cgit v1.2.3