From 339fef2649de26f7f2a32c7120167782c38f4199 Mon Sep 17 00:00:00 2001 From: wernsaar Date: Sun, 1 Dec 2013 18:10:23 +0100 Subject: [PATCH] modified param.h --- param.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/param.h b/param.h index b865287be..b96375376 100644 --- a/param.h +++ b/param.h @@ -1154,6 +1154,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef HASWELL +<<<<<<< HEAD #define SNUMOPT 8 #define DNUMOPT 4 @@ -1164,6 +1165,18 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define SYMV_P 8 #define SWITCH_RATIO 4 +======= +#define SNUMOPT 8 +#define DNUMOPT 4 + +#define GEMM_DEFAULT_OFFSET_A 0 +#define GEMM_DEFAULT_OFFSET_B 0 +#define GEMM_DEFAULT_ALIGN 0x03fffUL + +#define SYMV_P 8 + +#define SWITCH_RATIO 4 +>>>>>>> origin/haswell #ifdef ARCH_X86 @@ -1233,6 +1246,10 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define ZGEMM_DEFAULT_Q 128 #define SGEMM_DEFAULT_R sgemm_r +<<<<<<< HEAD +======= +//#define DGEMM_DEFAULT_R dgemm_r +>>>>>>> origin/haswell #define DGEMM_DEFAULT_R 13824 #define CGEMM_DEFAULT_R cgemm_r #define ZGEMM_DEFAULT_R zgemm_r