floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
Zhang Xianyi 2014-12-03 23:14:21 +08:00
parent 37aee1f9b1 1943ea91a8
commit 51ce5ef447
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
c_check
View File

@ -3,6 +3,7 @@
# Checking cross compile # Checking cross compile
$hostos = `uname -s | sed -e s/\-.*//`; chop($hostos); $hostos = `uname -s | sed -e s/\-.*//`; chop($hostos);
$hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch); $hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
$hostarch = "x86_64" if ($hostarch eq "amd64");
$binary = $ENV{"BINARY"}; $binary = $ENV{"BINARY"};

5
f_check
View File

@ -16,6 +16,7 @@ $config = shift(@ARGV);
$nofortran = 0; $nofortran = 0;
$compiler = join(" ", @ARGV); $compiler = join(" ", @ARGV);
$compiler_bin = shift(@ARGV);
# f77 is too ambiguous # f77 is too ambiguous
$compiler = "" if $compiler eq "f77"; $compiler = "" if $compiler eq "f77";
@ -53,7 +54,7 @@ if ($compiler eq "") {
} else { } else {
$data = `which $compiler > /dev/null 2> /dev/null`; $data = `which $compiler_bin > /dev/null 2> /dev/null`;
$vendor = ""; $vendor = "";
if (!$?) { if (!$?) {
@ -204,7 +205,7 @@ if ($compiler eq "") {
} }
} }
$data = `which $compiler > /dev/null 2> /dev/null`; $data = `which $compiler_bin > /dev/null 2> /dev/null`;
if (!$?) { if (!$?) {

6
kernel/x86_64/sgemm_kernel_16x4_sandy.S
View File

@ -726,8 +726,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if !defined(TRMMKERNEL) #if !defined(TRMMKERNEL)
vaddps (CO1), %xmm4,%xmm4 vaddss (CO1), %xmm4,%xmm4
vaddps 1 * SIZE(CO1), %xmm5,%xmm5 vaddss 1 * SIZE(CO1), %xmm5,%xmm5
#endif #endif
@ -756,7 +756,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if !defined(TRMMKERNEL) #if !defined(TRMMKERNEL)
vaddps (CO1), %xmm4,%xmm4 vaddss (CO1), %xmm4,%xmm4
#endif #endif