From patchwork Mon Oct 16 17:25:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 115941 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3942355qgn; Mon, 16 Oct 2017 10:36:07 -0700 (PDT) X-Received: by 10.200.48.54 with SMTP id f51mr15354384qte.39.1508175367460; Mon, 16 Oct 2017 10:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508175367; cv=none; d=google.com; s=arc-20160816; b=iYn9vZWzAFnwUUpPxwipgTYuvSQTtksPyNfM4SrOXF80jbupGGC5pVYJ6uh7JHLXmc NkTY4ONYM0GutE2SceXTtTgwj23FW2W903GaGkjxrp+3he/A1OPXr+couJ2x0djjA3uq NV1eUDByIOoY/XQWeVi4u5hOmnyAEK9gHoRy9v4g/FxnkOShj90hGmc8NQbvq1TrruIm V6KQmsowWDAuDtys2lmhxh5MeTF8/klluJRbU3E6dDN3Fn4+tHF1+zLik83Hzb4r54vO BAdHp5YmzEEvlc6o3myuPSNUC7xRJajCzAvyZ0uMN5Vya68+DAuX3JgmGOoV5CA6eHkn 1LjQ== 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:arc-authentication-results; bh=hZ9n6xXzAsKsql6NCKFLW4u7P6Isdp90YZ1xrlTByRg=; b=BV6c7fb3dE96A7kU3asA39ZjgdawXy6e5woS2v5/ysjipgBTxxfkHnEIOAfOa3W+Cp +cLNxpwDHxrXdeqw01Duw5Wdfztb/A03+xYESyjSDxREO+sNdF90eu/3uCwHsJgUwypj W1VCk0yJtF5842Zk80za2C1OZO0vJgwrMQA3xMZQ+Osjs3J+HhNPUAkq9qvAMBSN0Yje ncuNsHV76uWLk8XBepqqeMkX0IVvse2zjWmVl7gRUMzQw+LRjsoNjrQrWt+JJT2didyf cnie0dP2W7AfVGW1NDtmW6ISMqLmL4bINxZlqwx4bkyN1a8dPYkkGSDErW4tUkW0Xfeg /UWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DdhVIIKx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z10si2277428qth.292.2017.10.16.10.36.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Oct 2017 10:36:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DdhVIIKx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:34334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49J7-0001qF-8V for patch@linaro.org; Mon, 16 Oct 2017 13:36:05 -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) 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) 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) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This avoids needing to test the index of a temp against nb_globals. Signed-off-by: Richard Henderson --- tcg/tcg.h | 12 ++++++++---- tcg/optimize.c | 15 ++++++++------- tcg/tcg.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 14 deletions(-) -- 2.13.6 Reviewed-by: Emilio G. Cota 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; 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) } } -static TCGArg find_better_copy(TCGContext *s, TCGArg temp) +static TCGArg find_better_copy(TCGContext *s, TCGArg arg) { + TCGTemp *ts = arg_temp(arg); TCGArg i; /* If this is already a global, we can't do better. */ - if (temp < s->nb_globals) { - return temp; + if (ts->temp_global) { + return arg; } /* Search for a global first. */ - for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) { + for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) { if (i < s->nb_globals) { return i; } } /* If it is a temp, search for a temp local. */ - if (!arg_temp(temp)->temp_local) { - for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) { + if (!ts->temp_local) { + for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) { if (s->temps[i].temp_local) { return i; } @@ -142,7 +143,7 @@ static TCGArg find_better_copy(TCGContext *s, TCGArg temp) } /* Failure to find a better representation, return the same temp. */ - return temp; + return arg; } 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) static inline TCGTemp *tcg_global_alloc(TCGContext *s) { + TCGTemp *ts; + tcg_debug_assert(s->nb_globals == s->nb_temps); s->nb_globals++; - return tcg_temp_alloc(s); + ts = tcg_temp_alloc(s); + ts->temp_global = 1; + + return ts; } 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 = temp_idx(s, ts); - 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 = (free_or_dead < 0 || ts->temp_local - || temp_idx(s, ts) < s->nb_globals + || ts->temp_global ? TEMP_VAL_MEM : TEMP_VAL_DEAD); }