Skip to content

L
linux
Commit f94a73f8 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files
Options

crypto: twofish-avx - tune assembler code for more performance 

Patch replaces 'movb' instructions with 'movzbl' to break false register
dependencies and interleaves instructions better for out-of-order scheduling.

Tested on Intel Core i5-2450M and AMD FX-8100.

tcrypt ECB results:

Intel Core i5-2450M:

size    old-vs-new      new-vs-3way     old-vs-3way
        enc     dec     enc     dec     enc     dec
256     1.12x   1.13x   1.36x   1.37x   1.21x   1.22x
1k      1.14x   1.14x   1.48x   1.49x   1.29x   1.31x
8k      1.14x   1.14x   1.50x   1.52x   1.32x   1.33x

AMD FX-8100:

size    old-vs-new      new-vs-3way     old-vs-3way
        enc     dec     enc     dec     enc     dec
256     1.10x   1.11x   1.01x   1.01x   0.92x   0.91x
1k      1.11x   1.12x   1.08x   1.07x   0.97x   0.96x
8k      1.11x   1.13x   1.10x   1.08x   0.99x   0.97x

[v2]
 - Do instruction interleaving another way to avoid adding new FPU<=>CPU
   register moves as these cause performance drop on Bulldozer.
 - Further interleaving improvements for better out-of-order scheduling.
