From patchwork Mon Jan 22 03:42:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 125318 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp950237ljf; Sun, 21 Jan 2018 20:07:23 -0800 (PST) X-Google-Smtp-Source: AH8x226NOplLazj1a2ydfMCbNq1WHYjDGpachY4CsbSP5wzD9Ff+SocOmzucDG33S1Ko0IcBGZlM X-Received: by 10.129.148.193 with SMTP id l184mr6060181ywg.452.1516594043795; Sun, 21 Jan 2018 20:07:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516594043; cv=none; d=google.com; s=arc-20160816; b=OE6nn/rJPcgdOw/K2MXTv3vivaz5nLToEDYYA1lTWNYnymH3Tp3kD53QItlLSwhioe 7Zn/MzJOM83JdtkISKFAnMrraeihr4jA8AeGtaVGDlAIQhPCf8zHVHdKK+7R2LcK0Fek xH57JVRPmX1hydBOJhIK0UybYMtU3W8o224RtOsv5Nv9ynw9LRN0S1vfwb4cWgMU40Wv 6kTD156hS34RZ37OlMfUU3RaWavDgk+z91bPDxo0gX1hqjJE124AcRkxSh7YpS54cklG MEmgq/KTp1GCRjLfr/p2FL84iwb7xIeBNbcrORiqpSCsoJ1xDtT5FCkQNfC9CJtkrvsb e+wg== 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=jQDvwAZOAXYljqzsdO87DYsQ7XKjm2rpXdoxkaoGBP0=; b=KJg/bS0OFsrEji5t+3XDk2FG1RzvGm+hlMhQI1MW3ZaGcyUTg23ExOSYGwoF/zgtIV CNHfKYatfTTeUIVG2ZEpIjJQ2syKsllCJbujzklStoH6AxNbUQF5/+9ZBM6r343E+wrb HauxAUcRJxCXSYLkK4Txj8UL/HOKEOLpIrkrjaei5hqoDKvXd/dVLhlgom2B2TkBqqaS cmZyY+uBRhIyDJ2EG71GS40tdn9FmYLxwTtoGYLlcw+Fm8UqTaMJZI1CUdB1zcH2xCsp 3eV/v4JjThCUNZpvP568KiKdqjglqFo9MxOxPYf7XeJWK4l/Jku8j0VUDL757BJ4rJAa CLLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GHDkE4DH; 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 z11si3347478ywb.158.2018.01.21.20.07.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 21 Jan 2018 20:07:23 -0800 (PST) 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=GHDkE4DH; 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]:41774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edTOF-0006SQ-3s for patch@linaro.org; Sun, 21 Jan 2018 23:07:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edT0g-0005oY-So for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:43:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edT0f-0006fH-MK for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:43:02 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:37787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edT0f-0006ex-En for qemu-devel@nongnu.org; Sun, 21 Jan 2018 22:43:01 -0500 Received: by mail-pg0-x242.google.com with SMTP id z17so6089561pgc.4 for ; Sun, 21 Jan 2018 19:43:01 -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=jQDvwAZOAXYljqzsdO87DYsQ7XKjm2rpXdoxkaoGBP0=; b=GHDkE4DHvla5+EY0SOhozAxxVry5ehX+cWbRQII98YoRlMozRehYEuNBJl82tYS4lO bwEcJkgVB/lggyS+nxwkxyi63MY5uX+sUa9qR+ovHe8cI/bF0acY+yCyX+EI22cXhda6 T4Atq4zJBxsEXkQsnjG7tH9A4Tf0SqhaxAHLU= 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=jQDvwAZOAXYljqzsdO87DYsQ7XKjm2rpXdoxkaoGBP0=; b=SQkTuhCScZpMyRvt3wqaizmxJAwmSmqXHcuQ4gR93S9zXkm4clKatQ8pePvOxzvPkU 5KBMy/5qXNxoHVFW+V2heWuElwXTJbjYkE6GnfQvz4Urt4j3Kz7X63g5Y44R71Tyihwo 8IJ03nSCcHtG2dzRn7tVyNRK211hkFxFm0FjzGGPM+uYno/yOUXQvmxcOGBiJESSnFw4 9qDMDv18UhjeoJL6tdUYVwu69OoQLlR58Hs9XV16xVLbD0ZzOdtn3inqIeaq+W3JmjeU dYkerZRT2Ul5+CWFi9CkzE20xFLXxjgQGXffqabdb369eRfM2xsQd/V/Y6hHUXUhJkpN J5/g== X-Gm-Message-State: AKwxytfGG6KdhNdQ7KZwP03x5QOGwhjL9UWuRCHcUK+IzFzzXbtsySQ8 sWd7jxFTZphlhiCCD3ysFqE8XcZkiSY= X-Received: by 10.98.220.195 with SMTP id c64mr6987702pfl.47.1516592580083; Sun, 21 Jan 2018 19:43:00 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-6-47.tukw.qwest.net. [174.21.6.47]) by smtp.gmail.com with ESMTPSA id z125sm182023pfz.27.2018.01.21.19.42.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 21 Jan 2018 19:42:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 21 Jan 2018 19:42:02 -0800 Message-Id: <20180122034217.19593-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180122034217.19593-1-richard.henderson@linaro.org> References: <20180122034217.19593-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::242 Subject: [Qemu-devel] [PULL 28/43] target/hppa: Optimize for flat addressing space 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Linux sets sr4-sr7 all to the same value, which means that we need not do any runtime computation to find out what space to use in forming the GVA. Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 11 ++++++++++- target/hppa/translate.c | 29 ++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index a6e4091b6a..57e0bd6f0e 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -282,7 +282,11 @@ static inline target_ulong hppa_form_gva(CPUHPPAState *env, uint64_t spc, return hppa_form_gva_psw(env->psw, spc, off); } -/* Since PSW_CB will never need to be in tb->flags, reuse them. */ +/* Since PSW_{I,CB} will never need to be in tb->flags, reuse them. + * TB_FLAG_SR_SAME indicates that SR4 through SR7 all contain the + * same value. + */ +#define TB_FLAG_SR_SAME PSW_I #define TB_FLAG_PRIV_SHIFT 8 static inline void cpu_get_tb_cpu_state(CPUHPPAState *env, target_ulong *pc, @@ -318,6 +322,11 @@ static inline void cpu_get_tb_cpu_state(CPUHPPAState *env, target_ulong *pc, *cs_base |= (uint32_t)diff; } } + if ((env->sr[4] == env->sr[5]) + & (env->sr[4] == env->sr[6]) + & (env->sr[4] == env->sr[7])) { + flags |= TB_FLAG_SR_SAME; + } #endif *pflags = flags; diff --git a/target/hppa/translate.c b/target/hppa/translate.c index de96765664..e4a140b9a6 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -280,6 +280,7 @@ typedef struct DisasContext { TCGLabel *null_lab; uint32_t insn; + uint32_t tb_flags; int mmu_idx; int privilege; bool psw_n_nonzero; @@ -319,6 +320,7 @@ typedef struct DisasInsn { /* global register indexes */ static TCGv_reg cpu_gr[32]; static TCGv_i64 cpu_sr[4]; +static TCGv_i64 cpu_srH; static TCGv_reg cpu_iaoq_f; static TCGv_reg cpu_iaoq_b; static TCGv_i64 cpu_iasq_f; @@ -356,8 +358,8 @@ void hppa_translate_init(void) "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31" }; /* SR[4-7] are not global registers so that we can index them. */ - static const char sr_names[4][4] = { - "sr0", "sr1", "sr2", "sr3" + static const char sr_names[5][4] = { + "sr0", "sr1", "sr2", "sr3", "srH" }; int i; @@ -373,6 +375,9 @@ void hppa_translate_init(void) offsetof(CPUHPPAState, sr[i]), sr_names[i]); } + cpu_srH = tcg_global_mem_new_i64(cpu_env, + offsetof(CPUHPPAState, sr[4]), + sr_names[4]); for (i = 0; i < ARRAY_SIZE(vars); ++i) { const GlobalVar *v = &vars[i]; @@ -600,6 +605,8 @@ static void load_spr(DisasContext *ctx, TCGv_i64 dest, unsigned reg) #else if (reg < 4) { tcg_gen_mov_i64(dest, cpu_sr[reg]); + } else if (ctx->tb_flags & TB_FLAG_SR_SAME) { + tcg_gen_mov_i64(dest, cpu_srH); } else { tcg_gen_ld_i64(dest, cpu_env, offsetof(CPUHPPAState, sr[reg])); } @@ -1351,6 +1358,9 @@ static TCGv_i64 space_select(DisasContext *ctx, int sp, TCGv_reg base) load_spr(ctx, spc, sp); return spc; } + if (ctx->tb_flags & TB_FLAG_SR_SAME) { + return cpu_srH; + } ptr = tcg_temp_new_ptr(); tmp = tcg_temp_new(); @@ -1394,7 +1404,7 @@ static void form_gva(DisasContext *ctx, TCGv_tl *pgva, TCGv_reg *pofs, #else TCGv_tl addr = get_temp_tl(ctx); tcg_gen_extu_reg_tl(addr, modify <= 0 ? ofs : base); - if (ctx->base.tb->flags & PSW_W) { + if (ctx->tb_flags & PSW_W) { tcg_gen_andi_tl(addr, addr, 0x3fffffffffffffffull); } if (!is_phys) { @@ -2101,6 +2111,7 @@ static DisasJumpType trans_mtsp(DisasContext *ctx, uint32_t insn, if (rs >= 4) { tcg_gen_st_i64(t64, cpu_env, offsetof(CPUHPPAState, sr[rs])); + ctx->tb_flags &= ~TB_FLAG_SR_SAME; } else { tcg_gen_mov_i64(cpu_sr[rs], t64); } @@ -2396,7 +2407,7 @@ static DisasJumpType trans_ixtlbx(DisasContext *ctx, uint32_t insn, /* Exit TB for ITLB change if mmu is enabled. This *should* not be the case, since the OS TLB fill handler runs with mmu disabled. */ - return nullify_end(ctx, !is_data && (ctx->base.tb->flags & PSW_C) + return nullify_end(ctx, !is_data && (ctx->tb_flags & PSW_C) ? DISAS_IAQ_N_STALE : DISAS_NEXT); } @@ -2432,7 +2443,7 @@ static DisasJumpType trans_pxtlbx(DisasContext *ctx, uint32_t insn, } /* Exit TB for TLB change if mmu is enabled. */ - return nullify_end(ctx, !is_data && (ctx->base.tb->flags & PSW_C) + return nullify_end(ctx, !is_data && (ctx->tb_flags & PSW_C) ? DISAS_IAQ_N_STALE : DISAS_NEXT); } @@ -4545,6 +4556,7 @@ static int hppa_tr_init_disas_context(DisasContextBase *dcbase, int bound; ctx->cs = cs; + ctx->tb_flags = ctx->base.tb->flags; #ifdef CONFIG_USER_ONLY ctx->privilege = MMU_USER_IDX; @@ -4552,9 +4564,8 @@ static int hppa_tr_init_disas_context(DisasContextBase *dcbase, ctx->iaoq_f = ctx->base.pc_first; ctx->iaoq_b = ctx->base.tb->cs_base; #else - ctx->privilege = (ctx->base.tb->flags >> TB_FLAG_PRIV_SHIFT) & 3; - ctx->mmu_idx = (ctx->base.tb->flags & PSW_D - ? ctx->privilege : MMU_PHYS_IDX); + ctx->privilege = (ctx->tb_flags >> TB_FLAG_PRIV_SHIFT) & 3; + ctx->mmu_idx = (ctx->tb_flags & PSW_D ? ctx->privilege : MMU_PHYS_IDX); /* Recover the IAOQ values from the GVA + PRIV. */ uint64_t cs_base = ctx->base.tb->cs_base; @@ -4586,7 +4597,7 @@ static void hppa_tr_tb_start(DisasContextBase *dcbase, CPUState *cs) /* Seed the nullification status from PSW[N], as saved in TB->FLAGS. */ ctx->null_cond = cond_make_f(); ctx->psw_n_nonzero = false; - if (ctx->base.tb->flags & PSW_N) { + if (ctx->tb_flags & PSW_N) { ctx->null_cond.c = TCG_COND_ALWAYS; ctx->psw_n_nonzero = true; }