updated param.h for EXCAVATOR

diff --git a/param.h b/param.h
index b1bce23..aa09f6d 100644 (file)
--- a/param.h
+++ b/param.h
@@ -410,100 +410,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #endif
 
-#ifdef STEAMROLLER
-#define SNUMOPT         8
-#define DNUMOPT         4
-
-#define GEMM_DEFAULT_OFFSET_A  64
-#define GEMM_DEFAULT_OFFSET_B 832
-#define GEMM_DEFAULT_ALIGN 0x0fffUL
-
-
-
-#define QGEMM_DEFAULT_UNROLL_N 2
-#define CGEMM_DEFAULT_UNROLL_N 2
-#define ZGEMM_DEFAULT_UNROLL_N 2
-#define XGEMM_DEFAULT_UNROLL_N 1
-
-#ifdef ARCH_X86
-#define SGEMM_DEFAULT_UNROLL_N 4
-#define DGEMM_DEFAULT_UNROLL_N 4
-#define SGEMM_DEFAULT_UNROLL_M 4
-#define DGEMM_DEFAULT_UNROLL_M 2
-#define QGEMM_DEFAULT_UNROLL_M 2
-#define CGEMM_DEFAULT_UNROLL_M 2
-#define ZGEMM_DEFAULT_UNROLL_M 1
-#define XGEMM_DEFAULT_UNROLL_M 1
-#else
-#define SGEMM_DEFAULT_UNROLL_N 2
-#define DGEMM_DEFAULT_UNROLL_N 2
-#define SGEMM_DEFAULT_UNROLL_M 16
-#define DGEMM_DEFAULT_UNROLL_M 8
-#define QGEMM_DEFAULT_UNROLL_M 2
-#define CGEMM_DEFAULT_UNROLL_M 4
-#define ZGEMM_DEFAULT_UNROLL_M 2
-#define XGEMM_DEFAULT_UNROLL_M 1
-#define CGEMM3M_DEFAULT_UNROLL_N 4
-#define CGEMM3M_DEFAULT_UNROLL_M 8
-#define ZGEMM3M_DEFAULT_UNROLL_N 4
-#define ZGEMM3M_DEFAULT_UNROLL_M 4
-#define GEMV_UNROLL 8
-#endif
-
-#if defined(ARCH_X86_64)
-#define SGEMM_DEFAULT_P 768
-#define DGEMM_DEFAULT_P 576
-#define ZGEMM_DEFAULT_P 288
-#define CGEMM_DEFAULT_P 576
-#else
-#define SGEMM_DEFAULT_P 448
-#define DGEMM_DEFAULT_P 480
-#define ZGEMM_DEFAULT_P 112
-#define CGEMM_DEFAULT_P 224
-#endif
-#define QGEMM_DEFAULT_P 112
-#define XGEMM_DEFAULT_P  56
-
-#if defined(ARCH_X86_64)
-#define SGEMM_DEFAULT_Q 192
-#define DGEMM_DEFAULT_Q 160
-#define ZGEMM_DEFAULT_Q 160
-#define CGEMM_DEFAULT_Q 160
-#else
-#define SGEMM_DEFAULT_Q 224
-#define DGEMM_DEFAULT_Q 224
-#define ZGEMM_DEFAULT_Q 224
-#define CGEMM_DEFAULT_Q 224
-#endif
-#define QGEMM_DEFAULT_Q 224
-#define XGEMM_DEFAULT_Q 224
-
-#define CGEMM3M_DEFAULT_P 448
-#define ZGEMM3M_DEFAULT_P 224
-#define XGEMM3M_DEFAULT_P 112
-#define CGEMM3M_DEFAULT_Q 224
-#define ZGEMM3M_DEFAULT_Q 224
-#define XGEMM3M_DEFAULT_Q 224
-#define CGEMM3M_DEFAULT_R 12288
-#define ZGEMM3M_DEFAULT_R 12288
-#define XGEMM3M_DEFAULT_R 12288
-
-#define SGEMM_DEFAULT_R 12288
-#define QGEMM_DEFAULT_R qgemm_r
-#define DGEMM_DEFAULT_R 12288
-#define CGEMM_DEFAULT_R cgemm_r
-#define ZGEMM_DEFAULT_R zgemm_r
-#define XGEMM_DEFAULT_R xgemm_r
-
-#define SYMV_P  16
-#define HAVE_EXCLUSIVE_CACHE
-
-#define GEMM_THREAD gemm_thread_mn
-
-#endif
-
-
-#ifdef EXCAVATOR
+#if defined(STEAMROLLER) || defined(EXCAVATOR)
 #define SNUMOPT         8
 #define DNUMOPT         4