From patchwork Tue Apr 23 15:38:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 162723 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3934404jan; Tue, 23 Apr 2019 08:44:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqwSGu35BDc+SOJLmoZpitpYPfGTn8LZV/Hh1W0mQQSlPIIVlmeL8DHeY5UHDFaj/bRszTjL X-Received: by 2002:a1c:d1c5:: with SMTP id i188mr2881159wmg.8.1556034269257; Tue, 23 Apr 2019 08:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556034269; cv=none; d=google.com; s=arc-20160816; b=AMi5KHmz4tDTzN8jqwzOnkiodlTrqupuCcHPVVk+Wuv4tcd5BxDWmGkfmO5G7aABRv 7h0M9hWr1+XUMC15ldEQ0JUZxSLnAqk/cXpMo7QreBe7SIMmTmn2m5YmzhVH2PafcGkM Ev6MREWuh8R0SYzfgs5HGyHSxwnFKGhI9r+Rlr2SQV5ZmsEkS49idwr6sYeYglDED0lQ 8Gi/MPXBBsGaKne2ahDR2+2ZMSHIDB66T568JYxTh7vt2KcCRAgpLOE0IqF0xoWEJtQ4 /+cL89E/Jfqqgvmsd0kGuWwkgA5IP6sU8AiGDAGQqNy3KZM2gG/Y7nwE8eRfT7ELPKz9 piDg== 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=etFJ/jJqxo/gX9AJnnw5VNXWmGywWB8mmeO93OmpSSU=; b=qXAkOHGcsmPxeuPgSAAwvVuEi0WueyzIezOST8p2/OiqBSNRHc0C7MfdZ7D/b8jpBj 9Bwz0f2ehCe1M5zrvq8bhn7pxBJG6Oa3PbMcSa4aeqpCEmI2FvreolyjV6fcVNbCCL/a 8ri10P0p6UeRBtbv4kUxDqw1hdvx8KzXU4eR8lwqdXtQv9AXSLtvWgb+S5P3IS5dPqXc 32hvtN1ub8KtvUyoXvEBaUgJzoyQNOZbZrzyoLBcu0N9QRBiMYgrG2P1enToAWmgJJYa 3BsELFm0NEjWchx3G88kTu8YbDunVu7yNeR2IuwAZ7YZQ8qRsCK+98AoQY1ZYe54Pz/b 5dMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jzgbkHif; 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 v18si12190216wri.292.2019.04.23.08.44.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 23 Apr 2019 08:44:29 -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=jzgbkHif; 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]:55603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIxau-0005V3-6V for patch@linaro.org; Tue, 23 Apr 2019 11:44:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIxVk-0001D4-3X for qemu-devel@nongnu.org; Tue, 23 Apr 2019 11:39:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIxVi-00071F-Rn for qemu-devel@nongnu.org; Tue, 23 Apr 2019 11:39:08 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:45117) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hIxVi-00070M-LA for qemu-devel@nongnu.org; Tue, 23 Apr 2019 11:39:06 -0400 Received: by mail-pg1-x541.google.com with SMTP id y3so7786198pgk.12 for ; Tue, 23 Apr 2019 08:39:06 -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=etFJ/jJqxo/gX9AJnnw5VNXWmGywWB8mmeO93OmpSSU=; b=jzgbkHifc0abmPHiZtAeTm0bryfoAm5kvYT9Xolo5gyj//anWu2C4KsJNQ+7/2GqC3 0yxKduAVuxgBgqG2Hqa0hUjf9dXNyqbo9xyl+TkR/5JoEErIyJKxHjPLNNMdyhCbvAWB 5it/q0YkaOdyN3W+inI+cta48J0A7VyCBpwY51HvfNilamCfCLxxIyMf1zbk2I20bf7r 2UZmSdyPIEx1IEqK84gXxJoZ+OLBx1PkODd3rX6ekFKgq5qDkmwStd2DSbfWCP8Yr515 Oywszf182Dio3MYL8LkJ7uChvTxZdN0R61TSoJZOBRvnoSIyn+sRHuwQprFUQNqJ9FlO W0Nw== 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=etFJ/jJqxo/gX9AJnnw5VNXWmGywWB8mmeO93OmpSSU=; b=I2kp3eKxEw72pZW2qNr78XvGEV2HYQJJMKPkjdnLg0pruU7WeKq6b0uXNqv3CfsiUV m3KHYrV7hrsv//RMW6ILgpkqndGCts4rxIWkz0XKSGYttaWn+5ITemaOpPfiEvjyz5kF E+4Udv85IuezR5td1bJKHMgEQHDdrEXSJyhkayZfNRBv3SCH7T528slwkMci9Z799vMP AGgBrWeabq/B2KLy/8ktDl+o5O60fu312JH82lfA9yJOeXd/kUg4lONiYNYA7OYyUT+X jOMEf2paQBQEYFpmL9vtan7Y0lCiR836W43OovQ1BYJ2ADI3dQXy1BqeioGo4uxulUiO ApOw== X-Gm-Message-State: APjAAAU0or1R0DR0asQ+oRFWUQEZWRRDPFomWzP52cPhamXAHC45J/9x RUpMEfik8cOpWEhVvaHxxrlVnQzYFwI= X-Received: by 2002:a65:638f:: with SMTP id h15mr25225228pgv.147.1556033945214; Tue, 23 Apr 2019 08:39:05 -0700 (PDT) Received: from localhost.localdomain (97-113-179-147.tukw.qwest.net. [97.113.179.147]) by smtp.gmail.com with ESMTPSA id c25sm24366591pfo.69.2019.04.23.08.39.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Apr 2019 08:39:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Apr 2019 08:38:53 -0700 Message-Id: <20190423153853.19790-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190423153853.19790-1-richard.henderson@linaro.org> References: <20190423153853.19790-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::541 Subject: [Qemu-devel] [PATCH v2 7/7] tcg/arm: Restrict constant pool displacement to 12 bits 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: alistair23@gmail.com, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This will not necessarily restrict the size of the TB, since for v7 the majority of constant pool usage is for calls from the out-of-line ldst code, which is already at the end of the TB. But this does allow us to save one insn per reference on the off-chance. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 57 +++++++++++++++------------------------- 1 file changed, 21 insertions(+), 36 deletions(-) -- 2.17.1 diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 0514b0ac25..5515728295 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -197,6 +197,24 @@ static inline bool reloc_pc24(tcg_insn_unit *code_ptr, tcg_insn_unit *target) return false; } +static inline bool reloc_pc13(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +{ + ptrdiff_t offset = tcg_ptr_byte_diff(target, code_ptr) - 8; + + if (offset >= -0xfff && offset <= 0xfff) { + tcg_insn_unit insn = *code_ptr; + bool u = (offset >= 0); + if (!u) { + offset = -offset; + } + insn = deposit32(insn, 23, 1, u); + insn = deposit32(insn, 0, 12, offset); + *code_ptr = insn; + return true; + } + return false; +} + static bool patch_reloc(tcg_insn_unit *code_ptr, int type, intptr_t value, intptr_t addend) { @@ -205,39 +223,10 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type, if (type == R_ARM_PC24) { return reloc_pc24(code_ptr, (tcg_insn_unit *)value); } else if (type == R_ARM_PC13) { - intptr_t diff = value - (uintptr_t)(code_ptr + 2); - tcg_insn_unit insn = *code_ptr; - bool u; - - if (diff >= -0xfff && diff <= 0xfff) { - u = (diff >= 0); - if (!u) { - diff = -diff; - } - } else { - int rd = extract32(insn, 12, 4); - int rt = rd == TCG_REG_PC ? TCG_REG_TMP : rd; - - if (diff < 0x1000 || diff >= 0x100000) { - return false; - } - - /* add rt, pc, #high */ - *code_ptr++ = ((insn & 0xf0000000) | (1 << 25) | ARITH_ADD - | (TCG_REG_PC << 16) | (rt << 12) - | (20 << 7) | (diff >> 12)); - /* ldr rd, [rt, #low] */ - insn = deposit32(insn, 12, 4, rt); - diff &= 0xfff; - u = 1; - } - insn = deposit32(insn, 23, 1, u); - insn = deposit32(insn, 0, 12, diff); - *code_ptr = insn; + return reloc_pc13(code_ptr, (tcg_insn_unit *)value); } else { g_assert_not_reached(); } - return true; } #define TCG_CT_CONST_ARM 0x100 @@ -605,12 +594,8 @@ static inline void tcg_out_ld8s_r(TCGContext *s, int cond, TCGReg rt, static void tcg_out_movi_pool(TCGContext *s, int cond, int rd, uint32_t arg) { - /* The 12-bit range on the ldr insn is sometimes a bit too small. - In order to get around that we require two insns, one of which - will usually be a nop, but may be replaced in patch_reloc. */ new_pool_label(s, arg, R_ARM_PC13, s->code_ptr, 0); tcg_out_ld32_12(s, cond, rd, TCG_REG_PC, 0); - tcg_out_nop(s); } static void tcg_out_movi32(TCGContext *s, int cond, int rd, uint32_t arg) @@ -1069,8 +1054,8 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *addr) tcg_out_movi32(s, COND_AL, TCG_REG_TMP, addri); tcg_out_blx(s, COND_AL, TCG_REG_TMP); } else { - /* ??? Know that movi_pool emits exactly 2 insns. */ - tcg_out_dat_imm(s, COND_AL, ARITH_ADD, TCG_REG_R14, TCG_REG_PC, 4); + /* ??? Know that movi_pool emits exactly 1 insn. */ + tcg_out_dat_imm(s, COND_AL, ARITH_ADD, TCG_REG_R14, TCG_REG_PC, 0); tcg_out_movi_pool(s, COND_AL, TCG_REG_PC, addri); } }