Message ID | 1363956370-23681-2-git-send-email-pl@kamp.de |
---|---|
State | New |
Headers | show |
On 03/22/2013 02:46 PM, Peter Lieven wrote: > vector optimizations will now be used at various places > not just in is_dup_page() in arch_init.c > > this patch also adds a zero splat vector. > > Signed-off-by: Peter Lieven <pl@kamp.de> > Reviewed-by: Eric Blake <eblake@redhat.com> > --- > arch_init.c | 20 -------------------- > include/qemu-common.h | 24 ++++++++++++++++++++++++ > 2 files changed, 24 insertions(+), 20 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 98e2bc6..1b71912 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -114,26 +114,6 @@ const uint32_t arch_type = QEMU_ARCH; > #define RAM_SAVE_FLAG_CONTINUE 0x20 > #define RAM_SAVE_FLAG_XBZRLE 0x40 > > -#ifdef __ALTIVEC__ > -#include <altivec.h> > -#define VECTYPE vector unsigned char > -#define SPLAT(p) vec_splat(vec_ld(0, p), 0) > -#define ALL_EQ(v1, v2) vec_all_eq(v1, v2) > -/* altivec.h may redefine the bool macro as vector type. > - * Reset it to POSIX semantics. */ > -#undef bool > -#define bool _Bool > -#elif defined __SSE2__ > -#include <emmintrin.h> > -#define VECTYPE __m128i > -#define SPLAT(p) _mm_set1_epi8(*(p)) > -#define ALL_EQ(v1, v2) (_mm_movemask_epi8(_mm_cmpeq_epi8(v1, v2)) == 0xFFFF) > -#else > -#define VECTYPE unsigned long > -#define SPLAT(p) (*(p) * (~0UL / 255)) > -#define ALL_EQ(v1, v2) ((v1) == (v2)) > -#endif > - > > static struct defconfig_file { > const char *filename; > diff --git a/include/qemu-common.h b/include/qemu-common.h > index 7754ee2..e76ade3 100644 > --- a/include/qemu-common.h > +++ b/include/qemu-common.h > @@ -448,4 +448,28 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n); > > void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size); > > +/* vector definitions */ > +#ifdef __ALTIVEC__ > +#include <altivec.h> > +#define VECTYPE vector unsigned char > +#define SPLAT(p) vec_splat(vec_ld(0, p), 0) > +#define ZERO_SPLAT vec_splat(vec_ld(0, 0), 0) This is new macro please move it to a separate patch Orit > +#define ALL_EQ(v1, v2) vec_all_eq(v1, v2) > +/* altivec.h may redefine the bool macro as vector type. > + * Reset it to POSIX semantics. */ > +#undef bool > +#define bool _Bool > +#elif defined __SSE2__ > +#include <emmintrin.h> > +#define VECTYPE __m128i > +#define SPLAT(p) _mm_set1_epi8(*(p)) > +#define ZERO_SPLAT _mm_setzero_si128() > +#define ALL_EQ(v1, v2) (_mm_movemask_epi8(_mm_cmpeq_epi8(v1, v2)) == 0xFFFF) > +#else > +#define VECTYPE unsigned long > +#define SPLAT(p) (*(p) * (~0UL / 255)) > +#define ZERO_SPLAT 0x0UL > +#define ALL_EQ(v1, v2) ((v1) == (v2)) > +#endif > + > #endif >
diff --git a/arch_init.c b/arch_init.c index 98e2bc6..1b71912 100644 --- a/arch_init.c +++ b/arch_init.c @@ -114,26 +114,6 @@ const uint32_t arch_type = QEMU_ARCH; #define RAM_SAVE_FLAG_CONTINUE 0x20 #define RAM_SAVE_FLAG_XBZRLE 0x40 -#ifdef __ALTIVEC__ -#include <altivec.h> -#define VECTYPE vector unsigned char -#define SPLAT(p) vec_splat(vec_ld(0, p), 0) -#define ALL_EQ(v1, v2) vec_all_eq(v1, v2) -/* altivec.h may redefine the bool macro as vector type. - * Reset it to POSIX semantics. */ -#undef bool -#define bool _Bool -#elif defined __SSE2__ -#include <emmintrin.h> -#define VECTYPE __m128i -#define SPLAT(p) _mm_set1_epi8(*(p)) -#define ALL_EQ(v1, v2) (_mm_movemask_epi8(_mm_cmpeq_epi8(v1, v2)) == 0xFFFF) -#else -#define VECTYPE unsigned long -#define SPLAT(p) (*(p) * (~0UL / 255)) -#define ALL_EQ(v1, v2) ((v1) == (v2)) -#endif - static struct defconfig_file { const char *filename; diff --git a/include/qemu-common.h b/include/qemu-common.h index 7754ee2..e76ade3 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -448,4 +448,28 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n); void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size); +/* vector definitions */ +#ifdef __ALTIVEC__ +#include <altivec.h> +#define VECTYPE vector unsigned char +#define SPLAT(p) vec_splat(vec_ld(0, p), 0) +#define ZERO_SPLAT vec_splat(vec_ld(0, 0), 0) +#define ALL_EQ(v1, v2) vec_all_eq(v1, v2) +/* altivec.h may redefine the bool macro as vector type. + * Reset it to POSIX semantics. */ +#undef bool +#define bool _Bool +#elif defined __SSE2__ +#include <emmintrin.h> +#define VECTYPE __m128i +#define SPLAT(p) _mm_set1_epi8(*(p)) +#define ZERO_SPLAT _mm_setzero_si128() +#define ALL_EQ(v1, v2) (_mm_movemask_epi8(_mm_cmpeq_epi8(v1, v2)) == 0xFFFF) +#else +#define VECTYPE unsigned long +#define SPLAT(p) (*(p) * (~0UL / 255)) +#define ZERO_SPLAT 0x0UL +#define ALL_EQ(v1, v2) ((v1) == (v2)) +#endif + #endif