From nobody Thu May 8 15:26:01 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=1678063249; cv=none;
d=zohomail.com; s=zohoarc;
b=nVxYHh4EHsg7ugrIIFu/A4M2kApBC2DSKvfEiDKytNG7tUy09XEmzt+tiVobWFyFo8CXO6OD/ZHBA+i8ocXRVO2DLTvaQiTCvxbozW25ZNc1heO/JsWnMNFLMpdYoY/2zz1Ih9tap+RjJRD0DFKEPKi6OnpLsWTUqnvMM0RI8d0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1678063249;
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=P1mD3JyW8JNvYTJ6ajE1F+gJ2zolF5eyXGF8XE3ujic=;
b=UX9o2MpUS8oWKTjyJZfe2QJWxw7qanBrfVpBkFhzA5Zk8PrgAiO29gIU/gY09QyOWGrQfGDoYikBgCFbJIAe7GyMGfdtKA+t3kkUoR6aR7v5Fk3FNnRRlhhpxDiD8OBiUCgnivyFBxFbj2AYZmU+zvxpRCVS9sHx905uKQwYJuo=
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)
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 1678063249562279.32698642701916;
Sun, 5 Mar 2023 16:40:49 -0800 (PST)
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 1pYytX-0004N7-I7; Sun, 05 Mar 2023 19:40:03 -0500
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 <richard.henderson@linaro.org>)
id 1pYytV-0004Mb-Oc
for qemu-devel@nongnu.org; Sun, 05 Mar 2023 19:40:01 -0500
Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033])
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 1pYytT-0006Mj-1d
for qemu-devel@nongnu.org; Sun, 05 Mar 2023 19:40:01 -0500
Received: by mail-pj1-x1033.google.com with SMTP id
qa18-20020a17090b4fd200b0023750b675f5so11558192pjb.3
for <qemu-devel@nongnu.org>; Sun, 05 Mar 2023 16:39:58 -0800 (PST)
Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b])
by smtp.gmail.com with ESMTPSA id
r13-20020a17090b050d00b002372106a5c2sm6567901pjz.37.2023.03.05.16.39.57
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 05 Mar 2023 16:39:57 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1678063198;
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=P1mD3JyW8JNvYTJ6ajE1F+gJ2zolF5eyXGF8XE3ujic=;
b=E1W0gZLeiD5VDhJKtmVr+ItAZzIHUkuIMJ8cCcY4HD81Sadt6GQXOTtzSZfPbYZyWe
HEnLQ+KT8qQGdwaiTznqKyzqQiSVD+hPGH+CKHzma0G7+PnB1c15hgAIl2FBy732QrNP
DyZbYWv94W3K4S0ZrLskbE0x34HKoaWeRBOdPMC8U3nsWU+LxLeN78Xt9OeU2yMIjoN+
BslLeRaLKqFDAigPMviUPZA1Zf6KwHlEvebtqql3cEuFJfKprt6NTzhq4isCCadv5ZHo
KtBK5LoSSyG/yQMKd4317v78L2ZFIYagJGORW5WmIBV7jx8xLj3aQ5T3gPN1JDQ2cw4y
+/lw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112; t=1678063198;
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=P1mD3JyW8JNvYTJ6ajE1F+gJ2zolF5eyXGF8XE3ujic=;
b=G15qW+gk+8N6NyQGttP39wr8Dk7LRJjJP16LBh3qCVSwcZ3IFPK7ZeMp0iRllZu5yH
TsCYA3XvJYgH/Cx3ABfjqNt2iRxcLvSgH1Kx6OqLhchdBmStoJB3iTUYRIxHurw+YHND
kW6Uh/viRAmjwUw87tsLk0HE99rqnBgLxhex5eWJuO4t5AVMxXiYCt3tLifNsmkejdf4
/rhk+lu2eHgWAHD4Jq1gLhy+udAbabFJRVDw+78KZ1kczr0HTSOzgg401gNtB4/OoBFp
J6KJqnSyPfp7xKFL2OsazTeE0lWBJWHteBRhAiN3lOOouq0Qye9wj9GNhuiGub5wAhbK
5B2w==
X-Gm-Message-State: AO0yUKX279tm5DkWZrO6VsFUYJ/JnL3KNYGO3QOAwV1QmHpVjdXRR7zl
QgMPQrVmHHLi7ToDqsewlp6xrW+/oJU1nDNt/DmwTw==
X-Google-Smtp-Source:
AK7set+W/qc4aHZ3pZy+t2+/g+czwP7ir0ZpK1w3vQzo9UeLaa70fryXzaAuDqNBN2pD8yZLqXJjHg==
X-Received: by 2002:a17:90a:8:b0:234:91a2:e07c with SMTP id
8-20020a17090a000800b0023491a2e07cmr9561570pja.31.1678063197730;
Sun, 05 Mar 2023 16:39:57 -0800 (PST)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
Taylor Simpson <tsimpson@quicinc.com>
Subject: [PULL 02/84] tcg: Link branches to the labels
Date: Sun, 5 Mar 2023 16:38:32 -0800
Message-Id: <20230306003954.1866998-3-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20230306003954.1866998-1-richard.henderson@linaro.org>
References: <20230306003954.1866998-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::1033;
envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.google.com
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.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 @linaro.org)
X-ZM-MESSAGEID: 1678063251535100011
Content-Type: text/plain; charset="utf-8"
This allows us to easily find all branches that use a label.
Since 'refs' is only tested vs zero, remove it and test for
an empty list instead. Drop the use of bitfields, which had
been used to pack refs into a single 32-bit word.
Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg-op.h | 7 +------
include/tcg/tcg.h | 19 +++++++++++++------
tcg/tcg-op.c | 22 +++++++++++++++++++---
tcg/tcg.c | 30 ++++++++++++++++++++----------
4 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h
index 353d430a63..70856147c5 100644
--- a/include/tcg/tcg-op.h
+++ b/include/tcg/tcg-op.h
@@ -259,12 +259,7 @@ static inline void gen_set_label(TCGLabel *l)
tcg_gen_op1(INDEX_op_set_label, label_arg(l));
}
=20
-static inline void tcg_gen_br(TCGLabel *l)
-{
- l->refs++;
- tcg_gen_op1(INDEX_op_br, label_arg(l));
-}
-
+void tcg_gen_br(TCGLabel *l);
void tcg_gen_mb(TCGBar);
=20
/* Helper calls. */
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 7e2b954dbc..0dc88011ce 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -238,16 +238,23 @@ struct TCGRelocation {
int type;
};
=20
+typedef struct TCGOp TCGOp;
+typedef struct TCGLabelUse TCGLabelUse;
+struct TCGLabelUse {
+ QSIMPLEQ_ENTRY(TCGLabelUse) next;
+ TCGOp *op;
+};
+
typedef struct TCGLabel TCGLabel;
struct TCGLabel {
- unsigned present : 1;
- unsigned has_value : 1;
- unsigned id : 14;
- unsigned refs : 16;
+ bool present;
+ bool has_value;
+ uint16_t id;
union {
uintptr_t value;
const tcg_insn_unit *value_ptr;
} u;
+ QSIMPLEQ_HEAD(, TCGLabelUse) branches;
QSIMPLEQ_HEAD(, TCGRelocation) relocs;
QSIMPLEQ_ENTRY(TCGLabel) next;
};
@@ -487,7 +494,7 @@ typedef struct TCGTempSet {
#define SYNC_ARG (1 << 0)
typedef uint32_t TCGLifeData;
=20
-typedef struct TCGOp {
+struct TCGOp {
TCGOpcode opc : 8;
unsigned nargs : 8;
=20
@@ -506,7 +513,7 @@ typedef struct TCGOp {
=20
/* Arguments for the opcode. */
TCGArg args[];
-} TCGOp;
+};
=20
#define TCGOP_CALLI(X) (X)->param1
#define TCGOP_CALLO(X) (X)->param2
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index f2269a1b91..77658a88f0 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -84,6 +84,22 @@ void tcg_gen_op6(TCGOpcode opc, TCGArg a1, TCGArg a2, TC=
GArg a3,
op->args[5] =3D a6;
}
=20
+/* Generic ops. */
+
+static void add_last_as_label_use(TCGLabel *l)
+{
+ TCGLabelUse *u =3D tcg_malloc(sizeof(TCGLabelUse));
+
+ u->op =3D tcg_last_op();
+ QSIMPLEQ_INSERT_TAIL(&l->branches, u, next);
+}
+
+void tcg_gen_br(TCGLabel *l)
+{
+ tcg_gen_op1(INDEX_op_br, label_arg(l));
+ add_last_as_label_use(l);
+}
+
void tcg_gen_mb(TCGBar mb_type)
{
if (tcg_ctx->gen_tb->cflags & CF_PARALLEL) {
@@ -216,8 +232,8 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, TC=
Gv_i32 arg2, TCGLabel *l)
if (cond =3D=3D TCG_COND_ALWAYS) {
tcg_gen_br(l);
} else if (cond !=3D TCG_COND_NEVER) {
- l->refs++;
tcg_gen_op4ii_i32(INDEX_op_brcond_i32, arg1, arg2, cond, label_arg=
(l));
+ add_last_as_label_use(l);
}
}
=20
@@ -1474,7 +1490,6 @@ void tcg_gen_brcond_i64(TCGCond cond, TCGv_i64 arg1, =
TCGv_i64 arg2, TCGLabel *l)
if (cond =3D=3D TCG_COND_ALWAYS) {
tcg_gen_br(l);
} else if (cond !=3D TCG_COND_NEVER) {
- l->refs++;
if (TCG_TARGET_REG_BITS =3D=3D 32) {
tcg_gen_op6ii_i32(INDEX_op_brcond2_i32, TCGV_LOW(arg1),
TCGV_HIGH(arg1), TCGV_LOW(arg2),
@@ -1483,6 +1498,7 @@ void tcg_gen_brcond_i64(TCGCond cond, TCGv_i64 arg1, =
TCGv_i64 arg2, TCGLabel *l)
tcg_gen_op4ii_i64(INDEX_op_brcond_i64, arg1, arg2, cond,
label_arg(l));
}
+ add_last_as_label_use(l);
}
}
=20
@@ -1493,12 +1509,12 @@ void tcg_gen_brcondi_i64(TCGCond cond, TCGv_i64 arg=
1, int64_t arg2, TCGLabel *l)
} else if (cond =3D=3D TCG_COND_ALWAYS) {
tcg_gen_br(l);
} else if (cond !=3D TCG_COND_NEVER) {
- l->refs++;
tcg_gen_op6ii_i32(INDEX_op_brcond2_i32,
TCGV_LOW(arg1), TCGV_HIGH(arg1),
tcg_constant_i32(arg2),
tcg_constant_i32(arg2 >> 32),
cond, label_arg(l));
+ add_last_as_label_use(l);
}
}
=20
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 6b830ade4c..0b93359d3c 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -283,6 +283,7 @@ TCGLabel *gen_new_label(void)
=20
memset(l, 0, sizeof(TCGLabel));
l->id =3D s->nb_labels++;
+ QSIMPLEQ_INIT(&l->branches);
QSIMPLEQ_INIT(&l->relocs);
=20
QSIMPLEQ_INSERT_TAIL(&s->labels, l, next);
@@ -2520,23 +2521,32 @@ static void process_op_defs(TCGContext *s)
}
}
=20
+static void remove_label_use(TCGOp *op, int idx)
+{
+ TCGLabel *label =3D arg_label(op->args[idx]);
+ TCGLabelUse *use;
+
+ QSIMPLEQ_FOREACH(use, &label->branches, next) {
+ if (use->op =3D=3D op) {
+ QSIMPLEQ_REMOVE(&label->branches, use, TCGLabelUse, next);
+ return;
+ }
+ }
+ g_assert_not_reached();
+}
+
void tcg_op_remove(TCGContext *s, TCGOp *op)
{
- TCGLabel *label;
-
switch (op->opc) {
case INDEX_op_br:
- label =3D arg_label(op->args[0]);
- label->refs--;
+ remove_label_use(op, 0);
break;
case INDEX_op_brcond_i32:
case INDEX_op_brcond_i64:
- label =3D arg_label(op->args[3]);
- label->refs--;
+ remove_label_use(op, 3);
break;
case INDEX_op_brcond2_i32:
- label =3D arg_label(op->args[5]);
- label->refs--;
+ remove_label_use(op, 5);
break;
default:
break;
@@ -2648,7 +2658,7 @@ reachable_code_pass(TCGContext *s)
dead =3D false;
}
=20
- if (label->refs =3D=3D 0) {
+ if (QSIMPLEQ_EMPTY(&label->branches)) {
/*
* While there is an occasional backward branch, virtually
* all branches generated by the translators are forward.
@@ -4892,7 +4902,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb,=
target_ulong pc_start)
bool error =3D false;
=20
QSIMPLEQ_FOREACH(l, &s->labels, next) {
- if (unlikely(!l->present) && l->refs) {
+ if (unlikely(!l->present) && !QSIMPLEQ_EMPTY(&l->branches)) {
qemu_log_mask(CPU_LOG_TB_OP,
"$L%d referenced but not present.\n", l->id);
error =3D true;
--=20
2.34.1