From nobody Sun May 11 21:08:35 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1694414843; cv=none;
d=zohomail.com; s=zohoarc;
b=GL3kS6whjXY8wmsmnwUusXObFiNheLujMWDY6JYB9VfSTAwPJJLthubE1G6m8U3pZND24iRUsIMTBUnkqduD3BURbAqhApB8BNZEstjikDXiKnhNCffWLnVkGNGcCOFp2u5nt+5Ze/PAbaG6D4OWsdiP94SGJh/SGpAODgWsslc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1694414843;
h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=KCzcagA45q4P5ZXNWFhRkkRERr88WEyNrG4CtwWBxb4=;
b=K5MD+YzddGbdpapt96iNqdREw2RQhgCxfZF3JySbxqpE6OpZnIci0tZ+GCrjDLsU24fyHPsvvjSDVe11bIj2L//v/jFH7ewHRN2nIIBWv9AuZCSzJ4pHYXKOFpskcRzRZUEkLBX4Rio085Sz0swTEe2UzEspOFGelQkxJOOLfDA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<alistair23@gmail.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 169441484382768.22360883758597;
Sun, 10 Sep 2023 23:47:23 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1qfaf0-0000dl-Gk; Mon, 11 Sep 2023 02:44:38 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <alistair23@gmail.com>)
id 1qfaez-0000dc-DG
for qemu-devel@nongnu.org; Mon, 11 Sep 2023 02:44:37 -0400
Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <alistair23@gmail.com>)
id 1qfaev-0004Z9-V6
for qemu-devel@nongnu.org; Mon, 11 Sep 2023 02:44:36 -0400
Received: by mail-pg1-x533.google.com with SMTP id
41be03b00d2f7-5657add1073so2656935a12.0
for <qemu-devel@nongnu.org>; Sun, 10 Sep 2023 23:44:33 -0700 (PDT)
Received: from toolbox.alistair23.me
(2403-580b-97e8-0-321-6fb2-58f1-a1b1.ip6.aussiebb.net.
[2403:580b:97e8:0:321:6fb2:58f1:a1b1])
by smtp.gmail.com with ESMTPSA id
q12-20020a656a8c000000b00553dcfc2179sm4264606pgu.52.2023.09.10.23.44.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Sep 2023 23:44:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694414672; x=1695019472; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=KCzcagA45q4P5ZXNWFhRkkRERr88WEyNrG4CtwWBxb4=;
b=jZdKklWvr/rTas2sZm+Cc9uqJHphSsY737FQRMcHchnHvuzmO9FQf8223SAd04vYef
ZDekAU9VGr7D+sjOkb4C5a8GWXQ6/3R2G9Y7BJg+zQA7c4xuZUlPGWk/teLupZCxRo9C
NHZc5aYSkSymti6J4o0fBY/j4a5UrVW9j9rrD9P3g/TQvF5oFtvv8c3TOxon2tsbu42X
j4NqnOJcbAseetK1xTzTWhKcUUr79MRtrEsmz8w4paDGADJVwzeAS4kuXteLvPe4Tq/h
T9sPua3im0C5iqwIbsLEH7+Fhcmb5Rss/kmtlfiehn8pHLPd76PjA5MMxBibkDl7+Fp+
jHlQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694414672; x=1695019472;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=KCzcagA45q4P5ZXNWFhRkkRERr88WEyNrG4CtwWBxb4=;
b=JVdDpa8I+4Zv3jQem8dmi/hgk35XLbfp6BrYw+f1F6fsbtGoAgxDB1ykXnJB/WvwWh
MAjJuAfaEKUYJOhOH3I+jiX6SbxiOwOzn44eu60N+m4BTzdKOzsHusAmnJedUnOG49Rd
iYM5VSIRdzH8g4CkYdSaIuXfzq8717JEUh9QCa8ha3jkFeAWoOw/1N+18gMMVZ8C+ttZ
9szCzZVWbhdGINf772cDNiJFaJ4hONebfOcaKK4J2/7rqAv2mRERbrxYcM1HtASs6olK
oILffpV0/4qRwjqeFtZ2caTud4H6S6gw+vSbvMjOjLrorWmL3EcbQTdip6OKxRUaTKaf
ukrQ==
X-Gm-Message-State: AOJu0YzdlJjLF1bgGd7geXxXNp1wR+IBK2Rc+pgLVR5O9IbToyFDvyeZ
yyQfB6SKymbmjV0CWbD6JzlpW/I5NaK0Zw==
X-Google-Smtp-Source:
AGHT+IFVhMA9Lxr8HdIJ117S8+CjbJquvX1LVAkSZk23oclZ+Hjq5Ms0jHjuNnvj+8N85Tt0pCkJbw==
X-Received: by 2002:a05:6a20:7f84:b0:154:8d7a:aeb3 with SMTP id
d4-20020a056a207f8400b001548d7aaeb3mr8347785pzj.28.1694414672051;
Sun, 10 Sep 2023 23:44:32 -0700 (PDT)
From: Alistair Francis <alistair23@gmail.com>
X-Google-Original-From: Alistair Francis <alistair.francis@wdc.com>
To: qemu-devel@nongnu.org
Cc: alistair23@gmail.com, Kiran Ostrolenk <kiran.ostrolenk@codethink.co.uk>,
Weiwei Li <liweiwei@iscas.ac.cn>, Max Chou <max.chou@sifive.com>,
Alistair Francis <alistair.francis@wdc.com>
Subject: [PULL v2 14/45] target/riscv: Refactor some of the generic vector
functionality
Date: Mon, 11 Sep 2023 16:42:49 +1000
Message-ID: <20230911064320.939791-15-alistair.francis@wdc.com>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20230911064320.939791-1-alistair.francis@wdc.com>
References: <20230911064320.939791-1-alistair.francis@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2607:f8b0:4864:20::533;
envelope-from=alistair23@gmail.com; helo=mail-pg1-x533.google.com
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @gmail.com)
X-ZM-MESSAGEID: 1694414844233100001
Content-Type: text/plain; charset="utf-8"
From: Kiran Ostrolenk <kiran.ostrolenk@codethink.co.uk>
Move some macros out of `vector_helper` and into `vector_internals`.
This ensures they can be used by both vector and vector-crypto helpers
(latter implemented in proceeding commits).
Signed-off-by: Kiran Ostrolenk <kiran.ostrolenk@codethink.co.uk>
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Max Chou <max.chou@sifive.com>
Message-ID: <20230711165917.2629866-8-max.chou@sifive.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/vector_internals.h | 46 +++++++++++++++++++++++++++++++++
target/riscv/vector_helper.c | 42 ------------------------------
2 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/target/riscv/vector_internals.h b/target/riscv/vector_internal=
s.h
index 749d138beb..8133111e5f 100644
--- a/target/riscv/vector_internals.h
+++ b/target/riscv/vector_internals.h
@@ -121,12 +121,52 @@ void vext_set_elems_1s(void *base, uint32_t is_agnost=
ic, uint32_t cnt,
/* expand macro args before macro */
#define RVVCALL(macro, ...) macro(__VA_ARGS__)
=20
+/* (TD, T2, TX2) */
+#define OP_UU_B uint8_t, uint8_t, uint8_t
+#define OP_UU_H uint16_t, uint16_t, uint16_t
+#define OP_UU_W uint32_t, uint32_t, uint32_t
+#define OP_UU_D uint64_t, uint64_t, uint64_t
+
/* (TD, T1, T2, TX1, TX2) */
#define OP_UUU_B uint8_t, uint8_t, uint8_t, uint8_t, uint8_t
#define OP_UUU_H uint16_t, uint16_t, uint16_t, uint16_t, uint16_t
#define OP_UUU_W uint32_t, uint32_t, uint32_t, uint32_t, uint32_t
#define OP_UUU_D uint64_t, uint64_t, uint64_t, uint64_t, uint64_t
=20
+#define OPIVV1(NAME, TD, T2, TX2, HD, HS2, OP) \
+static void do_##NAME(void *vd, void *vs2, int i) \
+{ \
+ TX2 s2 =3D *((T2 *)vs2 + HS2(i)); \
+ *((TD *)vd + HD(i)) =3D OP(s2); \
+}
+
+#define GEN_VEXT_V(NAME, ESZ) \
+void HELPER(NAME)(void *vd, void *v0, void *vs2, \
+ CPURISCVState *env, uint32_t desc) \
+{ \
+ uint32_t vm =3D vext_vm(desc); \
+ uint32_t vl =3D env->vl; \
+ uint32_t total_elems =3D \
+ vext_get_total_elems(env, desc, ESZ); \
+ uint32_t vta =3D vext_vta(desc); \
+ uint32_t vma =3D vext_vma(desc); \
+ uint32_t i; \
+ \
+ for (i =3D env->vstart; i < vl; i++) { \
+ if (!vm && !vext_elem_mask(v0, i)) { \
+ /* set masked-off elements to 1s */ \
+ vext_set_elems_1s(vd, vma, i * ESZ, \
+ (i + 1) * ESZ); \
+ continue; \
+ } \
+ do_##NAME(vd, vs2, i); \
+ } \
+ env->vstart =3D 0; \
+ /* set tail elements to 1s */ \
+ vext_set_elems_1s(vd, vta, vl * ESZ, \
+ total_elems * ESZ); \
+}
+
/* operation of two vector elements */
typedef void opivv2_fn(void *vd, void *vs1, void *vs2, int i);
=20
@@ -179,4 +219,10 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1,=
\
do_##NAME, ESZ); \
}
=20
+/* Three of the widening shortening macros: */
+/* (TD, T1, T2, TX1, TX2) */
+#define WOP_UUU_B uint16_t, uint8_t, uint8_t, uint16_t, uint16_t
+#define WOP_UUU_H uint32_t, uint16_t, uint16_t, uint32_t, uint32_t
+#define WOP_UUU_W uint64_t, uint32_t, uint32_t, uint64_t, uint64_t
+
#endif /* TARGET_RISCV_VECTOR_INTERNALS_H */
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index 1f29236a63..3fb05cc3d6 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -636,9 +636,6 @@ GEN_VEXT_ST_WHOLE(vs8r_v, int8_t, ste_b)
#define OP_SUS_H int16_t, uint16_t, int16_t, uint16_t, int16_t
#define OP_SUS_W int32_t, uint32_t, int32_t, uint32_t, int32_t
#define OP_SUS_D int64_t, uint64_t, int64_t, uint64_t, int64_t
-#define WOP_UUU_B uint16_t, uint8_t, uint8_t, uint16_t, uint16_t
-#define WOP_UUU_H uint32_t, uint16_t, uint16_t, uint32_t, uint32_t
-#define WOP_UUU_W uint64_t, uint32_t, uint32_t, uint64_t, uint64_t
#define WOP_SSS_B int16_t, int8_t, int8_t, int16_t, int16_t
#define WOP_SSS_H int32_t, int16_t, int16_t, int32_t, int32_t
#define WOP_SSS_W int64_t, int32_t, int32_t, int64_t, int64_t
@@ -3438,11 +3435,6 @@ GEN_VEXT_VF(vfwnmsac_vf_h, 4)
GEN_VEXT_VF(vfwnmsac_vf_w, 8)
=20
/* Vector Floating-Point Square-Root Instruction */
-/* (TD, T2, TX2) */
-#define OP_UU_H uint16_t, uint16_t, uint16_t
-#define OP_UU_W uint32_t, uint32_t, uint32_t
-#define OP_UU_D uint64_t, uint64_t, uint64_t
-
#define OPFVV1(NAME, TD, T2, TX2, HD, HS2, OP) \
static void do_##NAME(void *vd, void *vs2, int i, \
CPURISCVState *env) \
@@ -4139,40 +4131,6 @@ GEN_VEXT_CMP_VF(vmfge_vf_w, uint32_t, H4, vmfge32)
GEN_VEXT_CMP_VF(vmfge_vf_d, uint64_t, H8, vmfge64)
=20
/* Vector Floating-Point Classify Instruction */
-#define OPIVV1(NAME, TD, T2, TX2, HD, HS2, OP) \
-static void do_##NAME(void *vd, void *vs2, int i) \
-{ \
- TX2 s2 =3D *((T2 *)vs2 + HS2(i)); \
- *((TD *)vd + HD(i)) =3D OP(s2); \
-}
-
-#define GEN_VEXT_V(NAME, ESZ) \
-void HELPER(NAME)(void *vd, void *v0, void *vs2, \
- CPURISCVState *env, uint32_t desc) \
-{ \
- uint32_t vm =3D vext_vm(desc); \
- uint32_t vl =3D env->vl; \
- uint32_t total_elems =3D \
- vext_get_total_elems(env, desc, ESZ); \
- uint32_t vta =3D vext_vta(desc); \
- uint32_t vma =3D vext_vma(desc); \
- uint32_t i; \
- \
- for (i =3D env->vstart; i < vl; i++) { \
- if (!vm && !vext_elem_mask(v0, i)) { \
- /* set masked-off elements to 1s */ \
- vext_set_elems_1s(vd, vma, i * ESZ, \
- (i + 1) * ESZ); \
- continue; \
- } \
- do_##NAME(vd, vs2, i); \
- } \
- env->vstart =3D 0; \
- /* set tail elements to 1s */ \
- vext_set_elems_1s(vd, vta, vl * ESZ, \
- total_elems * ESZ); \
-}
-
target_ulong fclass_h(uint64_t frs1)
{
float16 f =3D frs1;
--=20
2.41.0