From patchwork Tue Jun 4 20:33:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 165851 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp6357430ili; Tue, 4 Jun 2019 14:06:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzYzmFmGV5cX+slqS2PA085HHMobm2hGYrn6DYWNwcNXUAnHR62n/CcOh0ynTZDAsSsQpcf X-Received: by 2002:ac8:38d5:: with SMTP id g21mr29858683qtc.52.1559682363507; Tue, 04 Jun 2019 14:06:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559682363; cv=none; d=google.com; s=arc-20160816; b=rR9162ZOEvJ/H0awQa2GNwxfyj/lThzPLrnhuHPA0Noz7LF6cr9YDy7JoHfWe0BmCS YKIjtKVlVM4i9NUtkzv5GKGFmqt0PoOgdUa9G5cWI747nIaa1asSkbSIoAg4Aiu0M98v Wel8twVh+DApiSKxyaVtE0pHeW5IZgjK12e6m2eWaVYfdCkMY076pWG6PzzCggZLUXhD 5FWyRl5u6enLIESai9uBZseRUIKysb40le5/pVk5LefDTpin3NOav7UTFf29rbWfYwe/ vMjt+bCwuaRDRDzUFdWwEyMycrWUmc0mpj6aZzOxDWZ9CEkmEPVFQzOKx7kQfDhJzDmq do5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=8wDpuqt2tvKadOymhMpkkiKWS+EHs0ZcemyyrplJ7bs=; b=X4hFaBjwkVn+kh0qd8TIm0wRbaulOK+V6ElCnPBMQqka+3BqzQHKOsZr2VSn4Npdqb brTStB5+vbbZ43X9eQ7C/n7TbR5OSRY5GH+uHp3+NUDydW3qVX/xUKot6cPJHOn42PN3 NKZwe4phv7yg9/eXF5C2gJ6AKRUlZsiUjDx44oThiSg4VSX3SSCLL/8bFe2jMpeB07zO hXnS6AJjvI8Cjur/zvb7WEsMHgTxPgYNAVjSw2s0F7vTJzpmsdBQgM1Za5+G4+C8JqgN MOd9E4RHnj+l0GMwGVNRIl83tYdGEAlXwYVtiRw2ruvDOMgiqiF4vpKlvVeZ5M2MmEJi my0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b4G3l++D; 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 c144si9082723qkb.177.2019.06.04.14.06.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 04 Jun 2019 14:06:03 -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=b4G3l++D; 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]:58113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYGd9-0002Dq-0g for patch@linaro.org; Tue, 04 Jun 2019 17:06:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYG95-0001j2-SS for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:35:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYG94-00051U-5b for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:59 -0400 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]:37825) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYG93-0004wI-W2 for qemu-devel@nongnu.org; Tue, 04 Jun 2019 16:34:58 -0400 Received: by mail-oi1-x244.google.com with SMTP id t76so1581677oih.4 for ; Tue, 04 Jun 2019 13:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=8wDpuqt2tvKadOymhMpkkiKWS+EHs0ZcemyyrplJ7bs=; b=b4G3l++DM5lY5nFvXhNgyNVJdSJiP2fPobYejXCrWikvLRamBtiHVfz6uOm74JSxhv R7IaeprCyybU+WzZ1cExVhgKfoTmYqlUU9EjDtd8IEbnhSRtGnswnhtcE/qehpbKeD0R eqTn7Qj8oAg2zw9xK9+bcCmJOtHhrINCnQ+nkayj+d/r+LBs4GyosIrmFdKK+eVmi6YJ MGlx/HeNaMIfmJBmi9SNNGR7c0vrMeEmLeLgIH5Vuvddm2RfrmzH3Gmg1pAhnOyT7yY1 PlnYymO9H6Wtcb9igKbU1a7PiIWbt/7MCnIbkI3IJxqFWOXHIDJ7vDCqN911InkEJXaq qK5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8wDpuqt2tvKadOymhMpkkiKWS+EHs0ZcemyyrplJ7bs=; b=sNO2vfsgHVqyQjZ0hMQQSJa6OPecS/J9MQjbUidunuuy2LrKfxk53HRy9mE+YzmSLm itYHZClmoh63n12dsYTwXAdCRg7f0g2mrHj4gGl1ThgZx9N2n6dZCTg9FnsiRTShGthn s05P3EawJEco73y2E5RZpCERvAo2Gm/YVtmys23Iz0FSzrNaBBJSXHSpf582z1ll6F9z iNVPcaFyzFmLjbXQ7pG1yG6sUE54uaIatFIp8uYHpG7C5wPGRNwYUiGQBT1LRncvavCM nkPkTb80nuUhsBqlojgVHIM5C+KwTUt3YY+sDMH32tFHx2WK0YuM8Y0NRNC1Th2sVwK5 PMFw== X-Gm-Message-State: APjAAAW4kJ50DIeviy0bcbPq1qJRWGgEXzt2Fs64ePdfDl/a4su9oLZW aQ8VCc7VsxMqxgHyvcMFF8ryAm15b1nIjw== X-Received: by 2002:aca:5d45:: with SMTP id r66mr1036453oib.143.1559680493992; Tue, 04 Jun 2019 13:34:53 -0700 (PDT) Received: from localhost.localdomain (200-56-192-86-cable.cybercable.net.mx. [200.56.192.86]) by smtp.gmail.com with ESMTPSA id h1sm5979901otj.78.2019.06.04.13.34.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 13:34:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2019 15:33:51 -0500 Message-Id: <20190604203351.27778-40-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190604203351.27778-1-richard.henderson@linaro.org> References: <20190604203351.27778-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::244 Subject: [Qemu-devel] [PATCH v4 39/39] tcg/arm: Remove mostly unreachable tlb special case 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There was nothing armv7 specific about the bic+cmp sequence, however looking at the set of guests more closely shows that the 8-bit immediate operand for the bic can only be satisfied with one guest in tree: baseline m-profile -- 10-bit pages with aligned 4-byte memory ops. Therefore it does not seem useful to keep this path. Acked-by: Alistair Francis Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 276e843627..ece88dc2eb 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -1290,19 +1290,20 @@ static TCGReg tcg_out_tlb_read(TCGContext *s, TCGReg addrlo, TCGReg addrhi, tcg_out_ld32_12(s, COND_AL, TCG_REG_R1, TCG_REG_R1, offsetof(CPUTLBEntry, addend)); - /* Check alignment, check comparators. */ - if (use_armv7_instructions) { + /* + * Check alignment, check comparators. + * Do this in no more than 3 insns. Use MOVW for v7, if possible, + * to reduce the number of sequential conditional instructions. + * Almost all guests have at least 4k pages, which means that we need + * to clear at least 9 bits even for an 8-byte memory, which means it + * isn't worth checking for an immediate operand for BIC. + */ + if (use_armv7_instructions && TARGET_PAGE_BITS <= 16) { tcg_target_ulong mask = ~(TARGET_PAGE_MASK | ((1 << a_bits) - 1)); - int rot = encode_imm(mask); - if (rot >= 0) { - tcg_out_dat_imm(s, COND_AL, ARITH_BIC, TCG_REG_TMP, addrlo, - rotl(mask, rot) | (rot << 7)); - } else { - tcg_out_movi32(s, COND_AL, TCG_REG_TMP, mask); - tcg_out_dat_reg(s, COND_AL, ARITH_BIC, TCG_REG_TMP, - addrlo, TCG_REG_TMP, 0); - } + tcg_out_movi32(s, COND_AL, TCG_REG_TMP, mask); + tcg_out_dat_reg(s, COND_AL, ARITH_BIC, TCG_REG_TMP, + addrlo, TCG_REG_TMP, 0); tcg_out_dat_reg(s, COND_AL, ARITH_CMP, 0, TCG_REG_R2, TCG_REG_TMP, 0); } else { if (a_bits) {