sha1-armv4-large.pl: comply with ABI.
[openssl.git] / crypto / sha / asm / sha1-armv4-large.pl
index f54eef5a045d92847e123b75db2bb7e742cba86c..33da3e0e3c0d50031a705b182b22b74c6b6cbdf1 100644 (file)
@@ -18,8 +18,8 @@
 # thumb                304             3212            4420
 # armv4-small  392/+29%        1958/+64%       2250/+96%
 # armv4-compact        740/+89%        1552/+26%       1840/+22%
-# armv4-large  1420/+92%       1307/+19%       1500/+23%
-# full unroll  ~5100/+260%     ~1260/+4%       ~1500/+0%
+# armv4-large  1420/+92%       1307/+19%       1370/+34%[***]
+# full unroll  ~5100/+260%     ~1260/+4%       ~1300/+5%
 # ====================================================================
 # thumb                = same as 'small' but in Thumb instructions[**] and
 #                with recurring code in two private functions;
 #      modes are limited. As result it takes more instructions to do
 #      the same job in Thumb, therefore the code is never twice as
 #      small and always slower.
+# [***]        which is also ~35% better than compiler generated code. Dual-
+#      issue Cortex A8 core was measured to process input block in
+#      ~990 cycles.
+
+# August 2010.
+#
+# Rescheduling for dual-issue pipeline resulted in 13% improvement on
+# Cortex A8 core and in absolute terms ~870 cycles per input block
+# [or 13.6 cycles per byte].
+
+# February 2011.
+#
+# Profiler-assisted and platform-specific optimization resulted in 10%
+# improvement on Cortex A8 core and 12.2 cycles per byte.
+
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
+open STDOUT,">$output";
 
 $ctx="r0";
 $inp="r1";
@@ -47,69 +64,69 @@ $c="r5";
 $d="r6";
 $e="r7";
 $K="r8";
-$t0="r10";
-$t1="r11";
-$t2="r12";
+$t0="r9";
+$t1="r10";
+$t2="r11";
+$t3="r12";
 $Xi="r14";
 @V=($a,$b,$c,$d,$e);
 
