From nobody Wed May 7 08:15:44 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=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1602163858; cv=none;
d=zohomail.com; s=zohoarc;
b=dT2T0MTDgbFIHzy+cK9BUzb71IY58t/97ziUNvJhtCoUhoj1W3Eox86KkVSkrZRatK+ZIcQ4MLtN2cQD69swcQ1Qp+JEsNn9l8kvqT69sWMKz3mq98lG9lzBRM0heo3iexS4UeFsILHqm0AkWa9ydJha81hoqrs83xwGKZ/pMzc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1602163858;
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=g67AaWSNMDVXjRU+vP3LKCD0hiHwTorrb1XmdieL2IE=;
b=ITlgroyT5zguxkJR5uHRoPnApnSf9rmvmB/XRB4hycDme3yvoS63ykwK5+xV/5EBV9nBS2gKsJEhAayOtduz1NH5U5wtEVS/fn7MCghIsXRyWGexWc6dHOfCON8j1Yu6LUthZJ2P5RUI78LyVXa84E75EuuXQT3ui303fCuV1U8=
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=<richard.henderson@linaro.org> (p=none dis=none)
header.from=<richard.henderson@linaro.org>
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 1602163858850920.451293002637;
Thu, 8 Oct 2020 06:30:58 -0700 (PDT)
Received: from localhost ([::1]:53392 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1kQVZn-0000Sm-R2
for importer@patchew.org; Thu, 08 Oct 2020 09:03:19 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:45352)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1kQVTu-0003ds-U2
for qemu-devel@nongnu.org; Thu, 08 Oct 2020 08:57:14 -0400
Received: from mail-oi1-x229.google.com ([2607:f8b0:4864:20::229]:35632)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1kQVTs-0001yW-VQ
for qemu-devel@nongnu.org; Thu, 08 Oct 2020 08:57:14 -0400
Received: by mail-oi1-x229.google.com with SMTP id w141so6192465oia.2
for <qemu-devel@nongnu.org>; Thu, 08 Oct 2020 05:57:12 -0700 (PDT)
Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx.
[189.204.159.168])
by smtp.gmail.com with ESMTPSA id w64sm4701933oig.31.2020.10.08.05.57.10
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 08 Oct 2020 05:57:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=g67AaWSNMDVXjRU+vP3LKCD0hiHwTorrb1XmdieL2IE=;
b=Fgi3twoc1HVrcIetOSBYpE9HtjSkihuYNxLQBYm2S3UohpajeIH7AeYnxVFWGfB4yi
9gqqri2qdUPe43YJpNAnZsK7QCtDfUeJ1yL9nG4JkYgxq0RqW1JjNh1/lHdmOXK9Q7K3
dmvzSuv3t8T4perpgIY72PZ7ofn4aNWDmxu2JNRKmVEUPjfnY4QCigJNnVIgIivLI3Zk
ICaZv2/K4Ub4NVSzzjMCflKhXJ2lWRmdDqVPWmXuM4sX8v/vBxKk1t/yEZbGi9YEw+IX
EEBiU4YRZX/7QVczwmBo/+5oUNg2+Zg/rQuXQyWxRvgEDJUhDmrAd39XbXzpZSBJP330
olIw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=g67AaWSNMDVXjRU+vP3LKCD0hiHwTorrb1XmdieL2IE=;
b=IaZD7wulDmHjqDHSyuxuJRuezzqhiDAlvgiEydLIXNMf438ik5ueZDqHzYgHE6Z768
kMn51Q8iylRAGJdkMvjI/teLsc8lEc/aUUU507l6Eq8mcy5vkiNXJVQZd+xwtdjtjAQU
/R15+JiBhFv1kfDPcn9xr/JSB0YuNjuXN9BNJhCWSujnIbL5i5pkopNLbSilRheO/LzV
Ym2vhjNMQPYz5TIQcq881TGvx52Mvr7bBWmojm4Expgdi1IfyJCC+V+y/jtKQBnbVstK
5G8nO3uEvmDVvoC/PQsoqnqkxhb39JogooeFXIlWeiKT2vAWCsTv+JHnYyuk7RtUu6vL
eU6A==
X-Gm-Message-State: AOAM5337vWg2ksbeArhk4eFYfStVeebm4wjSFPK9QaKk4gKxt2Sx2Ity
h88bBc8Y+Ie+ep6ZT1jDQl7xCuD/DWa3DrSm
X-Google-Smtp-Source:
ABdhPJznlJPgeg2iY0nVtR6jAy+QTGL8s0O7OWojMrwRKGAyDcCjtrU9n3QlEe12wHgebNuqu5pSTg==
X-Received: by 2002:aca:3607:: with SMTP id d7mr5000347oia.168.1602161831449;
Thu, 08 Oct 2020 05:57:11 -0700 (PDT)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 05/11] tcg: Move some TCG_CT_* bits to TCGArgConstraint
bitfields
Date: Thu, 8 Oct 2020 07:56:53 -0500
Message-Id: <20201008125659.49857-6-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20201008125659.49857-1-richard.henderson@linaro.org>
References: <20201008125659.49857-1-richard.henderson@linaro.org>
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::229;
envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x229.google.com
X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache.
That's all we know.
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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,
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.23
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>
Cc: peter.maydell@linaro.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
Content-Type: text/plain; charset="utf-8"
These are easier to set and test when they have their own fields.
Reduce the size of alias_index and sort_index to 4 bits, which is
sufficient for TCG_MAX_OP_ARGS. This leaves only the bits indicating
constants within the ct field.
Move all initialization to allocation time, rather than init
individual fields in process_op_defs.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg.h | 14 +++++++-------
tcg/tcg.c | 28 ++++++++++++----------------
2 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 3168315bb8..e8629b58c8 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -976,15 +976,15 @@ int64_t tcg_cpu_exec_time(void);
void tcg_dump_info(void);
void tcg_dump_op_count(void);
=20
-#define TCG_CT_ALIAS 0x80
-#define TCG_CT_IALIAS 0x40
-#define TCG_CT_NEWREG 0x20 /* output requires a new register */
-#define TCG_CT_CONST 0x02 /* any constant of register size */
+#define TCG_CT_CONST 1 /* any constant of register size */
=20
typedef struct TCGArgConstraint {
- uint16_t ct;
- uint8_t alias_index;
- uint8_t sort_index;
+ unsigned ct : 16;
+ unsigned alias_index : 4;
+ unsigned sort_index : 4;
+ bool oalias : 1;
+ bool ialias : 1;
+ bool newreg : 1;
TCGRegSet regs;
} TCGArgConstraint;
=20
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 55b2fc3ae3..a8c28440e2 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -958,7 +958,7 @@ void tcg_context_init(TCGContext *s)
total_args +=3D n;
}
=20
- args_ct =3D g_malloc(sizeof(TCGArgConstraint) * total_args);
+ args_ct =3D g_new0(TCGArgConstraint, total_args);
=20
for(op =3D 0; op < NB_OPS; op++) {
def =3D &tcg_op_defs[op];
@@ -2197,7 +2197,7 @@ static int get_constraint_priority(const TCGOpDef *de=
f, int k)
const TCGArgConstraint *arg_ct =3D &def->args_ct[k];
int n;
=20
- if (arg_ct->ct & TCG_CT_ALIAS) {
+ if (arg_ct->oalias) {
/* an alias is equivalent to a single register */
n =3D 1;
} else {
@@ -2260,8 +2260,6 @@ static void process_op_defs(TCGContext *s)
/* Incomplete TCGTargetOpDef entry. */
tcg_debug_assert(ct_str !=3D NULL);
=20
- def->args_ct[i].regs =3D 0;
- def->args_ct[i].ct =3D 0;
while (*ct_str !=3D '\0') {
switch(*ct_str) {
case '0' ... '9':
@@ -2270,18 +2268,18 @@ static void process_op_defs(TCGContext *s)
tcg_debug_assert(ct_str =3D=3D tdefs->args_ct_str[=
i]);
tcg_debug_assert(oarg < def->nb_oargs);
tcg_debug_assert(def->args_ct[oarg].regs !=3D 0);
- /* TCG_CT_ALIAS is for the output arguments.
- The input is tagged with TCG_CT_IALIAS. */
def->args_ct[i] =3D def->args_ct[oarg];
- def->args_ct[oarg].ct |=3D TCG_CT_ALIAS;
+ /* The output sets oalias. */
+ def->args_ct[oarg].oalias =3D true;
def->args_ct[oarg].alias_index =3D i;
- def->args_ct[i].ct |=3D TCG_CT_IALIAS;
+ /* The input sets ialias. */
+ def->args_ct[i].ialias =3D true;
def->args_ct[i].alias_index =3D oarg;
}
ct_str++;
break;
case '&':
- def->args_ct[i].ct |=3D TCG_CT_NEWREG;
+ def->args_ct[i].newreg =3D true;
ct_str++;
break;
case 'i':
@@ -2848,7 +2846,7 @@ static void liveness_pass_1(TCGContext *s)
set =3D *pset;
=20
set &=3D ct->regs;
- if (ct->ct & TCG_CT_IALIAS) {
+ if (ct->ialias) {
set &=3D op->output_pref[ct->alias_index];
}
/* If the combination is not possible, restart. */
@@ -3665,7 +3663,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCG=
Op *op)
}
=20
i_preferred_regs =3D o_preferred_regs =3D 0;
- if (arg_ct->ct & TCG_CT_IALIAS) {
+ if (arg_ct->ialias) {
o_preferred_regs =3D op->output_pref[arg_ct->alias_index];
if (ts->fixed_reg) {
/* if fixed register, we must allocate a new register
@@ -3688,8 +3686,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCG=
Op *op)
reg =3D ts->reg;
for (k2 =3D 0 ; k2 < k ; k2++) {
i2 =3D def->args_ct[nb_oargs + k2].sort_index;
- if ((def->args_ct[i2].ct & TCG_CT_IALIAS) &&
- reg =3D=3D new_args[i2]) {
+ if (def->args_ct[i2].ialias && reg =3D=3D new_args=
[i2]) {
goto allocate_in_reg;
}
}
@@ -3760,10 +3757,9 @@ static void tcg_reg_alloc_op(TCGContext *s, const TC=
GOp *op)
/* ENV should not be modified. */
tcg_debug_assert(!ts->fixed_reg);
=20
- if ((arg_ct->ct & TCG_CT_ALIAS)
- && !const_args[arg_ct->alias_index]) {
+ if (arg_ct->oalias && !const_args[arg_ct->alias_index]) {
reg =3D new_args[arg_ct->alias_index];
- } else if (arg_ct->ct & TCG_CT_NEWREG) {
+ } else if (arg_ct->newreg) {
reg =3D tcg_reg_alloc(s, arg_ct->regs,
i_allocated_regs | o_allocated_regs,
op->output_pref[k], ts->indirect_base);
--=20
2.25.1