UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/64: optimise LOAD_REG_IMMEDIATE_SYM() 

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 <segher@kernel.crashing.org>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/bad41ed02531bb0382420cbab50a0d7153b71767.1566311636.git.christophe.leroy@c-s.fr
This commit is contained in:
Christophe Leroy 2019-08-20 14:34:14 +00:00 committed by Michael Ellerman
parent ba18025fb0
commit d7fb5b18a5
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/include/asm/ppc_asm.h
View File

@ -347,12 +347,12 @@ n:
#define LOAD_REG_IMMEDIATE(reg, expr) __LOAD_REG_IMMEDIATE reg, expr #define LOAD_REG_IMMEDIATE(reg, expr) __LOAD_REG_IMMEDIATE reg, expr
#define LOAD_REG_IMMEDIATE_SYM(reg,expr) \ #define LOAD_REG_IMMEDIATE_SYM(reg, tmp, expr) \
lis reg,(expr)@highest; \ lis tmp, (expr)@highest; \
ori reg,reg,(expr)@higher; \ lis reg, (expr)@__AS_ATHIGH; \
rldicr reg,reg,32,31; \ ori tmp, tmp, (expr)@higher; \
oris reg,reg,(expr)@__AS_ATHIGH; \ ori reg, reg, (expr)@l; \
ori reg,reg,(expr)@l; rldimi reg, tmp, 32, 0
#define LOAD_REG_ADDR(reg,name) \ #define LOAD_REG_ADDR(reg,name) \
ld reg,name@got(r2) ld reg,name@got(r2)

22
arch/powerpc/kernel/exceptions-64e.S
View File

@ -750,12 +750,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
ld r15,PACATOC(r13) ld r15,PACATOC(r13)
ld r14,interrupt_base_book3e@got(r15) ld r14,interrupt_base_book3e@got(r15)
ld r15,__end_interrupts@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 cr0,r10,r14
cmpld cr1,r10,r15 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 blt+ cr0,1f
bge+ cr1,1f bge+ cr1,1f
@ -820,12 +822,14 @@ kernel_dbg_exc:
ld r15,PACATOC(r13) ld r15,PACATOC(r13)
ld r14,interrupt_base_book3e@got(r15) ld r14,interrupt_base_book3e@got(r15)
ld r15,__end_interrupts@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 cr0,r10,r14
cmpld cr1,r10,r15 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 blt+ cr0,1f
bge+ cr1,1f bge+ cr1,1f
@ -1449,7 +1453,7 @@ a2_tlbinit_code_start:
a2_tlbinit_after_linear_map: a2_tlbinit_after_linear_map:
/* Now we branch the new virtual address mapped by this entry */ /* 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 mtctr r3
bctr bctr

2
arch/powerpc/kernel/head_64.S
View File

@ -635,7 +635,7 @@ __after_prom_start:
sub r5,r5,r11 sub r5,r5,r11
#else #else
/* just copy interrupts */ /* 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 #endif
b 5f b 5f
3: 3: