walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try enabling vectorization smartly 

We'll see if this sticks to the bots.
This commit is contained in:
Behdad Esfahbod 2018-05-22 21:06:22 -07:00
parent dd22c29f95
commit b995b501ef
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hb-private.hh
View File

@ -978,6 +978,14 @@ struct HbOpXor
template <typename T> static void process (T &o, const T &a, const T &b) { o = a ^ b; } template <typename T> static void process (T &o, const T &a, const T &b) { o = a ^ b; }
}; };
/* Compiler-assisted vectorization. */
/* The `vector_size' attribute was introduced in gcc 3.1. */
#if defined( __GNUC__ ) && ( __GNUC__ >= 4 )
#define HAVE_VECTOR_SIZE 1
#endif
/* Type behaving similar to vectorized vars defined using __attribute__((vector_size(...))). */ /* Type behaving similar to vectorized vars defined using __attribute__((vector_size(...))). */
template <typename elt_t, unsigned int byte_size> template <typename elt_t, unsigned int byte_size>
struct hb_vector_size_t struct hb_vector_size_t
@ -989,8 +997,11 @@ struct hb_vector_size_t
inline hb_vector_size_t process (const hb_vector_size_t &o) const inline hb_vector_size_t process (const hb_vector_size_t &o) const
{ {
hb_vector_size_t r; hb_vector_size_t r;
for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++) if (HAVE_VECTOR_SIZE+0)
Op::process (r.v[i], v[i], o.v[i]); Op::process (r.vec, vec, o.vec);
else
for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
Op::process (r.v[i], v[i], o.v[i]);
return r; return r;
} }
inline hb_vector_size_t operator | (const hb_vector_size_t &o) const inline hb_vector_size_t operator | (const hb_vector_size_t &o) const
@ -1009,14 +1020,12 @@ struct hb_vector_size_t
private: private:
static_assert (byte_size / sizeof (elt_t) * sizeof (elt_t) == byte_size, ""); static_assert (byte_size / sizeof (elt_t) * sizeof (elt_t) == byte_size, "");
elt_t v[byte_size / sizeof (elt_t)]; union {
elt_t v[byte_size / sizeof (elt_t)];
elt_t vec __attribute__((vector_size (byte_size))); /* Only usable if HAVE_VECTOR_SIZE */
};
}; };
/* The `vector_size' attribute was introduced in gcc 3.1. */
#if defined( __GNUC__ ) && ( __GNUC__ >= 4 )
#define HAVE_VECTOR_SIZE 1
#endif
/* Global runtime options. */ /* Global runtime options. */

7
src/hb-set-private.hh
View File

@ -164,14 +164,7 @@ struct hb_set_t
static inline unsigned int elt_get_min (const elt_t &elt) { return _hb_ctz (elt); } static inline unsigned int elt_get_min (const elt_t &elt) { return _hb_ctz (elt); }
static inline unsigned int elt_get_max (const elt_t &elt) { return _hb_bit_storage (elt) - 1; } static inline unsigned int elt_get_max (const elt_t &elt) { return _hb_bit_storage (elt) - 1; }
#if 0 && HAVE_VECTOR_SIZE
/* The vectorized version does not work with clang as non-const
* elt() errs "non-const reference cannot bind to vector element". */
typedef elt_t vector_t __attribute__((vector_size (PAGE_BITS / 8)));
#else
typedef hb_vector_size_t<elt_t, PAGE_BITS / 8> vector_t; typedef hb_vector_size_t<elt_t, PAGE_BITS / 8> vector_t;
#endif
vector_t v; vector_t v;
static const unsigned int ELT_BITS = sizeof (elt_t) * 8; static const unsigned int ELT_BITS = sizeof (elt_t) * 8;