diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
| commit | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (patch) | |
| tree | cdad95c688236c6e2e36f13a3495c498393dabc8 /pixman/test | |
| parent | feab85024204c7db3ad243697fe06bf3960349a9 (diff) | |
| parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
| download | vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.gz vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.bz2 vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'pixman/test')
| -rw-r--r-- | pixman/test/tolerance-test.c | 4 | ||||
| -rw-r--r-- | pixman/test/utils-prng.c | 10 | ||||
| -rw-r--r-- | pixman/test/utils-prng.h | 9 |
3 files changed, 11 insertions, 12 deletions
diff --git a/pixman/test/tolerance-test.c b/pixman/test/tolerance-test.c index 562563026..320bb7fe0 100644 --- a/pixman/test/tolerance-test.c +++ b/pixman/test/tolerance-test.c @@ -347,12 +347,12 @@ main (int argc, const char *argv[]) else { #ifdef USE_OPENMP -# pragma omp parallel for default(none) shared(i) private (result) +# pragma omp parallel for default(none) reduction(|:result) #endif for (i = 0; i < N_TESTS; ++i) { if (!do_check (i)) - result = 1; + result |= 1; } } diff --git a/pixman/test/utils-prng.c b/pixman/test/utils-prng.c index 7b32e3531..c27b5be83 100644 --- a/pixman/test/utils-prng.c +++ b/pixman/test/utils-prng.c @@ -27,7 +27,7 @@ #include "utils.h" #include "utils-prng.h" -#if defined(GCC_VECTOR_EXTENSIONS_SUPPORTED) && defined(__SSE2__) +#if defined(HAVE_GCC_VECTOR_EXTENSIONS) && defined(__SSE2__) #include <xmmintrin.h> #endif @@ -52,7 +52,7 @@ void smallprng_srand_r (smallprng_t *x, uint32_t seed) */ void prng_srand_r (prng_t *x, uint32_t seed) { -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS int i; prng_rand_128_data_t dummy; smallprng_srand_r (&x->p0, seed); @@ -75,7 +75,7 @@ void prng_srand_r (prng_t *x, uint32_t seed) static force_inline void store_rand_128_data (void *addr, prng_rand_128_data_t *d, int aligned) { -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS if (aligned) { *(uint8x16 *)addr = d->vb; @@ -120,7 +120,7 @@ randmemset_internal (prng_t *prng, { prng_rand_128_r (&local_prng, &t); prng_rand_128_r (&local_prng, &randdata); -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS if (flags & RANDMEMSET_MORE_FF) { const uint8x16 const_C0 = @@ -199,7 +199,7 @@ randmemset_internal (prng_t *prng, } else { -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS const uint8x16 bswap_shufflemask = { 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 diff --git a/pixman/test/utils-prng.h b/pixman/test/utils-prng.h index 564ffcef1..f9ae8ddf7 100644 --- a/pixman/test/utils-prng.h +++ b/pixman/test/utils-prng.h @@ -79,8 +79,7 @@ /*****************************************************************************/ -#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) -#define GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS typedef uint32_t uint32x4 __attribute__ ((vector_size(16))); typedef uint8_t uint8x16 __attribute__ ((vector_size(16))); #endif @@ -92,7 +91,7 @@ typedef struct typedef struct { -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS uint32x4 a, b, c, d; #else smallprng_t p1, p2, p3, p4; @@ -104,7 +103,7 @@ typedef union { uint8_t b[16]; uint32_t w[4]; -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS uint8x16 vb; uint32x4 vw; #endif @@ -134,7 +133,7 @@ prng_rand_r (prng_t *x) static force_inline void prng_rand_128_r (prng_t *x, prng_rand_128_data_t *data) { -#ifdef GCC_VECTOR_EXTENSIONS_SUPPORTED +#ifdef HAVE_GCC_VECTOR_EXTENSIONS uint32x4 e = x->a - ((x->b << 27) + (x->b >> (32 - 27))); x->a = x->b ^ ((x->c << 17) ^ (x->c >> (32 - 17))); x->b = x->c + x->d; |