From patchwork Wed Jan 23 22:56:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 156434 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1265846jaa; Wed, 23 Jan 2019 15:00:28 -0800 (PST) X-Google-Smtp-Source: ALg8bN4yJpiASlY6CggPKLbh9jVp+OG9eXylM4mEjAgOwDK5MlLwH+JJNsmgHbe38mVwfn/3jXmj X-Received: by 2002:adf:8228:: with SMTP id 37mr4520497wrb.160.1548284428149; Wed, 23 Jan 2019 15:00:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548284428; cv=none; d=google.com; s=arc-20160816; b=e6diQL8SSYjMWAsuZmKQlhwwPbduWF9c1h5PhxsvhD7LRqQZRlyyyT9X0MEGMcXqNu gNWONc/AeDL96ksb7jNgYDylOoVLpwFnM4BNqpzzF5EyyIv0+2/KS6EEiKFxrCoI1S9q Y1QF21rLBwZLSYSQ8Y9Lcek1yS87dDaupyCIY+Ja7M4k4ZfUwa907zAt79AUItJALc4O SmvEvMZLazdVhMmaZQtGz1dgsWFVOvosZsRHxMHhKc3lj5DK6XyUgIXLKBjQJSuOiNoK VRXqjq083baK5/wBs/w/Zx9OFFSbub3RsIggnK58I0Bd+VBzzhUSenYMU1GiICEn/eep jVow== 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=Dw5nbSHMsvXdy8KVi1NIDw6faRz5GrF8p+oczK/QAi4=; b=ETKMl6x175g3/0OGLBHIiW6rQuvmHsbA2NseZ5CKkU4RjxShG7LDQyIiUkxzA9yGEf veCGmB/QI1NVx4pfijMEyZVdf9rP1/PA6yvprVgq3qk/ldBZpJBIE8YYIRCCkLabmOsv e2KDeXSxzo+gTTm5VDTgZAPtaILaRNrp8vF8l11lnLaylReyHreepWq71cKP7G/Hdgrg LIjdL4JWAhJLhKXKWLSmV61rVqjzMO7g+FAGXUgm9H6QbiKl3/ULKGEr4jqlURKrsRI1 3HCTLvxuo3mK01j4TnMoiSZ7iLFjWQk2YKMirPEqCQE3k3zHDxCseqZc6z/Zlw27mNT/ VkBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EfJoc+se; 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 y13si71138241wrm.329.2019.01.23.15.00.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Jan 2019 15:00:28 -0800 (PST) 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=EfJoc+se; 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]:43184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmRVT-0007PO-26 for patch@linaro.org; Wed, 23 Jan 2019 18:00:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmRSj-00063J-Gk for qemu-devel@nongnu.org; Wed, 23 Jan 2019 17:57:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmRSf-0004Gz-Ll for qemu-devel@nongnu.org; Wed, 23 Jan 2019 17:57:37 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:34632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmRST-0004Ah-66 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 17:57:26 -0500 Received: by mail-pl1-x643.google.com with SMTP id w4so1920755plz.1 for ; Wed, 23 Jan 2019 14:57:16 -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=Dw5nbSHMsvXdy8KVi1NIDw6faRz5GrF8p+oczK/QAi4=; b=EfJoc+sepSKhb/YDN8mDhcTpAQ5PQAxQHTU29L/Yz8Ix0kEpBP3MJWNjJXV/AT+Fn6 rXvf9l7DyZGW7HsCcbO4+rx16NKiMtIdtwxsxlswQ7FOz4z9t4eGS2niww2U5w4u4um/ FFT+IsqGTNc+x/JGkjUUsvO5TwXBPCoD0zNnE= 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=Dw5nbSHMsvXdy8KVi1NIDw6faRz5GrF8p+oczK/QAi4=; b=H1GWdwJPsNewKTnXleg3hg69w1kpN0lx+Ocs4uV5LLljOQHbKKV+BZ0g98zzdWbN7h 8yCAjokicKyTxVHsuKu0DMazrpfS6FCIIIiihW9YrF+ArsYasvLp8pVytmRKnv01Z3iF 9iaaMdx+fFESHgGs1z3lidbPuAoXZb4uEqiOTS8wpGuhrzGxFOsVb/X5MdeTaNTEAnxa UmmshyE7aC1ZqRQbN2Tu706tzMVVyS2nVkeWRAUIX6KsDI5P5japy7qqIrz6h6ddmfuS jAwB7YroJ1M2Xr6HMWoznEup83J9Y60heuBysYYomh+gn0MNSmCGFEK96mlxTSpFRWhn 6rMA== X-Gm-Message-State: AJcUukepHABc2hn7fzwSLBhGvPfSzORlBOb3/qt2pafoRajn25NAU0Eo IsgN1j4KLDGGEUZgJCQlOzMGapgD+B8= X-Received: by 2002:a17:902:1101:: with SMTP id d1mr4126366pla.136.1548284235576; Wed, 23 Jan 2019 14:57:15 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id y9sm23858132pfi.74.2019.01.23.14.57.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Jan 2019 14:57:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:56:58 -0800 Message-Id: <20190123225705.28963-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190123225705.28963-1-richard.henderson@linaro.org> References: <20190123225705.28963-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::643 Subject: [Qemu-devel] [PATCH 06/13] tcg/sparc: enable dynamic TLB sizing 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, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.h | 2 +- tcg/sparc/tcg-target.inc.c | 82 +++++++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 33 deletions(-) -- 2.17.2 diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h index dc0a227890..6020a670c0 100644 --- a/tcg/sparc/tcg-target.h +++ b/tcg/sparc/tcg-target.h @@ -29,7 +29,7 @@ #define TCG_TARGET_INSN_UNIT_SIZE 4 #define TCG_TARGET_TLB_DISPLACEMENT_BITS 32 -#define TCG_TARGET_IMPLEMENTS_DYN_TLB 0 +#define TCG_TARGET_IMPLEMENTS_DYN_TLB 1 #define TCG_TARGET_NB_REGS 32 typedef enum { diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c index 55144c437c..7a61839dc1 100644 --- a/tcg/sparc/tcg-target.inc.c +++ b/tcg/sparc/tcg-target.inc.c @@ -1074,54 +1074,72 @@ static void tcg_out_nop_fill(tcg_insn_unit *p, int count) The result of the TLB comparison is in %[ix]cc. The sanitized address is in the returned register, maybe %o0. The TLB addend is in %o1. */ +/* We expect tlb_mask to be before tlb_table. */ +QEMU_BUILD_BUG_ON(offsetof(CPUArchState, tlb_table) < + offsetof(CPUArchState, tlb_mask)); + +/* We expect tlb_mask to be "near" tlb_table. */ +QEMU_BUILD_BUG_ON(offsetof(CPUArchState, tlb_table) - + offsetof(CPUArchState, tlb_mask) >= (1 << 13)); + static TCGReg tcg_out_tlb_load(TCGContext *s, TCGReg addr, int mem_index, TCGMemOp opc, int which) { + int mask_off = offsetof(CPUArchState, tlb_mask[mem_index]); + int table_off = offsetof(CPUArchState, tlb_table[mem_index]); + TCGReg base = TCG_AREG0; const TCGReg r0 = TCG_REG_O0; const TCGReg r1 = TCG_REG_O1; const TCGReg r2 = TCG_REG_O2; unsigned s_bits = opc & MO_SIZE; unsigned a_bits = get_alignment_bits(opc); - int tlb_ofs; + tcg_target_long compare_mask; - /* Shift the page number down. */ - tcg_out_arithi(s, r1, addr, TARGET_PAGE_BITS, SHIFT_SRL); + if (!check_fit_i32(table_off, 13)) { + int table_hi; + + base = r1; + if (table_off <= 2 * 0xfff) { + table_hi = 0xfff; + tcg_out_arithi(s, base, TCG_AREG0, table_hi, ARITH_ADD); + } else { + table_hi = table_off & ~0x3ff; + tcg_out_sethi(s, base, table_hi); + tcg_out_arith(s, base, TCG_AREG0, base, ARITH_ADD); + } + mask_off -= table_hi; + table_off -= table_hi; + tcg_debug_assert(check_fit_i32(mask_off, 13)); + } + + /* Load tlb_mask[mmu_idx] and tlb_table[mmu_idx]. */ + tcg_out_ld(s, TCG_TYPE_PTR, r0, base, mask_off); + tcg_out_ld(s, TCG_TYPE_PTR, r1, base, table_off); + + /* Extract the page index, shifted into place for tlb index. */ + tcg_out_arithi(s, r2, addr, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS, + SHIFT_SRL); + tcg_out_arith(s, r2, r2, r0, ARITH_AND); + + /* Add the tlb_table pointer, creating the CPUTLBEntry address into R2. */ + tcg_out_arith(s, r2, r2, r1, ARITH_ADD); + + /* Load the tlb comparator and the addend. */ + tcg_out_ld(s, TCG_TYPE_TL, r0, r2, which); + tcg_out_ld(s, TCG_TYPE_PTR, r1, r2, offsetof(CPUTLBEntry, addend)); /* Mask out the page offset, except for the required alignment. We don't support unaligned accesses. */ if (a_bits < s_bits) { a_bits = s_bits; } - tcg_out_movi(s, TCG_TYPE_TL, TCG_REG_T1, - TARGET_PAGE_MASK | ((1 << a_bits) - 1)); - - /* Mask the tlb index. */ - tcg_out_arithi(s, r1, r1, CPU_TLB_SIZE - 1, ARITH_AND); - - /* Mask page, part 2. */ - tcg_out_arith(s, r0, addr, TCG_REG_T1, ARITH_AND); - - /* Shift the tlb index into place. */ - tcg_out_arithi(s, r1, r1, CPU_TLB_ENTRY_BITS, SHIFT_SLL); - - /* Relative to the current ENV. */ - tcg_out_arith(s, r1, TCG_AREG0, r1, ARITH_ADD); - - /* Find a base address that can load both tlb comparator and addend. */ - tlb_ofs = offsetof(CPUArchState, tlb_table[mem_index][0]); - if (!check_fit_ptr(tlb_ofs + sizeof(CPUTLBEntry), 13)) { - if (tlb_ofs & ~0x3ff) { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_T1, tlb_ofs & ~0x3ff); - tcg_out_arith(s, r1, r1, TCG_REG_T1, ARITH_ADD); - } - tlb_ofs &= 0x3ff; + compare_mask = (tcg_target_ulong)TARGET_PAGE_MASK | ((1 << a_bits) - 1); + if (check_fit_tl(compare_mask, 13)) { + tcg_out_arithi(s, r2, addr, compare_mask, ARITH_AND); + } else { + tcg_out_movi(s, TCG_TYPE_TL, r2, compare_mask); + tcg_out_arith(s, r2, addr, r2, ARITH_AND); } - - /* Load the tlb comparator and the addend. */ - tcg_out_ld(s, TCG_TYPE_TL, r2, r1, tlb_ofs + which); - tcg_out_ld(s, TCG_TYPE_PTR, r1, r1, tlb_ofs+offsetof(CPUTLBEntry, addend)); - - /* subcc arg0, arg2, %g0 */ tcg_out_cmp(s, r0, r2, 0); /* If the guest address must be zero-extended, do so now. */