From nobody Tue Feb 10 05:41:53 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508924439002551.0375330401014; Wed, 25 Oct 2017 02:40:39 -0700 (PDT) Received: from localhost ([::1]:47321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7IAm-0003LR-4i for importer@patchew.org; Wed, 25 Oct 2017 05:40:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7I6I-000851-DA for qemu-devel@nongnu.org; Wed, 25 Oct 2017 05:35:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7I6H-0007sK-84 for qemu-devel@nongnu.org; Wed, 25 Oct 2017 05:35:50 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:49993) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7I6H-0007rf-2P for qemu-devel@nongnu.org; Wed, 25 Oct 2017 05:35:49 -0400 Received: by mail-wr0-x243.google.com with SMTP id g90so23296686wrd.6 for ; Wed, 25 Oct 2017 02:35:48 -0700 (PDT) Received: from cloudburst.twiddle.net ([62.168.35.107]) by smtp.gmail.com with ESMTPSA id v23sm2751025wmh.8.2017.10.25.02.35.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2017 02:35:46 -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=7t90pC2NdyFAeMacyx2N1Zw7t0f3PCfH2cRPZZtwz3Q=; b=Y7sI6KcH6JMNs00tSsLKA0jZiG0tyfsepzS6VkmN3BV8YSHD81w6OV68v+KCiQrp03 YyxrOu8PqIhxNWVn2zFRBQprQKav73eTjyua1knCVGbiYIbtEiquqr9hqK6VNTSPIb4s dmO+HRhnIQ+/KVQuuEMqWb1hENxyD+LuQFmvA= 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=7t90pC2NdyFAeMacyx2N1Zw7t0f3PCfH2cRPZZtwz3Q=; b=CJzBgmcPL5edBJ0MSvlFvIBaXpbL0gIDX1mNvFvSsbQ2SVjSEynMZhE5khjPH8ABJN kYTQKDBH0UCVuuS0FuBw0SaGoz1Rzfbz0V9wGHIL0IpmKwYGqgABGsGEDJw98vmT6xqz wdcOICZbvQHIFXECL3uk+VV4tkNsnBac2wlmYS5/3kvdDeXShJcbO3MBt8N3C3UnH/kk bB71gFn/5LQ5BUkKLmfUvSulhqH8buH9iyx2HbbAAJsDus0mxRIW4e9kMGM4i1m35jAD Ud45cAOHgy0DFtG0wDiu3jY7kX1kGYQLavU7cvctz1XuG0PCGpR3jNGYKE8n6N9X/rhv IFxQ== X-Gm-Message-State: AMCzsaWuo3tASBUayTBeA4mOp7Ef0kI9Fj7UCEOrPnQYI6tSIjO8rnKw 4YZMMhmgXXvgDkixKQWEXloHK/l3C+c= X-Google-Smtp-Source: ABhQp+RIHz+WrecZbhxnSldDJaezjIoNVWIzAr268KLez1Lo8dATcKZZtJcDdlTbUOra6zAvquQuXQ== X-Received: by 10.223.147.68 with SMTP id 62mr1425399wro.261.1508924147822; Wed, 25 Oct 2017 02:35:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 25 Oct 2017 11:34:50 +0200 Message-Id: <20171025093535.10175-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171025093535.10175-1-richard.henderson@linaro.org> References: <20171025093535.10175-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 06/51] 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: peter.maydell@linaro.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 From: Richard Henderson This avoids needing to test the index of a temp against nb_globals. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- 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 935f3da0a1..e2a5f3f4c2 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