Tested-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Johannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 49d30d3d
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 85 deletions
arch/x86/crypto/twofish-avx-x86_64-asm_64.S
View file @ f94a73f8
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
* Copyright (C) 2012 Johannes Goetzfried * Copyright (C) 2012 Johannes Goetzfried
* <Johannes.Goetzfried@informatik.stud.uni-erlangen.de> * <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
* *
* Copyright © 2012 Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
...@@ -47,16 +49,22 @@ ...@@ -47,16 +49,22 @@
#define RC2 %xmm6 #define RC2 %xmm6
#define RD2 %xmm7 #define RD2 %xmm7
#define RX %xmm8 #define RX0 %xmm8
#define RY %xmm9 #define RY0 %xmm9
#define RX1 %xmm10
#define RY1 %xmm11
#define RK1 %xmm10 #define RK1 %xmm12
#define RK2 %xmm11 #define RK2 %xmm13
#define RID1 %rax #define RT %xmm14
#define RID1b %al #define RR %xmm15
#define RID2 %rbx
#define RID2b %bl #define RID1 %rbp
#define RID1d %ebp
#define RID2 %rsi
#define RID2d %esi
#define RGI1 %rdx #define RGI1 %rdx
#define RGI1bl %dl #define RGI1bl %dl
...@@ -65,6 +73,13 @@ ...@@ -65,6 +73,13 @@
#define RGI2bl %cl #define RGI2bl %cl
#define RGI2bh %ch #define RGI2bh %ch
#define RGI3 %rax
#define RGI3bl %al
#define RGI3bh %ah
#define RGI4 %rbx
#define RGI4bl %bl
#define RGI4bh %bh
#define RGS1 %r8 #define RGS1 %r8
#define RGS1d %r8d #define RGS1d %r8d
#define RGS2 %r9 #define RGS2 %r9
...@@ -73,89 +88,123 @@ ...@@ -73,89 +88,123 @@
#define RGS3d %r10d #define RGS3d %r10d
#define lookup_32bit(t0, t1, t2, t3, src, dst) \ #define lookup_32bit(t0, t1, t2, t3, src, dst, interleave_op, il_reg) \
movb src ## bl, RID1b; \ movzbl src ## bl, RID1d; \
movb src ## bh, RID2b; \ movzbl src ## bh, RID2d; \
movl t0(CTX, RID1, 4), dst ## d; \
xorl t1(CTX, RID2, 4), dst ## d; \
shrq $16, src; \ shrq $16, src; \
movb src ## bl, RID1b; \ movl t0(CTX, RID1, 4), dst ## d; \
movb src ## bh, RID2b; \ movl t1(CTX, RID2, 4), RID2d; \
movzbl src ## bl, RID1d; \
xorl RID2d, dst ## d; \
movzbl src ## bh, RID2d; \
interleave_op(il_reg); \
xorl t2(CTX, RID1, 4), dst ## d; \ xorl t2(CTX, RID1, 4), dst ## d; \
xorl t3(CTX, RID2, 4), dst ## d; xorl t3(CTX, RID2, 4), dst ## d;
#define G(a, x, t0, t1, t2, t3) \ #define dummy(d) /* do nothing */
vmovq a, RGI1; \
vpsrldq $8, a, x; \ #define shr_next(reg) \
vmovq x, RGI2; \ shrq $16, reg;
#define G(gi1, gi2, x, t0, t1, t2, t3) \
lookup_32bit(t0, t1, t2, t3, ##gi1, RGS1, shr_next, ##gi1); \
lookup_32bit(t0, t1, t2, t3, ##gi2, RGS3, shr_next, ##gi2); \
\
lookup_32bit(t0, t1, t2, t3, ##gi1, RGS2, dummy, none); \
shlq $32, RGS2; \
orq RGS1, RGS2; \
lookup_32bit(t0, t1, t2, t3, ##gi2, RGS1, dummy, none); \
shlq $32, RGS1; \
orq RGS1, RGS3;
#define round_head_2(a, b, x1, y1, x2, y2) \
vmovq b ## 1, RGI3; \
vpextrq $1, b ## 1, RGI4; \
\ \
lookup_32bit(t0, t1, t2, t3, RGI1, RGS1); \ G(RGI1, RGI2, x1, s0, s1, s2, s3); \
shrq $16, RGI1; \ vmovq a ## 2, RGI1; \
lookup_32bit(t0, t1, t2, t3, RGI1, RGS2); \ vpextrq $1, a ## 2, RGI2; \
shlq $32, RGS2; \ vmovq RGS2, x1; \
orq RGS1, RGS2; \ vpinsrq $1, RGS3, x1, x1; \
\ \
lookup_32bit(t0, t1, t2, t3, RGI2, RGS1); \ G(RGI3, RGI4, y1, s1, s2, s3, s0); \
shrq $16, RGI2; \ vmovq b ## 2, RGI3; \
lookup_32bit(t0, t1, t2, t3, RGI2, RGS3); \ vpextrq $1, b ## 2, RGI4; \
shlq $32, RGS3; \ vmovq RGS2, y1; \
orq RGS1, RGS3; \ vpinsrq $1, RGS3, y1, y1; \
\ \
vmovq RGS2, x; \ G(RGI1, RGI2, x2, s0, s1, s2, s3); \
vpinsrq $1, RGS3, x, x; vmovq RGS2, x2; \
vpinsrq $1, RGS3, x2, x2; \
\
G(RGI3, RGI4, y2, s1, s2, s3, s0); \
vmovq RGS2, y2; \
vpinsrq $1, RGS3, y2, y2;
#define encround(a, b, c, d, x, y) \ #define encround_tail(a, b, c, d, x, y, prerotate) \
G(a, x, s0, s1, s2, s3); \
G(b, y, s1, s2, s3, s0); \
vpaddd x, y, x; \ vpaddd x, y, x; \
vpaddd x, RK1, RT;\
prerotate(b); \
vpxor RT, c, c; \
vpaddd y, x, y; \ vpaddd y, x, y; \
vpaddd x, RK1, x; \
vpaddd y, RK2, y; \ vpaddd y, RK2, y; \
vpxor x, c, c; \ vpsrld $1, c, RT; \
vpsrld $1, c, x; \
vpslld $(32 - 1), c, c; \ vpslld $(32 - 1), c, c; \
vpor c, x, c; \ vpor c, RT, c; \
vpslld $1, d, x; \ vpxor d, y, d; \
vpsrld $(32 - 1), d, d; \
vpor d, x, d; \ #define decround_tail(a, b, c, d, x, y, prerotate) \
vpxor d, y, d;
#define decround(a, b, c, d, x, y) \
G(a, x, s0, s1, s2, s3); \
G(b, y, s1, s2, s3, s0); \
vpaddd x, y, x; \ vpaddd x, y, x; \
vpaddd x, RK1, RT;\
prerotate(a); \
vpxor RT, c, c; \
vpaddd y, x, y; \ vpaddd y, x, y; \
vpaddd y, RK2, y; \ vpaddd y, RK2, y; \
vpxor d, y, d; \ vpxor d, y, d; \
vpsrld $1, d, y; \ vpsrld $1, d, y; \
vpslld $(32 - 1), d, d; \ vpslld $(32 - 1), d, d; \
vpor d, y, d; \ vpor d, y, d; \
vpslld $1, c, y; \
vpsrld $(32 - 1), c, c; \ #define rotate_1l(x) \
vpor c, y, c; \ vpslld $1, x, RR; \
vpaddd x, RK1, x; \ vpsrld $(32 - 1), x, x; \
vpxor x, c, c; vpor x, RR, x;
#define encrypt_round(n, a, b, c, d) \ #define preload_rgi(c) \
vbroadcastss (k+4*(2*(n)))(CTX), RK1; \ vmovq c, RGI1; \
vbroadcastss (k+4*(2*(n)+1))(CTX), RK2; \ vpextrq $1, c, RGI2;
encround(a ## 1, b ## 1, c ## 1, d ## 1, RX, RY); \
encround(a ## 2, b ## 2, c ## 2, d ## 2, RX, RY); #define encrypt_round(n, a, b, c, d, preload, prerotate) \
vbroadcastss (k+4*(2*(n)))(CTX), RK1; \
#define decrypt_round(n, a, b, c, d) \ vbroadcastss (k+4*(2*(n)+1))(CTX), RK2; \
vbroadcastss (k+4*(2*(n)))(CTX), RK1; \ round_head_2(a, b, RX0, RY0, RX1, RY1); \
vbroadcastss (k+4*(2*(n)+1))(CTX), RK2; \ encround_tail(a ## 1, b ## 1, c ## 1, d ## 1, RX0, RY0, prerotate); \
decround(a ## 1, b ## 1, c ## 1, d ## 1, RX, RY); \ preload(c ## 1); \
decround(a ## 2, b ## 2, c ## 2, d ## 2, RX, RY); encround_tail(a ## 2, b ## 2, c ## 2, d ## 2, RX1, RY1, prerotate);
#define decrypt_round(n, a, b, c, d, preload, prerotate) \
vbroadcastss (k+4*(2*(n)))(CTX), RK1; \
vbroadcastss (k+4*(2*(n)+1))(CTX), RK2; \
round_head_2(a, b, RX0, RY0, RX1, RY1); \
decround_tail(a ## 1, b ## 1, c ## 1, d ## 1, RX0, RY0, prerotate); \
preload(c ## 1); \
decround_tail(a ## 2, b ## 2, c ## 2, d ## 2, RX1, RY1, prerotate);
#define encrypt_cycle(n) \ #define encrypt_cycle(n) \
encrypt_round((2*n), RA, RB, RC, RD); \ encrypt_round((2*n), RA, RB, RC, RD, preload_rgi, rotate_1l); \
encrypt_round(((2*n) + 1), RC, RD, RA, RB); encrypt_round(((2*n) + 1), RC, RD, RA, RB, preload_rgi, rotate_1l);
#define encrypt_cycle_last(n) \
encrypt_round((2*n), RA, RB, RC, RD, preload_rgi, rotate_1l); \
encrypt_round(((2*n) + 1), RC, RD, RA, RB, dummy, dummy);
#define decrypt_cycle(n) \ #define decrypt_cycle(n) \
decrypt_round(((2*n) + 1), RC, RD, RA, RB); \ decrypt_round(((2*n) + 1), RC, RD, RA, RB, preload_rgi, rotate_1l); \
decrypt_round((2*n), RA, RB, RC, RD); decrypt_round((2*n), RA, RB, RC, RD, preload_rgi, rotate_1l);
#define decrypt_cycle_last(n) \
decrypt_round(((2*n) + 1), RC, RD, RA, RB, preload_rgi, rotate_1l); \
decrypt_round((2*n), RA, RB, RC, RD, dummy, dummy);
#define transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \ #define transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \
vpunpckldq x1, x0, t0; \ vpunpckldq x1, x0, t0; \
...@@ -216,17 +265,20 @@ __twofish_enc_blk_8way: ...@@ -216,17 +265,20 @@ __twofish_enc_blk_8way:
* %rcx: bool, if true: xor output * %rcx: bool, if true: xor output
*/ */
pushq %rbp;
pushq %rbx; pushq %rbx;
pushq %rcx; pushq %rcx;
vmovdqu w(CTX), RK1; vmovdqu w(CTX), RK1;
leaq (4*4*4)(%rdx), %rax; leaq (4*4*4)(%rdx), %rax;
inpack_blocks(%rdx, RA1, RB1, RC1, RD1, RK1, RX, RY, RK2); inpack_blocks(%rdx, RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
inpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX, RY, RK2); preload_rgi(RA1);
rotate_1l(RD1);
inpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
rotate_1l(RD2);
xorq RID1, RID1; movq %rsi, %r11;
xorq RID2, RID2;
encrypt_cycle(0); encrypt_cycle(0);
encrypt_cycle(1); encrypt_cycle(1);
...@@ -235,26 +287,27 @@ __twofish_enc_blk_8way: ...@@ -235,26 +287,27 @@ __twofish_enc_blk_8way:
encrypt_cycle(4); encrypt_cycle(4);
encrypt_cycle(5); encrypt_cycle(5);
encrypt_cycle(6); encrypt_cycle(6);
encrypt_cycle(7); encrypt_cycle_last(7);
vmovdqu (w+4*4)(CTX), RK1; vmovdqu (w+4*4)(CTX), RK1;
popq %rcx; popq %rcx;
popq %rbx; popq %rbx;
popq %rbp;
leaq (4*4*4)(%rsi), %rax; leaq (4*4*4)(%r11), %rax;
testb %cl, %cl; testb %cl, %cl;
jnz __enc_xor8; jnz __enc_xor8;
outunpack_blocks(%rsi, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2); outunpack_blocks(%r11, RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
outunpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2); outunpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
ret; ret;
__enc_xor8: __enc_xor8:
outunpack_xor_blocks(%rsi, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2); outunpack_xor_blocks(%r11, RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
outunpack_xor_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2); outunpack_xor_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
ret; ret;
...@@ -269,16 +322,19 @@ twofish_dec_blk_8way: ...@@ -269,16 +322,19 @@ twofish_dec_blk_8way:
* %rdx: src * %rdx: src
*/ */
pushq %rbp;
pushq %rbx; pushq %rbx;
vmovdqu (w+4*4)(CTX), RK1; vmovdqu (w+4*4)(CTX), RK1;
leaq (4*4*4)(%rdx), %rax; leaq (4*4*4)(%rdx), %rax;
inpack_blocks(%rdx, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2); inpack_blocks(%rdx, RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
inpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2); preload_rgi(RC1);
rotate_1l(RA1);
inpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
rotate_1l(RA2);
xorq RID1, RID1; movq %rsi, %r11;
xorq RID2, RID2;
decrypt_cycle(7); decrypt_cycle(7);
decrypt_cycle(6); decrypt_cycle(6);
...@@ -287,14 +343,15 @@ twofish_dec_blk_8way: ...@@ -287,14 +343,15 @@ twofish_dec_blk_8way:
decrypt_cycle(3); decrypt_cycle(3);
decrypt_cycle(2); decrypt_cycle(2);
decrypt_cycle(1); decrypt_cycle(1);
decrypt_cycle(0); decrypt_cycle_last(0);
vmovdqu (w)(CTX), RK1; vmovdqu (w)(CTX), RK1;
popq %rbx; popq %rbx;
popq %rbp;
leaq (4*4*4)(%rsi), %rax; leaq (4*4*4)(%r11), %rax;
outunpack_blocks(%rsi, RA1, RB1, RC1, RD1, RK1, RX, RY, RK2); outunpack_blocks(%r11, RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX, RY, RK2); outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
ret; ret;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7