From patchwork Tue Dec 25 20:55:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154495 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5219732ljp; Tue, 25 Dec 2018 13:14:24 -0800 (PST) X-Google-Smtp-Source: ALg8bN4bi2rlEa/e7PnbzfMmmp5Uwgo+zJ9IpJV+VcTh8nt2Vm2isHr8cSEtWoyu7leJWhFF2PAK X-Received: by 2002:a37:ab03:: with SMTP id u3mr15636111qke.24.1545772464846; Tue, 25 Dec 2018 13:14:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545772464; cv=none; d=google.com; s=arc-20160816; b=S6I3xkxu23TwhdJlC3xYrsO+X9JHlPxBJDcncIs0z5rbkIKDbXVKjUCZzkqEKVA6si LBP0xGn7aIV4Brx3ULmeGAfopV30V3hEPsWPp1S4W5fXuL3Hj4+RzbG7N2NcIMK1Yq5p Hq1e584RiDucvOKsLAFl1ZNe2nm0gwO9fm9D+vjdXalMnIrU1jijIIN7FAIJpJTYwQzK EM6Vy2ei4lGjF+BoefKtA5qDXNSrF2VXuurFo42JRTEAcO25RatzSNMbw+wqW3UnCkpF ZlXofMwPSPiUdfEejJpJk6y7oRAGTmBKpyj7tbAPLgD5K4xeD+G8TeizPGRD8odBCCAo AuaQ== 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=r2I/9ChAl3XEIXJG3eEWF8YqYCOrRkM1UpTamxua9sY=; b=Y3LW4sCk2sPEgGyk1+Lgh4MHclK3BKLhr6KL+yzBbOi0XG1dMpXqslY6p6p5TjJ508 SXlp9SmcvG20clPh6KPNUEBawygY+xt9Jy0xXZoLSE23z4T3ZkvBBzCpL8/A9Meb4aqI 6n93TxcC7gRSO2wQVpF7Th/lTp2X21Z0bWA2MdCBgbWux6FjYX/9ekZOruVej63sNpzm jRYIpFgHEpU8wHWcF8YlWu3ftLAVCcEtov7arLlKCGZAL6uELeYVUO/lk9noTJc7zIwL My5p7r7kdBxXC6MHXTOOOcxTr94dAZOPtKZtnPN+VNnrOjzJBq826M2Jrd3YysehgK3u UGxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CrdlUQj/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.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. [208.118.235.17]) by mx.google.com with ESMTPS id i20si13648996qkh.98.2018.12.25.13.14.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:14:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CrdlUQj/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.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]:43174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbu1w-0001yp-80 for patch@linaro.org; Tue, 25 Dec 2018 16:14:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtnT-0007bC-88 for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtnQ-0001GH-2Y for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:27 -0500 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:44210) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtnP-0001FI-TM for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:24 -0500 Received: by mail-pg1-x535.google.com with SMTP id t13so6806496pgr.11 for ; Tue, 25 Dec 2018 12:59:23 -0800 (PST) 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=r2I/9ChAl3XEIXJG3eEWF8YqYCOrRkM1UpTamxua9sY=; b=CrdlUQj/5Sfg8z6Y1uPSLnopXyLl/W/oFzaKExGm+wR3ATjGDMVV5Xqw3AsjEghaUT FpyCH1NXTvO/OicW00F6889gglCW+VxJm9y2wZ/afbpA9duPjecM3dPbnznE7b0hEs1z DcajqQVNIklfbec8aglaBWNyVscuo9mXRF8J4= 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=r2I/9ChAl3XEIXJG3eEWF8YqYCOrRkM1UpTamxua9sY=; b=K1Ooe4tE3hWRYhVyT36qP64QHVEtNk4ZKPef5QTDAaH2ebC4dO7CRKtnJa4eqiFa38 lQTjs+hPsd3HB1tjQEjiJzzxaXAxPjlLBJZ1o+eNDJt95GpSK1CSxDXNOLM2l6qDSH1t 1N0edzQ0bHSYBIg1l7jVago6sjU5bjSzrdGYFgyQJ9M8bkm5jOzwYC/zFa5oUr0+cCZU cvGcHA3NYl4PWnhJfbzMsVTyK3chIs64YLFd6fso5wOGQZ8Nf+rWWrAaPvLcAvc64Lwj LF2ZILixCkA3UZJY0WUws98pb1XjI0IZ4CVQhBzIvb1Ih4s6oEPsgO4b61szraU2a4rU NhyQ== X-Gm-Message-State: AJcUukdejxr9fXVNouJLZ1tl+H1YwTO+hvqgKnZg7pwiVaCDG+53BlX/ 3qv7qQT/ZVPNgYAmcVEh0xuozFKn5+w= X-Received: by 2002:a63:295:: with SMTP id 143mr16198954pgc.362.1545771562527; Tue, 25 Dec 2018 12:59:22 -0800 (PST) Received: from cloudburst.home (c211-28-135-144.sunsh3.vic.optusnet.com.au. [211.28.135.144]) by smtp.gmail.com with ESMTPSA id t21sm48501628pgg.24.2018.12.25.12.59.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:59:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:55:18 +1100 Message-Id: <20181225205529.10874-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181225205529.10874-1-richard.henderson@linaro.org> References: <20181225205529.10874-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::535 Subject: [Qemu-devel] [PULL 31/42] tcg: Add preferred_reg argument to temp_load 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Pass this through to tcg_reg_alloc. Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- tcg/tcg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.17.2 diff --git a/tcg/tcg.c b/tcg/tcg.c index 210bd5c6b9..351d302a68 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2837,7 +2837,7 @@ static void temp_allocate_frame(TCGContext *s, TCGTemp *ts) s->current_frame_offset += sizeof(tcg_target_long); } -static void temp_load(TCGContext *, TCGTemp *, TCGRegSet, TCGRegSet); +static void temp_load(TCGContext *, TCGTemp *, TCGRegSet, TCGRegSet, TCGRegSet); /* Mark a temporary as free or dead. If 'free_or_dead' is negative, mark it free; otherwise mark it dead. */ @@ -2886,7 +2886,7 @@ static void temp_sync(TCGContext *s, TCGTemp *ts, break; } temp_load(s, ts, tcg_target_available_regs[ts->type], - allocated_regs); + allocated_regs, 0); /* fallthrough */ case TEMP_VAL_REG: @@ -2992,7 +2992,7 @@ static TCGReg tcg_reg_alloc(TCGContext *s, TCGRegSet required_regs, /* Make sure the temporary is in a register. If needed, allocate the register from DESIRED while avoiding ALLOCATED. */ static void temp_load(TCGContext *s, TCGTemp *ts, TCGRegSet desired_regs, - TCGRegSet allocated_regs) + TCGRegSet allocated_regs, TCGRegSet preferred_regs) { TCGReg reg; @@ -3001,13 +3001,13 @@ static void temp_load(TCGContext *s, TCGTemp *ts, TCGRegSet desired_regs, return; case TEMP_VAL_CONST: reg = tcg_reg_alloc(s, desired_regs, allocated_regs, - 0, ts->indirect_base); + preferred_regs, ts->indirect_base); tcg_out_movi(s, ts->type, reg, ts->val); ts->mem_coherent = 0; break; case TEMP_VAL_MEM: reg = tcg_reg_alloc(s, desired_regs, allocated_regs, - 0, ts->indirect_base); + preferred_regs, ts->indirect_base); tcg_out_ld(s, ts->type, reg, ts->mem_base->reg, ts->mem_offset); ts->mem_coherent = 1; break; @@ -3137,7 +3137,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) the SOURCE value into its own register first, that way we don't have to reload SOURCE the next time it is used. */ if (ts->val_type == TEMP_VAL_MEM) { - temp_load(s, ts, tcg_target_available_regs[itype], allocated_regs); + temp_load(s, ts, tcg_target_available_regs[itype], allocated_regs, 0); } tcg_debug_assert(ts->val_type == TEMP_VAL_REG); @@ -3221,7 +3221,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) goto iarg_end; } - temp_load(s, ts, arg_ct->u.regs, i_allocated_regs); + temp_load(s, ts, arg_ct->u.regs, i_allocated_regs, 0); if (arg_ct->ct & TCG_CT_IALIAS) { if (ts->fixed_reg) { @@ -3402,7 +3402,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op) if (arg != TCG_CALL_DUMMY_ARG) { ts = arg_temp(arg); temp_load(s, ts, tcg_target_available_regs[ts->type], - s->reserved_regs); + s->reserved_regs, 0); tcg_out_st(s, ts->type, ts->reg, TCG_REG_CALL_STACK, stack_offset); } #ifndef TCG_TARGET_STACK_GROWSUP @@ -3427,7 +3427,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op) TCGRegSet arg_set = 0; tcg_regset_set_reg(arg_set, reg); - temp_load(s, ts, arg_set, allocated_regs); + temp_load(s, ts, arg_set, allocated_regs, 0); } tcg_regset_set_reg(allocated_regs, reg);