Merge pull request #3669 from VFerrari/fix_small_matrix_kernel

POWER: fix issues with the small matrix kernel

Makefile.system

@@ -261,7 +261,7 @@ endif
 #For small matrix optimization
 ifeq ($(ARCH), x86_64)
 SMALL_MATRIX_OPT = 1
-else ifeq ($(CORE), POWER10)
+else ifeq ($(ARCH), power)
 SMALL_MATRIX_OPT = 1
 endif
 ifeq ($(SMALL_MATRIX_OPT), 1)

kernel/power/gemm_small_kernel_permit_power10.c

@@ -69,6 +69,7 @@ int CNAME(int transa, int transb, BLASLONG M, BLASLONG N, BLASLONG K, FLOAT alph
 
 #endif
 
+#ifdef SMP
   // Multi-threading execution outperforms (or approaches) the execution of the
   // small kernel.
   if (num_cpu_avail(3) > 1) {
@@ -77,6 +78,9 @@ int CNAME(int transa, int transb, BLASLONG M, BLASLONG N, BLASLONG K, FLOAT alph
   } else {
     return 1;
   }
+#else
+  return 1;
+#endif
 
 #endif