From patchwork Sat Mar 23 19:09:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160977 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2190855jan; Sat, 23 Mar 2019 12:37:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXI5jbY7ASbkfLhGd/XQHFJpxsYs39l93THWDLqP+8pUN1uPDKpjf0Sr89NuKKLBqPRr+A X-Received: by 2002:a25:2d51:: with SMTP id s17mr13508341ybe.458.1553369855429; Sat, 23 Mar 2019 12:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553369855; cv=none; d=google.com; s=arc-20160816; b=RwB1/8U0dI6O8EZRp2D/ZkB80S8hTqAkMb454A1E3sAjx1mOZP8RQrroJ2sVpq2X9U Yx1TrqrKI+GUsdejizcavuDYdMYb9aWPPri17JkNeufNiqCe9kcc7VVlN1NnxJKrWTtB R8ohMMDgZO6drmMP00CVidIHhGSmQHeDuZyBRm/GuvOL5rqYjOIPhr5rVdPUsn8m5VKo +x6DFIjjqUfLOqCeVPfg7htx8yjgPxPFDFHnbmK8hB09jPnZ7MD9hrdG/F7kW8eXOliy 1FQQGwM++SLBocqX12iK0/Fucz/h5+rUcaA3Hqw8Njz8POLylYwXjp7K9yAbX/9c9H0Z pXiQ== 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=dDakszDmSUCuJ4r4/Y0FdfGOX4G6OmUB7PuqceQttcA=; b=cDHXZrK37JdO0Mo/I96kdECKO6eG8858+V0VD/kkOGgAe40Ht2O2hnfx3J1aIgbDs5 jeZb+2l6s1dCjteRQ6HafXq5G9GUqZzbLW5sVo2UlVmwjvoOG+9Wu83BADfbKntDV1zI HKc9w+x+aCSTSEi9ZrBgTObt6fPUrKhs8bPHCj0h8VKnYmLlKtA++M+7DZOhODp1l6Yz sX3NZ/SK0+q+ajkCBY8DT2GeAxw22SiEHRp71DlZfHuxAstszn+VDe/iZu2MZbCxn5PR zj+wrYUaL4qifZOrXlt2vl45hUCRcplkzC2aHjvwCkFmBMShHqfVUxssaK3t0wxIwomc ONoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eTv5Jc+n; 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 n10si6758183ybp.335.2019.03.23.12.37.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 23 Mar 2019 12:37: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=eTv5Jc+n; 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]:47125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7mSV-0001zF-0K for patch@linaro.org; Sat, 23 Mar 2019 15:37:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7mFt-0007kB-TF for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:24:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7m2K-0007PA-7Q for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:10:33 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:37594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7m2H-0007B2-6p for qemu-devel@nongnu.org; Sat, 23 Mar 2019 15:10:30 -0400 Received: by mail-pg1-x542.google.com with SMTP id q206so3709475pgq.4 for ; Sat, 23 Mar 2019 12:10:13 -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=dDakszDmSUCuJ4r4/Y0FdfGOX4G6OmUB7PuqceQttcA=; b=eTv5Jc+nwVi5jL0YE7hINiEWfeqJ2sOnjFGjKTGHJXgHsUsYe9j5zm2/eXxq0yHfHF gwRoD9Luw+IubZZ9YBX2CP2zzUMPRnzzbhDEXeYrXA8p7vJyt9LlH16qy1ABAalRS6bB IlL/Bk1fIrDdYhpltraeSpMD0J9ZvlnEnhLUx7kix3dwLJN6FX+xsxNYqC+GF6+VR632 FzEIy6igol/aDmExATMMdWCW29bfervk6FF1K7NINkpUZiZCkieqLpXG86UIi6MLzXmc xeOMYxFnWMiCmtOn4wg7QMvIRM0PkPUIxstHnaSNUHJggF/goVjhpKEE4i47FYJ0gGpb BXpw== 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=dDakszDmSUCuJ4r4/Y0FdfGOX4G6OmUB7PuqceQttcA=; b=C6Rkk/BcUJ5LpHrhTjipgVnR/RgdyqKQaaPxlPdJsweH//2ExkBKtkjcajj1Elf2i+ e8Z8EkCacskcRiBBOx0WLwypfJaqLIyUa7VKQkM6nqpGy7yFOycbPA4/L08RviUd0gLE 0UHn8HsW/t2PhSZLyTv3OKJgXNsFLmi4t+FP/yYavvFBS7t2zRX6ARtc29Iexn650Lry 6qLOuu5WL6m6l0q8k4eOvYXTA800vIsU/YiixFbk9qfzj01L+xLTQKOxS0tMXXB2hJrB Lpdcrp/WudN0P8moSFa2hx8mSotlcWU/GuNYGaa4+gaLJOIeefSSKnbtmQ2e3U4i9YEA 0YHw== X-Gm-Message-State: APjAAAXsinsBPH6NfNEvD92TsPNr6odu32fXvmZAkRU7Tm8TUqwDerl5 XCxKz/vMiQyKzSK1xr3Xvz2DQQ/80qI= X-Received: by 2002:a17:902:2702:: with SMTP id c2mr16264860plb.239.1553368212420; Sat, 23 Mar 2019 12:10:12 -0700 (PDT) Received: from localhost.localdomain (174-21-5-201.tukw.qwest.net. [174.21.5.201]) by smtp.gmail.com with ESMTPSA id h184sm25990703pfc.78.2019.03.23.12.10.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 12:10:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 23 Mar 2019 12:09:24 -0700 Message-Id: <20190323190925.21324-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190323190925.21324-1-richard.henderson@linaro.org> References: <20190323190925.21324-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 34/35] tcg/aarch64: Use LDP to load tlb mask+table 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" Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index ac765137ae..979efbcfe4 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -1463,14 +1463,11 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, TCGMemOp opc, tcg_insn_unit **label_ptr, int mem_index, bool is_read) { - int fast_ofs = TLB_MASK_TABLE_OFS(mem_index); - int mask_ofs = fast_ofs + offsetof(CPUTLBDescFast, mask); - int table_ofs = fast_ofs + offsetof(CPUTLBDescFast, table); unsigned a_bits = get_alignment_bits(opc); unsigned s_bits = opc & MO_SIZE; unsigned a_mask = (1u << a_bits) - 1; unsigned s_mask = (1u << s_bits) - 1; - TCGReg mask_base = TCG_AREG0, table_base = TCG_AREG0, x3; + TCGReg x3; TCGType mask_type; uint64_t compare_mask; @@ -1478,8 +1475,8 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, TCGMemOp opc, ? TCG_TYPE_I64 : TCG_TYPE_I32); /* Load tlb_mask[mmu_idx] and tlb_table[mmu_idx]. */ - tcg_out_ld(s, mask_type, TCG_REG_X0, mask_base, mask_ofs); - tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_X1, table_base, table_ofs); + tcg_out_insn(s, 3314, LDP, TCG_REG_X0, TCG_REG_X1, TCG_AREG0, + TLB_MASK_TABLE_OFS(mem_index), 1, 0); /* Extract the TLB index from the address into X0. */ tcg_out_insn(s, 3502S, AND_LSR, mask_type == TCG_TYPE_I64,