Merge pull request #3695 from martin-frbg/ppc6nrm2

[platform/upstream/openblas.git] / param.h

diff --git a/param.h b/param.h
index 03b98f4..62941db 100644 (file)
--- a/param.h
+++ b/param.h
@@ -1669,22 +1669,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #else
 
 #define SGEMM_DEFAULT_UNROLL_M 16
-#ifdef DYNAMIC_ARCH
-#define DGEMM_DEFAULT_UNROLL_M 4
-#else
 #define DGEMM_DEFAULT_UNROLL_M 16
-#endif
 #define QGEMM_DEFAULT_UNROLL_M 2
 #define CGEMM_DEFAULT_UNROLL_M 8
 #define ZGEMM_DEFAULT_UNROLL_M 4
 #define XGEMM_DEFAULT_UNROLL_M 1
 
 #define SGEMM_DEFAULT_UNROLL_N 4
-#ifdef DYNAMIC_ARCH
-#define DGEMM_DEFAULT_UNROLL_N 8
-#else
 #define DGEMM_DEFAULT_UNROLL_N 2
-#endif
 #define QGEMM_DEFAULT_UNROLL_N 2
 #define CGEMM_DEFAULT_UNROLL_N 2
 #define ZGEMM_DEFAULT_UNROLL_N 2
@@ -1718,29 +1710,17 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #else
 
 #define SGEMM_DEFAULT_P 448
-#ifndef DYNAMIC_ARCH
 #define DGEMM_DEFAULT_P 192
-#else
-#define DGEMM_DEFAULT_P 384
-#endif
 #define CGEMM_DEFAULT_P 384
 #define ZGEMM_DEFAULT_P 256
 
 #define SGEMM_DEFAULT_Q 448
-#ifndef DYNAMIC_ARCH
 #define DGEMM_DEFAULT_Q 384
-#else
-#define DGEMM_DEFAULT_Q 168
-#endif
 #define CGEMM_DEFAULT_Q 192
 #define ZGEMM_DEFAULT_Q 128
 
 #define SGEMM_DEFAULT_R sgemm_r
-#ifndef DYNAMIC_ARCH
 #define DGEMM_DEFAULT_R 8640
-#else
-#define DGEMM_DEFAULT_R 13824
-#endif
 #define CGEMM_DEFAULT_R cgemm_r
 #define ZGEMM_DEFAULT_R zgemm_r
 
@@ -3128,7 +3108,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define SYMV_P 16
 
-#if defined(CORTEXA57) || defined(CORTEXX1) \
+#if defined(CORTEXA57) || defined(CORTEXX1) || \
     defined(CORTEXA72) || defined(CORTEXA73) || \
     defined(FALKOR)    || defined(TSV110) || defined(EMAG8180) || defined(VORTEX) || defined(FT2000)
 
@@ -3350,6 +3330,11 @@ is a big desktop or server with abundant cache rather than a phone or embedded d
 
 #elif defined(NEOVERSEN2)
 
+#undef SBGEMM_DEFAULT_UNROLL_M
+#undef SBGEMM_DEFAULT_UNROLL_N
+#define SBGEMM_DEFAULT_UNROLL_M 8
+#define SBGEMM_DEFAULT_UNROLL_N 4
+
 #define SGEMM_DEFAULT_UNROLL_M  16
 #define SGEMM_DEFAULT_UNROLL_N  4