From patchwork Wed Jul 27 06:56:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 9249405 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 689846077C for ; Wed, 27 Jul 2016 07:49:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52CD926538 for ; Wed, 27 Jul 2016 07:49:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46CA227BF8; Wed, 27 Jul 2016 07:49:10 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 2F13026538 for ; Wed, 27 Jul 2016 07:49:08 +0000 (UTC) Received: from localhost ([::1]:44672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSJaV-0001Ip-Ct for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jul 2016 03:49:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSIqN-0006mC-Qe for qemu-devel@nongnu.org; Wed, 27 Jul 2016 03:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSIqH-0005ng-G9 for qemu-devel@nongnu.org; Wed, 27 Jul 2016 03:01:26 -0400 Received: from gate.crashing.org ([63.228.1.57]:57007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSIqH-0005nU-6q; Wed, 27 Jul 2016 03:01:21 -0400 Received: from pasglop.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id u6R6wWG8001953; Wed, 27 Jul 2016 02:00:59 -0500 From: Benjamin Herrenschmidt To: qemu-ppc@nongnu.org Date: Wed, 27 Jul 2016 16:56:49 +1000 Message-Id: <1469602609-31349-31-git-send-email-benh@kernel.crashing.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469602609-31349-1-git-send-email-benh@kernel.crashing.org> References: <1469602609-31349-1-git-send-email-benh@kernel.crashing.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 63.228.1.57 Subject: [Qemu-devel] [PATCHv2 31/31] 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: qemu-devel@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 da3f973..511079b 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]),