On Wed, Mar 10, 2010 at 11:20 AM, Pauli Nieminen <suok...@gmail.com> wrote: > intel_atomic.h includes very usefull atomic operations for > lock free parrallel access of variables. Moving these to > core libdrm for code sharing with radeon. > > Signed-off-by: Pauli Nieminen <suok...@gmail.com> > --- > Makefile.am | 2 +- > configure.ac | 2 +- > intel/intel_atomic.h | 56 +----------------------------- > xf86atomic.h | 93 > ++++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 96 insertions(+), 57 deletions(-) > create mode 100644 xf86atomic.h > > diff --git a/Makefile.am b/Makefile.am > index ee3ccc7..295121f 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -59,7 +59,7 @@ libdrm_la_SOURCES = \ > libdrm_lists.h > > libdrmincludedir = ${includedir} > -libdrminclude_HEADERS = xf86drm.h xf86drmMode.h > +libdrminclude_HEADERS = xf86drm.h xf86drmMode.h xf86atomic.h > > EXTRA_DIST = libdrm.pc.in include/drm/* > > diff --git a/configure.ac b/configure.ac > index aaa8efa..953a758 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -198,7 +198,7 @@ if test "x$INTEL" != "xno"; then > > ]) > if test "x$drm_cv_atomic_primitives" = xIntel; then > - AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1, > + AC_DEFINE(HAVE_LIBDRM_ATOMIC_PRIMITIVES, 1, > [Enable if your compiler supports the Intel __sync_* > atomic primitives]) > fi > if test "x$drm_cv_atomic_primitives" = "xlibatomic-ops"; then > diff --git a/intel/intel_atomic.h b/intel/intel_atomic.h > index 12bb96b..dcb4ec8 100644 > --- a/intel/intel_atomic.h > +++ b/intel/intel_atomic.h > @@ -34,60 +34,6 @@ > #ifndef INTEL_ATOMICS_H > #define INTEL_ATOMICS_H > > -#ifdef HAVE_CONFIG_H > -#include "config.h" > -#endif > - > -#if HAVE_INTEL_ATOMIC_PRIMITIVES > - > -#define HAS_ATOMIC_OPS 1 > - > -typedef struct { > - int atomic; > -} atomic_t; > - > -# define atomic_read(x) ((x)->atomic) > -# define atomic_set(x, val) ((x)->atomic = (val)) > -# define atomic_inc(x) ((void) __sync_fetch_and_add (&(x)->atomic, 1)) > -# define atomic_dec_and_test(x) (__sync_fetch_and_add (&(x)->atomic, -1) == > 1) > -# define atomic_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap > (&(x)->atomic, oldv, newv) > - > -#endif > - > -#if HAVE_LIB_ATOMIC_OPS > -#include <atomic_ops.h> > - > -#define HAS_ATOMIC_OPS 1 > - > -typedef struct { > - AO_t atomic; > -} atomic_t; > - > -# define atomic_read(x) AO_load_full(&(x)->atomic) > -# define atomic_set(x, val) AO_store_full(&(x)->atomic, (val)) > -# define atomic_inc(x) ((void) AO_fetch_and_add1_full(&(x)->atomic)) > -# define atomic_dec_and_test(x) (AO_fetch_and_sub1_full(&(x)->atomic) == 1) > -# define atomic_cmpxchg(x, oldv, newv) > AO_compare_and_swap_full(&(x)->atomic, oldv, newv) > - > -#endif > - > -#if defined(__sun) && !defined(HAS_ATOMIC_OPS) /* Solaris & OpenSolaris */ > - > -#include <sys/atomic.h> > -#define HAS_ATOMIC_OPS 1 > - > -typedef struct { uint_t atomic; } atomic_t; > - > -# define atomic_read(x) (int) ((x)->atomic) > -# define atomic_set(x, val) ((x)->atomic = (uint_t)(val)) > -# define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) > -# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 1) > -# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, > newv) > - > -#endif > - > -#if ! HAS_ATOMIC_OPS > -#error libdrm-intel requires atomic operations, please define them for your > CPU/compiler. > -#endif > +#include <xf86atomic.h> > > #endif > diff --git a/xf86atomic.h b/xf86atomic.h > new file mode 100644 > index 0000000..627dcf2 > --- /dev/null > +++ b/xf86atomic.h > @@ -0,0 +1,93 @@ > +/* > + * Copyright © 2009 Intel Corporation > + * > + * 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. > + * > + * Authors: > + * Chris Wilson <ch...@chris-wilson.co.uk> > + * > + */ > + > +/** > + * @file intel_atomics.h
This needs to be updated. > + * > + * Private definitions for atomic operations > + */ > + > +#ifndef LIBDRM_ATOMICS_H > +#define LIBDRM_ATOMICS_H > + > +#ifdef HAVE_CONFIG_H > +#include "config.h" > +#endif > + > +#if HAVE_LIBDRM_ATOMIC_PRIMITIVES > + > +#define HAS_ATOMIC_OPS 1 > + > +typedef struct { > + int atomic; > +} atomic_t; > + > +# define atomic_read(x) ((x)->atomic) > +# define atomic_set(x, val) ((x)->atomic = (val)) > +# define atomic_inc(x) ((void) __sync_fetch_and_add (&(x)->atomic, 1)) > +# define atomic_dec_and_test(x) (__sync_fetch_and_add (&(x)->atomic, -1) == > 1) > +# define atomic_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap > (&(x)->atomic, oldv, newv) > + > +#endif > + > +#if HAVE_LIB_ATOMIC_OPS > +#include <atomic_ops.h> > + > +#define HAS_ATOMIC_OPS 1 > + > +typedef struct { > + AO_t atomic; > +} atomic_t; > + > +# define atomic_read(x) AO_load_full(&(x)->atomic) > +# define atomic_set(x, val) AO_store_full(&(x)->atomic, (val)) > +# define atomic_inc(x) ((void) AO_fetch_and_add1_full(&(x)->atomic)) > +# define atomic_dec_and_test(x) (AO_fetch_and_sub1_full(&(x)->atomic) == 1) > +# define atomic_cmpxchg(x, oldv, newv) > AO_compare_and_swap_full(&(x)->atomic, oldv, newv) > + > +#endif > + > +#if defined(__sun) && !defined(HAS_ATOMIC_OPS) /* Solaris & OpenSolaris */ > + > +#include <sys/atomic.h> > +#define HAS_ATOMIC_OPS 1 > + > +typedef struct { uint_t atomic; } atomic_t; > + > +# define atomic_read(x) (int) ((x)->atomic) > +# define atomic_set(x, val) ((x)->atomic = (uint_t)(val)) > +# define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) > +# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 1) > +# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, > newv) > + > +#endif > + > +#if ! HAS_ATOMIC_OPS > +#error libdrm-intel requires atomic operations, please define them for your > CPU/compiler. > +#endif This needs to be updated/fixed. > + > +#endif > -- > 1.6.3.3 Matt ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel