From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Subject: [PATCH v3 14/15] target/arm: Move expand_pred_h to vec_internal.h
Date: Fri, 27 May 2022 11:06:22 -0700 [thread overview]
Message-ID: <20220527180623.185261-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220527180623.185261-1-richard.henderson@linaro.org>
Move the data to vec_helper.c and the inline to vec_internal.h.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/vec_internal.h | 7 +++++++
target/arm/sve_helper.c | 29 -----------------------------
target/arm/vec_helper.c | 26 ++++++++++++++++++++++++++
3 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/target/arm/vec_internal.h b/target/arm/vec_internal.h
index d1a1ea4a66..43cff5ec7c 100644
--- a/target/arm/vec_internal.h
+++ b/target/arm/vec_internal.h
@@ -59,6 +59,13 @@ static inline uint64_t expand_pred_b(uint8_t byte)
return expand_pred_b_data[byte];
}
+/* Similarly for half-word elements. */
+extern const uint64_t expand_pred_h_data[0x55+1];
+static inline uint64_t expand_pred_h(uint8_t byte)
+{
+ return expand_pred_h_data[byte & 0x55];
+}
+
static inline void clear_tail(void *vd, uintptr_t opr_sz, uintptr_t max_sz)
{
uint64_t *d = vd + opr_sz;
diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
index b8a37dd1eb..9a2741b20f 100644
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -103,35 +103,6 @@ uint32_t HELPER(sve_predtest)(void *vd, void *vg, uint32_t words)
return flags;
}
-/* Similarly for half-word elements.
- * for (i = 0; i < 256; ++i) {
- * unsigned long m = 0;
- * if (i & 0xaa) {
- * continue;
- * }
- * for (j = 0; j < 8; j += 2) {
- * if ((i >> j) & 1) {
- * m |= 0xfffful << (j << 3);
- * }
- * }
- * printf("[0x%x] = 0x%016lx,\n", i, m);
- * }
- */
-static inline uint64_t expand_pred_h(uint8_t byte)
-{
- static const uint64_t word[] = {
- [0x01] = 0x000000000000ffff, [0x04] = 0x00000000ffff0000,
- [0x05] = 0x00000000ffffffff, [0x10] = 0x0000ffff00000000,
- [0x11] = 0x0000ffff0000ffff, [0x14] = 0x0000ffffffff0000,
- [0x15] = 0x0000ffffffffffff, [0x40] = 0xffff000000000000,
- [0x41] = 0xffff00000000ffff, [0x44] = 0xffff0000ffff0000,
- [0x45] = 0xffff0000ffffffff, [0x50] = 0xffffffff00000000,
- [0x51] = 0xffffffff0000ffff, [0x54] = 0xffffffffffff0000,
- [0x55] = 0xffffffffffffffff,
- };
- return word[byte & 0x55];
-}
-
/* Similarly for single word elements. */
static inline uint64_t expand_pred_s(uint8_t byte)
{
diff --git a/target/arm/vec_helper.c b/target/arm/vec_helper.c
index 17fb158362..4db68fbbb3 100644
--- a/target/arm/vec_helper.c
+++ b/target/arm/vec_helper.c
@@ -127,6 +127,32 @@ const uint64_t expand_pred_b_data[256] = {
0xffffffffffffffff,
};
+/*
+ * Similarly for half-word elements.
+ * for (i = 0; i < 256; ++i) {
+ * unsigned long m = 0;
+ * if (i & 0xaa) {
+ * continue;
+ * }
+ * for (j = 0; j < 8; j += 2) {
+ * if ((i >> j) & 1) {
+ * m |= 0xfffful << (j << 3);
+ * }
+ * }
+ * printf("[0x%x] = 0x%016lx,\n", i, m);
+ * }
+ */
+const uint64_t expand_pred_h_data[0x55+1] = {
+ [0x01] = 0x000000000000ffff, [0x04] = 0x00000000ffff0000,
+ [0x05] = 0x00000000ffffffff, [0x10] = 0x0000ffff00000000,
+ [0x11] = 0x0000ffff0000ffff, [0x14] = 0x0000ffffffff0000,
+ [0x15] = 0x0000ffffffffffff, [0x40] = 0xffff000000000000,
+ [0x41] = 0xffff00000000ffff, [0x44] = 0xffff0000ffff0000,
+ [0x45] = 0xffff0000ffffffff, [0x50] = 0xffffffff00000000,
+ [0x51] = 0xffffffff0000ffff, [0x54] = 0xffffffffffff0000,
+ [0x55] = 0xffffffffffffffff,
+};
+
/* Signed saturating rounding doubling multiply-accumulate high half, 8-bit */
int8_t do_sqrdmlah_b(int8_t src1, int8_t src2, int8_t src3,
bool neg, bool round)
--
2.34.1
next prev parent reply other threads:[~2022-05-27 18:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 18:06 [PATCH v3 00/15] target/arm: SME prep patches Richard Henderson
2022-05-27 18:06 ` [PATCH v3 01/15] target/arm: Rename TBFLAG_A64 ZCR_LEN to SVE_LEN Richard Henderson
2022-05-31 12:13 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 02/15] linux-user/aarch64: Use SVE_LEN from hflags Richard Henderson
2022-05-31 12:15 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 03/15] target/arm: Do not use aarch64_sve_zcr_get_valid_len in reset Richard Henderson
2022-05-31 12:15 ` Peter Maydell
2022-05-31 14:28 ` Richard Henderson
2022-05-31 14:55 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 04/15] target/arm: Merge aarch64_sve_zcr_get_valid_len into caller Richard Henderson
2022-05-27 18:06 ` [PATCH v3 05/15] target/arm: Use uint32_t instead of bitmap for sve vq's Richard Henderson
2022-05-27 18:06 ` [PATCH v3 06/15] target/arm: Rename sve_zcr_len_for_el to sve_vqm1_for_el Richard Henderson
2022-05-31 12:19 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 07/15] target/arm: Remove fp checks from sve_exception_el Richard Henderson
2022-05-27 18:06 ` [PATCH v3 08/15] target/arm: Add el_is_in_host Richard Henderson
2022-05-31 12:24 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 09/15] target/arm: Use el_is_in_host for sve_vqm1_for_el Richard Henderson
2022-05-31 12:26 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 10/15] target/arm: Split out load/store primitives to sve_ldst_internal.h Richard Henderson
2022-05-31 12:26 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 11/15] target/arm: Export sve contiguous ldst support functions Richard Henderson
2022-05-31 12:27 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 12/15] target/arm: Move expand_pred_b to vec_internal.h Richard Henderson
2022-05-31 12:30 ` Peter Maydell
2022-05-27 18:06 ` [PATCH v3 13/15] target/arm: Use expand_pred_b in mve_helper.c Richard Henderson
2022-05-31 12:33 ` Peter Maydell
2022-05-27 18:06 ` Richard Henderson [this message]
2022-05-31 12:34 ` [PATCH v3 14/15] target/arm: Move expand_pred_h to vec_internal.h Peter Maydell
2022-05-27 18:06 ` [PATCH v3 15/15] target/arm: Export bfdotadd from vec_helper.c Richard Henderson
2022-05-31 12:35 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220527180623.185261-15-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.