Merge remote branch 'origin/haswell' into develop

diff --cc getarch.c
Simple merge

diff --cc param.h
index b865287,dd613fb..b963753
--- 1/param.h
--- 2/param.h
+++ b/param.h
@@@ -1154,16 -1152,16 +1154,29 @@@ USE OF THIS SOFTWARE, EVEN IF ADVISED O
  
  #ifdef HASWELL
  
++<<<<<<< HEAD
 +#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
++=======
+ #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 -1231,7 +1246,10 @@@
  #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