mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-08-14 01:53:41 +08:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md
This commit is contained in:
@@ -1,4 +1,11 @@
|
||||
#!/usr/bin/env perl
|
||||
#! /usr/bin/env perl
|
||||
# Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the OpenSSL license (the "License"). You may not use
|
||||
# this file except in compliance with the License. You can obtain a copy
|
||||
# in the file LICENSE in the source distribution or at
|
||||
# https://www.openssl.org/source/license.html
|
||||
|
||||
|
||||
# ====================================================================
|
||||
# Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
|
||||
@@ -19,6 +26,7 @@
|
||||
# Sandy Bridge (20.5 +5.15=25.7)/n 11.6 13.0 +103%
|
||||
# Ivy Bridge (20.4 +5.14=25.5)/n 10.3 11.6 +82%
|
||||
# Haswell(iii) (21.0 +5.00=26.0)/n 7.80 8.79 +170%
|
||||
# Skylake (18.9 +5.00=23.9)/n 7.70 8.17 +170%
|
||||
# Bulldozer (21.6 +5.76=27.4)/n 13.6 13.7 +100%
|
||||
#
|
||||
# (i) multi-block CBC encrypt with 128-bit key;
|
||||
@@ -59,11 +67,11 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
|
||||
$avx = ($1>=10) + ($1>=11);
|
||||
}
|
||||
|
||||
if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
|
||||
if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
|
||||
$avx = ($2>=3.0) + ($2>3.0);
|
||||
}
|
||||
|
||||
open OUT,"| \"$^X\" $xlate $flavour $output";
|
||||
open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
|
||||
*STDOUT=*OUT;
|
||||
|
||||
# void sha256_multi_block (
|
||||
@@ -382,7 +390,7 @@ $code.=<<___;
|
||||
jnz .Loop_grande
|
||||
|
||||
.Ldone:
|
||||
mov `$REG_SZ*17`(%rsp),%rax # orignal %rsp
|
||||
mov `$REG_SZ*17`(%rsp),%rax # original %rsp
|
||||
___
|
||||
$code.=<<___ if ($win64);
|
||||
movaps -0xb8(%rax),%xmm6
|
||||
@@ -442,7 +450,7 @@ $code.=<<___;
|
||||
lea K256_shaext+0x80(%rip),$Tbl
|
||||
|
||||
.Loop_grande_shaext:
|
||||
mov $num,`$REG_SZ*17+8`(%rsp) # orignal $num
|
||||
mov $num,`$REG_SZ*17+8`(%rsp) # original $num
|
||||
xor $num,$num
|
||||
___
|
||||
for($i=0;$i<2;$i++) {
|
||||
@@ -1061,7 +1069,7 @@ $code.=<<___;
|
||||
jnz .Loop_grande_avx
|
||||
|
||||
.Ldone_avx:
|
||||
mov `$REG_SZ*17`(%rsp),%rax # orignal %rsp
|
||||
mov `$REG_SZ*17`(%rsp),%rax # original %rsp
|
||||
vzeroupper
|
||||
___
|
||||
$code.=<<___ if ($win64);
|
||||
@@ -1237,7 +1245,7 @@ $code.=<<___;
|
||||
#jnz .Loop_grande_avx2
|
||||
|
||||
.Ldone_avx2:
|
||||
mov `$REG_SZ*17`(%rsp),%rax # orignal %rsp
|
||||
mov `$REG_SZ*17`(%rsp),%rax # original %rsp
|
||||
vzeroupper
|
||||
___
|
||||
$code.=<<___ if ($win64);
|
||||
|
||||
Reference in New Issue
Block a user