This patch is
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 10/29/2014 05:25 PM, Jason Ekstrand wrote:
> ---
> .../drivers/dri/i965/brw_fs_copy_propagation.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_fs_live_variables.h | 2 +-
> .../drivers/dri/i965/brw_performance_monitor.c | 2 +-
> .../drivers/dri/i965/brw_vec4_live_variables.h | 2 +-
> src/mesa/drivers/dri/nouveau/nouveau_context.h | 2 +-
> src/mesa/main/bitset.h | 101
> ---------------------
> src/mesa/main/performance_monitor.c | 2 +-
> src/mesa/main/texstate.c | 2 +-
> src/util/bitset.h | 100 ++++++++++++++++++++
> src/util/register_allocate.c | 2 +-
> 10 files changed, 108 insertions(+), 109 deletions(-)
> delete mode 100644 src/mesa/main/bitset.h
> create mode 100644 src/util/bitset.h
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> index e1989cb..1a97153 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> @@ -34,7 +34,7 @@
>
> #define ACP_HASH_SIZE 16
>
> -#include "main/bitset.h"
> +#include "util/bitset.h"
> #include "brw_fs.h"
> #include "brw_cfg.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
> b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
> index 6cc8a98..d5f883d 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
> +++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
> @@ -26,7 +26,7 @@
> */
>
> #include "brw_fs.h"
> -#include "main/bitset.h"
> +#include "util/bitset.h"
>
> struct cfg_t;
>
> diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> index edfa3d2..c174c81 100644
> --- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> +++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> @@ -44,7 +44,7 @@
>
> #include <limits.h>
>
> -#include "main/bitset.h"
> +#include "util/bitset.h"
> #include "main/hash.h"
> #include "main/macros.h"
> #include "main/mtypes.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
> b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
> index 03cc813..b50a36a 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
> +++ b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
> @@ -25,7 +25,7 @@
> *
> */
>
> -#include "main/bitset.h"
> +#include "util/bitset.h"
> #include "brw_vec4.h"
>
> namespace brw {
> diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h
> b/src/mesa/drivers/dri/nouveau/nouveau_context.h
> index 8ea431b..b6cbde4 100644
> --- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
> +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
> @@ -32,7 +32,7 @@
> #include "nouveau_scratch.h"
> #include "nouveau_render.h"
>
> -#include "main/bitset.h"
> +#include "util/bitset.h"
>
> enum nouveau_fallback {
> HWTNL = 0,
> diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
> deleted file mode 100644
> index dbf1af9..0000000
> --- a/src/mesa/main/bitset.h
> +++ /dev/null
> @@ -1,101 +0,0 @@
> -/*
> - * Mesa 3-D graphics library
> - *
> - * Copyright (C) 2006 Brian Paul All Rights Reserved.
> - *
> - * 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 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.
> - */
> -
> -/**
> - * \file bitset.h
> - * \brief Bitset of arbitrary size definitions.
> - * \author Michal Krol
> - */
> -
> -#ifndef BITSET_H
> -#define BITSET_H
> -
> -#include "imports.h"
> -#include "util/bitcount.h"
> -#include "util/macros.h"
> -
> -/****************************************************************************
> - * generic bitset implementation
> - */
> -
> -#define BITSET_WORD GLuint
> -#define BITSET_WORDBITS (sizeof (BITSET_WORD) * 8)
> -
> -/* bitset declarations
> - */
> -#define BITSET_WORDS(bits) (ALIGN(bits, BITSET_WORDBITS) / BITSET_WORDBITS)
> -#define BITSET_DECLARE(name, bits) BITSET_WORD name[BITSET_WORDS(bits)]
> -
> -/* bitset operations
> - */
> -#define BITSET_COPY(x, y) memcpy( (x), (y), sizeof (x) )
> -#define BITSET_EQUAL(x, y) (memcmp( (x), (y), sizeof (x) ) == 0)
> -#define BITSET_ZERO(x) memset( (x), 0, sizeof (x) )
> -#define BITSET_ONES(x) memset( (x), 0xff, sizeof (x) )
> -
> -#define BITSET_BITWORD(b) ((b) / BITSET_WORDBITS)
> -#define BITSET_BIT(b) (1 << ((b) % BITSET_WORDBITS))
> -
> -/* single bit operations
> - */
> -#define BITSET_TEST(x, b) ((x)[BITSET_BITWORD(b)] & BITSET_BIT(b))
> -#define BITSET_SET(x, b) ((x)[BITSET_BITWORD(b)] |= BITSET_BIT(b))
> -#define BITSET_CLEAR(x, b) ((x)[BITSET_BITWORD(b)] &= ~BITSET_BIT(b))
> -
> -#define BITSET_MASK(b) ((b) == BITSET_WORDBITS ? ~0 : BITSET_BIT(b) - 1)
> -#define BITSET_RANGE(b, e) (BITSET_MASK((e) + 1) & ~BITSET_MASK(b))
> -
> -/* bit range operations
> - */
> -#define BITSET_TEST_RANGE(x, b, e) \
> - (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \
> - ((x)[BITSET_BITWORD(b)] & BITSET_RANGE(b, e)) : \
> - (assert (!"BITSET_TEST_RANGE: bit range crosses word boundary"), 0))
> -#define BITSET_SET_RANGE(x, b, e) \
> - (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \
> - ((x)[BITSET_BITWORD(b)] |= BITSET_RANGE(b, e)) : \
> - (assert (!"BITSET_SET_RANGE: bit range crosses word boundary"), 0))
> -#define BITSET_CLEAR_RANGE(x, b, e) \
> - (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \
> - ((x)[BITSET_BITWORD(b)] &= ~BITSET_RANGE(b, e)) : \
> - (assert (!"BITSET_CLEAR_RANGE: bit range crosses word boundary"), 0))
> -
> -/* Get first bit set in a bitset.
> - */
> -static inline int
> -__bitset_ffs(const BITSET_WORD *x, int n)
> -{
> - int i;
> -
> - for (i = 0; i < n; i++) {
> - if (x[i])
> - return ffs(x[i]) + BITSET_WORDBITS * i;
> - }
> -
> - return 0;
> -}
> -
> -#define BITSET_FFS(x) __bitset_ffs(x, Elements(x))
> -
> -#endif
> diff --git a/src/mesa/main/performance_monitor.c
> b/src/mesa/main/performance_monitor.c
> index c02910e..2d740da 100644
> --- a/src/mesa/main/performance_monitor.c
> +++ b/src/mesa/main/performance_monitor.c
> @@ -42,7 +42,7 @@
> #include "macros.h"
> #include "mtypes.h"
> #include "performance_monitor.h"
> -#include "bitset.h"
> +#include "util/bitset.h"
> #include "util/ralloc.h"
>
> void
> diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
> index e0f0852..29e7a09 100644
> --- a/src/mesa/main/texstate.c
> +++ b/src/mesa/main/texstate.c
> @@ -40,7 +40,7 @@
> #include "teximage.h"
> #include "texstate.h"
> #include "mtypes.h"
> -#include "bitset.h"
> +#include "util/bitset.h"
>
>
> /**
> diff --git a/src/util/bitset.h b/src/util/bitset.h
> new file mode 100644
> index 0000000..e012338
> --- /dev/null
> +++ b/src/util/bitset.h
> @@ -0,0 +1,100 @@
> +/*
> + * Mesa 3-D graphics library
> + *
> + * Copyright (C) 2006 Brian Paul All Rights Reserved.
> + *
> + * 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 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.
> + */
> +
> +/**
> + * \file bitset.h
> + * \brief Bitset of arbitrary size definitions.
> + * \author Michal Krol
> + */
> +
> +#ifndef UTIL_BITSET_H
> +#define UTIL_BITSET_H
> +
> +#include "util/bitcount.h"
> +#include "util/macros.h"
> +
> +/****************************************************************************
> + * generic bitset implementation
> + */
> +
> +typedef unsigned int BITSET_WORD;
> +#define BITSET_WORDBITS (sizeof (BITSET_WORD) * 8)
> +
> +/* bitset declarations
> + */
> +#define BITSET_WORDS(bits) (ALIGN(bits, BITSET_WORDBITS) / BITSET_WORDBITS)
> +#define BITSET_DECLARE(name, bits) BITSET_WORD name[BITSET_WORDS(bits)]
> +
> +/* bitset operations
> + */
> +#define BITSET_COPY(x, y) memcpy( (x), (y), sizeof (x) )
> +#define BITSET_EQUAL(x, y) (memcmp( (x), (y), sizeof (x) ) == 0)
> +#define BITSET_ZERO(x) memset( (x), 0, sizeof (x) )
> +#define BITSET_ONES(x) memset( (x), 0xff, sizeof (x) )
> +
> +#define BITSET_BITWORD(b) ((b) / BITSET_WORDBITS)
> +#define BITSET_BIT(b) (1 << ((b) % BITSET_WORDBITS))
> +
> +/* single bit operations
> + */
> +#define BITSET_TEST(x, b) ((x)[BITSET_BITWORD(b)] & BITSET_BIT(b))
> +#define BITSET_SET(x, b) ((x)[BITSET_BITWORD(b)] |= BITSET_BIT(b))
> +#define BITSET_CLEAR(x, b) ((x)[BITSET_BITWORD(b)] &= ~BITSET_BIT(b))
> +
> +#define BITSET_MASK(b) ((b) == BITSET_WORDBITS ? ~0 : BITSET_BIT(b) - 1)
> +#define BITSET_RANGE(b, e) (BITSET_MASK((e) + 1) & ~BITSET_MASK(b))
> +
> +/* bit range operations
> + */
> +#define BITSET_TEST_RANGE(x, b, e) \
> + (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \
> + ((x)[BITSET_BITWORD(b)] & BITSET_RANGE(b, e)) : \
> + (assert (!"BITSET_TEST_RANGE: bit range crosses word boundary"), 0))
> +#define BITSET_SET_RANGE(x, b, e) \
> + (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \
> + ((x)[BITSET_BITWORD(b)] |= BITSET_RANGE(b, e)) : \
> + (assert (!"BITSET_SET_RANGE: bit range crosses word boundary"), 0))
> +#define BITSET_CLEAR_RANGE(x, b, e) \
> + (BITSET_BITWORD(b) == BITSET_BITWORD(e) ? \
> + ((x)[BITSET_BITWORD(b)] &= ~BITSET_RANGE(b, e)) : \
> + (assert (!"BITSET_CLEAR_RANGE: bit range crosses word boundary"), 0))
> +
> +/* Get first bit set in a bitset.
> + */
> +static inline int
> +__bitset_ffs(const BITSET_WORD *x, int n)
> +{
> + int i;
> +
> + for (i = 0; i < n; i++) {
> + if (x[i])
> + return ffs(x[i]) + BITSET_WORDBITS * i;
> + }
> +
> + return 0;
> +}
> +
> +#define BITSET_FFS(x) __bitset_ffs(x, Elements(x))
> +
> +#endif
> diff --git a/src/util/register_allocate.c b/src/util/register_allocate.c
> index 6cf7ce7..e8ba1c7 100644
> --- a/src/util/register_allocate.c
> +++ b/src/util/register_allocate.c
> @@ -76,7 +76,7 @@
> #include "main/imports.h"
> #include "main/macros.h"
> #include "main/mtypes.h"
> -#include "main/bitset.h"
> +#include "util/bitset.h"
> #include "register_allocate.h"
>
> #define NO_REG ~0
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
