From patchwork Tue Sep 6 03:42:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 64E2F601C0 for ; Tue, 6 Sep 2016 06:33:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A1FA28570 for ; Tue, 6 Sep 2016 06:33:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E82728621; Tue, 6 Sep 2016 06:33:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D758F28570 for ; Tue, 6 Sep 2016 06:33:35 +0000 (UTC) Received: from localhost ([::1]:59078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh9hx-00042Q-Tu for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 02:18:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GQ-0003Dg-6w for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7GD-0007rz-SE for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:34 -0400 Received: from ozlabs.org ([103.22.144.67]:55756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GD-0007l2-67; Mon, 05 Sep 2016 23:41:21 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSsp83m3yz9sBR; Tue, 6 Sep 2016 13:41:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133280; bh=ypkr3BKtZWytHw3BPV3G5at37SMQMcGDp9Ov8+5JEmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NIYLCB/ebBH8y306aQ1uJaNDyK2pUt6fYroN4zp9NV8aKzb1CnDMS9OGCrE0oMTYR OX9BOjY5SxnQBQ62qnNeiGNxOpqASVuj6Z0zFAuM5YC8k1USUUpIudbOBGcBSaAZKD 0DOAzafpFw/8zZN0Bs7zSrk+kyS9RC0y+e/iOdbo= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 6 Sep 2016 13:42:55 +1000 Message-Id: <1473133396-18940-46-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473133396-18940-1-git-send-email-david@gibson.dropbear.id.au> References: <1473133396-18940-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 45/66] ppc: Speed up load/store multiple 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: David Gibson , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Benjamin Herrenschmidt Use a single translate when not crossing a page boundary and avoid going through layers of helpers. MacOS uses those instructions a lot, so does OpenBIOS. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/mem_helper.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c index 6548715..bf6c44a 100644 --- a/target-ppc/mem_helper.c +++ b/target-ppc/mem_helper.c @@ -53,8 +53,48 @@ static inline target_ulong addr_add(CPUPPCState *env, target_ulong addr, } } +/* Reduce the length so that addr + len doesn't cross a page boundary. */ +static inline uint64_t adj_len_to_page(uint64_t len, uint64_t addr) +{ +#ifndef CONFIG_USER_ONLY + if ((addr & ~TARGET_PAGE_MASK) + len - 1 >= TARGET_PAGE_SIZE) { + return -addr & ~TARGET_PAGE_MASK; + } +#endif + return len; +} + void helper_lmw(CPUPPCState *env, target_ulong addr, uint32_t reg) { + uint32_t *src; + uint64_t len, adjlen; + + if ((addr & 3)) { + goto fallback; + } + len = (32 - reg) << 2; + while (len) { + src = tlb_vaddr_to_host(env, addr, MMU_DATA_LOAD, env->dmmu_idx); + if (!src) { + goto fallback; + } + adjlen = adj_len_to_page(len, addr); + len -= adjlen; +#if defined(HOST_WORDS_BIGENDIAN) + memcpy(&env->gpr[reg], src, adjlen); + reg += (adjlen >> 2); + addr = addr_add(env, addr, adjlen); +#else + while(adjlen) { + env->gpr[reg++] = bswap32(*(src++)); + adjlen -= 4; + addr = addr_add(env, addr, 4); + } +#endif + } + return; + + fallback: for (; reg < 32; reg++) { if (needs_byteswap(env)) { env->gpr[reg] = bswap32(cpu_ldl_data_ra(env, addr, GETPC())); @@ -67,6 +107,35 @@ void helper_lmw(CPUPPCState *env, target_ulong addr, uint32_t reg) void helper_stmw(CPUPPCState *env, target_ulong addr, uint32_t reg) { + uint32_t *dst; + uint64_t len, adjlen; + + if ((addr & 3)) { + goto fallback; + } + len = (32 - reg) << 2; + while (len) { + dst = tlb_vaddr_to_host(env, addr, MMU_DATA_STORE, env->dmmu_idx); + if (!dst) { + goto fallback; + } + adjlen = adj_len_to_page(len, addr); + len -= adjlen; +#if defined(HOST_WORDS_BIGENDIAN) + memcpy(dst, &env->gpr[reg], adjlen); + reg += (adjlen >> 2); + addr = addr_add(env, addr, adjlen); +#else + while(adjlen) { + *(dst++) = bswap32(env->gpr[reg++]); + adjlen -= 4; + addr = addr_add(env, addr, 4); + } +#endif + } + return; + + fallback: for (; reg < 32; reg++) { if (needs_byteswap(env)) { cpu_stl_data_ra(env, addr, bswap32((uint32_t)env->gpr[reg]),