-# One can optimize this for aligned access on big-endian architecture,
-# but code's endian neutrality makes it too pretty:-)
-sub Xload {
-my ($a,$b,$c,$d,$e)=@_;
-$code.=<<___;
-       ldrb    $t0,[$inp],#4
-       ldrb    $t1,[$inp,#-3]
-       ldrb    $t2,[$inp,#-2]
-       add     $e,$K,$e,ror#2                  @ E+=K_00_19
-       orr     $t0,$t1,$t0,lsl#8
-       ldrb    $t1,[$inp,#-1]
-       orr     $t0,$t2,$t0,lsl#8
-       add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
-       orr     $t0,$t1,$t0,lsl#8
-       add     $e,$e,$t0                       @ E+=X[i]
-       eor     $t1,$c,$d                       @ F_xx_xx
-       str     $t0,[$Xi,#-4]!
-___
-}
 sub Xupdate {
-my ($a,$b,$c,$d,$e,$flag)=@_;
+my ($a,$b,$c,$d,$e,$opt1,$opt2)=@_;
 $code.=<<___;
        ldr     $t0,[$Xi,#15*4]
        ldr     $t1,[$Xi,#13*4]
        ldr     $t2,[$Xi,#7*4]
        add     $e,$K,$e,ror#2                  @ E+=K_xx_xx
+       ldr     $t3,[$Xi,#2*4]
        eor     $t0,$t0,$t1
-       ldr     $t1,[$Xi,#2*4]
-       add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
-       eor     $t0,$t0,$t2
-       eor     $t0,$t0,$t1
-___
-$code.=<<___ if (!defined($flag));
-       eor     $t1,$c,$d                       @ F_xx_xx, but not in 40_59
-___
-$code.=<<___;
+       eor     $t2,$t2,$t3                     @ 1 cycle stall
+       eor     $t1,$c,$d                       @ F_xx_xx
        mov     $t0,$t0,ror#31
-       add     $e,$e,$t0                       @ E+=X[i]
+       add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
+       eor     $t0,$t0,$t2,ror#31
        str     $t0,[$Xi,#-4]!
+       $opt1                                   @ F_xx_xx
+       $opt2                                   @ F_xx_xx
+       add     $e,$e,$t0                       @ E+=X[i]
 ___
 }
 
 sub BODY_00_15 {
 my ($a,$b,$c,$d,$e)=@_;
-       &Xload(@_);
 $code.=<<___;
+#if __ARM_ARCH__<7
+       ldrb    $t1,[$inp,#2]
+       ldrb    $t0,[$inp,#3]
+       ldrb    $t2,[$inp,#1]
+       add     $e,$K,$e,ror#2                  @ E+=K_00_19
+       ldrb    $t3,[$inp],#4
+       orr     $t0,$t0,$t1,lsl#8
+       eor     $t1,$c,$d                       @ F_xx_xx
+       orr     $t0,$t0,$t2,lsl#16
+       add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
+       orr     $t0,$t0,$t3,lsl#24
+#else
+       ldr     $t0,[$inp],#4                   @ handles unaligned
+       add     $e,$K,$e,ror#2                  @ E+=K_00_19
+       eor     $t1,$c,$d                       @ F_xx_xx
+       add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
+#ifdef __ARMEL__
+       rev     $t0,$t0                         @ byte swap
+#endif
+#endif
        and     $t1,$b,$t1,ror#2
+       add     $e,$e,$t0                       @ E+=X[i]
        eor     $t1,$t1,$d,ror#2                @ F_00_19(B,C,D)
+       str     $t0,[$Xi,#-4]!
        add     $e,$e,$t1                       @ E+=F_00_19(B,C,D)
 ___
 }
 
 sub BODY_16_19 {
 my ($a,$b,$c,$d,$e)=@_;
-       &Xupdate(@_);
+       &Xupdate(@_,"and $t1,$b,$t1,ror#2");
 $code.=<<___;
-       and     $t1,$b,$t1,ror#2
        eor     $t1,$t1,$d,ror#2                @ F_00_19(B,C,D)
        add     $e,$e,$t1                       @ E+=F_00_19(B,C,D)
 ___
@@ -117,26 +134,24 @@ ___
 
 sub BODY_20_39 {
 my ($a,$b,$c,$d,$e)=@_;
-       &Xupdate(@_);
+       &Xupdate(@_,"eor $t1,$b,$t1,ror#2");
 $code.=<<___;
-       eor     $t1,$b,$t1,ror#2                @ F_20_39(B,C,D)
        add     $e,$e,$t1                       @ E+=F_20_39(B,C,D)
 ___
 }
 
 sub BODY_40_59 {
 my ($a,$b,$c,$d,$e)=@_;
-       &Xupdate(@_,1);
+       &Xupdate(@_,"and $t1,$b,$t1,ror#2","and $t2,$c,$d");
 $code.=<<___;
-       and     $t1,$b,$c,ror#2
-       orr     $t2,$b,$c,ror#2
-       and     $t2,$t2,$d,ror#2
-       orr     $t1,$t1,$t2                     @ F_40_59(B,C,D)
        add     $e,$e,$t1                       @ E+=F_40_59(B,C,D)
+       add     $e,$e,$t2,ror#2
 ___
 }
 
 $code=<<___;
+#include "arm_arch.h"
+
 .text
 
 .global        sha1_block_data_order
@@ -162,6 +177,7 @@ for($i=0;$i<5;$i++) {
 $code.=<<___;
        teq     $Xi,sp
        bne     .L_00_15                @ [((11+4)*5+2)*3]
+       sub     sp,sp,#25*4
 ___
        &BODY_00_15(@V);        unshift(@V,pop(@V));
        &BODY_16_19(@V);        unshift(@V,pop(@V));
@@ -171,7 +187,6 @@ ___
 $code.=<<___;
 
        ldr     $K,.LK_20_39            @ [+15+16*4]
-       sub     sp,sp,#25*4
        cmn     sp,#0                   @ [+3], clear carry to denote 20_39
 .L_20_39_or_60_79:
 ___
@@ -200,20 +215,24 @@ $code.=<<___;
        b       .L_20_39_or_60_79       @ [+4], spare 300 bytes
 .L_done:
        add     sp,sp,#80*4             @ "deallocate" stack frame
-       ldmia   $ctx,{$K,$t0,$t1,$t2,$Xi}
+       ldmia   $ctx,{$K,$t0,$t1,$t2,$t3}
        add     $a,$K,$a
        add     $b,$t0,$b
        add     $c,$t1,$c,ror#2
        add     $d,$t2,$d,ror#2
-       add     $e,$Xi,$e,ror#2
+       add     $e,$t3,$e,ror#2
        stmia   $ctx,{$a,$b,$c,$d,$e}
        teq     $inp,$len
        bne     .Lloop                  @ [+18], total 1307
 
+#if __ARM_ARCH__>=5
+       ldmia   sp!,{r4-r12,pc}
+#else
        ldmia   sp!,{r4-r12,lr}
        tst     lr,#1
        moveq   pc,lr                   @ be binary compatible with V4, yet
        bx      lr                      @ interoperable with Thumb ISA:-)
+#endif
 .align 2
 .LK_00_19:     .word   0x5a827999
 .LK_20_39:     .word   0x6ed9eba1
@@ -221,6 +240,9 @@ $code.=<<___;
 .LK_60_79:     .word   0xca62c1d6
 .size  sha1_block_data_order,.-sha1_block_data_order
 .asciz "SHA1 block transform for ARMv4, CRYPTOGAMS by <appro\@openssl.org>"
+.align 2
 ___
 
+$code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm;   # make it possible to compile with -march=armv4
 print $code;
+close STDOUT; # enforce flush