From patchwork Tue Mar 19 17:21:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160592 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4136520jad; Tue, 19 Mar 2019 10:24:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8BvaJjLtIZVR1lKY/iGrUi+LaVNl5Xp3Gk7w13UUDpsEkMBkhE170jQKnQFvBTFb/9pM7 X-Received: by 2002:a1c:e185:: with SMTP id y127mr3336775wmg.76.1553016275973; Tue, 19 Mar 2019 10:24:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553016275; cv=none; d=google.com; s=arc-20160816; b=t6ROq6hn/KKZnbtVUetFtwzPzWdIp7UoJio2VRJ1DjO8KRMTVklHLjuCoMAwVQTrnj PxVHxekwfk7OaT2qPOXSIS71Ip6p17hr319Y2CBad1k945iEBC1WysmUe9dF035RETbO jT5IK8ISIE8C63c5Zd3aG90/UF6+rICorLTSpuJyzsKpnJiEJbgjbqvKV+LB8mwuK7HY HWsMgiSevaayJL2wpCuIAgfe+t0ZCp6mKiwPiBq7sjz98YzcjUgDsKKb8RTtlKyPaZYt J5ewdPrvReer4iPwEGr9ggwikC2NIQYlVw+1nq1Ge1he9Z5PdsHJSy6ZfBxTsIT29Izt 0Mtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=hodYlcpRqUFAyF1u9EayD/KhJ3+IN8OK9GoDdoOHadc=; b=f1r8tR/5SqzKNkW8F++WwrnD7hFNsCQdw5HWasacqtrU4dUyntKfpW7XQJXGEbBf1Z COrnT7u3yzOMvWyC2BKb3KKX0jzC0xvQeJa25PmanOSZocYL+VvIpqyBPGig8ngVTZOT o5mpZ/Ivay4rI0cCRXYxyvhpSxBnGvYxqJTGxoo0fOrCG81+enbtqczXkHqrURZxDwcN 0H/300mcepX8Zhv10QRAXHx8D2ASX6Vu2/5AYTVFGtucMogvKafi72ydJK0Rj6Wn1ROr p5W95BrSz8etv1uYcftoeRRDo3bTTDb40Mg59DmmhPgfrxOdhIQJsPcWr9sBfIQ8xI5j 6wTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xIXMK9qP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y62si2014809wmg.2.2019.03.19.10.24.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Mar 2019 10:24:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xIXMK9qP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:60678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6ITa-0006YU-Mx for patch@linaro.org; Tue, 19 Mar 2019 13:24:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6IQg-0004XK-NZ for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6IQf-0004R3-Mo for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:34 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:33415) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h6IQf-0004QX-9v for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:33 -0400 Received: by mail-pg1-x542.google.com with SMTP id b12so602652pgk.0 for ; Tue, 19 Mar 2019 10:21:33 -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=hodYlcpRqUFAyF1u9EayD/KhJ3+IN8OK9GoDdoOHadc=; b=xIXMK9qP4Y2rTEuoLYM5jiXUWC1XCXzWwNyYcniBG/TslRn24zMM3PYwt2RGScJ0mk 1SftcxDfUSKJiyLNjcpdfN5WCiAt7V8TGNoRR/wEnysC/njfdNRiDkSUTQDeoixkUjlB 8I1yC2tfTpRo/d9vB20FvsdiNmyKvLP/mq9n2Zi72y0ZF8eWVpzb77SzTfZJdZxqpvjJ 5ZdC6j0rTnzgoqNciJNXGXlvTsZQVidDNUNuzepxbbC7z6hmLMT9kmlD95J0hcv2Nh3T BOKNhGQjRJVZnxxMxLavDKtHrJ0yfK/EwxxcSoAff+U6/5qk82y2RnCflcrdoD7VeBgi ClDA== 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=hodYlcpRqUFAyF1u9EayD/KhJ3+IN8OK9GoDdoOHadc=; b=oPyDKookLqhvGxRC8TASi6zaEdsQb8NMTjx5ObbaefExXH47OC0EWJQhrckEja3SRi aXjI+x3La0yCjtaOETB8hBrD7MnVy6q83HkxfwW7EEy9xHftR/W4T5AP7fZu2hwoaNw9 nCEadzBatcaRHZdSiUp0PK0DswdHqKhrZwEcgdSiqKWu1JgSOkQXA5K0CdAHb6CGI/0D 9ZpFm5tGGzvPaFhFcLRF0W3nckURCg0GwHSVYSm/GtTWzkSwgcpeeszxI4oO0u+BIBPL GtVH5m9UtXdjSoRfGEZZ/MdSDZxpoh9tDyAqtCzLSwC0pvG9eFYteV1nVLIgRi7EF6GD 32eQ== X-Gm-Message-State: APjAAAWjRj+g/vf//PnrZ26Pv6pcP0TuXD4Nz+EZWDEd0s2s0i2fK6u5 wm1SbEns6n5FL5Zryv+rLb6dVJaY70k= X-Received: by 2002:a17:902:6b8c:: with SMTP id p12mr3219861plk.282.1553016091966; Tue, 19 Mar 2019 10:21:31 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id w68sm5616666pfb.176.2019.03.19.10.21.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2019 10:21:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 10:21:11 -0700 Message-Id: <20190319172126.7502-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190319172126.7502-1-richard.henderson@linaro.org> References: <20190319172126.7502-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH for-4.1 v3 02/17] tcg: Assert fixed_reg is read-only 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: mark.cave-ayland@ilande.co.uk, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The only fixed_reg is cpu_env, and it should not be modified during any TB. Therefore code that tries to special-case moves into a fixed_reg is dead. Remove it. Signed-off-by: Richard Henderson --- tcg/tcg.c | 85 +++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 47 deletions(-) -- 2.17.2 diff --git a/tcg/tcg.c b/tcg/tcg.c index 9b2bf7f439..6f320a4849 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3275,11 +3275,8 @@ static void tcg_reg_alloc_do_movi(TCGContext *s, TCGTemp *ots, tcg_target_ulong val, TCGLifeData arg_life, TCGRegSet preferred_regs) { - if (ots->fixed_reg) { - /* For fixed registers, we do not do any constant propagation. */ - tcg_out_movi(s, ots->type, ots->reg, val); - return; - } + /* ENV should not be modified. */ + tcg_debug_assert(!ots->fixed_reg); /* The movi is not explicitly generated here. */ if (ots->val_type == TEMP_VAL_REG) { @@ -3315,6 +3312,9 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) ots = arg_temp(op->args[0]); ts = arg_temp(op->args[1]); + /* ENV should not be modified. */ + tcg_debug_assert(!ots->fixed_reg); + /* Note that otype != itype for no-op truncation. */ otype = ots->type; itype = ts->type; @@ -3339,7 +3339,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) } tcg_debug_assert(ts->val_type == TEMP_VAL_REG); - if (IS_DEAD_ARG(0) && !ots->fixed_reg) { + if (IS_DEAD_ARG(0)) { /* mov to a non-saved dead register makes no sense (even with liveness analysis disabled). */ tcg_debug_assert(NEED_SYNC_ARG(0)); @@ -3352,7 +3352,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) } temp_dead(s, ots); } else { - if (IS_DEAD_ARG(1) && !ts->fixed_reg && !ots->fixed_reg) { + if (IS_DEAD_ARG(1) && !ts->fixed_reg) { /* the mov can be suppressed */ if (ots->val_type == TEMP_VAL_REG) { s->reg_to_temp[ots->reg] = NULL; @@ -3505,6 +3505,10 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) arg = op->args[i]; arg_ct = &def->args_ct[i]; ts = arg_temp(arg); + + /* ENV should not be modified. */ + tcg_debug_assert(!ts->fixed_reg); + if ((arg_ct->ct & TCG_CT_ALIAS) && !const_args[arg_ct->alias_index]) { reg = new_args[arg_ct->alias_index]; @@ -3513,29 +3517,19 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) i_allocated_regs | o_allocated_regs, op->output_pref[k], ts->indirect_base); } else { - /* if fixed register, we try to use it */ - reg = ts->reg; - if (ts->fixed_reg && - tcg_regset_test_reg(arg_ct->u.regs, reg)) { - goto oarg_end; - } reg = tcg_reg_alloc(s, arg_ct->u.regs, o_allocated_regs, op->output_pref[k], ts->indirect_base); } tcg_regset_set_reg(o_allocated_regs, reg); - /* if a fixed register is used, then a move will be done afterwards */ - if (!ts->fixed_reg) { - if (ts->val_type == TEMP_VAL_REG) { - s->reg_to_temp[ts->reg] = NULL; - } - ts->val_type = TEMP_VAL_REG; - ts->reg = reg; - /* temp value is modified, so the value kept in memory is - potentially not the same */ - ts->mem_coherent = 0; - s->reg_to_temp[reg] = ts; + if (ts->val_type == TEMP_VAL_REG) { + s->reg_to_temp[ts->reg] = NULL; } - oarg_end: + ts->val_type = TEMP_VAL_REG; + ts->reg = reg; + /* temp value is modified, so the value kept in memory is + potentially not the same */ + ts->mem_coherent = 0; + s->reg_to_temp[reg] = ts; new_args[i] = reg; } } @@ -3551,10 +3545,10 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) /* move the outputs in the correct register if needed */ for(i = 0; i < nb_oargs; i++) { ts = arg_temp(op->args[i]); - reg = new_args[i]; - if (ts->fixed_reg && ts->reg != reg) { - tcg_out_mov(s, ts->type, ts->reg, reg); - } + + /* ENV should not be modified. */ + tcg_debug_assert(!ts->fixed_reg); + if (NEED_SYNC_ARG(i)) { temp_sync(s, ts, o_allocated_regs, 0, IS_DEAD_ARG(i)); } else if (IS_DEAD_ARG(i)) { @@ -3675,26 +3669,23 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op) for(i = 0; i < nb_oargs; i++) { arg = op->args[i]; ts = arg_temp(arg); + + /* ENV should not be modified. */ + tcg_debug_assert(!ts->fixed_reg); + reg = tcg_target_call_oarg_regs[i]; tcg_debug_assert(s->reg_to_temp[reg] == NULL); - - if (ts->fixed_reg) { - if (ts->reg != reg) { - tcg_out_mov(s, ts->type, ts->reg, reg); - } - } else { - if (ts->val_type == TEMP_VAL_REG) { - s->reg_to_temp[ts->reg] = NULL; - } - ts->val_type = TEMP_VAL_REG; - ts->reg = reg; - ts->mem_coherent = 0; - s->reg_to_temp[reg] = ts; - if (NEED_SYNC_ARG(i)) { - temp_sync(s, ts, allocated_regs, 0, IS_DEAD_ARG(i)); - } else if (IS_DEAD_ARG(i)) { - temp_dead(s, ts); - } + if (ts->val_type == TEMP_VAL_REG) { + s->reg_to_temp[ts->reg] = NULL; + } + ts->val_type = TEMP_VAL_REG; + ts->reg = reg; + ts->mem_coherent = 0; + s->reg_to_temp[reg] = ts; + if (NEED_SYNC_ARG(i)) { + temp_sync(s, ts, allocated_regs, 0, IS_DEAD_ARG(i)); + } else if (IS_DEAD_ARG(i)) { + temp_dead(s, ts); } } }