Patchwork [RFC,1/9] move vector definitions to qemu-common.h

login
register
mail settings
Submitter Peter Lieven
Date March 12, 2013, 3:48 p.m.
Message ID <513F4E38.2050005@dlhnet.de>
Download mbox | patch
Permalink /patch/227057/
State New
Headers show

Comments

Peter Lieven - March 12, 2013, 3:48 p.m.
vector optimizations will now be used outside is_dup_page() in arch_init.c

Signed-off-by: Peter Lieven <pl@kamp.de>
---
  arch_init.c           |   20 --------------------
  include/qemu-common.h |   23 +++++++++++++++++++++++
  2 files changed, 23 insertions(+), 20 deletions(-)

Patch

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 5e13708..a3555d0 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -442,4 +442,27 @@  int64_t pow2floor(int64_t value);
  int uleb128_encode_small(uint8_t *out, uint32_t n);
  int uleb128_decode_small(const uint8_t *in, uint32_t *n);

+#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