On Tue, Mar 21, 2017 at 9:57 AM, Timothy Arceri <tarc...@itsqueeze.com> wrote:
> ---
> src/gallium/drivers/radeon/r600_test_dma.c | 20 +----------------
> src/util/Makefile.sources | 2 ++
> src/util/rand_xor.c | 21 ++++++++++++++++++
> src/util/rand_xor.h | 35
> ++++++++++++++++++++++++++++++
> 4 files changed, 59 insertions(+), 19 deletions(-)
> create mode 100644 src/util/rand_xor.c
> create mode 100644 src/util/rand_xor.h
>
> diff --git a/src/gallium/drivers/radeon/r600_test_dma.c
> b/src/gallium/drivers/radeon/r600_test_dma.c
> index f7e9eb5..7d636b9 100644
> --- a/src/gallium/drivers/radeon/r600_test_dma.c
> +++ b/src/gallium/drivers/radeon/r600_test_dma.c
> @@ -19,39 +19,21 @@
> * 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.
> *
> */
>
> /* This file implements randomized SDMA texture blit tests. */
>
> #include "r600_pipe_common.h"
> #include "util/u_surface.h"
> -
> -static uint64_t seed_xorshift128plus[2];
> -
> -/* Super fast random number generator.
> - *
> - * This rand_xorshift128plus function by Sebastiano Vigna belongs
> - * to the public domain.
> - */
> -static uint64_t rand_xorshift128plus(void)
> -{
> - uint64_t *s = seed_xorshift128plus;
> -
> - uint64_t s1 = s[0];
> - const uint64_t s0 = s[1];
> - s[0] = s0;
> - s1 ^= s1 << 23;
> - s[1] = s1 ^ s0 ^ (s1 >> 18) ^ (s0 >> 5);
> - return s[1] + s0;
> -}
> +#include "util/rand_xor.h"
>
> #define RAND_NUM_SIZE 8
>
> /* The GPU blits are emulated on the CPU using these CPU textures. */
>
> struct cpu_texture {
> uint8_t *ptr;
> uint64_t size;
> uint64_t layer_stride;
> unsigned stride;
> diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
> index e6c1c76..411c1d7 100644
> --- a/src/util/Makefile.sources
> +++ b/src/util/Makefile.sources
> @@ -18,20 +18,22 @@ MESA_UTIL_FILES := \
> hash_table.c \
> hash_table.h \
> list.h \
> macros.h \
> mesa-sha1.c \
> mesa-sha1.h \
> sha1/sha1.c \
> sha1/sha1.h \
> ralloc.c \
> ralloc.h \
> + rand_xor.c \
> + rand_xor.h \
> register_allocate.c \
> register_allocate.h \
> rgtc.c \
> rgtc.h \
> rounding.h \
> set.c \
> set.h \
> simple_list.h \
> slab.c \
> slab.h \
> diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c
> new file mode 100644
> index 0000000..adb799d
> --- /dev/null
> +++ b/src/util/rand_xor.c
> @@ -0,0 +1,21 @@
> +/* Super fast random number generator.
> + *
> + * This rand_xorshift128plus function by Sebastiano Vigna belongs
> + * to the public domain.
> + */
> +
> +#include "rand_xor.h"
> +
> +uint64_t
> +rand_xorshift128plus(void)
> +{
> + uint64_t *s = seed_xorshift128plus;
> +
> + uint64_t s1 = s[0];
> + const uint64_t s0 = s[1];
> + s[0] = s0;
> + s1 ^= s1 << 23;
> + s[1] = s1 ^ s0 ^ (s1 >> 18) ^ (s0 >> 5);
> +
> + return s[1] + s0;
> +}
> diff --git a/src/util/rand_xor.h b/src/util/rand_xor.h
> new file mode 100644
> index 0000000..c7667e4
> --- /dev/null
> +++ b/src/util/rand_xor.h
> @@ -0,0 +1,35 @@
> +/*
> + * Copyright 2017 Timothy Arceri
> + *
> + * 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 (including the next
> + * paragraph) 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.
> + *
> + */
> +
> +#ifndef RAND_XOR_H
> +#define RAND_XOR_H
> +
> +#include <stdint.h>
> +
> +static uint64_t seed_xorshift128plus[2];
I think you didn't mean to put a static variable into a header file.
Marek
> +
> +uint64_t
> +rand_xorshift128plus(void);
> +
> +#endif /* RAND_XOR_H */
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
