[Mesa-dev] [PATCH 4/4] r600g: simplify dirty atom tracking

[Marek Olšák]

Except for the workaround in patch 1, this series looks good to me.

Marek

On Mon, Aug 24, 2015 at 2:24 AM, Grazvydas Ignotas <notasas at gmail.com> wrote:
> Now that R600_NUM_ATOMS is below 64, dirty atom tracking can be
> simplified.
> ---
>  src/gallium/drivers/r600/r600_pipe.h | 41 ++++++++++--------------------------
>  1 file changed, 11 insertions(+), 30 deletions(-)
>
> diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
> index 1962bc5..c6fb86b 100644
> --- a/src/gallium/drivers/r600/r600_pipe.h
> +++ b/src/gallium/drivers/r600/r600_pipe.h
> @@ -85,9 +85,6 @@
>  #define R600_BIG_ENDIAN 0
>  #endif
>
> -#define R600_DIRTY_ATOM_WORD_BITS (sizeof(unsigned long) * 8)
> -#define R600_DIRTY_ATOM_ARRAY_LEN DIV_ROUND_UP(R600_NUM_ATOMS, R600_DIRTY_ATOM_WORD_BITS)
> -
>  struct r600_context;
>  struct r600_bytecode;
>  union  r600_shader_key;
> @@ -430,7 +427,7 @@ struct r600_context {
>         /* State binding slots are here. */
>         struct r600_atom                *atoms[R600_NUM_ATOMS];
>         /* Dirty atom bitmask for fast tests */
> -       unsigned long                   dirty_atoms[R600_DIRTY_ATOM_ARRAY_LEN];
> +       uint64_t                        dirty_atoms;
>         /* States for CS initialization. */
>         struct r600_command_buffer      start_cs_cmd; /* invariant state mostly */
>         /** Compute specific registers initializations.  The start_cs_cmd atom
> @@ -507,18 +504,17 @@ static inline void r600_set_atom_dirty(struct r600_context *rctx,
>                                        struct r600_atom *atom,
>                                        bool dirty)
>  {
> -       unsigned long mask;
> -       unsigned int w;
> +       uint64_t mask;
>
>         atom->dirty = dirty;
>
>         assert(atom->id != 0);
> -       w = atom->id / R600_DIRTY_ATOM_WORD_BITS;
> -       mask = 1ul << (atom->id % R600_DIRTY_ATOM_WORD_BITS);
> +       assert(atom->id < sizeof(mask) * 8);
> +       mask = 1ull << atom->id;
>         if (dirty)
> -               rctx->dirty_atoms[w] |= mask;
> +               rctx->dirty_atoms |= mask;
>         else
> -               rctx->dirty_atoms[w] &= ~mask;
> +               rctx->dirty_atoms &= ~mask;
>  }
>
>  static inline void r600_mark_atom_dirty(struct r600_context *rctx,
> @@ -530,30 +526,15 @@ static inline void r600_mark_atom_dirty(struct r600_context *rctx,
>  static inline unsigned int r600_next_dirty_atom(struct r600_context *rctx,
>                                                 unsigned int id)
>  {
> -#if !defined(DEBUG) && defined(HAVE___BUILTIN_CTZ)
> -       unsigned int w = id / R600_DIRTY_ATOM_WORD_BITS;
> -       unsigned int bit = id % R600_DIRTY_ATOM_WORD_BITS;
> -       unsigned long bits, mask = (1ul << bit) - 1;
> +       uint64_t mask = rctx->dirty_atoms & ~((1ull << id) - 1);
>
> -       for (; w < R600_DIRTY_ATOM_ARRAY_LEN; w++, mask = 0ul) {
> -               bits = rctx->dirty_atoms[w] & ~mask;
> -               if (bits == 0)
> -                       continue;
> -               return w * R600_DIRTY_ATOM_WORD_BITS + __builtin_ctzl(bits);
> +       if (mask != 0) {
> +               id = u_bit_scan64(&mask);
> +               assert(rctx->atoms[id] && rctx->atoms[id]->dirty);
> +               return id;
>         }
>
>         return R600_NUM_ATOMS;
> -#else
> -       for (; id < R600_NUM_ATOMS; id++) {
> -               bool dirty = !!(rctx->dirty_atoms[id / R600_DIRTY_ATOM_WORD_BITS] &
> -                       (1ul << (id % R600_DIRTY_ATOM_WORD_BITS)));
> -               assert(dirty == (rctx->atoms[id] && rctx->atoms[id]->dirty));
> -               if (dirty)
> -                       break;
> -       }
> -
> -       return id;
> -#endif
>  }
>
>  void r600_trace_emit(struct r600_context *rctx);
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev