From nobody Tue Feb 10 16:21:55 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150817546010499.24887123409871; Mon, 16 Oct 2017 10:37:40 -0700 (PDT) Received: from localhost ([::1]:34339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49Ka-0002yp-7b for importer@patchew.org; Mon, 16 Oct 2017 13:37:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e499k-0001vF-5v for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e499j-0003JY-2t for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:24 -0400 Received: from mail-pg0-x230.google.com ([2607:f8b0:400e:c05::230]:52538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e499i-0003Ih-R8 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:26:22 -0400 Received: by mail-pg0-x230.google.com with SMTP id a192so5918158pge.9 for ; Mon, 16 Oct 2017 10:26:22 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-104-76.tukw.qwest.net. [97.126.104.76]) by smtp.gmail.com with ESMTPSA id i187sm5594249pfc.96.2017.10.16.10.26.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Oct 2017 10:26:20 -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; bh=hZ9n6xXzAsKsql6NCKFLW4u7P6Isdp90YZ1xrlTByRg=; b=DdhVIIKxjnRYNTVxlKH/SFJUyz8M13PoHN0gjVOitLyZDLs55d2w0KSf4ZpVT1QBzk h2hCbQiNVeaHcNmAaAcz1CXkk5fGJYyfPJhIF92EGQCeA0kHUyyFKWxzTW6dXhUmH08z sDEYdX82JnBuQbLchN8CylOxtqC09fE1xeN6k= 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; bh=hZ9n6xXzAsKsql6NCKFLW4u7P6Isdp90YZ1xrlTByRg=; b=pYiNT+w0Ri1lNQne947xB3juc5qXEleTElVafv2hDxEXi1gQvhwDf4lQfAZB6fOdgO 1iOmLhGDVu5CdxcEmnqLHnlliCwf6xbnf+4wcvRnTURZ5M5rQc39JBwOPnPZmTOGbBvd IdJoQG4bt1R3q9pDRWVOp1hf69TRfCP/cLvoEAvZS7+nKDjliuOD6cHDf3eiNk8OwdGV 4e+V1AtT71zLPDh2Rn0qRa+qwY/Z+gpX+sy7nJzWjEGNE8gbykEmMrXpbDFO7I6jh+6Y i78+pvWn317bEzdC9IUdMSBLGvOKHB2qc4Pao2QgRiU1TbWJ5px2Zi1EWrhRF7jXuTCd BC/A== X-Gm-Message-State: AMCzsaWtpSI0GXQ0J1rST2H5qxgLO8IRCUv0MdbfBFL4+UGhBfC93tYR +74JmGA7C0kx/mqs/AJwCVc7x3CdjSY= X-Google-Smtp-Source: AOwi7QCf2b6KijrvL/A9Sc+4aNKvJ9cL98drPqAsvDluDS4jmXjp2rOI4rourssXkNDbXkZ+P9jPKw== X-Received: by 10.99.9.193 with SMTP id 184mr8827440pgj.142.1508174781629; Mon, 16 Oct 2017 10:26:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 10:25:25 -0700 Message-Id: <20171016172609.23422-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171016172609.23422-1-richard.henderson@linaro.org> References: <20171016172609.23422-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::230 Subject: [Qemu-devel] [PATCH v6 06/50] tcg: Add temp_global bit to TCGTemp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cota@braap.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Richard Henderson This avoids needing to test the index of a temp against nb_globals. Signed-off-by: Richard Henderson Reviewed-by: Emilio G. Cota --- tcg/tcg.h | 12 ++++++++---- tcg/optimize.c | 15 ++++++++------- tcg/tcg.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/tcg/tcg.h b/tcg/tcg.h index f06187fd8e..fc4d1ed58b 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -579,10 +579,14 @@ typedef struct TCGTemp { unsigned int indirect_base:1; unsigned int mem_coherent:1; unsigned int mem_allocated:1; - unsigned int temp_local:1; /* If true, the temp is saved across - basic blocks. Otherwise, it is not - preserved across basic blocks. */ - unsigned int temp_allocated:1; /* never used for code gen */ + /* If true, the temp is saved across both basic blocks and + translation blocks. */ + unsigned int temp_global:1; + /* If true, the temp is saved across basic blocks but dead + at the end of translation blocks. If false, the temp is + dead at the end of basic blocks. */ + unsigned int temp_local:1; + unsigned int temp_allocated:1; =20 tcg_target_long val; struct TCGTemp *mem_base; diff --git a/tcg/optimize.c b/tcg/optimize.c index d8c3a7ed56..55f9e83ce8 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -116,25 +116,26 @@ static TCGOpcode op_to_movi(TCGOpcode op) } } =20 -static TCGArg find_better_copy(TCGContext *s, TCGArg temp) +static TCGArg find_better_copy(TCGContext *s, TCGArg arg) { + TCGTemp *ts =3D arg_temp(arg); TCGArg i; =20 /* If this is already a global, we can't do better. */ - if (temp < s->nb_globals) { - return temp; + if (ts->temp_global) { + return arg; } =20 /* Search for a global first. */ - for (i =3D temps[temp].next_copy ; i !=3D temp ; i =3D temps[i].next_c= opy) { + for (i =3D temps[arg].next_copy ; i !=3D arg; i =3D temps[i].next_copy= ) { if (i < s->nb_globals) { return i; } } =20 /* If it is a temp, search for a temp local. */ - if (!arg_temp(temp)->temp_local) { - for (i =3D temps[temp].next_copy ; i !=3D temp ; i =3D temps[i].ne= xt_copy) { + if (!ts->temp_local) { + for (i =3D temps[arg].next_copy ; i !=3D arg; i =3D temps[i].next_= copy) { if (s->temps[i].temp_local) { return i; } @@ -142,7 +143,7 @@ static TCGArg find_better_copy(TCGContext *s, TCGArg te= mp) } =20 /* Failure to find a better representation, return the same temp. */ - return temp; + return arg; } =20 static bool temps_are_copies(TCGArg arg1, TCGArg arg2) diff --git a/tcg/tcg.c b/tcg/tcg.c index 2704aa8a4d..915e041bea 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -489,9 +489,14 @@ static inline TCGTemp *tcg_temp_alloc(TCGContext *s) =20 static inline TCGTemp *tcg_global_alloc(TCGContext *s) { + TCGTemp *ts; + tcg_debug_assert(s->nb_globals =3D=3D s->nb_temps); s->nb_globals++; - return tcg_temp_alloc(s); + ts =3D tcg_temp_alloc(s); + ts->temp_global =3D 1; + + return ts; } =20 static int tcg_global_reg_new_internal(TCGContext *s, TCGType type, @@ -1190,7 +1195,7 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char = *buf, int buf_size, { int idx =3D temp_idx(s, ts); =20 - if (idx < s->nb_globals) { + if (ts->temp_global) { pstrcpy(buf, buf_size, ts->name); } else if (ts->temp_local) { snprintf(buf, buf_size, "loc%d", idx - s->nb_globals); @@ -2128,7 +2133,7 @@ static void temp_free_or_dead(TCGContext *s, TCGTemp = *ts, int free_or_dead) } ts->val_type =3D (free_or_dead < 0 || ts->temp_local - || temp_idx(s, ts) < s->nb_globals + || ts->temp_global ? TEMP_VAL_MEM : TEMP_VAL_DEAD); } =20 --=20 2.13.6