Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp4143190ybl; Tue, 20 Aug 2019 07:36:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqz53F5TWM3LrNQbKptOUle7Bh6Mr4nENsfNU/HfRlEl4gGW3OwD8jhO470lRhDQNlR7NSMl X-Received: by 2002:a17:902:e311:: with SMTP id cg17mr27470256plb.183.1566311781495; Tue, 20 Aug 2019 07:36:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566311781; cv=none; d=google.com; s=arc-20160816; b=FRRC3O8eOlXTytrzqVPmhskLgawv5P7bUTo6jgAj+jy5WzPSTM8jeY+pXjZx1DdWqH Zegrqmibaqm+ecmfcQ0MTgLN5rgV7pPUYm5+bnAEgx8qagJOKI080XzofMuOQrOCif39 z+LPp+iIWeqM5//T9+v2ZEthJaVDLobIQvNeQ0YUr9zIJ0p/OE4h0UeWbuvtNPoc2eio F4V7uwLEwWh2p74JQ1TQXy9HiSaQ9Wni3QHlS41ldGoQycYe3QEqVa+cRhPPgupaebKz fkLZrxkDK+ypmR3AmySTpUCwxIXxUkfHGD336k4dcmFdKt1/atEWlL/NZBTWnCUkBal2 XAcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=xOUVOtxYdJqJ3lo0s/K+hdItwxr4U4urlUl4yvu2T/M=; b=ijyRtJIVQcjzIMq0PzZAx/qz6Er4lvSUkW+oT8SB6PguhfBExhAOJAMY0WkG5Epk1B 2rVmLyM3MtlJF90pOPtmtxNNPX57qeaaOQ4Ot5IF2OcrG0Xm+HVNgjt7q2UVM1pgdV2i dOgNqZAJbE4Y65hftzrL6pMJ+rzOgvmHk86LQOAS6tN0euw3Vau0OwIQ2gqpockznFSI odpGR7219mK6zSnykSrC1+U/n/jslYyHNdHl79tKDgN4sqmoPCmdYQFzZeqbkC75ePBI eJ8wtOxPkwBmzUY+44LBdQJB6JhVI4zhxbdA+yV+Of1OnorkLTN0QYu4Y9uTTAR+pge5 qDzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=kGBZWl+J; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o18si79205pjp.93.2019.08.20.07.36.05; Tue, 20 Aug 2019 07:36:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=kGBZWl+J; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730358AbfHTOeT (ORCPT + 99 others); Tue, 20 Aug 2019 10:34:19 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:26562 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729762AbfHTOeR (ORCPT ); Tue, 20 Aug 2019 10:34:17 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 46CYFz3CfDz9vBmf; Tue, 20 Aug 2019 16:34:15 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=kGBZWl+J; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 9hx3uDPH-qLC; Tue, 20 Aug 2019 16:34:15 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 46CYFz1xgBz9vBmb; Tue, 20 Aug 2019 16:34:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1566311655; bh=xOUVOtxYdJqJ3lo0s/K+hdItwxr4U4urlUl4yvu2T/M=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=kGBZWl+JnleiXlG+LHURLi+OPtWDSRbVUSnzLjKQ1sbaN2GTpvnbF34ln/Ct/WiKe GXNstE4yxtQFd01gBhbjf1c9s96TuJYmzycCnsG2hYQ1pfrXS9D59Us5E//ZKZFCvT p/IA2oXJuxbZA/jXoqiJXtuRYYn/oQUesSruMMj8= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A85DB8B7C9; Tue, 20 Aug 2019 16:34:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 4x1NYA1kjwKS; Tue, 20 Aug 2019 16:34:15 +0200 (CEST) Received: from pc16032vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4C9728B7D3; Tue, 20 Aug 2019 16:34:15 +0200 (CEST) Received: by pc16032vm.idsi0.si.c-s.fr (Postfix, from userid 0) id C73756B735; Tue, 20 Aug 2019 14:34:14 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v4 3/3] powerpc/64: optimise LOAD_REG_IMMEDIATE_SYM() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , segher@kernel.crashing.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 20 Aug 2019 14:34:14 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Optimise LOAD_REG_IMMEDIATE_SYM() using a temporary register to parallelise operations. It reduces the path from 5 to 3 instructions. Suggested-by: Segher Boessenkool Signed-off-by: Christophe Leroy --- v3: new v4: fixed the registers of lis/ori to match rldimi args (tmp is upper part, reg is lower part) --- arch/powerpc/include/asm/ppc_asm.h | 12 ++++++------ arch/powerpc/kernel/exceptions-64e.S | 22 +++++++++++++--------- arch/powerpc/kernel/head_64.S | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index 20a00209c965..dd3b191bdcea 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -347,12 +347,12 @@ GLUE(.,name): #define LOAD_REG_IMMEDIATE(reg, expr) __LOAD_REG_IMMEDIATE reg, expr -#define LOAD_REG_IMMEDIATE_SYM(reg,expr) \ - lis reg,(expr)@highest; \ - ori reg,reg,(expr)@higher; \ - rldicr reg,reg,32,31; \ - oris reg,reg,(expr)@__AS_ATHIGH; \ - ori reg,reg,(expr)@l; +#define LOAD_REG_IMMEDIATE_SYM(reg, tmp, expr) \ + lis tmp, (expr)@highest; \ + lis reg, (expr)@__AS_ATHIGH; \ + ori tmp, tmp, (expr)@higher; \ + ori reg, reg, (expr)@l; \ + rldimi reg, tmp, 32, 0 #define LOAD_REG_ADDR(reg,name) \ ld reg,name@got(r2) diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index 898aae6da167..829950b96d29 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -750,12 +750,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) ld r15,PACATOC(r13) ld r14,interrupt_base_book3e@got(r15) ld r15,__end_interrupts@got(r15) -#else - LOAD_REG_IMMEDIATE_SYM(r14,interrupt_base_book3e) - LOAD_REG_IMMEDIATE_SYM(r15,__end_interrupts) -#endif cmpld cr0,r10,r14 cmpld cr1,r10,r15 +#else + LOAD_REG_IMMEDIATE_SYM(r14, r15, interrupt_base_book3e) + cmpld cr0, r10, r14 + LOAD_REG_IMMEDIATE_SYM(r14, r15, __end_interrupts) + cmpld cr1, r10, r14 +#endif blt+ cr0,1f bge+ cr1,1f @@ -820,12 +822,14 @@ kernel_dbg_exc: ld r15,PACATOC(r13) ld r14,interrupt_base_book3e@got(r15) ld r15,__end_interrupts@got(r15) -#else - LOAD_REG_IMMEDIATE_SYM(r14,interrupt_base_book3e) - LOAD_REG_IMMEDIATE_SYM(r15,__end_interrupts) -#endif cmpld cr0,r10,r14 cmpld cr1,r10,r15 +#else + LOAD_REG_IMMEDIATE_SYM(r14, r15, interrupt_base_book3e) + cmpld cr0, r10, r14 + LOAD_REG_IMMEDIATE_SYM(r14, r15,__end_interrupts) + cmpld cr1, r10, r14 +#endif blt+ cr0,1f bge+ cr1,1f @@ -1449,7 +1453,7 @@ a2_tlbinit_code_start: a2_tlbinit_after_linear_map: /* Now we branch the new virtual address mapped by this entry */ - LOAD_REG_IMMEDIATE_SYM(r3,1f) + LOAD_REG_IMMEDIATE_SYM(r3, r5, 1f) mtctr r3 bctr diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 1fd44761e997..0f2d61af47cc 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -635,7 +635,7 @@ __after_prom_start: sub r5,r5,r11 #else /* just copy interrupts */ - LOAD_REG_IMMEDIATE_SYM(r5, FIXED_SYMBOL_ABS_ADDR(__end_interrupts)) + LOAD_REG_IMMEDIATE_SYM(r5, r11, FIXED_SYMBOL_ABS_ADDR(__end_interrupts)) #endif b 5f 3: -- 2.13.3