Merge branch 'z13' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 9 Jan 2017 10:52:42 +0000 (05:52 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 9 Jan 2017 10:52:42 +0000 (05:52 -0500)
Conflicts:
CONTRIBUTORS.md

1  2 
CONTRIBUTORS.md
README.md
c_check
common.h
ctest.c
getarch.c
kernel/Makefile.L3
param.h

diff --cc CONTRIBUTORS.md
@@@ -151,13 -151,6 +151,18 @@@ In chronological order
    * [2016-03-20] Fix compiler error in VisualStudio with CMake
    * [2016-03-22] Fix access violation on Windows while static linking
  
 +* Paul Mustière <https://github.com/buffer51/>
 +  * [2016-02-04] Fix Android build on ARMV7
 +  * [2016-04-26] Android build with LAPACK for ARMV7 & ARMV8
 +
 +* Shivraj Patil <https://github.com/sva-img/>
 +  * [2016-05-03] DGEMM optimization for MIPS P5600 and I6400 using MSA
 +
 +* Kaustubh Raste <https://github.com/ksraste/>
 +  * [2016-05-09] DTRSM optimization for MIPS P5600 and I6400 using MSA
 +  * [2016-05-20] STRSM optimization for MIPS P5600 and I6400 using MSA
++
+ * Abdelrauf  <https://github.com/quickwritereader>
+   * [2017-01-01] dgemm and dtrmm kernels for IBM z13
++
diff --cc README.md
Simple merge
diff --cc c_check
+++ b/c_check
@@@ -10,8 -7,8 +10,9 @@@ $hostarch = "x86_64" if ($hostarch eq "
  $hostarch = "arm" if ($hostarch =~ /^arm.*/);
  $hostarch = "arm64" if ($hostarch eq "aarch64");
  $hostarch = "power" if ($hostarch =~ /^(powerpc|ppc).*/);
+ $hostarch = "zarch" if ($hostarch eq "s390x");
  
 +$tmpf = new File::Temp( UNLINK => 1 );
  $binary = $ENV{"BINARY"};
  
  $makefile = shift(@ARGV);
diff --cc common.h
Simple merge
diff --cc ctest.c
Simple merge
diff --cc getarch.c
Simple merge
Simple merge
diff --cc param.h
Simple merge