qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [PATCH 17/71] target/arm: Move expand_pred_h to vec_internal.h
Date: Thu,  2 Jun 2022 14:47:59 -0700	[thread overview]
Message-ID: <20220602214853.496211-18-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220602214853.496211-1-richard.henderson@linaro.org>

Move the data to vec_helper.c and the inline to vec_internal.h.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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..1d527fadac 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 e865c12527..1654c0bbf9 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..26c373e522 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



  parent reply	other threads:[~2022-06-02 22:12 UTC|newest]

Thread overview: 109+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-02 21:47 [PATCH 00/71] target/arm: Scalable Matrix Extension Richard Henderson
2022-06-02 21:47 ` [PATCH 01/71] target/arm: Rename TBFLAG_A64 ZCR_LEN to VL Richard Henderson
2022-06-02 21:47 ` [PATCH 02/71] linux-user/aarch64: Introduce sve_vq_cached Richard Henderson
2022-06-06 10:31   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 03/71] target/arm: Remove route_to_el2 check from sve_exception_el Richard Henderson
2022-06-06 12:13   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 04/71] target/arm: Remove fp checks " Richard Henderson
2022-06-06 12:23   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 05/71] target/arm: Add el_is_in_host Richard Henderson
2022-06-02 21:47 ` [PATCH 06/71] target/arm: Use el_is_in_host for sve_zcr_len_for_el Richard Henderson
2022-06-02 21:47 ` [PATCH 07/71] target/arm: Use el_is_in_host for sve_exception_el Richard Henderson
2022-06-06 12:24   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 08/71] target/arm: Hoist arm_is_el2_enabled check in sve_exception_el Richard Henderson
2022-06-06 12:27   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 09/71] target/arm: Do not use aarch64_sve_zcr_get_valid_len in reset Richard Henderson
2022-06-06 12:27   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 10/71] target/arm: Merge aarch64_sve_zcr_get_valid_len into caller Richard Henderson
2022-06-06 12:30   ` Peter Maydell
2022-06-02 21:47 ` [PATCH 11/71] target/arm: Use uint32_t instead of bitmap for sve vq's Richard Henderson
2022-06-02 21:47 ` [PATCH 12/71] target/arm: Rename sve_zcr_len_for_el to sve_vqm1_for_el Richard Henderson
2022-06-02 21:47 ` [PATCH 13/71] target/arm: Split out load/store primitives to sve_ldst_internal.h Richard Henderson
2022-06-02 21:47 ` [PATCH 14/71] target/arm: Export sve contiguous ldst support functions Richard Henderson
2022-06-02 21:47 ` [PATCH 15/71] target/arm: Move expand_pred_b to vec_internal.h Richard Henderson
2022-06-02 21:47 ` [PATCH 16/71] target/arm: Use expand_pred_b in mve_helper.c Richard Henderson
2022-06-02 21:47 ` Richard Henderson [this message]
2022-06-02 21:48 ` [PATCH 18/71] target/arm: Export bfdotadd from vec_helper.c Richard Henderson
2022-06-02 21:48 ` [PATCH 19/71] target/arm: Add isar_feature_aa64_sme Richard Henderson
2022-06-06 12:31   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 20/71] target/arm: Add ID_AA64SMFR0_EL1 Richard Henderson
2022-06-06 13:05   ` Peter Maydell
2022-06-06 16:19     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 21/71] target/arm: Implement TPIDR2_EL0 Richard Henderson
2022-06-06 13:18   ` Peter Maydell
2022-06-06 14:38     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 22/71] target/arm: Add SMEEXC_EL to TB flags Richard Henderson
2022-06-06 13:25   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 23/71] target/arm: Add syn_smetrap Richard Henderson
2022-06-06 13:28   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 24/71] target/arm: Add ARM_CP_SME Richard Henderson
2022-06-06 13:32   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 25/71] target/arm: Add SVCR Richard Henderson
2022-06-06 13:40   ` Peter Maydell
2022-06-06 14:41     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 26/71] target/arm: Add SMCR_ELx Richard Henderson
2022-06-06 13:42   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 27/71] target/arm: Add SMIDR_EL1, SMPRI_EL1, SMPRIMAP_EL2 Richard Henderson
2022-06-06 15:55   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 28/71] target/arm: Add PSTATE.{SM,ZA} to TB flags Richard Henderson
2022-06-06 15:58   ` Peter Maydell
2022-06-06 16:50     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 29/71] target/arm: Add the SME ZA storage to CPUARMState Richard Henderson
2022-06-06 16:13   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 30/71] target/arm: Implement SMSTART, SMSTOP Richard Henderson
2022-06-06 16:50   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 31/71] target/arm: Move error for sve%d property to arm_cpu_sve_finalize Richard Henderson
2022-06-07  8:44   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 32/71] target/arm: Create ARMVQMap Richard Henderson
2022-06-07  8:45   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 33/71] target/arm: Generalize cpu_arm_{get,set}_vq Richard Henderson
2022-06-07  8:48   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 34/71] target/arm: Generalize cpu_arm_{get, set}_default_vec_len Richard Henderson
2022-06-07  8:49   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 35/71] target/arm: Move arm_cpu_*_finalize to internals.h Richard Henderson
2022-06-07  8:50   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 36/71] target/arm: Unexport aarch64_add_*_properties Richard Henderson
2022-06-07  8:51   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 37/71] target/arm: Add cpu properties for SME Richard Henderson
2022-06-07  9:47   ` Peter Maydell
2022-06-07 14:45     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 38/71] target/arm: Introduce sve_vqm1_for_el_sm Richard Henderson
2022-06-07  9:54   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 39/71] target/arm: Add SVL to TB flags Richard Henderson
2022-06-07  9:58   ` Peter Maydell
2022-06-07 14:49     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 40/71] target/arm: Move pred_{full, gvec}_reg_{offset, size} to translate-a64.h Richard Henderson
2022-06-07  9:58   ` Peter Maydell
2022-06-02 21:48 ` [PATCH 41/71] target/arm: Add infrastructure for disas_sme Richard Henderson
2022-06-07 10:03   ` Peter Maydell
2022-06-07 14:52     ` Richard Henderson
2022-06-02 21:48 ` [PATCH 42/71] target/arm: Trap AdvSIMD usage when Streaming SVE is active Richard Henderson
2022-06-02 21:48 ` [PATCH 43/71] target/arm: Implement SME RDSVL, ADDSVL, ADDSPL Richard Henderson
2022-06-02 21:48 ` [PATCH 44/71] target/arm: Implement SME ZERO Richard Henderson
2022-06-02 21:48 ` [PATCH 45/71] target/arm: Implement SME MOVA Richard Henderson
2022-06-02 21:48 ` [PATCH 46/71] target/arm: Implement SME LD1, ST1 Richard Henderson
2022-06-02 21:48 ` [PATCH 47/71] target/arm: Export unpredicated ld/st from translate-sve.c Richard Henderson
2022-06-02 21:48 ` [PATCH 48/71] target/arm: Implement SME LDR, STR Richard Henderson
2022-06-02 21:48 ` [PATCH 49/71] target/arm: Implement SME ADDHA, ADDVA Richard Henderson
2022-06-02 21:48 ` [PATCH 50/71] target/arm: Implement FMOPA, FMOPS (non-widening) Richard Henderson
2022-06-02 21:48 ` [PATCH 51/71] target/arm: Implement BFMOPA, BFMOPS Richard Henderson
2022-06-02 21:48 ` [PATCH 52/71] target/arm: Implement FMOPA, FMOPS (widening) Richard Henderson
2022-06-02 21:48 ` [PATCH 53/71] target/arm: Implement SME integer outer product Richard Henderson
2022-06-02 21:48 ` [PATCH 54/71] target/arm: Implement PSEL Richard Henderson
2022-06-02 21:48 ` [PATCH 55/71] target/arm: Implement REVD Richard Henderson
2022-06-02 21:48 ` [PATCH 56/71] target/arm: Implement SCLAMP, UCLAMP Richard Henderson
2022-06-02 21:48 ` [PATCH 57/71] target/arm: Reset streaming sve state on exception boundaries Richard Henderson
2022-06-02 21:48 ` [PATCH 58/71] target/arm: Enable SME for -cpu max Richard Henderson
2022-06-02 21:48 ` [PATCH 59/71] linux-user/aarch64: Clear tpidr2_el0 if CLONE_SETTLS Richard Henderson
2022-06-02 21:48 ` [PATCH 60/71] linux-user/aarch64: Reset PSTATE.SM on syscalls Richard Henderson
2022-06-02 21:48 ` [PATCH 61/71] linux-user/aarch64: Add SM bit to SVE signal context Richard Henderson
2022-06-02 21:48 ` [PATCH 62/71] linux-user/aarch64: Tidy target_restore_sigframe error return Richard Henderson
2022-06-02 21:48 ` [PATCH 63/71] linux-user/aarch64: Do not allow duplicate or short sve records Richard Henderson
2022-06-02 21:48 ` [PATCH 64/71] linux-user/aarch64: Verify extra record lock succeeded Richard Henderson
2022-06-02 21:48 ` [PATCH 65/71] linux-user/aarch64: Move sve record checks into restore Richard Henderson
2022-06-02 21:48 ` [PATCH 66/71] linux-user/aarch64: Implement SME signal handling Richard Henderson
2022-06-02 21:48 ` [PATCH 67/71] linux-user: Rename sve prctls Richard Henderson
2022-06-02 21:48 ` [PATCH 68/71] linux-user/aarch64: Implement PR_SME_GET_VL, PR_SME_SET_VL Richard Henderson
2022-06-02 21:48 ` [PATCH 69/71] target/arm: Only set ZEN in reset if SVE present Richard Henderson
2022-06-02 21:48 ` [PATCH 70/71] target/arm: Enable SME for user-only Richard Henderson
2022-06-02 21:48 ` [PATCH 71/71] linux-user/aarch64: Add SME related hwcap entries Richard Henderson

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=20220602214853.496211-18-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).