Merge branch 'develop'

Makefile

@@ -20,8 +20,6 @@ ifneq ($(NO_LAPACK), 1)
 SUBDIRS	+= lapack
 endif
 
-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
-
 SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
 
 .PHONY : all libs netlib test ctest shared install
@@ -133,7 +131,7 @@ ifeq ($(CORE), UNKOWN)
 	$(error OpenBLAS: Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for the detail.)
 endif
 ifeq ($(NOFORTRAN), 1)
-	$(info OpenBLAS: Detecting fortran compiler failed. Cannot compile LAPACK. Only compile BLAS.)
+	$(error OpenBLAS: Detecting fortran compiler failed. Please install fortran compiler, e.g. gfortran, ifort, openf90.)
 endif
 ifeq ($(NO_STATIC), 1)
 ifeq ($(NO_SHARED), 1)
@@ -233,7 +231,7 @@ ifndef NOFORTRAN
 	-@echo "FORTRAN     = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "OPTS        = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-	-@echo "NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
+	-@echo "NOOPT       = $(LAPACK_FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc

Makefile.arm

@@ -1,23 +1,13 @@
 # ifeq logical or
 ifeq ($(CORE), $(filter $(CORE),CORTEXA9 CORTEXA15))
-ifeq ($(OSNAME), Android)
-CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
-FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
-else
 CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 endif
-endif
 
 ifeq ($(CORE), ARMV7)
-ifeq ($(OSNAME), Android)
-CCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
-FCOMMON_OPT += -marm -mfpu=neon  -mfloat-abi=hard -march=armv7-a
-else
 CCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 FCOMMON_OPT += -marm -mfpu=vfpv3  -mfloat-abi=hard -march=armv7-a
 endif
-endif
 
 ifeq ($(CORE), ARMV6)
 CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard  -march=armv6

Makefile.install

@@ -86,8 +86,8 @@ ifeq ($(OSNAME), Darwin)
 	ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
 endif
 ifeq ($(OSNAME), WINNT)
-	@-cp $(LIBDLLNAME) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
-	@-cp $(LIBDLLNAME).a $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+	@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)
+	@-cp $(LIBDLLNAME).a $(OPENBLAS_LIBRARY_DIR)
 endif
 ifeq ($(OSNAME), CYGWIN_NT)
 	@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)

Makefile.rule

@@ -114,9 +114,6 @@ NO_AFFINITY = 1
 # Support for IEEE quad precision(it's *real* REAL*16)( under testing)
 # QUAD_PRECISION = 1
 
-# Support for integer matrix and vector (e.g. iaxpy)
-# INTEGER_PRECISION = 1
-
 # Theads are still working for a while after finishing BLAS operation
 # to reduce thread activate/deactivate overhead. You can determine
 # time out to improve performance. This number should be from 4 to 30
@@ -165,7 +162,7 @@ COMMON_PROF = -pg
 # Improve GEMV and GER for small matrices by stack allocation.
 # For details, https://github.com/xianyi/OpenBLAS/pull/482
 #
- MAX_STACK_ALLOC=2048
+# MAX_STACK_ALLOC=2048
 
 # Add a prefix or suffix to all exported symbol names in the shared library.
 # Avoid conflicts with other BLAS libraries, especially when using

Makefile.system

@@ -23,7 +23,6 @@ CC = gcc
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
      CC = clang
-#     EXTRALIB += -Wl,-no_compact_unwind
 endif
 endif
 
@@ -65,9 +64,6 @@ endif
 ifeq ($(TARGET), STEAMROLLER)
 GETARCH_FLAGS := -DFORCE_BARCELONA
 endif
-ifeq ($(TARGET), EXCAVATOR)
-GETARCH_FLAGS := -DFORCE_BARCELONA
-endif
 endif
 
 
@@ -95,9 +91,6 @@ endif
 ifeq ($(TARGET_CORE), STEAMROLLER)
 GETARCH_FLAGS := -DFORCE_BARCELONA
 endif
-ifeq ($(TARGET_CORE), EXCAVATOR)
-GETARCH_FLAGS := -DFORCE_BARCELONA
-endif
 endif
 
 
@@ -202,18 +195,12 @@ DLLWRAP = $(CROSS_SUFFIX)dllwrap
 OBJCOPY = $(CROSS_SUFFIX)objcopy
 OBJCONV = $(CROSS_SUFFIX)objconv
 
-
-# For detect fortran failed, only build BLAS.
-ifeq ($(NOFORTRAN), 1)
-NO_LAPACK = 1
-endif
-
 #
 #  OS dependent settings
 #
 
 ifeq ($(OSNAME), Darwin)
-export MACOSX_DEPLOYMENT_TARGET=10.6
+export MACOSX_DEPLOYMENT_TARGET=10.2
 MD5SUM = md5 -r
 endif
 
@@ -309,10 +296,6 @@ CCOMMON_OPT	+= -DQUAD_PRECISION
 NO_EXPRECISION = 1
 endif
 
-ifdef INTEGER_PRECISION
-CCOMMON_OPT	+= -DINTEGER_PRECISION
-endif
-
 ifneq ($(ARCH), x86)
 ifneq ($(ARCH), x86_64)
 NO_EXPRECISION = 1
@@ -425,7 +408,7 @@ endif
 ifeq ($(ARCH), x86_64)
 DYNAMIC_CORE = PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO
 ifneq ($(NO_AVX), 1)
-DYNAMIC_CORE += SANDYBRIDGE BULLDOZER PILEDRIVER STEAMROLLER EXCAVATOR
+DYNAMIC_CORE += SANDYBRIDGE BULLDOZER PILEDRIVER STEAMROLLER
 endif
 ifneq ($(NO_AVX2), 1)
 DYNAMIC_CORE += HASWELL
@@ -595,7 +578,7 @@ else
 FCOMMON_OPT += -m32
 endif
 endif
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -fopenmp
 endif
 endif
@@ -607,14 +590,14 @@ ifneq ($(INTERFACE64), 0)
 FCOMMON_OPT += -i8
 endif
 endif
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -openmp
 endif
 endif
 
 ifeq ($(F_COMPILER), FUJITSU)
 CCOMMON_OPT += -DF_INTERFACE_FUJITSU
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -openmp
 endif
 endif
@@ -632,7 +615,7 @@ endif
 else
 FCOMMON_OPT += -q32
 endif
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -openmp
 endif
 endif
@@ -650,7 +633,7 @@ FCOMMON_OPT += -tp p7-64
 else
 FCOMMON_OPT += -tp p7
 endif
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -mp
 endif
 endif
@@ -679,7 +662,7 @@ FCOMMON_OPT += -mabi=n32
 endif
 endif
 
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -mp
 endif
 endif
@@ -716,7 +699,7 @@ FCOMMON_OPT += -m64
 endif
 endif
 
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FEXTRALIB   += -lstdc++
 FCOMMON_OPT += -mp
 endif
@@ -764,14 +747,14 @@ FCOMMON_OPT  += -m32
 else
 FCOMMON_OPT  += -m64
 endif
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -xopenmp=parallel
 endif
 endif
 
 ifeq ($(F_COMPILER), COMPAQ)
 CCOMMON_OPT  += -DF_INTERFACE_COMPAQ
-ifeq ($(USE_OPENMP), 1)
+ifdef USE_OPENMP
 FCOMMON_OPT += -openmp
 endif
 endif

Makefile.tail

@@ -4,7 +4,6 @@ QBLASOBJS_P = $(QBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 CBLASOBJS_P = $(CBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 ZBLASOBJS_P = $(ZBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 XBLASOBJS_P = $(XBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
-IBLASOBJS_P = $(IBLASOBJS:.$(SUFFIX)=.$(PSUFFIX))
 
 COMMONOBJS_P = $(COMMONOBJS:.$(SUFFIX)=.$(PSUFFIX))
 
@@ -23,18 +22,12 @@ BLASOBJS   += $(QBLASOBJS)   $(XBLASOBJS)
 BLASOBJS_P += $(QBLASOBJS_P) $(XBLASOBJS_P)
 endif
 
-ifdef INTEGER_PRECISION
-BLASOBJS   += $(IBLASOBJS)
-BLASOBJS_P += $(IBLASOBJS_P)
-endif
-
 $(SBLASOBJS) $(SBLASOBJS_P) : override CFLAGS += -UDOUBLE  -UCOMPLEX
 $(DBLASOBJS) $(DBLASOBJS_P) : override CFLAGS += -DDOUBLE  -UCOMPLEX
 $(QBLASOBJS) $(QBLASOBJS_P) : override CFLAGS += -DXDOUBLE -UCOMPLEX
 $(CBLASOBJS) $(CBLASOBJS_P) : override CFLAGS += -UDOUBLE  -DCOMPLEX
 $(ZBLASOBJS) $(ZBLASOBJS_P) : override CFLAGS += -DDOUBLE  -DCOMPLEX
 $(XBLASOBJS) $(XBLASOBJS_P) : override CFLAGS += -DXDOUBLE -DCOMPLEX
-$(IBLASOBJS) $(IBLASOBJS_P) : override CFLAGS += -DINTEGER -UCOMPLEX
 
 $(SBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(DBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
@@ -42,7 +35,6 @@ $(QBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(CBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(ZBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 $(XBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
-$(IBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 
 libs    :: $(BLASOBJS) $(COMMONOBJS)
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^

TargetList.txt

@@ -33,7 +33,6 @@ BOBCAT
 BULLDOZER
 PILEDRIVER
 STEAMROLLER
-EXCAVATOR
 
 c)VIA CPU:
 SSE_GENERIC

benchmark/Make_exe.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-for f in *.goto *.acml *.mkl *.atlas
-do
-	if [ -f "$f" ]; then
-		mv $f `echo $f|tr '.' '_'`.exe
-	fi
-done
-

benchmark/asum.c

@@ -1,196 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#include "common.h"
-
-
-#undef ASUM
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define ASUM   BLASFUNC(dzasum)
-#else
-#define ASUM   BLASFUNC(scasum)
-#endif
-#else
-#ifdef DOUBLE
-#define ASUM   BLASFUNC(dasum)
-#else
-#define ASUM   BLASFUNC(sasum)
-#endif
-#endif
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x;
-  FLOAT result;
-  blasint m, i;
-  blasint inc_x=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Loops = %d\n", from, to, step,inc_x,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-    	gettimeofday( &start, (struct timezone *)0);
-
-    	result = ASUM (&m, x, &inc_x);
-
-    	gettimeofday( &stop, (struct timezone *)0);
-
-    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-#ifdef COMPLEX
-    fprintf(stderr, " %10.2f MFlops\n", 4. * (double)m / timeg * 1.e-6);
-#else
-    fprintf(stderr, " %10.2f MFlops\n", 2. * (double)m / timeg * 1.e-6);
-#endif
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

benchmark/cholesky.c

@@ -71,14 +71,8 @@ double fabs(double);
 #endif
 #endif
 
-
-
 #if defined(__WIN32__) || defined(__WIN64__)
 
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
 int gettimeofday(struct timeval *tv, void *tz){
 
   FILETIME ft;
@@ -105,7 +99,6 @@ int gettimeofday(struct timeval *tv, void *tz){
 
 #endif
 
-
 static __inline double getmflops(int ratio, int m, double secs){
 
   double mm = (double)m;

benchmark/copy.c

@@ -1,201 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#include "common.h"
-
-
-#undef COPY
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define COPY   BLASFUNC(zcopy)
-#else
-#define COPY   BLASFUNC(ccopy)
-#endif
-#else
-#ifdef DOUBLE
-#define COPY   BLASFUNC(dcopy)
-#else
-#define COPY   BLASFUNC(scopy)
-#endif
-#endif
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y;
-  FLOAT alpha[2] = { 2.0, 2.0 };
-  blasint m, i;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-    	gettimeofday( &start, (struct timezone *)0);
-
-    	COPY (&m, x, &inc_x, y, &inc_y );
-
-    	gettimeofday( &stop, (struct timezone *)0);
-
-    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MBytes\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

benchmark/geev.c

@@ -144,7 +144,6 @@ int main(int argc, char *argv[]){
   FLOAT *a,*vl,*vr,*wi,*wr,*work,*rwork;
   FLOAT wkopt[4];
   char job='V';
-  char jobr='N';
   char *p;
 
   blasint m, i, j, info,lwork;
@@ -203,9 +202,9 @@ int main(int argc, char *argv[]){
     lwork = -1;
     m=to;
 #ifndef COMPLEX
-    GEEV (&job, &jobr, &m, a, &m, wr, wi, vl, &m, vr, &m, wkopt, &lwork, &info);
+    GEEV (&job, &job, &m, a, &m, wr, wi, vl, &m, vr, &m, wkopt, &lwork, &info);
 #else
-    GEEV (&job, &jobr, &m, a, &m, wr, vl, &m, vr, &m, wkopt, &lwork,rwork, &info);
+    GEEV (&job, &job, &m, a, &m, wr, vl, &m, vr, &m, wkopt, &lwork,rwork, &info);
 #endif
 
   lwork = (blasint)wkopt[0];
@@ -227,16 +226,16 @@ int main(int argc, char *argv[]){
 
     lwork = -1;
 #ifndef COMPLEX
-    GEEV (&job, &jobr, &m, a, &m, wr, wi, vl, &m, vr, &m, wkopt, &lwork, &info);
+    GEEV (&job, &job, &m, a, &m, wr, wi, vl, &m, vr, &m, wkopt, &lwork, &info);
 #else
-    GEEV (&job, &jobr, &m, a, &m, wr, vl, &m, vr, &m, wkopt, &lwork,rwork, &info);
+    GEEV (&job, &job, &m, a, &m, wr, vl, &m, vr, &m, wkopt, &lwork,rwork, &info);
 #endif
 
     lwork = (blasint)wkopt[0];
 #ifndef COMPLEX
-    GEEV (&job, &jobr, &m, a, &m, wr, wi, vl, &m, vr, &m, work, &lwork, &info);
+    GEEV (&job, &job, &m, a, &m, wr, wi, vl, &m, vr, &m, work, &lwork, &info);
 #else
-    GEEV (&job, &jobr, &m, a, &m, wr, vl, &m, vr, &m, work, &lwork,rwork, &info);
+    GEEV (&job, &job, &m, a, &m, wr, vl, &m, vr, &m, work, &lwork,rwork, &info);
 #endif
 
     gettimeofday( &stop, (struct timezone *)0);

benchmark/gemm.c

@@ -122,7 +122,7 @@ int main(int argc, char *argv[]){
 
   FLOAT *a, *b, *c;
   FLOAT alpha[] = {1.0, 1.0};
-  FLOAT beta [] = {0.0, 0.0};
+  FLOAT beta [] = {1.0, 1.0};
   char trans='N';
   blasint m, n, i, j;
   int loops = 1;
@@ -168,21 +168,12 @@ int main(int argc, char *argv[]){
 	  has_param_n=1;	  
   }
 
+
 #ifdef linux
   srandom(getpid());
 #endif
- 
-	for(j = 0; j < m; j++){
-      		for(i = 0; i < to * COMPSIZE; i++){
-			a[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-			b[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-			c[i + j * to * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      		}
-    	}
 
-
-
-  fprintf(stderr, "   SIZE          Flops          Time\n");
+  fprintf(stderr, "   SIZE       Flops\n");
 
   for(m = from; m <= to; m += step)
   {
@@ -197,23 +188,34 @@ int main(int argc, char *argv[]){
 
 
     fprintf(stderr, " %6dx%d : ", (int)m, (int)n);
-    gettimeofday( &start, (struct timezone *)0);
 
     for (l=0; l<loops; l++)
     {
+  
+    	for(j = 0; j < m; j++){
+      		for(i = 0; i < m * COMPSIZE; i++){
+			a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+			c[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+      		}
+    	}
+
+    	gettimeofday( &start, (struct timezone *)0);
 
     	GEMM (&trans, &trans, &m, &n, &m, alpha, a, &m, b, &m, beta, c, &m );
 
+    	gettimeofday( &stop, (struct timezone *)0);
 
+    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
+
+	timeg += time1;
 
     }
-   gettimeofday( &stop, (struct timezone *)0);
-   time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
 
-    timeg = time1/loops;
+    timeg /= loops;
     fprintf(stderr,
-	    " %10.2f MFlops %10.6f sec\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)m * (double)m * (double)n / timeg * 1.e-6, time1);
+	    " %10.2f MFlops\n",
+	    COMPSIZE * COMPSIZE * 2. * (double)m * (double)m * (double)n / timeg * 1.e-6);
 
   }
 

benchmark/ger.c

@@ -35,19 +35,12 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #undef GER
 
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define GER   BLASFUNC(zgeru)
-#else
-#define GER   BLASFUNC(cgeru)
-#endif
-#else
+
 #ifdef DOUBLE
 #define GER   BLASFUNC(dger)
 #else
 #define GER   BLASFUNC(sger)
 #endif
-#endif
 
 
 #if defined(__WIN32__) || defined(__WIN64__)

benchmark/gesv.c

@@ -1,218 +0,0 @@
-/*********************************************************************/
-/* Copyright 2009, 2010 The University of Texas at Austin.           */
-/* All rights reserved.                                              */
-/*                                                                   */
-/* Redistribution and use in source and binary forms, with or        */
-/* without modification, are permitted provided that the following   */
-/* conditions are met:                                               */
-/*                                                                   */
-/*   1. Redistributions of source code must retain the above         */
-/*      copyright notice, this list of conditions and the following  */
-/*      disclaimer.                                                  */
-/*                                                                   */
-/*   2. Redistributions in binary form must reproduce the above      */
-/*      copyright notice, this list of conditions and the following  */
-/*      disclaimer in the documentation and/or other materials       */
-/*      provided with the distribution.                              */
-/*                                                                   */
-/*    THIS  SOFTWARE IS PROVIDED  BY THE  UNIVERSITY OF  TEXAS AT    */
-/*    AUSTIN  ``AS IS''  AND ANY  EXPRESS OR  IMPLIED WARRANTIES,    */
-/*    INCLUDING, BUT  NOT LIMITED  TO, THE IMPLIED  WARRANTIES OF    */
-/*    MERCHANTABILITY  AND FITNESS FOR  A PARTICULAR  PURPOSE ARE    */
-/*    DISCLAIMED.  IN  NO EVENT SHALL THE UNIVERSITY  OF TEXAS AT    */
-/*    AUSTIN OR CONTRIBUTORS BE  LIABLE FOR ANY DIRECT, INDIRECT,    */
-/*    INCIDENTAL,  SPECIAL, EXEMPLARY,  OR  CONSEQUENTIAL DAMAGES    */
-/*    (INCLUDING, BUT  NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE    */
-/*    GOODS  OR  SERVICES; LOSS  OF  USE,  DATA,  OR PROFITS;  OR    */
-/*    BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON ANY THEORY OF    */
-/*    LIABILITY, WHETHER  IN CONTRACT, STRICT  LIABILITY, OR TORT    */
-/*    (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING IN ANY WAY OUT    */
-/*    OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF ADVISED  OF  THE    */
-/*    POSSIBILITY OF SUCH DAMAGE.                                    */
-/*                                                                   */
-/* The views and conclusions contained in the software and           */
-/* documentation are those of the authors and should not be          */
-/* interpreted as representing official policies, either expressed   */
-/* or implied, of The University of Texas at Austin.                 */
-/*********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#include "common.h"
-
-double fabs(double);
-
-#undef GESV
-#undef GETRS
-
-#ifndef COMPLEX
-#ifdef XDOUBLE
-#define GESV   BLASFUNC(qgesv)
-#elif defined(DOUBLE)
-#define GESV   BLASFUNC(dgesv)
-#else
-#define GESV   BLASFUNC(sgesv)
-#endif
-#else
-#ifdef XDOUBLE
-#define GESV   BLASFUNC(xgesv)
-#elif defined(DOUBLE)
-#define GESV   BLASFUNC(zgesv)
-#else
-#define GESV   BLASFUNC(cgesv)
-#endif
-#endif
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *a, *b;
-  blasint *ipiv;
-
-  blasint m, i, j, info;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d\n", from, to, step);
-
-  if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( b = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( ipiv = (blasint *)malloc(sizeof(blasint) * to * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops              Time\n");
-
-  for(m = from; m <= to; m += step){
-
-    fprintf(stderr, " %dx%d : ", (int)m, (int)m);
-
-    for(j = 0; j < m; j++){
-      for(i = 0; i < m * COMPSIZE; i++){
-	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      }
-    }
-
-    for(j = 0; j < m; j++){
-      for(i = 0; i < m * COMPSIZE; i++){
-	b[i + j * m * COMPSIZE] = 0.0;
-      }
-    }
-
-
-    for (j = 0; j < m; ++j) {
-      for (i = 0; i < m * COMPSIZE; ++i) {
-	b[i] += a[i + j * m * COMPSIZE];
-      }
-    }
-
-    gettimeofday( &start, (struct timezone *)0);
-
-    GESV (&m, &m, a, &m, ipiv, b, &m,  &info);
-
-    gettimeofday( &stop, (struct timezone *)0);
-
-
-    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-
-
-    fprintf(stderr,
-	    "%10.2f MFlops %10.6f s\n",
-	    COMPSIZE * COMPSIZE * (2. / 3. * (double)m * (double)m * (double)m + 2. * (double)m * (double)m * (double)m ) / (time1) * 1.e-6 , time1);
-
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

benchmark/plot-filter.sh

@@ -52,11 +52,6 @@ C)
 	awk '/MFlops/ { print $3,int($9) }'|tail --lines=+2
 	;;
 
-B)
-	# Copy Benchmark	
-	awk '/MBytes/ { print $1,int($3) }'|tail --lines=+2
-	;;
-
 
 *)
 	awk '/MFlops/ { print $1,int($3) }'|tail --lines=+2

benchmark/potrf.c

@@ -88,10 +88,6 @@ double fabs(double);
 
 #if defined(__WIN32__) || defined(__WIN64__)
 
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
 int gettimeofday(struct timeval *tv, void *tz){
 
   FILETIME ft;

benchmark/scal.c

@@ -1,202 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#include "common.h"
-
-
-#undef SCAL
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define SCAL   BLASFUNC(zscal)
-#else
-#define SCAL   BLASFUNC(cscal)
-#endif
-#else
-#ifdef DOUBLE
-#define SCAL   BLASFUNC(dscal)
-#else
-#define SCAL   BLASFUNC(sscal)
-#endif
-#endif
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y;
-  FLOAT alpha[2] = { 2.0, 2.0 };
-  blasint m, i;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-    	gettimeofday( &start, (struct timezone *)0);
-
-    	SCAL (&m, alpha, x, &inc_x);
-
-    	gettimeofday( &stop, (struct timezone *)0);
-
-    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-#ifdef COMPLEX
-    fprintf(stderr, " %10.2f MFlops\n", 6. * (double)m / timeg * 1.e-6);
-#else
-    fprintf(stderr, " %10.2f MFlops\n", 1. * (double)m / timeg * 1.e-6);
-#endif
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

benchmark/scripts/NUMPY/cgemm.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_cgemm(N,l):
-
-	A = randn(N,N).astype('float32') + randn(N,N).astype('float32') * 1j;
-	B = randn(N,N).astype('float32') + randn(N,N).astype('float32') * 1j;
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 8*N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_cgemm(i,LOOPS)
-

benchmark/scripts/NUMPY/cgemv.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_cgemv(N,l):
-
-	A = randn(N,N).astype('float32') + randn(N,N).astype('float32') * 1j;
-	B = randn(N).astype('float32') + randn(N).astype('float32') * 1j;
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 8*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_cgemv(i,LOOPS)
-

benchmark/scripts/NUMPY/daxpy.py

@@ -1,58 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-from scipy.linalg.blas import daxpy
-
-
-def run_daxpy(N,l):
-
-	x = randn(N).astype('float64')
-	y = randn(N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		y = daxpy(x,y, a=2.0 )
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N ) *l / timediff
-	mflops *= 1e-6
-
-	size = "%d" % (N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_daxpy(i,LOOPS)
-

benchmark/scripts/NUMPY/ddot.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_ddot(N,l):
-
-	A = randn(N).astype('float64')
-	B = randn(N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N ) *l / timediff
-	mflops *= 1e-6
-
-	size = "%d" % (N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_ddot(i,LOOPS)
-

benchmark/scripts/NUMPY/deig.py

@@ -1,55 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_deig(N,l):
-
-	A = randn(N,N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		la,v = numpy.linalg.eig(A)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 26.33 *N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_deig(i,LOOPS)
-

benchmark/scripts/NUMPY/dgemm.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_dgemm(N,l):
-
-	A = randn(N,N).astype('float64')
-	B = randn(N,N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_dgemm(i,LOOPS)
-

benchmark/scripts/NUMPY/dgemv.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_dgemv(N,l):
-
-	A = randn(N,N).astype('float64')
-	B = randn(N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_dgemv(i,LOOPS)
-

benchmark/scripts/NUMPY/dgesv.py

@@ -1,58 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-from scipy.linalg.lapack import dgesv
-
-def run_dgesv(N,l):
-
-	a = randn(N,N).astype('float64')
-	b = randn(N,N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		dgesv(a,b,1,1)
-	end = time.time()
-	
-	timediff = (end -start) 
-
-	mflops = ( 2.0/3.0 *N*N*N + 2.0*N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_dgesv(i,LOOPS)
-

benchmark/scripts/NUMPY/dsolve.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_dsolve(N,l):
-
-	A = randn(N,N).astype('float64')
-	B = randn(N,N).astype('float64')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.linalg.solve(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2.0/3.0 *N*N*N + 2.0*N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_dsolve(i,LOOPS)
-

benchmark/scripts/NUMPY/sdot.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_sdot(N,l):
-
-	A = randn(N).astype('float32')
-	B = randn(N).astype('float32')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N ) *l / timediff
-	mflops *= 1e-6
-
-	size = "%d" % (N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_sdot(i,LOOPS)
-

benchmark/scripts/NUMPY/sgemm.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_sgemm(N,l):
-
-	A = randn(N,N).astype('float32')
-	B = randn(N,N).astype('float32')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_sgemm(i,LOOPS)
-

benchmark/scripts/NUMPY/sgemv.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_sgemv(N,l):
-
-	A = randn(N,N).astype('float32')
-	B = randn(N).astype('float32')
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 2*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_sgemv(i,LOOPS)
-

benchmark/scripts/NUMPY/zgemm.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_zgemm(N,l):
-
-	A = randn(N,N).astype('float64') + randn(N,N).astype('float64') * 1j;
-	B = randn(N,N).astype('float64') + randn(N,N).astype('float64') * 1j;
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 8*N*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_zgemm(i,LOOPS)
-

benchmark/scripts/NUMPY/zgemv.py

@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import time
-import numpy
-from numpy.random import randn
-
-def run_zgemv(N,l):
-
-	A = randn(N,N).astype('float64') + randn(N,N).astype('float64') * 1j;
-	B = randn(N).astype('float64') + randn(N).astype('float64') * 1j;
-
-	start = time.time();
-	for i in range(0,l):
-		ref = numpy.dot(A,B)
-	end = time.time()
-	
-	timediff = (end -start) 
-	mflops = ( 8*N*N) *l / timediff
-	mflops *= 1e-6
-
-	size = "%dx%d" % (N,N)
-	print("%14s :\t%20f MFlops\t%20f sec" % (size,mflops,timediff))
-
-
-if __name__ == "__main__":
-	N=128
-	NMAX=2048
-	NINC=128
-	LOOPS=1
-
-	z=0
-	for arg in sys.argv:
-		if z == 1:
-			N = int(arg)
-		elif z == 2:
-			NMAX = int(arg)
-		elif z == 3:
-			NINC = int(arg)
-		elif z == 4:
-			LOOPS = int(arg)
-
-		z = z + 1
-
-	if 'OPENBLAS_LOOPS' in os.environ:
-		p = os.environ['OPENBLAS_LOOPS']
-		if p:
-			LOOPS = int(p);
-
-	print("From: %d To: %d Step=%d Loops=%d" % (N, NMAX, NINC, LOOPS))
-	print("\tSIZE\t\t\tFlops\t\t\t\t\tTime")
-
-	for i in range (N,NMAX+NINC,NINC):
-		run_zgemv(i,LOOPS)
-

benchmark/scripts/OCTAVE/cgemm.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = single(rand(n,n)) + single(rand(n,n)) * 1i;
-	B = single(rand(n,n)) + single(rand(n,n)) * 1i;
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 4.0 * 2.0*n*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/cgemv.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = single(rand(n,n)) + single(rand(n,n)) * 1i;
-	B = single(rand(n,1)) + single(rand(n,1)) * 1i;
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 4.0 * 2.0*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/deig.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = double(rand(n,n));
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		[V,lambda] = eig(A);
-		l = l + 1;
-
-	endwhile
-
-
-	timeg = etime(clock(), start);
-	mflops = ( 26.33 *n*n*n ) *loops / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg );
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/dgemm.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = double(rand(n,n));
-	B = double(rand(n,n));
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 2.0*n*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/dgemv.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = double(rand(n,n));
-	B = double(rand(n,1));
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 2.0*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/dsolve.m

@@ -1,59 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = double(rand(n,n));
-	B = double(rand(n,n));
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		x = linsolve(A,B);
-		#x = A / B;
-		l = l + 1;
-
-	endwhile
-
-
-	timeg = etime(clock(), start);
-	#r = norm(A*x - B)/norm(B)
-	mflops = ( 2.0/3.0 *n*n*n + 2.0*n*n*n ) *loops / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg );
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/sgemm.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = single(rand(n,n));
-	B = single(rand(n,n));
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 2.0*n*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/sgemv.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = single(rand(n,n));
-	B = single(rand(n,1));
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 2.0*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/zgemm.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = double(rand(n,n)) + double(rand(n,n)) * 1i;
-	B = double(rand(n,n)) + double(rand(n,n)) * 1i;
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 4.0 * 2.0*n*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/OCTAVE/zgemv.m

@@ -1,56 +0,0 @@
-#!/usr/bin/octave --silent 
-
-nfrom = 128 ;
-nto   = 2048;
-nstep = 128;
-loops = 1;
-
-
-arg_list = argv();
-for i = 1:nargin
-
-	switch(i)
-		case 1
-			nfrom = str2num(arg_list{i});
-		case 2
-			nto   = str2num(arg_list{i});
-		case 3
-			nstep = str2num(arg_list{i});
-		case 4
-			loops = str2num(arg_list{i});
-
-	endswitch
-
-endfor
-
-p = getenv("OPENBLAS_LOOPS");
-if p 
-	loops = str2num(p);
-endif
-
-printf("From %d To %d Step=%d Loops=%d\n",nfrom, nto, nstep, loops);
-printf("        SIZE             FLOPS             TIME\n");
-
-n = nfrom;
-while n <= nto
-
-	A = double(rand(n,n)) + double(rand(n,n)) * 1i;
-	B = double(rand(n,1)) + double(rand(n,1)) * 1i;
-	start = clock();
-
-	l=0;
-	while l < loops
-
-		C = A * B;
-		l = l + 1;
-
-	endwhile
-
-	timeg = etime(clock(), start);
-	mflops = ( 4.0 * 2.0*n*n *loops ) / ( timeg * 1.0e6 );
-
-	st1 = sprintf("%dx%d : ", n,n);
-	printf("%20s %10.2f MFlops %10.6f sec\n", st1, mflops, timeg);
-	n = n + nstep;
-
-endwhile

benchmark/scripts/R/deig.R

@@ -1,62 +0,0 @@
-#!/usr/bin/Rscript
-
-argv <- commandArgs(trailingOnly = TRUE)
-
-nfrom = 128
-nto = 2048
-nstep = 128
-loops = 1
-
-if ( length(argv) > 0 ) {
-
-	for ( z in 1:length(argv) ) {
-
-		if ( z == 1 ) {
-			nfrom <- as.numeric(argv[z])
-		} else if ( z==2 ) {
-			nto <- as.numeric(argv[z])
-		} else if ( z==3 ) {
-			nstep <- as.numeric(argv[z])
-		} else if ( z==4 ) {
-			loops <- as.numeric(argv[z])
-		}
-	}
-
-}
-
-p=Sys.getenv("OPENBLAS_LOOPS")
-if ( p != "" ) {
-	loops <- as.numeric(p)
-}	
-
-
-cat(sprintf("From %.0f To %.0f Step=%.0f Loops=%.0f\n",nfrom, nto, nstep, loops))
-cat(sprintf("      SIZE             Flops                   Time\n"))
-
-n = nfrom
-while ( n <= nto ) {
-
-	A <- matrix(runif(n*n), ncol = n, nrow = n, byrow = TRUE)
-	
-	l = 1
-
-	start <- proc.time()[3]
-
-	while ( l <= loops ) {
-
-		ev <- eigen(A)
-		l = l + 1
-	}
-
-	end <- proc.time()[3]
-	timeg = end - start
-	mflops = (26.66 *n*n*n ) * loops / ( timeg * 1.0e6 )
-
-	st = sprintf("%.0fx%.0f :",n , n)
-	cat(sprintf("%20s %10.2f MFlops %10.6f sec\n", st, mflops, timeg))
-
-	n = n + nstep
-
-}
-
-

benchmark/scripts/R/dgemm.R

@@ -1,63 +0,0 @@
-#!/usr/bin/Rscript
-
-argv <- commandArgs(trailingOnly = TRUE)
-
-nfrom = 128
-nto = 2048
-nstep = 128
-loops = 1
-
-if ( length(argv) > 0 ) {
-
-	for ( z in 1:length(argv) ) {
-
-		if ( z == 1 ) {
-			nfrom <- as.numeric(argv[z])
-		} else if ( z==2 ) {
-			nto <- as.numeric(argv[z])
-		} else if ( z==3 ) {
-			nstep <- as.numeric(argv[z])
-		} else if ( z==4 ) {
-			loops <- as.numeric(argv[z])
-		}
-	}
-
-}
-
-p=Sys.getenv("OPENBLAS_LOOPS")
-if ( p != "" ) {
-	loops <- as.numeric(p)
-}	
-
-
-cat(sprintf("From %.0f To %.0f Step=%.0f Loops=%.0f\n",nfrom, nto, nstep, loops))
-cat(sprintf("      SIZE             Flops                   Time\n"))
-
-n = nfrom
-while ( n <= nto ) {
-
-	A <- matrix(runif(n*n), ncol = n, nrow = n, byrow = TRUE)
-	B <- matrix(runif(n*n), ncol = n, nrow = n, byrow = TRUE)
-	
-	l = 1
-
-	start <- proc.time()[3]
-
-	while ( l <= loops ) {
-
-		C <- A %*% B
-		l = l + 1
-	}
-
-	end <- proc.time()[3]
-	timeg = end - start
-	mflops = ( 2.0 *n*n*n ) * loops / ( timeg * 1.0e6 )
-
-	st = sprintf("%.0fx%.0f :",n , n)
-	cat(sprintf("%20s %10.2f MFlops %10.6f sec\n", st, mflops, timeg))
-
-	n = n + nstep
-
-}
-
-

benchmark/scripts/R/dsolve.R

@@ -1,63 +0,0 @@
-#!/usr/bin/Rscript
-
-argv <- commandArgs(trailingOnly = TRUE)
-
-nfrom = 128
-nto = 2048
-nstep = 128
-loops = 1
-
-if ( length(argv) > 0 ) {
-
-	for ( z in 1:length(argv) ) {
-
-		if ( z == 1 ) {
-			nfrom <- as.numeric(argv[z])
-		} else if ( z==2 ) {
-			nto <- as.numeric(argv[z])
-		} else if ( z==3 ) {
-			nstep <- as.numeric(argv[z])
-		} else if ( z==4 ) {
-			loops <- as.numeric(argv[z])
-		}
-	}
-
-}
-
-p=Sys.getenv("OPENBLAS_LOOPS")
-if ( p != "" ) {
-	loops <- as.numeric(p)
-}	
-
-
-cat(sprintf("From %.0f To %.0f Step=%.0f Loops=%.0f\n",nfrom, nto, nstep, loops))
-cat(sprintf("      SIZE             Flops                   Time\n"))
-
-n = nfrom
-while ( n <= nto ) {
-
-	A <- matrix(runif(n*n), ncol = n, nrow = n, byrow = TRUE)
-	B <- matrix(runif(n*n), ncol = n, nrow = n, byrow = TRUE)
-	
-	l = 1
-
-	start <- proc.time()[3]
-
-	while ( l <= loops ) {
-
-		solve(A,B)
-		l = l + 1
-	}
-
-	end <- proc.time()[3]
-	timeg = end - start
-	mflops = (2.0/3.0 *n*n*n + 2.0 *n*n*n ) * loops / ( timeg * 1.0e6 )
-
-	st = sprintf("%.0fx%.0f :",n , n)
-	cat(sprintf("%20s %10.2f MFlops %10.6f sec\n", st, mflops, timeg))
-
-	n = n + nstep
-
-}
-
-

benchmark/swap.c

@@ -1,201 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above swapright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above swapright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE SWAPRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#include "common.h"
-
-
-#undef SWAP
-
-#ifdef COMPLEX
-#ifdef DOUBLE
-#define SWAP   BLASFUNC(zswap)
-#else
-#define SWAP   BLASFUNC(cswap)
-#endif
-#else
-#ifdef DOUBLE
-#define SWAP   BLASFUNC(dswap)
-#else
-#define SWAP   BLASFUNC(sswap)
-#endif
-#endif
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y;
-  FLOAT alpha[2] = { 2.0, 2.0 };
-  blasint m, i;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-    	gettimeofday( &start, (struct timezone *)0);
-
-    	SWAP (&m, x, &inc_x, y, &inc_y );
-
-    	gettimeofday( &stop, (struct timezone *)0);
-
-    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MBytes\n",
-	    COMPSIZE * sizeof(FLOAT) * 1. * (double)m / timeg * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

benchmark/trsm.c

@@ -130,21 +130,11 @@ int main(int argc, char *argv[]){
   char trans='N';
   char diag ='U';
 
-
-  int l;
-  int loops = 1;
-  double timeg;
-
   if ((p = getenv("OPENBLAS_SIDE"))) side=*p; 
   if ((p = getenv("OPENBLAS_UPLO"))) uplo=*p;
   if ((p = getenv("OPENBLAS_TRANS"))) trans=*p;
   if ((p = getenv("OPENBLAS_DIAG"))) diag=*p;
 
-  p = getenv("OPENBLAS_LOOPS");
-  if ( p != NULL )
-        loops = atoi(p);
-
-
   blasint m, i, j;
 
   int from =   1;
@@ -160,7 +150,7 @@ int main(int argc, char *argv[]){
   if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
   if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
 
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Side = %c Uplo = %c Trans = %c Diag = %c Loops = %d\n", from, to, step,side,uplo,trans,diag,loops);
+  fprintf(stderr, "From : %3d  To : %3d Step = %3d Side = %c Uplo = %c Trans = %c Diag = %c\n", from, to, step,side,uplo,trans,diag);
 
   if (( a = (FLOAT *)malloc(sizeof(FLOAT) * to * to * COMPSIZE)) == NULL){
     fprintf(stderr,"Out of Memory!!\n");exit(1);
@@ -181,35 +171,28 @@ int main(int argc, char *argv[]){
   for(m = from; m <= to; m += step)
   {
 
-	timeg=0.0;
+    fprintf(stderr, " %6d : ", (int)m);
 
-        fprintf(stderr, " %6d : ", (int)m);
+    for(j = 0; j < m; j++){
+      for(i = 0; i < m * COMPSIZE; i++){
+	a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+	b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
+      }
+    }
 
-	for (l=0; l<loops; l++)
-    	{
+    gettimeofday( &start, (struct timezone *)0);
 
+    TRSM (&side, &uplo, &trans, &diag, &m, &m, alpha, a, &m, b, &m);
 
-   		 for(j = 0; j < m; j++){
-      			for(i = 0; i < m * COMPSIZE; i++){
-				a[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-				b[i + j * m * COMPSIZE] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-      		 	}
-    		 }
+    gettimeofday( &stop, (struct timezone *)0);
 
-    		gettimeofday( &start, (struct timezone *)0);
+    time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
 
-    		TRSM (&side, &uplo, &trans, &diag, &m, &m, alpha, a, &m, b, &m);
+    gettimeofday( &start, (struct timezone *)0);
 
-    		gettimeofday( &stop, (struct timezone *)0);
-
-    		time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-		timeg += time1;
-        }
-
-	time1 = timeg/loops;
-
-        fprintf(stderr, " %10.2f MFlops\n", COMPSIZE * COMPSIZE * 1. * (double)m * (double)m * (double)m / time1 * 1.e-6);
+    fprintf(stderr,
+	    " %10.2f MFlops\n",
+	    COMPSIZE * COMPSIZE * 1. * (double)m * (double)m * (double)m / time1 * 1.e-6);
 
   }
 

benchmark/zdot-intel.c

@@ -1,196 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#define RETURN_BY_STACK 1
-#include "common.h"
-
-
-#undef DOT
-
-
-#ifdef DOUBLE
-#define DOT   BLASFUNC(zdotu)
-#else
-#define DOT   BLASFUNC(cdotu)
-#endif
-
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y;
-  FLOAT _Complex result;
-  blasint m, i;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-    	gettimeofday( &start, (struct timezone *)0);
-
-    	DOT (&result, &m, x, &inc_x, y, &inc_y );
-
-    	gettimeofday( &stop, (struct timezone *)0);
-
-    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)m / timeg * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

benchmark/zdot.c

@@ -1,195 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __CYGWIN32__
-#include <sys/time.h>
-#endif
-#include "common.h"
-
-
-#undef DOT
-
-
-#ifdef DOUBLE
-#define DOT   BLASFUNC(zdotu)
-#else
-#define DOT   BLASFUNC(cdotu)
-#endif
-
-
-#if defined(__WIN32__) || defined(__WIN64__)
-
-#ifndef DELTA_EPOCH_IN_MICROSECS
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-int gettimeofday(struct timeval *tv, void *tz){
-
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-    {
-      GetSystemTimeAsFileTime(&ft);
-
-      tmpres |= ft.dwHighDateTime;
-      tmpres <<= 32;
-      tmpres |= ft.dwLowDateTime;
-
-      /*converting file time to unix epoch*/
-      tmpres /= 10;  /*convert into microseconds*/
-      tmpres -= DELTA_EPOCH_IN_MICROSECS;
-      tv->tv_sec = (long)(tmpres / 1000000UL);
-      tv->tv_usec = (long)(tmpres % 1000000UL);
-    }
-
-  return 0;
-}
-
-#endif
-
-#if !defined(__WIN32__) && !defined(__WIN64__) && !defined(__CYGWIN32__) && 0
-
-static void *huge_malloc(BLASLONG size){
-  int shmid;
-  void *address;
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-
-  if ((shmid =shmget(IPC_PRIVATE,
-		     (size + HUGE_PAGESIZE) & ~(HUGE_PAGESIZE - 1),
-		     SHM_HUGETLB | IPC_CREAT |0600)) < 0) {
-    printf( "Memory allocation failed(shmget).\n");
-    exit(1);
-  }
-
-  address = shmat(shmid, NULL, SHM_RND);
-
-  if ((BLASLONG)address == -1){
-    printf( "Memory allocation failed(shmat).\n");
-    exit(1);
-  }
-
-  shmctl(shmid, IPC_RMID, 0);
-
-  return address;
-}
-
-#define malloc huge_malloc
-
-#endif
-
-int main(int argc, char *argv[]){
-
-  FLOAT *x, *y;
-  FLOAT _Complex result;
-  blasint m, i;
-  blasint inc_x=1,inc_y=1;
-  int loops = 1;
-  int l;
-  char *p;
-
-  int from =   1;
-  int to   = 200;
-  int step =   1;
-
-  struct timeval start, stop;
-  double time1,timeg;
-
-  argc--;argv++;
-
-  if (argc > 0) { from     = atol(*argv);		argc--; argv++;}
-  if (argc > 0) { to       = MAX(atol(*argv), from);	argc--; argv++;}
-  if (argc > 0) { step     = atol(*argv);		argc--; argv++;}
-
-  if ((p = getenv("OPENBLAS_LOOPS")))  loops = atoi(p);
-  if ((p = getenv("OPENBLAS_INCX")))   inc_x = atoi(p);
-  if ((p = getenv("OPENBLAS_INCY")))   inc_y = atoi(p);
-
-  fprintf(stderr, "From : %3d  To : %3d Step = %3d Inc_x = %d Inc_y = %d Loops = %d\n", from, to, step,inc_x,inc_y,loops);
-
-  if (( x = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_x) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-  if (( y = (FLOAT *)malloc(sizeof(FLOAT) * to * abs(inc_y) * COMPSIZE)) == NULL){
-    fprintf(stderr,"Out of Memory!!\n");exit(1);
-  }
-
-#ifdef linux
-  srandom(getpid());
-#endif
-
-  fprintf(stderr, "   SIZE       Flops\n");
-
-  for(m = from; m <= to; m += step)
-  {
-
-   timeg=0;
-
-   fprintf(stderr, " %6d : ", (int)m);
-
-
-   for (l=0; l<loops; l++)
-   {
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_x); i++){
-			x[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-
-   	for(i = 0; i < m * COMPSIZE * abs(inc_y); i++){
-			y[i] = ((FLOAT) rand() / (FLOAT) RAND_MAX) - 0.5;
-   	}
-    	gettimeofday( &start, (struct timezone *)0);
-
-    	result = DOT (&m, x, &inc_x, y, &inc_y );
-
-    	gettimeofday( &stop, (struct timezone *)0);
-
-    	time1 = (double)(stop.tv_sec - start.tv_sec) + (double)((stop.tv_usec - start.tv_usec)) * 1.e-6;
-
-	timeg += time1;
-
-    }
-
-    timeg /= loops;
-
-    fprintf(stderr,
-	    " %10.2f MFlops\n",
-	    COMPSIZE * COMPSIZE * 2. * (double)m / timeg * 1.e-6);
-
-  }
-
-  return 0;
-}
-
-// void main(int argc, char *argv[]) __attribute__((weak, alias("MAIN__")));

c_check

@@ -4,8 +4,6 @@
 $hostos   = `uname -s | sed -e s/\-.*//`;    chop($hostos);
 $hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
 $hostarch = "x86_64" if ($hostarch eq "amd64");
-$hostarch = "arm" if ($hostarch =~ /^arm.*/);
-$hostarch = "arm64" if ($hostarch eq "aarch64");
 
 $binary = $ENV{"BINARY"};
 
@@ -57,7 +55,6 @@ $os = osf             if ($data =~ /OS_OSF/);
 $os = WINNT           if ($data =~ /OS_WINNT/);
 $os = CYGWIN_NT       if ($data =~ /OS_CYGWIN_NT/);
 $os = Interix         if ($data =~ /OS_INTERIX/);
-$os = Android         if ($data =~ /OS_ANDROID/);
 
 $architecture = x86    if ($data =~ /ARCH_X86/);
 $architecture = x86_64 if ($data =~ /ARCH_X86_64/);

common.h

@@ -93,10 +93,6 @@ extern "C" {
 #include <sched.h>
 #endif
 
-#ifdef OS_ANDROID
-#define NO_SYSV_IPC
-#endif
-
 #ifdef OS_WINDOWS
 #ifdef  ATOM
 #define GOTO_ATOM ATOM
@@ -110,9 +106,7 @@ extern "C" {
 #endif
 #else
 #include <sys/mman.h>
-#ifndef NO_SYSV_IPC
 #include <sys/shm.h>
-#endif
 #include <sys/time.h>
 #include <unistd.h>
 #include <math.h>
@@ -276,11 +270,6 @@ typedef int blasint;
 #define SIZE	8
 #define  BASE_SHIFT 3
 #define ZBASE_SHIFT 4
-#elif defined(INTEGER) //extend for integer matrix
-#define FLOAT	int
-#define SIZE    4
-#define  BASE_SHIFT 2
-#define ZBASE_SHIFT 3
 #else
 #define FLOAT	float
 #define SIZE    4
@@ -510,8 +499,6 @@ void  blas_set_parameter(void);
 int   blas_get_cpu_number(void);
 void *blas_memory_alloc  (int);
 void  blas_memory_free   (void *);
-void *blas_memory_alloc_nolock  (int); //use malloc without blas_lock
-void  blas_memory_free_nolock   (void *);
 
 int  get_num_procs (void);
 

common_arm.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-Copyright (c) 2011-2015, The OpenBLAS Project
+Copyright (c) 2011-2014, The OpenBLAS Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,21 +30,50 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **********************************************************************************/
 
+/*********************************************************************/
+/* Copyright 2009, 2010 The University of Texas at Austin.           */
+/* All rights reserved.                                              */
+/*                                                                   */
+/* Redistribution and use in source and binary forms, with or        */
+/* without modification, are permitted provided that the following   */
+/* conditions are met:                                               */
+/*                                                                   */
+/*   1. Redistributions of source code must retain the above         */
+/*      copyright notice, this list of conditions and the following  */
+/*      disclaimer.                                                  */
+/*                                                                   */
+/*   2. Redistributions in binary form must reproduce the above      */
+/*      copyright notice, this list of conditions and the following  */
+/*      disclaimer in the documentation and/or other materials       */
+/*      provided with the distribution.                              */
+/*                                                                   */
+/*    THIS  SOFTWARE IS PROVIDED  BY THE  UNIVERSITY OF  TEXAS AT    */
+/*    AUSTIN  ``AS IS''  AND ANY  EXPRESS OR  IMPLIED WARRANTIES,    */
+/*    INCLUDING, BUT  NOT LIMITED  TO, THE IMPLIED  WARRANTIES OF    */
+/*    MERCHANTABILITY  AND FITNESS FOR  A PARTICULAR  PURPOSE ARE    */
+/*    DISCLAIMED.  IN  NO EVENT SHALL THE UNIVERSITY  OF TEXAS AT    */
+/*    AUSTIN OR CONTRIBUTORS BE  LIABLE FOR ANY DIRECT, INDIRECT,    */
+/*    INCIDENTAL,  SPECIAL, EXEMPLARY,  OR  CONSEQUENTIAL DAMAGES    */
+/*    (INCLUDING, BUT  NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE    */
+/*    GOODS  OR  SERVICES; LOSS  OF  USE,  DATA,  OR PROFITS;  OR    */
+/*    BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON ANY THEORY OF    */
+/*    LIABILITY, WHETHER  IN CONTRACT, STRICT  LIABILITY, OR TORT    */
+/*    (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING IN ANY WAY OUT    */
+/*    OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF ADVISED  OF  THE    */
+/*    POSSIBILITY OF SUCH DAMAGE.                                    */
+/*                                                                   */
+/* The views and conclusions contained in the software and           */
+/* documentation are those of the authors and should not be          */
+/* interpreted as representing official policies, either expressed   */
+/* or implied, of The University of Texas at Austin.                 */
+/*********************************************************************/
+
 #ifndef COMMON_ARM
 #define COMMON_ARM
 
-#if defined(ARMV5) || defined(ARMV6)
-
 #define MB
 #define WMB
 
-#else
-
-#define MB   __asm__ __volatile__ ("dmb  ish" : : : "memory")
-#define WMB  __asm__ __volatile__ ("dmb  ishst" : : : "memory")
-
-#endif
-
 #define INLINE inline
 
 #define RETURN_BY_COMPLEX
@@ -59,12 +88,9 @@ static void __inline blas_lock(volatile BLASULONG *address){
     while (*address) {YIELDING;};
 
     __asm__ __volatile__(
-			 "1:								\n\t"
                          "ldrex r2, [%1]                                                \n\t"
                          "mov   r2, #0                                                  \n\t"
                          "strex r3, r2, [%1]                                            \n\t"
-			 "cmp	r3, #0							\n\t"
-			 "bne	1b							\n\t"
 			 "mov	%0 , r3							\n\t"
                          : "=r"(ret), "=r"(address)
                          : "1"(address)

common_arm64.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-Copyright (c) 2011-2015, The OpenBLAS Project
+Copyright (c) 2011-2014, The OpenBLAS Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,12 +30,49 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **********************************************************************************/
 
+/*********************************************************************/
+/* Copyright 2009, 2010 The University of Texas at Austin.           */
+/* All rights reserved.                                              */
+/*                                                                   */
+/* Redistribution and use in source and binary forms, with or        */
+/* without modification, are permitted provided that the following   */
+/* conditions are met:                                               */
+/*                                                                   */
+/*   1. Redistributions of source code must retain the above         */
+/*      copyright notice, this list of conditions and the following  */
+/*      disclaimer.                                                  */
+/*                                                                   */
+/*   2. Redistributions in binary form must reproduce the above      */
+/*      copyright notice, this list of conditions and the following  */
+/*      disclaimer in the documentation and/or other materials       */
+/*      provided with the distribution.                              */
+/*                                                                   */
+/*    THIS  SOFTWARE IS PROVIDED  BY THE  UNIVERSITY OF  TEXAS AT    */
+/*    AUSTIN  ``AS IS''  AND ANY  EXPRESS OR  IMPLIED WARRANTIES,    */
+/*    INCLUDING, BUT  NOT LIMITED  TO, THE IMPLIED  WARRANTIES OF    */
+/*    MERCHANTABILITY  AND FITNESS FOR  A PARTICULAR  PURPOSE ARE    */
+/*    DISCLAIMED.  IN  NO EVENT SHALL THE UNIVERSITY  OF TEXAS AT    */
+/*    AUSTIN OR CONTRIBUTORS BE  LIABLE FOR ANY DIRECT, INDIRECT,    */
+/*    INCIDENTAL,  SPECIAL, EXEMPLARY,  OR  CONSEQUENTIAL DAMAGES    */
+/*    (INCLUDING, BUT  NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE    */
+/*    GOODS  OR  SERVICES; LOSS  OF  USE,  DATA,  OR PROFITS;  OR    */
+/*    BUSINESS INTERRUPTION) HOWEVER CAUSED  AND ON ANY THEORY OF    */
+/*    LIABILITY, WHETHER  IN CONTRACT, STRICT  LIABILITY, OR TORT    */
+/*    (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING IN ANY WAY OUT    */
+/*    OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF ADVISED  OF  THE    */
+/*    POSSIBILITY OF SUCH DAMAGE.                                    */
+/*                                                                   */
+/* The views and conclusions contained in the software and           */
+/* documentation are those of the authors and should not be          */
+/* interpreted as representing official policies, either expressed   */
+/* or implied, of The University of Texas at Austin.                 */
+/*********************************************************************/
+
 #ifndef COMMON_ARM64
 #define COMMON_ARM64
 
-#define MB   __asm__ __volatile__ ("dmb  ish" : : : "memory")
-#define WMB  __asm__ __volatile__ ("dmb  ishst" : : : "memory")
-
+#define MB
+#define WMB
 
 #define INLINE inline
 
@@ -44,30 +81,26 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSEMBLER
 
 static void __inline blas_lock(volatile BLASULONG *address){
-
+/*
   int register ret;
-  int register tmp;
 
   do {
     while (*address) {YIELDING;};
 
     __asm__ __volatile__(
-                         "1:                                                            \n\t"
-                         "ldaxr %2, [%1]                                                \n\t"
-                         "mov   %2, #0                                                  \n\t"
-                         "stlxr %w0, %2, [%1]                                            \n\t"
-                         "cbnz  %w0, 1b                                                  \n\t"
-			 "mov   %0 , #0                                                  \n\t"
-                         : "=r"(ret), "=r"(address), "=r"(tmp)
+                         "ldrex r2, [%1]                                                \n\t"
+                         "mov   r2, #0                                                  \n\t"
+                         "strex r3, r2, [%1]                                            \n\t"
+			 "mov	%0 , r3							\n\t"
+                         : "=r"(ret), "=r"(address)
                          : "1"(address)
-                         : "memory", "%w0"
-			   //, "%r2" , "%r3"
+                         : "memory", "r2" , "r3"
 
 
     );
 
   } while (ret);
-
+*/
 }
 
 
@@ -133,4 +166,3 @@ REALNAME:
 #endif
 
 #endif
-

common_i.h

@@ -1,9 +0,0 @@
-#ifndef COMMON_I_H
-#define COMMON_I_H
-
-#ifndef DYNAMIC_ARCH
-#define	IAXPYU_K		iaxpy_k
-#else
-#error
-#endif
-#endif

common_interface.h

@@ -93,7 +93,6 @@ openblas_complex_xdouble BLASFUNC(xdotc)  (blasint *, xdouble  *, blasint *, xdo
 
 void    BLASFUNC(saxpy) (blasint *, float  *, float  *, blasint *, float  *, blasint *);
 void    BLASFUNC(daxpy) (blasint *, double *, double *, blasint *, double *, blasint *);
-void    BLASFUNC(iaxpy) (blasint *, int  *, int  *, blasint *, int  *, blasint *);
 void    BLASFUNC(qaxpy) (blasint *, xdouble *, xdouble *, blasint *, xdouble *, blasint *);
 void    BLASFUNC(caxpy) (blasint *, float  *, float  *, blasint *, float  *, blasint *);
 void    BLASFUNC(zaxpy) (blasint *, double *, double *, blasint *, double *, blasint *);

common_level1.h

@@ -60,8 +60,6 @@ int    daxpy_k (BLASLONG, BLASLONG, BLASLONG, double,
 	       double *, BLASLONG, double *, BLASLONG, double *, BLASLONG);
 int    qaxpy_k (BLASLONG, BLASLONG, BLASLONG, xdouble,
 	       xdouble *, BLASLONG, xdouble *, BLASLONG, xdouble *, BLASLONG);
-int    iaxpy_k (BLASLONG, BLASLONG, BLASLONG, int,
-	       int  *, BLASLONG, int  *, BLASLONG, int  *, BLASLONG);
 int    caxpy_k (BLASLONG, BLASLONG, BLASLONG, float,  float,
 	       float  *, BLASLONG, float  *, BLASLONG, float  *, BLASLONG);
 int    zaxpy_k (BLASLONG, BLASLONG, BLASLONG, double, double,

common_macro.h

@@ -47,10 +47,6 @@
 #include "common_z.h"
 #include "common_x.h"
 
-#ifdef INTEGER_PRECISION
-#include "common_i.h"
-#endif
-
 #ifndef COMPLEX
 #ifdef XDOUBLE
 
@@ -639,9 +635,6 @@
 #define OMATCOPY_K_CT		DOMATCOPY_K_CT
 #define OMATCOPY_K_RT		DOMATCOPY_K_RT
 #define GEADD_K                 DGEADD_K 
-
-#elif defined(INTEGER)
-#define AXPYU_K                 IAXPYU_K
 #else
 
 #define	AMAX_K			SAMAX_K

common_thread.h

@@ -65,7 +65,6 @@ extern int blas_omp_linked;
 #define BLAS_XDOUBLE	0x0002U
 #define BLAS_REAL	0x0000U
 #define BLAS_COMPLEX	0x0004U
-#define BLAS_INTEGER    0x0008U
 
 #define BLAS_TRANSA	0x0030U	/* 2bit */
 #define BLAS_TRANSA_N	0x0000U

common_x86.h

@@ -171,7 +171,7 @@ static __inline int blas_quickdivide(unsigned int x, unsigned int y){
 #define MMXSTORE	movd
 #endif
 
-#if defined(PILEDRIVER) || defined(BULLDOZER) || defined(STEAMROLLER) || defined(EXCAVATOR)
+#if defined(PILEDRIVER) || defined(BULLDOZER) || defined(STEAMROLLER)
 //Enable some optimazation for barcelona.
 #define BARCELONA_OPTIMIZATION
 #endif

common_x86_64.h

@@ -226,7 +226,7 @@ static __inline int blas_quickdivide(unsigned int x, unsigned int y){
 
 #ifdef ASSEMBLER
 
-#if defined(PILEDRIVER) || defined(BULLDOZER) || defined(STEAMROLLER) || defined(EXCAVATOR)
+#if defined(PILEDRIVER) || defined(BULLDOZER) || defined(STEAMROLLER)
 //Enable some optimazation for barcelona.
 #define BARCELONA_OPTIMIZATION
 #endif

cpuid.h

@@ -109,7 +109,6 @@
 #define CORE_PILEDRIVER  23
 #define CORE_HASWELL     24
 #define CORE_STEAMROLLER 25
-#define CORE_EXCAVATOR   26
 
 #define HAVE_SSE      (1 <<  0)
 #define HAVE_SSE2     (1 <<  1)
@@ -204,6 +203,5 @@ typedef struct {
 #define CPUTYPE_PILEDRIVER              47
 #define CPUTYPE_HASWELL 		48
 #define CPUTYPE_STEAMROLLER 		49
-#define CPUTYPE_EXCAVATOR 		50
 
 #endif

cpuid_x86.c

@@ -1098,16 +1098,6 @@ int get_cpuname(void){
             return CPUTYPE_HASWELL;
 #else
 	    return CPUTYPE_SANDYBRIDGE;
-#endif
-          else
-	    return CPUTYPE_NEHALEM;
-	case 13:
-	  //Broadwell
-          if(support_avx())
-#ifndef NO_AVX2
-            return CPUTYPE_HASWELL;
-#else
-	    return CPUTYPE_SANDYBRIDGE;
 #endif
           else
 	    return CPUTYPE_NEHALEM;
@@ -1122,36 +1112,11 @@ int get_cpuname(void){
             return CPUTYPE_HASWELL;
 #else
 	    return CPUTYPE_SANDYBRIDGE;
-#endif
-          else
-	    return CPUTYPE_NEHALEM;
-	case 7:
-	case 15:
-	  //Broadwell
-          if(support_avx())
-#ifndef NO_AVX2
-            return CPUTYPE_HASWELL;
-#else
-	    return CPUTYPE_SANDYBRIDGE;
 #endif
           else
 	    return CPUTYPE_NEHALEM;
         }
         break;
-      case 5:
-        switch (model) {
-	case 6:
-	  //Broadwell
-          if(support_avx())
-#ifndef NO_AVX2
-            return CPUTYPE_HASWELL;
-#else
-	    return CPUTYPE_SANDYBRIDGE;
-#endif
-          else
-	    return CPUTYPE_NEHALEM;
-	}
-	break;
       }
       break;
     case 0x7:
@@ -1198,20 +1163,11 @@ int get_cpuname(void){
 	  else
 	    return CPUTYPE_BARCELONA; //OS don't support AVX.
 	case 0:
-	  switch(exmodel){
-	  case 3:
-	    if(support_avx())
-	      return CPUTYPE_STEAMROLLER;
-	    else
-	      return CPUTYPE_BARCELONA; //OS don't support AVX.
+	  if(support_avx())
+	    return CPUTYPE_STEAMROLLER;
+	  else
+	    return CPUTYPE_BARCELONA; //OS don't support AVX.
 
-	  case 6:
-	    if(support_avx())
-	      return CPUTYPE_EXCAVATOR;
-	    else
-	      return CPUTYPE_BARCELONA; //OS don't support AVX.
-	  }
-	  break;
 	}
 	break;
       case  5:
@@ -1341,7 +1297,6 @@ static char *cpuname[] = {
   "PILEDRIVER",
   "HASWELL",
   "STEAMROLLER",
-  "EXCAVATOR",
 };
 
 static char *lowercpuname[] = {
@@ -1394,7 +1349,6 @@ static char *lowercpuname[] = {
   "piledriver",
   "haswell",
   "steamroller",
-  "excavator",
 };
 
 static char *corename[] = {
@@ -1424,7 +1378,6 @@ static char *corename[] = {
   "PILEDRIVER",
   "HASWELL",
   "STEAMROLLER",
-  "EXCAVATOR",
 };
 
 static char *corename_lower[] = {
@@ -1454,7 +1407,6 @@ static char *corename_lower[] = {
   "piledriver",
   "haswell",
   "steamroller",
-  "excavator",
 };
 
 
@@ -1573,16 +1525,6 @@ int get_coretype(void){
             return CORE_HASWELL;
 #else
 	    return CORE_SANDYBRIDGE;
-#endif
-          else
-	    return CORE_NEHALEM;
-	case 13:
-	  //broadwell
-          if(support_avx())
-#ifndef NO_AVX2
-            return CORE_HASWELL;
-#else
-	    return CORE_SANDYBRIDGE;
 #endif
           else
 	    return CORE_NEHALEM;
@@ -1597,36 +1539,11 @@ int get_coretype(void){
             return CORE_HASWELL;
 #else
 	    return CORE_SANDYBRIDGE;
-#endif
-          else
-	    return CORE_NEHALEM;
-	case 7:
-	case 15:
-	  //broadwell
-          if(support_avx())
-#ifndef NO_AVX2
-            return CORE_HASWELL;
-#else
-	    return CORE_SANDYBRIDGE;
 #endif
           else
 	    return CORE_NEHALEM;
         }
         break;
-      case 5:
-        switch (model) {
-	case 6:
-	  //broadwell
-          if(support_avx())
-#ifndef NO_AVX2
-            return CORE_HASWELL;
-#else
-	    return CORE_SANDYBRIDGE;
-#endif
-          else
-	    return CORE_NEHALEM;
-	}
-	break;
       }
       break;
 
@@ -1657,20 +1574,10 @@ int get_coretype(void){
 	    return CORE_BARCELONA; //OS don't support AVX.
 	
 	case 0:
-	  switch(exmodel){
-	  case 3:
-	    if(support_avx())
-	      return CORE_STEAMROLLER;
-	    else
-	      return CORE_BARCELONA; //OS don't support AVX.
-
-	  case 6:
-	    if(support_avx())
-	      return CORE_EXCAVATOR;
-	    else
-	      return CORE_BARCELONA; //OS don't support AVX.
-	  }
-	  break;
+	  if(support_avx())
+	    return CORE_STEAMROLLER;
+	  else
+	    return CORE_BARCELONA; //OS don't support AVX.
 	}
 
 

ctest.c

@@ -44,10 +44,6 @@ COMPILER_DEC
 COMPILER_GNU
 #endif
 
-#if defined(__ANDROID__)
-OS_ANDROID
-#endif
-
 #if defined(__linux__)
 OS_LINUX
 #endif

ctest/Makefile

@@ -27,18 +27,12 @@ ctestl2o = c_cblas2.o c_c2chke.o auxiliary.o c_xerbla.o constant.o
 
 ctestl3o = c_cblas3.o c_c3chke.o auxiliary.o c_xerbla.o constant.o
 
-ctestl3o_3m = c_cblas3_3m.o c_c3chke_3m.o auxiliary.o c_xerbla.o constant.o
-
 ztestl1o = c_zblas1.o
 
 ztestl2o = c_zblas2.o c_z2chke.o auxiliary.o c_xerbla.o constant.o
 
 ztestl3o = c_zblas3.o c_z3chke.o auxiliary.o c_xerbla.o constant.o
 
-ztestl3o_3m = c_zblas3_3m.o c_z3chke_3m.o auxiliary.o c_xerbla.o constant.o
-
-
-
 all :: all1 all2 all3
 
 all1: xscblat1 xdcblat1 xccblat1 xzcblat1
@@ -121,8 +115,8 @@ xccblat2: $(ctestl2o) c_cblat2.o $(TOPDIR)/$(LIBNAME)
 xccblat3: $(ctestl3o) c_cblat3.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xccblat3 c_cblat3.o $(ctestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 
-xccblat3_3m: $(ctestl3o_3m) c_cblat3_3m.o $(TOPDIR)/$(LIBNAME)
-	$(FC) $(FLDFLAGS) -o xccblat3_3m c_cblat3_3m.o $(ctestl3o_3m) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xccblat3_3m: $(ctestl3o) c_cblat3_3m.o $(TOPDIR)/$(LIBNAME)
+	$(FC) $(FLDFLAGS) -o xccblat3_3m c_cblat3_3m.o $(ctestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 
 # Double complex
 xzcblat1: $(ztestl1o) c_zblat1.o $(TOPDIR)/$(LIBNAME)
@@ -133,8 +127,8 @@ xzcblat3: $(ztestl3o) c_zblat3.o $(TOPDIR)/$(LIBNAME)
 	$(FC) $(FLDFLAGS) -o xzcblat3 c_zblat3.o $(ztestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 
 
-xzcblat3_3m: $(ztestl3o_3m) c_zblat3_3m.o $(TOPDIR)/$(LIBNAME)
-	$(FC) $(FLDFLAGS) -o xzcblat3_3m c_zblat3_3m.o $(ztestl3o_3m) $(LIB) $(EXTRALIB) $(CEXTRALIB)
+xzcblat3_3m: $(ztestl3o) c_zblat3_3m.o $(TOPDIR)/$(LIBNAME)
+	$(FC) $(FLDFLAGS) -o xzcblat3_3m c_zblat3_3m.o $(ztestl3o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
 
 
 include $(TOPDIR)/Makefile.tail

ctest/c_c3chke.c

@@ -46,7 +46,235 @@ void  F77_c3chke(char *  rout) {
    }
 
 
-   if (strncmp( sf,"cblas_cgemm"   ,11)==0) {
+   if (strncmp( sf,"cblas_cgemm3m"   ,13)==0) {
+      cblas_rout = "cblas_cgemm3"   ;
+
+      cblas_info = 1;
+      cblas_cgemm3m( INVALID,  CblasNoTrans, CblasNoTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemm3m( INVALID,  CblasNoTrans, CblasTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemm3m( INVALID,  CblasTrans, CblasNoTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_cgemm3m( INVALID,  CblasTrans, CblasTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  INVALID, CblasNoTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  INVALID, CblasTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, INVALID, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, INVALID, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_cgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9;  RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_cgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+   } else if (strncmp( sf,"cblas_cgemm"   ,11)==0) {
             cblas_rout = "cblas_cgemm"   ;
 
 

ctest/c_cblas3.c

@@ -567,3 +567,81 @@ void F77_ctrsm(int *order, char *rtlf, char *uplow, char *transp, char *diagn,
 
 
 
+void F77_cgemm3m(int *order, char *transpa, char *transpb, int *m, int *n,
+     int *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
+     CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
+     CBLAS_TEST_COMPLEX *c, int *ldc ) {
+
+  CBLAS_TEST_COMPLEX *A, *B, *C;
+  int i,j,LDA, LDB, LDC;
+  enum CBLAS_TRANSPOSE transa, transb;
+
+  get_transpose_type(transpa, &transa);
+  get_transpose_type(transpb, &transb);
+
+  if (*order == TEST_ROW_MJR) {
+     if (transa == CblasNoTrans) {
+        LDA = *k+1;
+        A=(CBLAS_TEST_COMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
+        for( i=0; i<*m; i++ )
+           for( j=0; j<*k; j++ ) {
+              A[i*LDA+j].real=a[j*(*lda)+i].real;
+              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+           }
+     }
+     else {
+        LDA = *m+1;
+        A=(CBLAS_TEST_COMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX));
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*m; j++ ) {
+              A[i*LDA+j].real=a[j*(*lda)+i].real;
+              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+           }
+     }
+
+     if (transb == CblasNoTrans) {
+        LDB = *n+1;
+        B=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_COMPLEX) );
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              B[i*LDB+j].real=b[j*(*ldb)+i].real;
+              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+           }
+     }
+     else {
+        LDB = *k+1;
+        B=(CBLAS_TEST_COMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_COMPLEX));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              B[i*LDB+j].real=b[j*(*ldb)+i].real;
+              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+           }
+     }
+
+     LDC = *n+1;
+     C=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_COMPLEX));
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*m; i++ ) {
+           C[i*LDC+j].real=c[j*(*ldc)+i].real;
+           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
+        }
+     cblas_cgemm3m( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
+                  B, LDB, beta, C, LDC );
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*m; i++ ) {
+           c[j*(*ldc)+i].real=C[i*LDC+j].real;
+           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
+        }
+     free(A);
+     free(B);
+     free(C);
+  }
+  else if (*order == TEST_COL_MJR)
+     cblas_cgemm3m( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
+                  b, *ldb, beta, c, *ldc );
+  else
+     cblas_cgemm3m( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
+                  b, *ldb, beta, c, *ldc );
+}
+
+

ctest/c_cblas3_3m.c

@@ -1,647 +0,0 @@
-/*
- *     Written by D.P. Manley, Digital Equipment Corporation.
- *     Prefixed "C_" to BLAS routines and their declarations.
- *
- *     Modified by T. H. Do, 4/15/98, SGI/CRAY Research.
- */
-#include <stdlib.h>
-#include "common.h"
-#include "cblas_test.h"
-
-#define  TEST_COL_MJR	0
-#define  TEST_ROW_MJR	1
-#define  UNDEFINED     -1
-
-void F77_cgemm(int *order, char *transpa, char *transpb, int *m, int *n,
-     int *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-     CBLAS_TEST_COMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_TRANSPOSE transa, transb;
-
-  get_transpose_type(transpa, &transa);
-  get_transpose_type(transpb, &transb);
-
-  if (*order == TEST_ROW_MJR) {
-     if (transa == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_COMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else {
-        LDA = *m+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-
-     if (transb == CblasNoTrans) {
-        LDB = *n+1;
-        B=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_COMPLEX) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDB = *k+1;
-        B=(CBLAS_TEST_COMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_COMPLEX));
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_cgemm( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
-                  B, LDB, beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_cgemm( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-  else
-     cblas_cgemm( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-}
-
-void F77_chemm(int *order, char *rtlf, char *uplow, int *m, int *n,
-        CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-        CBLAS_TEST_COMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_SIDE side;
-
-  get_uplo_type(uplow,&uplo);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A= (CBLAS_TEST_COMPLEX* )malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_COMPLEX* )malloc( (*m)*LDB*sizeof(CBLAS_TEST_COMPLEX ) );
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ ) {
-           B[i*LDB+j].real=b[j*(*ldb)+i].real;
-           B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-        }
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_COMPLEX ) );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_chemm( CblasRowMajor, side, uplo, *m, *n, alpha, A, LDA, B, LDB,
-                  beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_chemm( CblasColMajor, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-  else
-     cblas_chemm( UNDEFINED, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-}
-void F77_csymm(int *order, char *rtlf, char *uplow, int *m, int *n,
-          CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	  CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-          CBLAS_TEST_COMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_SIDE side;
-
-  get_uplo_type(uplow,&uplo);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ )
-              A[i*LDA+j]=a[j*(*lda)+i];
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ )
-              A[i*LDA+j]=a[j*(*lda)+i];
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDB*sizeof(CBLAS_TEST_COMPLEX ));
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ )
-           B[i*LDB+j]=b[j*(*ldb)+i];
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_COMPLEX));
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ )
-           C[i*LDC+j]=c[j*(*ldc)+i];
-     cblas_csymm( CblasRowMajor, side, uplo, *m, *n, alpha, A, LDA, B, LDB,
-                  beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ )
-           c[j*(*ldc)+i]=C[i*LDC+j];
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_csymm( CblasColMajor, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-  else
-     cblas_csymm( UNDEFINED, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-}
-
-void F77_cherk(int *order, char *uplow, char *transp, int *n, int *k,
-     float *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     float *beta, CBLAS_TEST_COMPLEX *c, int *ldc ) {
-
-  int i,j,LDA,LDC;
-  CBLAS_TEST_COMPLEX *A, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDA*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDC*sizeof(CBLAS_TEST_COMPLEX ) );
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_cherk(CblasRowMajor, uplo, trans, *n, *k, *alpha, A, LDA, *beta,
-	         C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_cherk(CblasColMajor, uplo, trans, *n, *k, *alpha, a, *lda, *beta,
-	         c, *ldc );
-  else
-     cblas_cherk(UNDEFINED, uplo, trans, *n, *k, *alpha, a, *lda, *beta,
-	         c, *ldc );
-}
-
-void F77_csyrk(int *order, char *uplow, char *transp, int *n, int *k,
-     CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     CBLAS_TEST_COMPLEX *beta, CBLAS_TEST_COMPLEX *c, int *ldc ) {
-
-  int i,j,LDA,LDC;
-  CBLAS_TEST_COMPLEX *A, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDA*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDC*sizeof(CBLAS_TEST_COMPLEX ) );
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_csyrk(CblasRowMajor, uplo, trans, *n, *k, alpha, A, LDA, beta,
-	         C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_csyrk(CblasColMajor, uplo, trans, *n, *k, alpha, a, *lda, beta,
-	         c, *ldc );
-  else
-     cblas_csyrk(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda, beta,
-	         c, *ldc );
-}
-void F77_cher2k(int *order, char *uplow, char *transp, int *n, int *k,
-        CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	CBLAS_TEST_COMPLEX *b, int *ldb, float *beta,
-        CBLAS_TEST_COMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
-  CBLAS_TEST_COMPLEX *A, *B, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        LDB = *k+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX ));
-        B=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDB*sizeof(CBLAS_TEST_COMPLEX ));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDA = *n+1;
-        LDB = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc( LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX ) );
-        B=(CBLAS_TEST_COMPLEX* )malloc( LDB*(*k)*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ){
-	      A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc( (*n)*LDC*sizeof(CBLAS_TEST_COMPLEX ) );
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_cher2k(CblasRowMajor, uplo, trans, *n, *k, alpha, A, LDA,
-		  B, LDB, *beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_cher2k(CblasColMajor, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, *beta, c, *ldc );
-  else
-     cblas_cher2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, *beta, c, *ldc );
-}
-void F77_csyr2k(int *order, char *uplow, char *transp, int *n, int *k,
-         CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-	 CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-         CBLAS_TEST_COMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
-  CBLAS_TEST_COMPLEX *A, *B, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        LDB = *k+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        B=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDB*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDA = *n+1;
-        LDB = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX));
-        B=(CBLAS_TEST_COMPLEX* )malloc(LDB*(*k)*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ){
-	      A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc( (*n)*LDC*sizeof(CBLAS_TEST_COMPLEX));
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_csyr2k(CblasRowMajor, uplo, trans, *n, *k, alpha, A, LDA,
-		  B, LDB, beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_csyr2k(CblasColMajor, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, beta, c, *ldc );
-  else
-     cblas_csyr2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, beta, c, *ldc );
-}
-void F77_ctrmm(int *order, char *rtlf, char *uplow, char *transp, char *diagn,
-       int *m, int *n, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a,
-       int *lda, CBLAS_TEST_COMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
-  CBLAS_TEST_COMPLEX *A, *B;
-  enum CBLAS_SIDE side;
-  enum CBLAS_DIAG diag;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-  get_diag_type(diagn,&diag);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDB*sizeof(CBLAS_TEST_COMPLEX));
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ ) {
-           B[i*LDB+j].real=b[j*(*ldb)+i].real;
-           B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-        }
-     cblas_ctrmm(CblasRowMajor, side, uplo, trans, diag, *m, *n, alpha,
-		 A, LDA, B, LDB );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           b[j*(*ldb)+i].real=B[i*LDB+j].real;
-           b[j*(*ldb)+i].imag=B[i*LDB+j].imag;
-        }
-     free(A);
-     free(B);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_ctrmm(CblasColMajor, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-  else
-     cblas_ctrmm(UNDEFINED, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-}
-
-void F77_ctrsm(int *order, char *rtlf, char *uplow, char *transp, char *diagn,
-         int *m, int *n, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a,
-         int *lda, CBLAS_TEST_COMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
-  CBLAS_TEST_COMPLEX *A, *B;
-  enum CBLAS_SIDE side;
-  enum CBLAS_DIAG diag;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-  get_diag_type(diagn,&diag);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc( (*m)*LDA*sizeof(CBLAS_TEST_COMPLEX ) );
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDB*sizeof(CBLAS_TEST_COMPLEX));
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ ) {
-           B[i*LDB+j].real=b[j*(*ldb)+i].real;
-           B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-        }
-     cblas_ctrsm(CblasRowMajor, side, uplo, trans, diag, *m, *n, alpha,
-		 A, LDA, B, LDB );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           b[j*(*ldb)+i].real=B[i*LDB+j].real;
-           b[j*(*ldb)+i].imag=B[i*LDB+j].imag;
-        }
-     free(A);
-     free(B);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_ctrsm(CblasColMajor, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-  else
-     cblas_ctrsm(UNDEFINED, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-}
-
-
-
-void F77_cgemm3m(int *order, char *transpa, char *transpb, int *m, int *n,
-     int *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-     CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-     CBLAS_TEST_COMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_COMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_TRANSPOSE transa, transb;
-
-  get_transpose_type(transpa, &transa);
-  get_transpose_type(transpb, &transb);
-
-  if (*order == TEST_ROW_MJR) {
-     if (transa == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_COMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else {
-        LDA = *m+1;
-        A=(CBLAS_TEST_COMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-
-     if (transb == CblasNoTrans) {
-        LDB = *n+1;
-        B=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_COMPLEX) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDB = *k+1;
-        B=(CBLAS_TEST_COMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_COMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-
-     LDC = *n+1;
-     C=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_COMPLEX));
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_cgemm3m( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
-                  B, LDB, beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_cgemm3m( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-  else
-     cblas_cgemm3m( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-}
-
-

ctest/c_z3chke.c

@@ -49,7 +49,237 @@ void  F77_z3chke(char *  rout) {
 
 
 
-   if (strncmp( sf,"cblas_zgemm"   ,11)==0) {
+   if (strncmp( sf,"cblas_zgemm3m"   ,13)==0) {
+      cblas_rout = "cblas_zgemm3"   ;
+
+      cblas_info = 1;
+      cblas_zgemm3m( INVALID,  CblasNoTrans, CblasNoTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemm3m( INVALID,  CblasNoTrans, CblasTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemm3m( INVALID,  CblasTrans, CblasNoTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 1;
+      cblas_zgemm3m( INVALID,  CblasTrans, CblasTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  INVALID, CblasNoTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 2; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  INVALID, CblasTrans, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, INVALID, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 3; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, INVALID, 0, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasNoTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = FALSE;
+      cblas_zgemm3m( CblasColMajor,  CblasTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 4; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, INVALID, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 5; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, INVALID, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 6; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, 0, INVALID,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9;  RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 2, BETA, C, 2 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 9; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 2, 0, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 2, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 11; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, 0, 2,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasNoTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasNoTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 2, BETA, C, 1 );
+      chkxer();
+      cblas_info = 14; RowMajorStrg = TRUE;
+      cblas_zgemm3m( CblasRowMajor,  CblasTrans, CblasTrans, 0, 2, 0,
+                   ALPHA, A, 1, B, 1, BETA, C, 1 );
+      chkxer();
+
+
+
+   } else if (strncmp( sf,"cblas_zgemm"   ,11)==0) {
             cblas_rout = "cblas_zgemm"   ;
 
       cblas_info = 1;

ctest/c_zblas3.c

@@ -564,3 +564,80 @@ void F77_ztrsm(int *order, char *rtlf, char *uplow, char *transp, char *diagn,
 }
 
 
+void F77_zgemm3m(int *order, char *transpa, char *transpb, int *m, int *n,
+     int *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
+     CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
+     CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
+
+  CBLAS_TEST_ZOMPLEX *A, *B, *C;
+  int i,j,LDA, LDB, LDC;
+  enum CBLAS_TRANSPOSE transa, transb;
+
+  get_transpose_type(transpa, &transa);
+  get_transpose_type(transpb, &transb);
+
+  if (*order == TEST_ROW_MJR) {
+     if (transa == CblasNoTrans) {
+        LDA = *k+1;
+        A=(CBLAS_TEST_ZOMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
+        for( i=0; i<*m; i++ )
+           for( j=0; j<*k; j++ ) {
+              A[i*LDA+j].real=a[j*(*lda)+i].real;
+              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+           }
+     }
+     else {
+        LDA = *m+1;
+        A=(CBLAS_TEST_ZOMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*m; j++ ) {
+              A[i*LDA+j].real=a[j*(*lda)+i].real;
+              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
+           }
+     }
+
+     if (transb == CblasNoTrans) {
+        LDB = *n+1;
+        B=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_ZOMPLEX) );
+        for( i=0; i<*k; i++ )
+           for( j=0; j<*n; j++ ) {
+              B[i*LDB+j].real=b[j*(*ldb)+i].real;
+              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+           }
+     }
+     else {
+        LDB = *k+1;
+        B=(CBLAS_TEST_ZOMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_ZOMPLEX));
+        for( i=0; i<*n; i++ )
+           for( j=0; j<*k; j++ ) {
+              B[i*LDB+j].real=b[j*(*ldb)+i].real;
+              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
+           }
+     }
+
+     LDC = *n+1;
+     C=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*m; i++ ) {
+           C[i*LDC+j].real=c[j*(*ldc)+i].real;
+           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
+        }
+     cblas_zgemm3m( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
+                  B, LDB, beta, C, LDC );
+     for( j=0; j<*n; j++ )
+        for( i=0; i<*m; i++ ) {
+           c[j*(*ldc)+i].real=C[i*LDC+j].real;
+           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
+        }
+     free(A);
+     free(B);
+     free(C);
+  }
+  else if (*order == TEST_COL_MJR)
+     cblas_zgemm3m( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
+                  b, *ldb, beta, c, *ldc );
+  else
+     cblas_zgemm3m( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
+                  b, *ldb, beta, c, *ldc );
+}
+

ctest/c_zblas3_3m.c

@@ -1,643 +0,0 @@
-/*
- *     Written by D.P. Manley, Digital Equipment Corporation.
- *     Prefixed "C_" to BLAS routines and their declarations.
- *
- *     Modified by T. H. Do, 4/15/98, SGI/CRAY Research.
- */
-#include <stdlib.h>
-#include "common.h"
-#include "cblas_test.h"
-#define  TEST_COL_MJR	0
-#define  TEST_ROW_MJR	1
-#define  UNDEFINED     -1
-
-void F77_zgemm(int *order, char *transpa, char *transpb, int *m, int *n,
-     int *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-     CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_TRANSPOSE transa, transb;
-
-  get_transpose_type(transpa, &transa);
-  get_transpose_type(transpb, &transb);
-
-  if (*order == TEST_ROW_MJR) {
-     if (transa == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_ZOMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else {
-        LDA = *m+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-
-     if (transb == CblasNoTrans) {
-        LDB = *n+1;
-        B=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_ZOMPLEX) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDB = *k+1;
-        B=(CBLAS_TEST_ZOMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zgemm( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
-                  B, LDB, beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zgemm( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-  else
-     cblas_zgemm( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-}
-void F77_zhemm(int *order, char *rtlf, char *uplow, int *m, int *n,
-        CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-        CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_SIDE side;
-
-  get_uplo_type(uplow,&uplo);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A= (CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_ZOMPLEX* )malloc( (*m)*LDB*sizeof(CBLAS_TEST_ZOMPLEX ) );
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ ) {
-           B[i*LDB+j].real=b[j*(*ldb)+i].real;
-           B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-        }
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_ZOMPLEX ) );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zhemm( CblasRowMajor, side, uplo, *m, *n, alpha, A, LDA, B, LDB,
-                  beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zhemm( CblasColMajor, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-  else
-     cblas_zhemm( UNDEFINED, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-}
-void F77_zsymm(int *order, char *rtlf, char *uplow, int *m, int *n,
-          CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	  CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-          CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_SIDE side;
-
-  get_uplo_type(uplow,&uplo);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ )
-              A[i*LDA+j]=a[j*(*lda)+i];
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ )
-              A[i*LDA+j]=a[j*(*lda)+i];
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDB*sizeof(CBLAS_TEST_ZOMPLEX ));
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ )
-           B[i*LDB+j]=b[j*(*ldb)+i];
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ )
-           C[i*LDC+j]=c[j*(*ldc)+i];
-     cblas_zsymm( CblasRowMajor, side, uplo, *m, *n, alpha, A, LDA, B, LDB,
-                  beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ )
-           c[j*(*ldc)+i]=C[i*LDC+j];
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zsymm( CblasColMajor, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-  else
-     cblas_zsymm( UNDEFINED, side, uplo, *m, *n, alpha, a, *lda, b, *ldb,
-                  beta, c, *ldc );
-}
-
-void F77_zherk(int *order, char *uplow, char *transp, int *n, int *k,
-     double *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     double *beta, CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-
-  int i,j,LDA,LDC;
-  CBLAS_TEST_ZOMPLEX *A, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDC*sizeof(CBLAS_TEST_ZOMPLEX ) );
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zherk(CblasRowMajor, uplo, trans, *n, *k, *alpha, A, LDA, *beta,
-	         C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zherk(CblasColMajor, uplo, trans, *n, *k, *alpha, a, *lda, *beta,
-	         c, *ldc );
-  else
-     cblas_zherk(UNDEFINED, uplo, trans, *n, *k, *alpha, a, *lda, *beta,
-	         c, *ldc );
-}
-
-void F77_zsyrk(int *order, char *uplow, char *transp, int *n, int *k,
-     CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     CBLAS_TEST_ZOMPLEX *beta, CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-
-  int i,j,LDA,LDC;
-  CBLAS_TEST_ZOMPLEX *A, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDC*sizeof(CBLAS_TEST_ZOMPLEX ) );
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zsyrk(CblasRowMajor, uplo, trans, *n, *k, alpha, A, LDA, beta,
-	         C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zsyrk(CblasColMajor, uplo, trans, *n, *k, alpha, a, *lda, beta,
-	         c, *ldc );
-  else
-     cblas_zsyrk(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda, beta,
-	         c, *ldc );
-}
-void F77_zher2k(int *order, char *uplow, char *transp, int *n, int *k,
-        CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	CBLAS_TEST_ZOMPLEX *b, int *ldb, double *beta,
-        CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
-  CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        LDB = *k+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ));
-        B=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDB*sizeof(CBLAS_TEST_ZOMPLEX ));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDA = *n+1;
-        LDB = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc( LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        B=(CBLAS_TEST_ZOMPLEX* )malloc( LDB*(*k)*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ){
-	      A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc( (*n)*LDC*sizeof(CBLAS_TEST_ZOMPLEX ) );
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zher2k(CblasRowMajor, uplo, trans, *n, *k, alpha, A, LDA,
-		  B, LDB, *beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zher2k(CblasColMajor, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, *beta, c, *ldc );
-  else
-     cblas_zher2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, *beta, c, *ldc );
-}
-void F77_zsyr2k(int *order, char *uplow, char *transp, int *n, int *k,
-         CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-	 CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-         CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-  int i,j,LDA,LDB,LDC;
-  CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-
-  if (*order == TEST_ROW_MJR) {
-     if (trans == CblasNoTrans) {
-        LDA = *k+1;
-        LDB = *k+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        B=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDB*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDA = *n+1;
-        LDB = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
-        B=(CBLAS_TEST_ZOMPLEX* )malloc(LDB*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ){
-	      A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc( (*n)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
-     for( i=0; i<*n; i++ )
-        for( j=0; j<*n; j++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zsyr2k(CblasRowMajor, uplo, trans, *n, *k, alpha, A, LDA,
-		  B, LDB, beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*n; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zsyr2k(CblasColMajor, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, beta, c, *ldc );
-  else
-     cblas_zsyr2k(UNDEFINED, uplo, trans, *n, *k, alpha, a, *lda,
-		   b, *ldb, beta, c, *ldc );
-}
-void F77_ztrmm(int *order, char *rtlf, char *uplow, char *transp, char *diagn,
-       int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a,
-       int *lda, CBLAS_TEST_ZOMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
-  CBLAS_TEST_ZOMPLEX *A, *B;
-  enum CBLAS_SIDE side;
-  enum CBLAS_DIAG diag;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-  get_diag_type(diagn,&diag);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDB*sizeof(CBLAS_TEST_ZOMPLEX));
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ ) {
-           B[i*LDB+j].real=b[j*(*ldb)+i].real;
-           B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-        }
-     cblas_ztrmm(CblasRowMajor, side, uplo, trans, diag, *m, *n, alpha,
-		 A, LDA, B, LDB );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           b[j*(*ldb)+i].real=B[i*LDB+j].real;
-           b[j*(*ldb)+i].imag=B[i*LDB+j].imag;
-        }
-     free(A);
-     free(B);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_ztrmm(CblasColMajor, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-  else
-     cblas_ztrmm(UNDEFINED, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-}
-
-void F77_ztrsm(int *order, char *rtlf, char *uplow, char *transp, char *diagn,
-         int *m, int *n, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a,
-         int *lda, CBLAS_TEST_ZOMPLEX *b, int *ldb) {
-  int i,j,LDA,LDB;
-  CBLAS_TEST_ZOMPLEX *A, *B;
-  enum CBLAS_SIDE side;
-  enum CBLAS_DIAG diag;
-  enum CBLAS_UPLO uplo;
-  enum CBLAS_TRANSPOSE trans;
-
-  get_uplo_type(uplow,&uplo);
-  get_transpose_type(transp,&trans);
-  get_diag_type(diagn,&diag);
-  get_side_type(rtlf,&side);
-
-  if (*order == TEST_ROW_MJR) {
-     if (side == CblasLeft) {
-        LDA = *m+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc( (*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX ) );
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else{
-        LDA = *n+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc((*n)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*n; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     LDB = *n+1;
-     B=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDB*sizeof(CBLAS_TEST_ZOMPLEX));
-     for( i=0; i<*m; i++ )
-        for( j=0; j<*n; j++ ) {
-           B[i*LDB+j].real=b[j*(*ldb)+i].real;
-           B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-        }
-     cblas_ztrsm(CblasRowMajor, side, uplo, trans, diag, *m, *n, alpha,
-		 A, LDA, B, LDB );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           b[j*(*ldb)+i].real=B[i*LDB+j].real;
-           b[j*(*ldb)+i].imag=B[i*LDB+j].imag;
-        }
-     free(A);
-     free(B);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_ztrsm(CblasColMajor, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-  else
-     cblas_ztrsm(UNDEFINED, side, uplo, trans, diag, *m, *n, alpha,
-		   a, *lda, b, *ldb);
-}
-
-
-void F77_zgemm3m(int *order, char *transpa, char *transpb, int *m, int *n,
-     int *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-     CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-     CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
-
-  CBLAS_TEST_ZOMPLEX *A, *B, *C;
-  int i,j,LDA, LDB, LDC;
-  enum CBLAS_TRANSPOSE transa, transb;
-
-  get_transpose_type(transpa, &transa);
-  get_transpose_type(transpb, &transb);
-
-  if (*order == TEST_ROW_MJR) {
-     if (transa == CblasNoTrans) {
-        LDA = *k+1;
-        A=(CBLAS_TEST_ZOMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*m; i++ )
-           for( j=0; j<*k; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-     else {
-        LDA = *m+1;
-        A=(CBLAS_TEST_ZOMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*m; j++ ) {
-              A[i*LDA+j].real=a[j*(*lda)+i].real;
-              A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-           }
-     }
-
-     if (transb == CblasNoTrans) {
-        LDB = *n+1;
-        B=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_ZOMPLEX) );
-        for( i=0; i<*k; i++ )
-           for( j=0; j<*n; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-     else {
-        LDB = *k+1;
-        B=(CBLAS_TEST_ZOMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_ZOMPLEX));
-        for( i=0; i<*n; i++ )
-           for( j=0; j<*k; j++ ) {
-              B[i*LDB+j].real=b[j*(*ldb)+i].real;
-              B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-           }
-     }
-
-     LDC = *n+1;
-     C=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           C[i*LDC+j].real=c[j*(*ldc)+i].real;
-           C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-        }
-     cblas_zgemm3m( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
-                  B, LDB, beta, C, LDC );
-     for( j=0; j<*n; j++ )
-        for( i=0; i<*m; i++ ) {
-           c[j*(*ldc)+i].real=C[i*LDC+j].real;
-           c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-        }
-     free(A);
-     free(B);
-     free(C);
-  }
-  else if (*order == TEST_COL_MJR)
-     cblas_zgemm3m( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-  else
-     cblas_zgemm3m( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
-                  b, *ldb, beta, c, *ldc );
-}
-

driver/level2/gemv_thread.c

@@ -62,11 +62,6 @@
 #endif
 #endif
 
-#ifndef TRANSA
-#define Y_DUMMY_NUM 1024
-static FLOAT y_dummy[Y_DUMMY_NUM];
-#endif
-
 static int gemv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *dummy1, FLOAT *buffer, BLASLONG pos){
 
   FLOAT *a, *x, *y;
@@ -104,15 +99,10 @@ static int gemv_kernel(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, F
     a += n_from * lda  * COMPSIZE;
 #ifdef TRANSA
     y += n_from * incy * COMPSIZE;
-#else
-    //for split matrix row (n) direction and vector x of gemv_n
-    x += n_from * incx * COMPSIZE;
-    //store partial result for every thread
-    y += (m_to - m_from) * 1 * COMPSIZE * pos;
 #endif
   }
 
-  //fprintf(stderr, "M_From = %d  M_To = %d  N_From = %d  N_To = %d POS=%d\n", m_from, m_to, n_from, n_to, pos);
+  //  fprintf(stderr, "M_From = %d  M_To = %d  N_From = %d  N_To = %d\n", m_from, m_to, n_from, n_to);
 
   GEMV(m_to - m_from, n_to - n_from, 0,
        *((FLOAT *)args -> alpha + 0),
@@ -136,10 +126,6 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *alpha, FLOAT *a, BLASLONG lda, FLOAT *x
 
   BLASLONG width, i, num_cpu;
 
-#ifndef TRANSA
-  int split_x=0;
-#endif
-
 #ifdef SMP
 #ifndef COMPLEX
 #ifdef XDOUBLE
@@ -212,58 +198,6 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *alpha, FLOAT *a, BLASLONG lda, FLOAT *x
     i -= width;
   }
 
-#ifndef TRANSA
-  //try to split matrix on row direction and x.
-  //Then, reduction.
-  if (num_cpu < nthreads) {
-
-    //too small to split or bigger than the y_dummy buffer.
-    double MN = (double) m * (double) n;
-    if ( MN <= (24.0 * 24.0  * (double) (GEMM_MULTITHREAD_THRESHOLD*GEMM_MULTITHREAD_THRESHOLD))
-	 || m*COMPSIZE*nthreads > Y_DUMMY_NUM)
-      goto Outer;
-
-    num_cpu  = 0;
-    range[0] = 0;
-
-    memset(y_dummy, 0, sizeof(FLOAT) * m * COMPSIZE * nthreads);
-
-    args.ldc = 1;
-    args.c = (void *)y_dummy;
-
-    //split on row (n) and x
-    i=n;
-    split_x=1;
-    while (i > 0){
-
-      width  = blas_quickdivide(i + nthreads - num_cpu - 1, nthreads - num_cpu);
-      if (width < 4) width = 4;
-      if (i < width) width = i;
-
-      range[num_cpu + 1] = range[num_cpu] + width;
-
-      queue[num_cpu].mode    = mode;
-      queue[num_cpu].routine = gemv_kernel;
-      queue[num_cpu].args    = &args;
-
-      queue[num_cpu].position = num_cpu;
-
-      queue[num_cpu].range_m = NULL;
-      queue[num_cpu].range_n = &range[num_cpu];
-
-      queue[num_cpu].sa      = NULL;
-      queue[num_cpu].sb      = NULL;
-      queue[num_cpu].next    = &queue[num_cpu + 1];
-
-      num_cpu ++;
-      i -= width;
-    }
-
-  }
-
-  Outer:
-#endif
-
   if (num_cpu) {
     queue[0].sa = NULL;
     queue[0].sb = buffer;
@@ -272,21 +206,5 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT *alpha, FLOAT *a, BLASLONG lda, FLOAT *x
     exec_blas(num_cpu, queue);
   }
 
-#ifndef TRANSA
-  if(split_x==1){
-    //reduction
-    for(i=0; i<num_cpu; i++){
-
-      int j;
-      for(j=0; j<m; j++){
-	y[j*incy*COMPSIZE] +=y_dummy[i*m*COMPSIZE + j*COMPSIZE];
-#ifdef COMPLEX
-	y[j*incy*COMPSIZE+1] +=y_dummy[i*m*COMPSIZE + j*COMPSIZE+1];
-#endif
-      }
-    }
-  }
-#endif
-
   return 0;
 }

driver/others/blas_server.c

@@ -189,20 +189,6 @@ static void legacy_exec(void *func, int mode, blas_arg_t *args, void *sb){
 		args -> b, args -> ldb,
 		args -> c, args -> ldc, sb);
 	} else
-#endif
-#ifdef INTEGER_PRECISION
-	if (mode & BLAS_INTEGER){
-	  /* REAL / Extended Double */
-	  void (*afunc)(BLASLONG, BLASLONG, BLASLONG, int,
-			int *, BLASLONG, int *, BLASLONG,
-			int *, BLASLONG, void *) = func;
-
-	  afunc(args -> m, args -> n, args -> k,
-		((int *)args -> alpha)[0],
-		args -> a, args -> lda,
-		args -> b, args -> ldb,
-		args -> c, args -> ldc, sb);
-	} else
 #endif
 	  if (mode & BLAS_DOUBLE){
 	    /* REAL / Double */

driver/others/dynamic.c

@@ -67,7 +67,6 @@ extern gotoblas_t  gotoblas_SANDYBRIDGE;
 extern gotoblas_t  gotoblas_BULLDOZER;
 extern gotoblas_t  gotoblas_PILEDRIVER;
 extern gotoblas_t  gotoblas_STEAMROLLER;
-extern gotoblas_t  gotoblas_EXCAVATOR;
 #ifdef NO_AVX2
 #define gotoblas_HASWELL gotoblas_SANDYBRIDGE
 #else
@@ -80,7 +79,6 @@ extern gotoblas_t  gotoblas_HASWELL;
 #define gotoblas_BULLDOZER gotoblas_BARCELONA
 #define gotoblas_PILEDRIVER gotoblas_BARCELONA
 #define gotoblas_STEAMROLLER gotoblas_BARCELONA
-#define gotoblas_EXCAVATOR gotoblas_BARCELONA
 #endif
 
 
@@ -223,15 +221,6 @@ static gotoblas_t *get_coretype(void){
 	    return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
 	  }
 	}
-	//Intel Broadwell
-	if (model == 13) {
-	  if(support_avx())
-	    return &gotoblas_HASWELL;
-	  else{
-	    openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
-	    return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
-	  }
-	}
 	return NULL;
       case 4:
 		//Intel Haswell
@@ -243,26 +232,6 @@ static gotoblas_t *get_coretype(void){
 	    return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
 	  }
 	}
-	//Intel Broadwell
-	if (model == 7 || model == 15) {
-	  if(support_avx())
-	    return &gotoblas_HASWELL;
-	  else{
-	    openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
-	    return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
-	  }
-	}
-	return NULL;
-      case 5:
-	//Intel Broadwell
-	if (model == 6) {
-	  if(support_avx())
-	    return &gotoblas_HASWELL;
-	  else{
-	    openblas_warning(FALLBACK_VERBOSE, NEHALEM_FALLBACK);
-	    return &gotoblas_NEHALEM; //OS doesn't support AVX. Use old kernels.
-	  }
-	}
 	return NULL;
       }
       case 0xf:
@@ -309,22 +278,12 @@ static gotoblas_t *get_coretype(void){
 	    return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels.
 	  }
 	}else if(model == 0){
-	  if (exmodel == 3) {
-	    //AMD STEAMROLLER
-	    if(support_avx())
-	      return &gotoblas_STEAMROLLER;
-	    else{
-	      openblas_warning(FALLBACK_VERBOSE, BARCELONA_FALLBACK);
-	      return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels.
-	    }
-	  }else if (exmodel == 6) {
-	    if(support_avx())
-	      return &gotoblas_EXCAVATOR;
-	    else{
-	      openblas_warning(FALLBACK_VERBOSE, BARCELONA_FALLBACK);
-	      return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels.
-	    }
-
+	  //AMD STEAMROLLER
+	  if(support_avx())
+	    return &gotoblas_STEAMROLLER;
+	  else{
+	    openblas_warning(FALLBACK_VERBOSE, BARCELONA_FALLBACK);
+	    return &gotoblas_BARCELONA; //OS doesn't support AVX. Use old kernels.
 	  }
 	}
 
@@ -369,7 +328,6 @@ static char *corename[] = {
     "Piledriver",
     "Haswell",
     "Steamroller",
-    "Excavator",
 };
 
 char *gotoblas_corename(void) {
@@ -395,7 +353,6 @@ char *gotoblas_corename(void) {
   if (gotoblas == &gotoblas_PILEDRIVER)   return corename[19];
   if (gotoblas == &gotoblas_HASWELL)      return corename[20];
   if (gotoblas == &gotoblas_STEAMROLLER)  return corename[21];
-  if (gotoblas == &gotoblas_EXCAVATOR)    return corename[22];
 
   return corename[0];
 }
@@ -426,7 +383,7 @@ static gotoblas_t *force_coretype(char *coretype){
 
 	switch (found)
 	{
-		case 22: return (&gotoblas_EXCAVATOR);
+
 		case 21: return (&gotoblas_STEAMROLLER);
 		case 20: return (&gotoblas_HASWELL);
 		case 19: return (&gotoblas_PILEDRIVER);

driver/others/memory.c

@@ -90,9 +90,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef OS_WINDOWS
 #include <sys/mman.h>
-#ifndef NO_SYSV_IPC
 #include <sys/shm.h>
-#endif
 #include <sys/ipc.h>
 #endif
 
@@ -171,14 +169,6 @@ int get_num_procs(void) {
 #endif
 #endif
 
-#ifdef OS_ANDROID
-int get_num_procs(void) {
-  static int nums = 0;
-  if (!nums) nums = sysconf(_SC_NPROCESSORS_ONLN);
-  return nums;
-}
-#endif
-
 #ifdef OS_WINDOWS
 
 int get_num_procs(void) {
@@ -276,7 +266,7 @@ void openblas_fork_handler()
   //   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60035
   // In the mean time build with USE_OPENMP=0 or link against another
   // implementation of OpenMP.
-#if !(defined(OS_WINDOWS) || defined(OS_ANDROID)) && defined(SMP_SERVER)
+#if !defined(OS_WINDOWS) && defined(SMP_SERVER)
   int err;
   err = pthread_atfork ((void (*)(void)) BLASFUNC(blas_thread_shutdown), NULL, NULL);
   if(err != 0)
@@ -286,7 +276,7 @@ void openblas_fork_handler()
 
 int blas_get_cpu_number(void){
   env_var_t p;
-#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
   int max_num;
 #endif
   int blas_goto_num   = 0;
@@ -294,7 +284,7 @@ int blas_get_cpu_number(void){
 
   if (blas_num_threads) return blas_num_threads;
 
-#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
   max_num = get_num_procs();
 #endif
 
@@ -318,7 +308,7 @@ int blas_get_cpu_number(void){
   else if (blas_omp_num > 0) blas_num_threads = blas_omp_num;
   else blas_num_threads = MAX_CPU_NUMBER;
 
-#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
   if (blas_num_threads > max_num) blas_num_threads = max_num;
 #endif
 
@@ -719,6 +709,8 @@ static void *alloc_shm(void *address){
   return map_address;
 }
 
+#endif
+
 #if defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS
 
 static void alloc_hugetlb_free(struct release_t *release){
@@ -825,8 +817,6 @@ static void *alloc_hugetlb(void *address){
 }
 #endif
 
-#endif
-
 #ifdef  ALLOC_HUGETLBFILE
 
 static int hugetlb_pid = 0;
@@ -927,13 +917,12 @@ void *blas_memory_alloc(int procpos){
 #ifdef ALLOC_DEVICEDRIVER
     alloc_devicedirver,
 #endif
-/* Hugetlb implicitly assumes ALLOC_SHM */
+#if defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS
+    alloc_hugetlb,
+#endif
 #ifdef ALLOC_SHM
     alloc_shm,
 #endif
-#if ((defined ALLOC_SHM) && (defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS))
-    alloc_hugetlb,
-#endif
 #ifdef ALLOC_MMAP
     alloc_mmap,
 #endif
@@ -1073,7 +1062,7 @@ void *blas_memory_alloc(int procpos){
 	}
 #endif
 
-#if (defined ALLOC_SHM) && (defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS)
+#if defined OS_LINUX  || defined OS_AIX  || defined __sun__  || defined OS_WINDOWS
 	if ((*func == alloc_hugetlb) && (map_address != (void *)-1)) hugetlb_allocated = 1;
 #endif
 
@@ -1172,16 +1161,6 @@ void blas_memory_free(void *free_area){
   return;
 }
 
-void *blas_memory_alloc_nolock(int unused) {
-  void *map_address;
-  map_address = (void *)malloc(BUFFER_SIZE + FIXED_PAGESIZE);
-  return map_address;
-}
-
-void blas_memory_free_nolock(void * map_address) {
-  free(map_address);
-}
-
 void blas_shutdown(void){
 
   int pos;

exports/Makefile

@@ -100,8 +100,8 @@ else
 	$(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).renamed
 $(LIBDYNNAME) : ../$(LIBNAME).renamed osx.def
 endif
-ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2))
-#only build without Fortran
+ifeq ($(NOFORTRAN), 2)
+#only build cblas without Fortran
 	$(CC) $(CFLAGS) -all_load -headerpad_max_install_names -install_name $(CURDIR)/../$(LIBDYNNAME) -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def  $(FEXTRALIB)
 else
 	$(FC) $(FFLAGS) -all_load -headerpad_max_install_names -install_name $(CURDIR)/../$(LIBDYNNAME) -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def  $(FEXTRALIB)

f_check

@@ -3,11 +3,11 @@
 #
 # 1. Not specified
 #   1.1 Automatically detect, then check compiler
-#   1.2 If no fortran compiler is detected, gfortran is default with NOFORTRAN definition
+#   1.2 If no fortran compiler is detected, g77 is default with NOFORTRAN definition
 # 2. Specified
 #   2.1 If path is correct, check compiler
 #   2.2 If path is not correct, but still valid compiler name, force setting
-#     2.2.2 Path is not correct, invalid compiler name, then gfortran is default with NOFORTRAN definition
+#     2.2.2 Path is not correct, invalid compiler name, then g77 is default with NOFORTRAN definition
 #
 
 $makefile = shift(@ARGV);
@@ -25,7 +25,7 @@ $compiler = "" if $compiler eq "f77";
 
 if ($compiler eq "") {
 
-    @lists = ("gfortran", "g95", "frt", "fort", "openf90", "openf95",
+    @lists = ("g77", "g95", "gfortran", "frt", "fort", "openf90", "openf95",
 	      "sunf77", "sunf90", "sunf95",
               "xlf95", "xlf90", "xlf",
               "ppuf77", "ppuf95", "ppuf90", "ppuxlf",
@@ -38,7 +38,6 @@ OUTER:
         foreach $path (@path) {
             if (-x $path . "/" . $lists) {
                 $compiler = $lists;
-                $compiler_bin = $lists;
                 last OUTER;
             }
         }
@@ -49,8 +48,8 @@ OUTER:
 if ($compiler eq "") {
 
     $nofortran = 1;
-    $compiler = "gfortran";
-    $vendor = GFORTRAN;
+    $compiler = "g77";
+    $vendor = G77;
     $bu       = "_";
 
 } else {
@@ -197,8 +196,8 @@ if ($compiler eq "") {
 
 	if ($vendor eq "") {
 	    $nofortran = 1;
-	    $compiler = "gfortran";
-	    $vendor = GFORTRAN;
+	    $compiler = "g77";
+	    $vendor = G77;
 	    $bu       = "_";
 	    $openmp = "";
 	}

getarch.c

@@ -448,22 +448,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define CORENAME  "STEAMROLLER"
 #endif
 
-#if defined (FORCE_EXCAVATOR)
-#define FORCE
-#define FORCE_INTEL
-#define ARCHITECTURE    "X86"
-#define SUBARCHITECTURE "EXCAVATOR"
-#define ARCHCONFIG   "-DEXCAVATOR " \
-		     "-DL1_DATA_SIZE=16384 -DL1_DATA_LINESIZE=64 " \
-		     "-DL2_SIZE=2097152 -DL2_LINESIZE=64  -DL3_SIZE=12582912 " \
-		     "-DDTB_DEFAULT_ENTRIES=64 -DDTB_SIZE=4096 " \
-		     "-DHAVE_MMX -DHAVE_SSE -DHAVE_SSE2 -DHAVE_SSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 " \
-		     "-DHAVE_SSE4A -DHAVE_MISALIGNSSE -DHAVE_128BITFPU -DHAVE_FASTMOVU -DHAVE_CFLUSH " \
-                     "-DHAVE_AVX -DHAVE_FMA4 -DHAVE_FMA3"
-#define LIBNAME   "excavator"
-#define CORENAME  "EXCAVATOR"
-#endif
-
 
 #ifdef FORCE_SSE_GENERIC
 #define FORCE

interface/Makefile

@@ -253,15 +253,6 @@ XBLAS3OBJS   +=  xgemm3m.$(SUFFIX) xsymm3m.$(SUFFIX) xhemm3m.$(SUFFIX)
 endif
 endif
 
-ifdef INTEGER_PRECISION
-
-IBLAS1OBJS = \
-	     iaxpy.$(SUFFIX)
-
-IBLAS2OBJS = 
-IBLAS3OBJS = 
-endif
-
 endif
 
 HPLOBJS = dgemm.$(SUFFIX) dtrsm.$(SUFFIX) \
@@ -352,9 +343,6 @@ CZBLAS3OBJS   = \
 	cblas_zomatcopy.$(SUFFIX) cblas_zimatcopy.$(SUFFIX) \
 	cblas_zgeadd.$(SUFFIX)
 
-CIBLAS1OBJS = \
-	cblas_iaxpy.$(SUFFIX)
-
 
 ifeq ($(SUPPORT_GEMM3M), 1)
 
@@ -384,10 +372,6 @@ ZBLAS1OBJS   += $(CZBLAS1OBJS)
 ZBLAS2OBJS   += $(CZBLAS2OBJS)
 ZBLAS3OBJS   += $(CZBLAS3OBJS)
 
-IBLAS1OBJS   += $(CIBLAS1OBJS)
-IBLAS2OBJS   += $(CIBLAS2OBJS)
-IBLAS3OBJS   += $(CIBLAS3OBJS)
-
 endif
 
 SBLASOBJS    = $(SBLAS1OBJS) $(SBLAS2OBJS) $(SBLAS3OBJS)
@@ -396,7 +380,6 @@ QBLASOBJS    = $(QBLAS1OBJS) $(QBLAS2OBJS) $(QBLAS3OBJS)
 CBLASOBJS    = $(CBLAS1OBJS) $(CBLAS2OBJS) $(CBLAS3OBJS)
 ZBLASOBJS    = $(ZBLAS1OBJS) $(ZBLAS2OBJS) $(ZBLAS3OBJS)
 XBLASOBJS    = $(XBLAS1OBJS) $(XBLAS2OBJS) $(XBLAS3OBJS)
-IBLASOBJS    = $(IBLAS1OBJS) $(IBLAS2OBJS) $(IBLAS3OBJS)
 
 #SLAPACKOBJS	= \
 #	sgetrf.$(SUFFIX) sgetrs.$(SUFFIX) spotrf.$(SUFFIX) sgetf2.$(SUFFIX) \
@@ -475,10 +458,6 @@ ifdef QUAD_PRECISION
 FUNCOBJS   += $(QBLASOBJS) $(XBLASOBJS)
 endif
 
-ifdef INTEGER_PRECISION
-FUNCOBJS   += $(IBLASOBJS)
-endif
-
 FUNCALLFILES = $(FUNCOBJS:.$(SUFFIX)=)
 
 include $(TOPDIR)/Makefile.tail
@@ -497,18 +476,17 @@ endif
 clean ::
 	@rm -f functable.h
 
-level1 : $(SBLAS1OBJS) $(DBLAS1OBJS) $(QBLAS1OBJS) $(CBLAS1OBJS) $(ZBLAS1OBJS) $(XBLAS1OBJS) $(IBLAS1OBJS)
+level1 : $(SBLAS1OBJS) $(DBLAS1OBJS) $(QBLAS1OBJS) $(CBLAS1OBJS) $(ZBLAS1OBJS) $(XBLAS1OBJS)
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
 
-level2 : $(SBLAS2OBJS) $(DBLAS2OBJS) $(QBLAS2OBJS) $(CBLAS2OBJS) $(ZBLAS2OBJS) $(XBLAS2OBJS) $(IBLAS2OBJS)
+level2 : $(SBLAS2OBJS) $(DBLAS2OBJS) $(QBLAS2OBJS) $(CBLAS2OBJS) $(ZBLAS2OBJS) $(XBLAS2OBJS)
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
 
-level3 : $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $(XBLAS3OBJS) $(IBLAS3OBJS)
+level3 : $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $(XBLAS3OBJS)
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
 
 $(CSBLASOBJS) $(CSBLASOBJS_P) $(CDBLASOBJS) $(CDBLASOBJS_P) $(CQBLASOBJS) $(CQBLASOBJS_P) \
-$(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) \
-$(CIBLASOBJS) $(CIBLASOBJS_P) : override CFLAGS += -DCBLAS
+$(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) : override CFLAGS += -DCBLAS
 
 srot.$(SUFFIX) srot.$(PSUFFIX) : rot.c
 	$(CC) $(CFLAGS) -c $< -o $(@F)
@@ -747,9 +725,6 @@ saxpy.$(SUFFIX) saxpy.$(PSUFFIX) : axpy.c
 daxpy.$(SUFFIX) daxpy.$(PSUFFIX) : axpy.c
 	$(CC) $(CFLAGS) -c $< -o $(@F)
 
-iaxpy.$(SUFFIX) iaxpy.$(PSUFFIX) : axpy.c
-	$(CC) $(CFLAGS) -c $< -o $(@F)
-
 qaxpy.$(SUFFIX) qaxpy.$(PSUFFIX) : axpy.c
 	$(CC) $(CFLAGS) -c $< -o $(@F)
 
@@ -1462,9 +1437,6 @@ cblas_saxpy.$(SUFFIX) cblas_saxpy.$(PSUFFIX) : axpy.c
 cblas_daxpy.$(SUFFIX) cblas_daxpy.$(PSUFFIX) : axpy.c
 	$(CC) $(CFLAGS) -DCBLAS -c $< -o $(@F)
 
-cblas_iaxpy.$(SUFFIX) cblas_iaxpy.$(PSUFFIX) : axpy.c
-	$(CC) $(CFLAGS) -DCBLAS -c $< -o $(@F)
-
 cblas_caxpy.$(SUFFIX) cblas_caxpy.$(PSUFFIX) : zaxpy.c
 	$(CC) $(CFLAGS) -DCBLAS -c $< -o $(@F)
 

interface/axpy.c

@@ -103,8 +103,6 @@ void CNAME(blasint n, FLOAT alpha, FLOAT *x, blasint incx, FLOAT *y, blasint inc
     mode  =  BLAS_XDOUBLE | BLAS_REAL;
 #elif defined(DOUBLE)
     mode  =  BLAS_DOUBLE  | BLAS_REAL;
-#elif defined(INTEGER)
-    mode  =  BLAS_INTEGER | BLAS_REAL;
 #else
     mode  =  BLAS_SINGLE  | BLAS_REAL;
 #endif

interface/gemv.c

@@ -38,7 +38,6 @@
 
 #include <stdio.h>
 #include "common.h"
-#include "l1param.h"
 #ifdef FUNCTION_PROFILE
 #include "functable.h"
 #endif
@@ -190,7 +189,7 @@ void CNAME(enum CBLAS_ORDER order,
   }
 
 #endif
-  //printf("m=%d, n=%d, trans=%d, incx=%d, incy=%d, alpha=%f, beta=%f\n", m, n, trans, incx, incy, alpha, beta);
+
   if ((m==0) || (n==0)) return;
 
   lenx = n;
@@ -212,24 +211,15 @@ void CNAME(enum CBLAS_ORDER order,
 #ifdef MAX_STACK_ALLOC
   // make it volatile because some gemv implementation (ex: dgemv_n.S)
   // do not restore all register
-  volatile int stack_alloc_size = 0;
-  //for gemv_n and gemv_t, try to allocate on stack
-  stack_alloc_size = m + n;
-#ifdef ALIGNED_ACCESS
-  stack_alloc_size += 3;
-#endif
+  volatile int stack_alloc_size = m + n;
   if(stack_alloc_size < 128)
-    //dgemv_n.S require a 128 bytes buffer
-    stack_alloc_size = 128;
-
+      //dgemv_n.S require a 128 bytes buffer
+      stack_alloc_size = 128;
   if(stack_alloc_size > MAX_STACK_ALLOC / sizeof(FLOAT))
-    stack_alloc_size = 0;
-
+      stack_alloc_size = 0;
   FLOAT stack_buffer[stack_alloc_size];
   buffer = stack_alloc_size ? stack_buffer : (FLOAT *)blas_memory_alloc(1);
-  //  printf("stack_alloc_size=%d\n", stack_alloc_size);
 #else
-  //Original OpenBLAS/GotoBLAS codes.
   buffer = (FLOAT *)blas_memory_alloc(1);
 #endif
 
@@ -261,13 +251,10 @@ void CNAME(enum CBLAS_ORDER order,
 #endif
 
 #ifdef MAX_STACK_ALLOC
-  if(!stack_alloc_size){
-    blas_memory_free(buffer);
-  }
-#else
-    blas_memory_free(buffer);
+  if(!stack_alloc_size)
 #endif
-  
+    blas_memory_free(buffer);
+
   FUNCTION_PROFILE_END(1, m * n + m + n,  2 * m * n);
 
   IDEBUG_END;

interface/trsm.c

@@ -362,12 +362,6 @@ void CNAME(enum CBLAS_ORDER order,
   mode |= (side  << BLAS_RSIDE_SHIFT);
 
   args.nthreads = num_cpu_avail(3);
-  if ( args.m < 2*GEMM_MULTITHREAD_THRESHOLD )
-	args.nthreads = 1;
-  else
-	if ( args.n < 2*GEMM_MULTITHREAD_THRESHOLD )
-		args.nthreads = 1;
-		
 
   if (args.nthreads == 1) {
 #endif

kernel/Makefile.L1

@@ -210,10 +210,6 @@ ifndef XAXPYKERNEL
 XAXPYKERNEL = zaxpy.S
 endif
 
-ifndef IAXPYKERNEL
-IAXPYKERNEL = ../generic/iaxpy.c
-endif
-
 ### COPY ###
 
 ifndef SCOPYKERNEL
@@ -475,9 +471,6 @@ QBLASOBJS	+= \
 	qasum_k$(TSUFFIX).$(SUFFIX) qaxpy_k$(TSUFFIX).$(SUFFIX) qcopy_k$(TSUFFIX).$(SUFFIX) qdot_k$(TSUFFIX).$(SUFFIX) \
 	qnrm2_k$(TSUFFIX).$(SUFFIX) qrot_k$(TSUFFIX).$(SUFFIX) qscal_k$(TSUFFIX).$(SUFFIX) qswap_k$(TSUFFIX).$(SUFFIX)
 
-IBLASOBJS       += \
-	iaxpy_k$(TSUFFIX).$(SUFFIX)
-
 CBLASOBJS	+= \
 	camax_k$(TSUFFIX).$(SUFFIX)  camin_k$(TSUFFIX).$(SUFFIX) icamax_k$(TSUFFIX).$(SUFFIX) icamin_k$(TSUFFIX).$(SUFFIX) \
 	casum_k$(TSUFFIX).$(SUFFIX) caxpy_k$(TSUFFIX).$(SUFFIX) caxpyc_k$(TSUFFIX).$(SUFFIX) ccopy_k$(TSUFFIX).$(SUFFIX) \
@@ -652,9 +645,6 @@ $(KDIR)daxpy_k$(TSUFFIX).$(SUFFIX)  $(KDIR)daxpy_k$(TPSUFFIX).$(PSUFFIX)  : $(KE
 $(KDIR)qaxpy_k$(TSUFFIX).$(SUFFIX)  $(KDIR)qaxpy_k$(TPSUFFIX).$(PSUFFIX)  : $(KERNELDIR)/$(QAXPYKERNEL)
 	$(CC) -c $(CFLAGS) -UCOMPLEX -UCOMPLEX -DXDOUBLE $< -o $@
 
-$(KDIR)iaxpy_k$(TSUFFIX).$(SUFFIX)  $(KDIR)iaxpy_k$(TPSUFFIX).$(PSUFFIX)  : $(KERNELDIR)/$(IAXPYKERNEL)
-	$(CC) -c $(CFLAGS) -UCOMPLEX -UCOMPLEX -DINTEGER $< -o $@
-
 $(KDIR)caxpy_k$(TSUFFIX).$(SUFFIX)  $(KDIR)caxpy_k$(TPSUFFIX).$(PSUFFIX)  : $(KERNELDIR)/$(CAXPYKERNEL)
 	$(CC) -c $(CFLAGS) -DCOMPLEX -DCOMPLEX -UCONJ -UDOUBLE $< -o $@
 

kernel/Makefile.L3

@@ -32,10 +32,6 @@ ifeq ($(TARGET), GENERIC)
 USE_TRMM = 1
 endif
 
-ifeq ($(CORE), HASWELL)
-USE_TRMM = 1
-endif
-
 
 
 SKERNELOBJS	+= \

kernel/arm64/KERNEL.XGENE1

@@ -1 +0,0 @@
-include $(KERNELDIR)/KERNEL.ARMV8

kernel/generic/iaxpy.c

@@ -1,52 +0,0 @@
-/***************************************************************************
-Copyright (c) 2015, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#include "common.h"
-
-int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, int da, int *x, BLASLONG inc_x, int *y, BLASLONG inc_y, int *dummy, BLASLONG dummy2)
-{
-  BLASLONG i=0;
-  BLASLONG ix,iy;
-
-  if ( n < 0     )  return(0);
-  if ( da == 0 ) return(0);
-
-  ix = 0;
-  iy = 0;
-
-  while(i < n)
-    {
-
-      y[iy] += da * x[ix] ;
-      ix += inc_x ;
-      iy += inc_y ;
-      i++ ;
-
-    }
-
-  return 0;
-}

kernel/x86_64/KERNEL.BULLDOZER

@@ -1,14 +1,9 @@
-DSCALKERNEL = dscal.c
-CSCALKERNEL = cscal.c
-ZSCALKERNEL = zscal.c
-
 DAXPYKERNEL = daxpy.c
 CAXPYKERNEL = caxpy.c
 ZAXPYKERNEL = zaxpy.c
 
 SDOTKERNEL     = sdot.c
-CDOTKERNEL     = cdot.c
-ZDOTKERNEL     = zdot.c
+DDOTKERNEL     = ddot.c
 
 DSYMV_U_KERNEL = dsymv_U.c
 DSYMV_L_KERNEL = dsymv_L.c
@@ -31,11 +26,11 @@ SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c
 SGEMMITCOPY    =  ../generic/gemm_tcopy_16.c
 SGEMMONCOPY    =  gemm_ncopy_2_bulldozer.S
 SGEMMOTCOPY    =  gemm_tcopy_2_bulldozer.S
+
 SGEMMINCOPYOBJ =  sgemm_incopy$(TSUFFIX).$(SUFFIX)
 SGEMMITCOPYOBJ =  sgemm_itcopy$(TSUFFIX).$(SUFFIX)
 SGEMMONCOPYOBJ =  sgemm_oncopy$(TSUFFIX).$(SUFFIX)
 SGEMMOTCOPYOBJ =  sgemm_otcopy$(TSUFFIX).$(SUFFIX)
-
 DGEMMKERNEL    =  dgemm_kernel_8x2_bulldozer.S
 DGEMMINCOPY    =  dgemm_ncopy_8_bulldozer.S
 DGEMMITCOPY    =  dgemm_tcopy_8_bulldozer.S
@@ -45,7 +40,6 @@ DGEMMINCOPYOBJ =  dgemm_incopy$(TSUFFIX).$(SUFFIX)
 DGEMMITCOPYOBJ =  dgemm_itcopy$(TSUFFIX).$(SUFFIX)
 DGEMMONCOPYOBJ =  dgemm_oncopy$(TSUFFIX).$(SUFFIX)
 DGEMMOTCOPYOBJ =  dgemm_otcopy$(TSUFFIX).$(SUFFIX)
-
 CGEMMKERNEL    =  cgemm_kernel_4x2_bulldozer.S
 CGEMMINCOPY    =  ../generic/zgemm_ncopy_4.c
 CGEMMITCOPY    =  ../generic/zgemm_tcopy_4.c
@@ -55,7 +49,6 @@ CGEMMINCOPYOBJ =  cgemm_incopy$(TSUFFIX).$(SUFFIX)
 CGEMMITCOPYOBJ =  cgemm_itcopy$(TSUFFIX).$(SUFFIX)
 CGEMMONCOPYOBJ =  cgemm_oncopy$(TSUFFIX).$(SUFFIX)
 CGEMMOTCOPYOBJ =  cgemm_otcopy$(TSUFFIX).$(SUFFIX)
-
 ZGEMMKERNEL    =  zgemm_kernel_2x2_bulldozer.S
 ZGEMMINCOPY    =
 ZGEMMITCOPY    =

kernel/x86_64/KERNEL.EXCAVATOR

@@ -1,92 +0,0 @@
-SAXPYKERNEL = saxpy.c
-DAXPYKERNEL = daxpy.c
-CAXPYKERNEL = caxpy.c
-ZAXPYKERNEL = zaxpy.c
-
-SDOTKERNEL     = sdot.c
-DDOTKERNEL     = ddot.c
-CDOTKERNEL     = cdot.c
-ZDOTKERNEL     = zdot.c
-
-
-DSYMV_U_KERNEL = dsymv_U.c
-DSYMV_L_KERNEL = dsymv_L.c
-SSYMV_U_KERNEL = ssymv_U.c
-SSYMV_L_KERNEL = ssymv_L.c
-
-SGEMVNKERNEL = sgemv_n_4.c
-SGEMVTKERNEL = sgemv_t_4.c
-
-DGEMVNKERNEL = dgemv_n_4.c
-DGEMVTKERNEL = dgemv_t_4.c
-
-ZGEMVNKERNEL = zgemv_n_dup.S
-ZGEMVTKERNEL = zgemv_t_4.c
-
-DCOPYKERNEL  = dcopy_bulldozer.S
-
-
-SGEMMKERNEL    =  sgemm_kernel_16x2_piledriver.S
-SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c
-SGEMMITCOPY    =  ../generic/gemm_tcopy_16.c
-SGEMMONCOPY    =  gemm_ncopy_2_bulldozer.S
-SGEMMOTCOPY    =  gemm_tcopy_2_bulldozer.S
-SGEMMINCOPYOBJ =  sgemm_incopy$(TSUFFIX).$(SUFFIX)
-SGEMMITCOPYOBJ =  sgemm_itcopy$(TSUFFIX).$(SUFFIX)
-SGEMMONCOPYOBJ =  sgemm_oncopy$(TSUFFIX).$(SUFFIX)
-SGEMMOTCOPYOBJ =  sgemm_otcopy$(TSUFFIX).$(SUFFIX)
-
-DGEMMKERNEL    =  dgemm_kernel_8x2_piledriver.S
-DGEMMINCOPY    =  ../generic/gemm_ncopy_8.c
-DGEMMITCOPY    =  ../generic/gemm_tcopy_8.c
-DGEMMONCOPY    =  gemm_ncopy_2_bulldozer.S
-DGEMMOTCOPY    =  gemm_tcopy_2_bulldozer.S
-DGEMMINCOPYOBJ =  dgemm_incopy$(TSUFFIX).$(SUFFIX)
-DGEMMITCOPYOBJ =  dgemm_itcopy$(TSUFFIX).$(SUFFIX)
-DGEMMONCOPYOBJ =  dgemm_oncopy$(TSUFFIX).$(SUFFIX)
-DGEMMOTCOPYOBJ =  dgemm_otcopy$(TSUFFIX).$(SUFFIX)
-
-CGEMMKERNEL    =  cgemm_kernel_4x2_piledriver.S
-CGEMMINCOPY    =  ../generic/zgemm_ncopy_4.c
-CGEMMITCOPY    =  ../generic/zgemm_tcopy_4.c
-CGEMMONCOPY    =  ../generic/zgemm_ncopy_2.c
-CGEMMOTCOPY    =  ../generic/zgemm_tcopy_2.c
-CGEMMINCOPYOBJ =  cgemm_incopy$(TSUFFIX).$(SUFFIX)
-CGEMMITCOPYOBJ =  cgemm_itcopy$(TSUFFIX).$(SUFFIX)
-CGEMMONCOPYOBJ =  cgemm_oncopy$(TSUFFIX).$(SUFFIX)
-CGEMMOTCOPYOBJ =  cgemm_otcopy$(TSUFFIX).$(SUFFIX)
-ZGEMMKERNEL    =  zgemm_kernel_2x2_piledriver.S
-ZGEMMINCOPY    =
-ZGEMMITCOPY    =
-ZGEMMONCOPY    =  ../generic/zgemm_ncopy_2.c
-ZGEMMOTCOPY    =  ../generic/zgemm_tcopy_2.c
-ZGEMMINCOPYOBJ =
-ZGEMMITCOPYOBJ =
-ZGEMMONCOPYOBJ =  zgemm_oncopy$(TSUFFIX).$(SUFFIX)
-ZGEMMOTCOPYOBJ =  zgemm_otcopy$(TSUFFIX).$(SUFFIX)
-
-CGEMM3MKERNEL    =  zgemm3m_kernel_8x4_barcelona.S
-ZGEMM3MKERNEL    =  zgemm3m_kernel_4x4_barcelona.S
-
-STRSMKERNEL_LN  =  ../generic/trsm_kernel_LN.c
-STRSMKERNEL_LT  =  ../generic/trsm_kernel_LT.c
-STRSMKERNEL_RN  =  ../generic/trsm_kernel_RN.c
-STRSMKERNEL_RT  =  ../generic/trsm_kernel_RT.c
-
-
-DTRSMKERNEL_LN  = ../generic/trsm_kernel_LN.c
-DTRSMKERNEL_LT  = dtrsm_kernel_LT_8x2_bulldozer.S
-DTRSMKERNEL_RN  = dtrsm_kernel_RN_8x2_bulldozer.S
-DTRSMKERNEL_RT  = ../generic/trsm_kernel_RT.c
-
-CTRSMKERNEL_LN  = ../generic/trsm_kernel_LN.c
-CTRSMKERNEL_LT  = ../generic/trsm_kernel_LT.c
-CTRSMKERNEL_RN  = ../generic/trsm_kernel_RN.c
-CTRSMKERNEL_RT  = ../generic/trsm_kernel_RT.c
-
-ZTRSMKERNEL_LN  = ../generic/trsm_kernel_LN.c
-ZTRSMKERNEL_LT  = ../generic/trsm_kernel_LT.c
-ZTRSMKERNEL_RN  = ../generic/trsm_kernel_RN.c
-ZTRSMKERNEL_RT  = ../generic/trsm_kernel_RT.c
-
-

kernel/x86_64/KERNEL.HASWELL

@@ -1,7 +1,3 @@
-DSCALKERNEL = dscal.c
-CSCALKERNEL = cscal.c
-ZSCALKERNEL = zscal.c
-
 SGEMVNKERNEL = sgemv_n_4.c
 SGEMVTKERNEL = sgemv_t_4.c
 
@@ -14,22 +10,6 @@ ZGEMVTKERNEL = zgemv_t_4.c
 CGEMVNKERNEL = cgemv_n_4.c
 CGEMVTKERNEL = cgemv_t_4.c
 
-SSYMV_L_KERNEL = ssymv_L.c
-SSYMV_U_KERNEL = ssymv_U.c
-DSYMV_L_KERNEL = dsymv_L.c
-DSYMV_U_KERNEL = dsymv_U.c
-
-SDOTKERNEL = sdot.c
-DDOTKERNEL = ddot.c
-CDOTKERNEL = cdot.c
-ZDOTKERNEL = zdot.c
-
-SAXPYKERNEL = saxpy.c
-DAXPYKERNEL = daxpy.c
-CAXPYKERNEL = caxpy.c
-ZAXPYKERNEL = zaxpy.c
-
-STRMMKERNEL    =  sgemm_kernel_16x4_haswell.S
 SGEMMKERNEL    =  sgemm_kernel_16x4_haswell.S
 SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c
 SGEMMITCOPY    =  ../generic/gemm_tcopy_16.c
@@ -40,18 +20,16 @@ SGEMMITCOPYOBJ =  sgemm_itcopy$(TSUFFIX).$(SUFFIX)
 SGEMMONCOPYOBJ =  sgemm_oncopy$(TSUFFIX).$(SUFFIX)
 SGEMMOTCOPYOBJ =  sgemm_otcopy$(TSUFFIX).$(SUFFIX)
 
-DTRMMKERNEL    =  dtrmm_kernel_4x8_haswell.c
-DGEMMKERNEL    =  dgemm_kernel_4x8_haswell.S
-DGEMMINCOPY    =  ../generic/gemm_ncopy_4.c
-DGEMMITCOPY    =  ../generic/gemm_tcopy_4.c
-DGEMMONCOPY    =  ../generic/gemm_ncopy_8.c
-DGEMMOTCOPY    =  ../generic/gemm_tcopy_8.c
-DGEMMINCOPYOBJ =  dgemm_incopy$(TSUFFIX).$(SUFFIX)
-DGEMMITCOPYOBJ =  dgemm_itcopy$(TSUFFIX).$(SUFFIX)
+DGEMMKERNEL    =  dgemm_kernel_4x4_haswell.S
+DGEMMINCOPY    =
+DGEMMITCOPY    =
+DGEMMONCOPY    =  ../generic/gemm_ncopy_4.c
+DGEMMOTCOPY    =  ../generic/gemm_tcopy_4.c
+DGEMMINCOPYOBJ =
+DGEMMITCOPYOBJ =
 DGEMMONCOPYOBJ =  dgemm_oncopy$(TSUFFIX).$(SUFFIX)
 DGEMMOTCOPYOBJ =  dgemm_otcopy$(TSUFFIX).$(SUFFIX)
 
-CTRMMKERNEL    =  cgemm_kernel_8x2_haswell.S
 CGEMMKERNEL    =  cgemm_kernel_8x2_haswell.S
 CGEMMINCOPY    =  ../generic/zgemm_ncopy_8.c
 CGEMMITCOPY    =  ../generic/zgemm_tcopy_8.c
@@ -62,7 +40,6 @@ CGEMMITCOPYOBJ =  cgemm_itcopy$(TSUFFIX).$(SUFFIX)
 CGEMMONCOPYOBJ =  cgemm_oncopy$(TSUFFIX).$(SUFFIX)
 CGEMMOTCOPYOBJ =  cgemm_otcopy$(TSUFFIX).$(SUFFIX)
 
-ZTRMMKERNEL    =  zgemm_kernel_4x2_haswell.S
 ZGEMMKERNEL    =  zgemm_kernel_4x2_haswell.S
 ZGEMMINCOPY    =  ../generic/zgemm_ncopy_4.c
 ZGEMMITCOPY    =  ../generic/zgemm_tcopy_4.c

kernel/x86_64/KERNEL.PILEDRIVER

@@ -1,13 +1,3 @@
-DSCALKERNEL = dscal.c
-CSCALKERNEL = cscal.c
-ZSCALKERNEL = zscal.c
-
-
-SAXPYKERNEL = saxpy.c
-DAXPYKERNEL = daxpy.c
-CAXPYKERNEL = caxpy.c
-ZAXPYKERNEL = zaxpy.c
-
 SGEMVNKERNEL = sgemv_n_4.c
 SGEMVTKERNEL = sgemv_t_4.c
 
@@ -17,11 +7,7 @@ ZGEMVTKERNEL = zgemv_t_4.c
 DGEMVNKERNEL = dgemv_n_bulldozer.S
 DGEMVTKERNEL = dgemv_t_bulldozer.S
 
-SDOTKERNEL   = sdot.c
-DDOTKERNEL   = ddot.c
-CDOTKERNEL   = cdot.c
-ZDOTKERNEL   = zdot.c
-
+DDOTKERNEL   = ddot_bulldozer.S
 DCOPYKERNEL  = dcopy_bulldozer.S
 
 SGEMMKERNEL    =  sgemm_kernel_16x2_piledriver.S

kernel/x86_64/KERNEL.SANDYBRIDGE

@@ -1,28 +1,8 @@
-DSCALKERNEL = dscal.c
-CSCALKERNEL = cscal.c
-
-SGERKERNEL = sger.c
-DGERKERNEL = dger.c
-
 SGEMVNKERNEL = sgemv_n_4.c
 SGEMVTKERNEL = sgemv_t_4.c
 
 ZGEMVNKERNEL = zgemv_n_4.c
 
-SDOTKERNEL = sdot.c
-DDOTKERNEL = ddot.c
-CDOTKERNEL = cdot.c
-ZDOTKERNEL = zdot.c
-
-SSYMV_L_KERNEL = ssymv_L.c
-SSYMV_U_KERNEL = ssymv_U.c
-DSYMV_L_KERNEL = dsymv_L.c
-DSYMV_U_KERNEL = dsymv_U.c
-
-SAXPYKERNEL = saxpy.c
-DAXPYKERNEL = daxpy.c
-CAXPYKERNEL = caxpy.c
-ZAXPYKERNEL = zaxpy.c
 
 SGEMMKERNEL    =  sgemm_kernel_16x4_sandy.S
 SGEMMINCOPY    =  ../generic/gemm_ncopy_16.c

kernel/x86_64/KERNEL.STEAMROLLER

@@ -1,17 +1,9 @@
-DSCALKERNEL = dscal.c
-CSCALKERNEL = cscal.c
-ZSCALKERNEL = zscal.c
-
-SAXPYKERNEL = saxpy.c
 DAXPYKERNEL = daxpy.c
 CAXPYKERNEL = caxpy.c
 ZAXPYKERNEL = zaxpy.c
 
 SDOTKERNEL     = sdot.c
 DDOTKERNEL     = ddot.c
-CDOTKERNEL     = cdot.c
-ZDOTKERNEL     = zdot.c
-
 
 DSYMV_U_KERNEL = dsymv_U.c
 DSYMV_L_KERNEL = dsymv_L.c

kernel/x86_64/caxpy.c

@@ -29,14 +29,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "common.h"
 
 
-#if defined(PILEDRIVER) || defined(STEAMROLLER)
-#include "caxpy_microk_steamroller-2.c"
-#elif defined(BULLDOZER)
+#if defined(BULLDOZER) || defined(PILEDRIVER) || defined(STEAMROLLER)
 #include "caxpy_microk_bulldozer-2.c"
-#elif defined(HASWELL)
-#include "caxpy_microk_haswell-2.c"
-#elif defined(SANDYBRIDGE)
-#include "caxpy_microk_sandy-2.c"
 #endif
 
 
@@ -84,16 +78,15 @@ int CNAME(BLASLONG n, BLASLONG dummy0, BLASLONG dummy1, FLOAT da_r, FLOAT da_i,
 	if ( (inc_x == 1) && (inc_y == 1) )
 	{
 
-		BLASLONG n1 = n & -32;
+		int n1 = n & -8;
 
 		if ( n1 )
 		{
 			da[0] = da_r;
 			da[1] = da_i;
-			caxpy_kernel_8(n1, x, y , da );
+			caxpy_kernel_8(n1, x, y , &da );
 			ix = 2 * n1;
 		}
-
 		i = n1;
 		while(i < n)
 		{

kernel/x86_64/caxpy_microk_bulldozer-2.c

@@ -31,87 +31,89 @@ static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __att
 static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
 {
 
-#if !defined(CONJ)
-	FLOAT mvec[4] = { -1.0, 1.0, -1.0, 1.0 };
-#else
-	FLOAT mvec[4] = { 1.0, -1.0, 1.0, -1.0 };
-#endif
 
 	BLASLONG register i = 0;
 
-  if ( n < 640 )
-  {
-
 	__asm__  __volatile__
 	(
-	"vzeroupper					    \n\t"
 	"vbroadcastss		(%4), %%xmm0		    \n\t"  // real part of alpha
 	"vbroadcastss	       4(%4), %%xmm1		    \n\t"  // imag part of alpha
-#if !defined(CONJ)
-	"vmulps		(%5), %%xmm1 , %%xmm1		    \n\t"
-#else
-	"vmulps		(%5), %%xmm0 , %%xmm0		    \n\t"
-#endif
 
 	".align 16				            \n\t"
 	"1:				            \n\t"
 
+	"prefetcht0  768(%2,%0,4)                           \n\t"
 	"vmovups        (%2,%0,4), %%xmm5                   \n\t" // 2 complex values from x
-	".align 2					    \n\t"
 	"vmovups      16(%2,%0,4), %%xmm7                   \n\t" // 2 complex values from x
 	"vmovups      32(%2,%0,4), %%xmm9                   \n\t" // 2 complex values from x
 	"vmovups      48(%2,%0,4), %%xmm11                  \n\t" // 2 complex values from x
+	"prefetcht0  768(%3,%0,4)                           \n\t"
 
-	"vmovups      64(%2,%0,4), %%xmm12                  \n\t" // 2 complex values from x
-	"vmovups      80(%2,%0,4), %%xmm13                  \n\t" // 2 complex values from x
-	"vmovups      96(%2,%0,4), %%xmm14                  \n\t" // 2 complex values from x
-	"vmovups     112(%2,%0,4), %%xmm15                  \n\t" // 2 complex values from x
-
+#if !defined(CONJ)
+	"vfmaddps    (%3,%0,4), %%xmm0 , %%xmm5, %%xmm12    \n\t"
 	"vpermilps	$0xb1 , %%xmm5 , %%xmm4 	    \n\t"  // exchange real and imag part
+	"vmulps         %%xmm1, %%xmm4 , %%xmm4             \n\t"
+
+	"vfmaddps  16(%3,%0,4), %%xmm0 , %%xmm7, %%xmm13    \n\t"
 	"vpermilps	$0xb1 , %%xmm7 , %%xmm6 	    \n\t"  // exchange real and imag part
+	"vmulps         %%xmm1, %%xmm6 , %%xmm6             \n\t"
+
+	"vfmaddps  32(%3,%0,4), %%xmm0 , %%xmm9, %%xmm14    \n\t"
 	"vpermilps	$0xb1 , %%xmm9 , %%xmm8 	    \n\t"  // exchange real and imag part
+	"vmulps         %%xmm1, %%xmm8 , %%xmm8             \n\t"
+
+	"vfmaddps  48(%3,%0,4), %%xmm0 , %%xmm11,%%xmm15    \n\t"
 	"vpermilps	$0xb1 , %%xmm11, %%xmm10 	    \n\t"  // exchange real and imag part
+	"vmulps         %%xmm1, %%xmm10, %%xmm10            \n\t"
 
-	"vfmaddps    (%3,%0,4), %%xmm0 , %%xmm5, %%xmm5     \n\t"
-	".align 2					    \n\t"
-	"vfmaddps  16(%3,%0,4), %%xmm0 , %%xmm7, %%xmm7     \n\t"
-	"vfmaddps  32(%3,%0,4), %%xmm0 , %%xmm9, %%xmm9     \n\t"
-	"vfmaddps  48(%3,%0,4), %%xmm0 , %%xmm11,%%xmm11    \n\t"
+        "vaddsubps      %%xmm4, %%xmm12, %%xmm12            \n\t"
+        "vaddsubps      %%xmm6, %%xmm13, %%xmm13            \n\t"
+        "vaddsubps      %%xmm8, %%xmm14, %%xmm14            \n\t"
+        "vaddsubps      %%xmm10,%%xmm15, %%xmm15            \n\t"
 
-	"vfmaddps	%%xmm5 , %%xmm1 , %%xmm4 , %%xmm5   \n\t"
-	"vfmaddps	%%xmm7 , %%xmm1 , %%xmm6 , %%xmm7   \n\t"
-	"vfmaddps	%%xmm9 , %%xmm1 , %%xmm8 , %%xmm9   \n\t"
-	"vfmaddps	%%xmm11, %%xmm1 , %%xmm10, %%xmm11  \n\t"
+#else
 
-	"vpermilps	$0xb1 , %%xmm12, %%xmm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm13, %%xmm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm14, %%xmm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm15, %%xmm10 	    \n\t"  // exchange real and imag part
+	"vmulps		%%xmm0, %%xmm5, %%xmm4		    \n\t" // a_r*x_r, a_r*x_i
+	"vmulps		%%xmm1, %%xmm5, %%xmm5 		    \n\t" // a_i*x_r, a_i*x_i
+	"vmulps		%%xmm0, %%xmm7, %%xmm6		    \n\t" // a_r*x_r, a_r*x_i
+	"vmulps		%%xmm1, %%xmm7, %%xmm7 		    \n\t" // a_i*x_r, a_i*x_i
+	"vmulps		%%xmm0, %%xmm9, %%xmm8		    \n\t" // a_r*x_r, a_r*x_i
+	"vmulps		%%xmm1, %%xmm9, %%xmm9 		    \n\t" // a_i*x_r, a_i*x_i
+	"vmulps		%%xmm0, %%xmm11, %%xmm10	    \n\t" // a_r*x_r, a_r*x_i
+	"vmulps		%%xmm1, %%xmm11, %%xmm11	    \n\t" // a_i*x_r, a_i*x_i
 
-	"vfmaddps  64(%3,%0,4), %%xmm0 , %%xmm12, %%xmm12   \n\t"
-	"vfmaddps  80(%3,%0,4), %%xmm0 , %%xmm13, %%xmm13   \n\t"
-	"vfmaddps  96(%3,%0,4), %%xmm0 , %%xmm14, %%xmm14   \n\t"
-	"vfmaddps 112(%3,%0,4), %%xmm0 , %%xmm15, %%xmm15   \n\t"
+	"vpermilps	$0xb1 , %%xmm4 , %%xmm4 	    \n\t"  // exchange real and imag part
+	"vaddsubps	%%xmm4 ,%%xmm5 , %%xmm4 	    \n\t"
+	"vpermilps	$0xb1 , %%xmm4 , %%xmm4 	    \n\t"  // exchange real and imag part
 
-	"vfmaddps	%%xmm12, %%xmm1 , %%xmm4 , %%xmm12  \n\t"
-	"vfmaddps	%%xmm13, %%xmm1 , %%xmm6 , %%xmm13  \n\t"
-	"vfmaddps	%%xmm14, %%xmm1 , %%xmm8 , %%xmm14  \n\t"
-	"vfmaddps	%%xmm15, %%xmm1 , %%xmm10, %%xmm15  \n\t"
+	"vpermilps	$0xb1 , %%xmm6 , %%xmm6 	    \n\t"  // exchange real and imag part
+	"vaddsubps	%%xmm6 ,%%xmm7 , %%xmm6 	    \n\t"
+	"vpermilps	$0xb1 , %%xmm6 , %%xmm6 	    \n\t"  // exchange real and imag part
 
-	"vmovups	%%xmm5 ,   (%3,%0,4)		    \n\t"
-	".align 2					    \n\t"
-	"vmovups	%%xmm7 , 16(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm9 , 32(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm11, 48(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm12, 64(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm13, 80(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm14, 96(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm15,112(%3,%0,4)		    \n\t"
+	"vpermilps	$0xb1 , %%xmm8 , %%xmm8 	    \n\t"  // exchange real and imag part
+	"vaddsubps	%%xmm8 ,%%xmm9 , %%xmm8 	    \n\t"
+	"vpermilps	$0xb1 , %%xmm8 , %%xmm8 	    \n\t"  // exchange real and imag part
 
-	"addq		$32, %0	  	 	             \n\t"
-	"subq	        $16, %1			             \n\t"		
+	"vpermilps	$0xb1 , %%xmm10, %%xmm10	    \n\t"  // exchange real and imag part
+	"vaddsubps	%%xmm10,%%xmm11, %%xmm10	    \n\t"
+	"vpermilps	$0xb1 , %%xmm10, %%xmm10	    \n\t"  // exchange real and imag part
+
+	"vaddps	     (%3,%0,4) ,%%xmm4 , %%xmm12	    \n\t"
+	"vaddps	   16(%3,%0,4) ,%%xmm6 , %%xmm13	    \n\t"
+	"vaddps	   32(%3,%0,4) ,%%xmm8 , %%xmm14	    \n\t"
+	"vaddps	   48(%3,%0,4) ,%%xmm10, %%xmm15	    \n\t"
+
+
+#endif
+
+	"vmovups	%%xmm12,   (%3,%0,4)		    \n\t"
+	"vmovups	%%xmm13, 16(%3,%0,4)		    \n\t"
+	"vmovups	%%xmm14, 32(%3,%0,4)		    \n\t"
+	"vmovups	%%xmm15, 48(%3,%0,4)		    \n\t"
+
+	"addq		$16, %0	  	 	             \n\t"
+	"subq	        $8 , %1			             \n\t"		
 	"jnz		1b		             \n\t"
-	"vzeroupper					    \n\t"
 
 	:
         : 
@@ -119,8 +121,7 @@ static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
 	  "r" (n),  	// 1
           "r" (x),      // 2
           "r" (y),      // 3
-          "r" (alpha),  // 4
-          "r" (mvec)    // 5
+          "r" (alpha)   // 4
 	: "cc", 
 	  "%xmm0", "%xmm1",
 	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
@@ -128,73 +129,7 @@ static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
 	  "%xmm12", "%xmm13", "%xmm14", "%xmm15",
 	  "memory"
 	);
-	return;
-  }
-
-	__asm__  __volatile__
-	(
-	"vzeroupper					    \n\t"
-	"vbroadcastss		(%4), %%xmm0		    \n\t"  // real part of alpha
-	"vbroadcastss	       4(%4), %%xmm1		    \n\t"  // imag part of alpha
-#if !defined(CONJ)
-	"vmulps		(%5), %%xmm1 , %%xmm1		    \n\t"
-#else
-	"vmulps		(%5), %%xmm0 , %%xmm0		    \n\t"
-#endif
-
-	".align 16				            \n\t"
-	"1:				            \n\t"
-
-	"prefetcht0	512(%2,%0,4)			    \n\t"
-	"vmovups        (%2,%0,4), %%xmm5                   \n\t" // 2 complex values from x
-	".align 2					    \n\t"
-	"vmovups      16(%2,%0,4), %%xmm7                   \n\t" // 2 complex values from x
-	"vmovups      32(%2,%0,4), %%xmm9                   \n\t" // 2 complex values from x
-	"vmovups      48(%2,%0,4), %%xmm11                  \n\t" // 2 complex values from x
-
-	"vpermilps	$0xb1 , %%xmm5 , %%xmm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm7 , %%xmm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm9 , %%xmm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm11, %%xmm10 	    \n\t"  // exchange real and imag part
-
-	"prefetcht0	512(%3,%0,4)			    \n\t"
-	"vfmaddps    (%3,%0,4), %%xmm0 , %%xmm5, %%xmm5     \n\t"
-	".align 2					    \n\t"
-	"vfmaddps  16(%3,%0,4), %%xmm0 , %%xmm7, %%xmm7     \n\t"
-	"vfmaddps  32(%3,%0,4), %%xmm0 , %%xmm9, %%xmm9     \n\t"
-	"vfmaddps  48(%3,%0,4), %%xmm0 , %%xmm11,%%xmm11    \n\t"
-
-	"vfmaddps	%%xmm5 , %%xmm1 , %%xmm4 , %%xmm5   \n\t"
-	"vfmaddps	%%xmm7 , %%xmm1 , %%xmm6 , %%xmm7   \n\t"
-	"vfmaddps	%%xmm9 , %%xmm1 , %%xmm8 , %%xmm9   \n\t"
-	"vfmaddps	%%xmm11, %%xmm1 , %%xmm10, %%xmm11  \n\t"
-
-	"vmovups	%%xmm5 ,   (%3,%0,4)		    \n\t"
-	".align 2					    \n\t"
-	"vmovups	%%xmm7 , 16(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm9 , 32(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm11, 48(%3,%0,4)		    \n\t"
-
-	"addq		$16, %0	  	 	             \n\t"
-	"subq	        $8, %1			             \n\t"		
-	"jnz		1b		             \n\t"
-	"vzeroupper					    \n\t"
-
-	:
-        : 
-          "r" (i),	// 0	
-	  "r" (n),  	// 1
-          "r" (x),      // 2
-          "r" (y),      // 3
-          "r" (alpha),  // 4
-          "r" (mvec)    // 5
-	: "cc", 
-	  "%xmm0", "%xmm1",
-	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
-	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
-	  "memory"
-	);
-
 
 } 
 
+

kernel/x86_64/caxpy_microk_haswell-2.c

@@ -1,132 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#define HAVE_KERNEL_8 1
-static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline));
-
-static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
-{
-
-#if !defined(CONJ)
-	FLOAT mvec[8] = { -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 };
-#else
-	FLOAT mvec[8] = { 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0 };
-#endif
-
-	BLASLONG register i = 0;
-
-	__asm__  __volatile__
-	(
-	"vzeroupper					    \n\t"
-	"vbroadcastss		(%4), %%ymm0		    \n\t"  // real part of alpha
-	"vbroadcastss	       4(%4), %%ymm1		    \n\t"  // imag part of alpha
-#if !defined(CONJ)
-	"vmulps		(%5), %%ymm1 , %%ymm1		    \n\t"
-#else
-	"vmulps		(%5), %%ymm0 , %%ymm0		    \n\t"
-#endif
-
-	".align 16				            \n\t"
-	"1:				            \n\t"
-
-	"vmovups        (%2,%0,4), %%ymm5                   \n\t" // 4 complex values from x
-	".align 2					    \n\t"
-	"vmovups      32(%2,%0,4), %%ymm7                   \n\t" // 4 complex values from x
-	"vmovups      64(%2,%0,4), %%ymm9                   \n\t" // 4 complex values from x
-	"vmovups      96(%2,%0,4), %%ymm11                  \n\t" // 4 complex values from x
-
-	"vmovups     128(%2,%0,4), %%ymm12                  \n\t" // 4 complex values from x
-	"vmovups     160(%2,%0,4), %%ymm13                  \n\t" // 4 complex values from x
-	"vmovups     192(%2,%0,4), %%ymm14                  \n\t" // 4 complex values from x
-	"vmovups     224(%2,%0,4), %%ymm15                  \n\t" // 4 complex values from x
-
-	"vpermilps	$0xb1 , %%ymm5 , %%ymm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm7 , %%ymm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm9 , %%ymm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm11, %%ymm10 	    \n\t"  // exchange real and imag part
-
-	"vfmadd213ps    (%3,%0,4), %%ymm0 , %%ymm5          \n\t"
-	".align 2					    \n\t"
-	"vfmadd213ps  32(%3,%0,4), %%ymm0 , %%ymm7          \n\t"
-	"vfmadd213ps  64(%3,%0,4), %%ymm0 , %%ymm9          \n\t"
-	"vfmadd213ps  96(%3,%0,4), %%ymm0 , %%ymm11         \n\t"
-
-	"vfmadd231ps	%%ymm1 , %%ymm4 , %%ymm5   \n\t"
-	"vfmadd231ps	%%ymm1 , %%ymm6 , %%ymm7   \n\t"
-	"vfmadd231ps	%%ymm1 , %%ymm8 , %%ymm9   \n\t"
-	"vfmadd231ps	%%ymm1 , %%ymm10, %%ymm11  \n\t"
-
-	"vpermilps	$0xb1 , %%ymm12, %%ymm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm13, %%ymm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm14, %%ymm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm15, %%ymm10 	    \n\t"  // exchange real and imag part
-
-	"vfmadd213ps 128(%3,%0,4), %%ymm0 , %%ymm12         \n\t"
-	"vfmadd213ps 160(%3,%0,4), %%ymm0 , %%ymm13         \n\t"
-	"vfmadd213ps 192(%3,%0,4), %%ymm0 , %%ymm14         \n\t"
-	"vfmadd213ps 224(%3,%0,4), %%ymm0 , %%ymm15         \n\t"
-
-	"vfmadd231ps	%%ymm1 , %%ymm4 , %%ymm12  \n\t"
-	"vfmadd231ps	%%ymm1 , %%ymm6 , %%ymm13  \n\t"
-	"vfmadd231ps	%%ymm1 , %%ymm8 , %%ymm14  \n\t"
-	"vfmadd231ps	%%ymm1 , %%ymm10, %%ymm15  \n\t"
-
-	"vmovups	%%ymm5 ,   (%3,%0,4)		    \n\t"
-	".align 2					    \n\t"
-	"vmovups	%%ymm7 , 32(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm9 , 64(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm11, 96(%3,%0,4)		    \n\t"
-
-	"vmovups	%%ymm12,128(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm13,160(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm14,192(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm15,224(%3,%0,4)		    \n\t"
-
-	"addq		$64, %0	  	 	             \n\t"
-	"subq	        $32, %1			             \n\t"		
-	"jnz		1b		             \n\t"
-	"vzeroupper					    \n\t"
-
-	:
-        : 
-          "r" (i),	// 0	
-	  "r" (n),  	// 1
-          "r" (x),      // 2
-          "r" (y),      // 3
-          "r" (alpha),  // 4
-          "r" (mvec)    // 5
-	: "cc", 
-	  "%xmm0", "%xmm1",
-	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
-	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
-	  "%xmm12", "%xmm13", "%xmm14", "%xmm15", 
-	  "memory"
-	);
-
-
-} 
-

kernel/x86_64/caxpy_microk_sandy-2.c

@@ -1,116 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#define HAVE_KERNEL_8 1
-static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline));
-
-static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
-{
-
-#if !defined(CONJ)
-	FLOAT mvec[8] = { -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 };
-#else
-	FLOAT mvec[8] = { 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0 };
-#endif
-
-	BLASLONG register i = 0;
-
-	__asm__  __volatile__
-	(
-	"vzeroupper					    \n\t"
-	"vbroadcastss		(%4), %%ymm0		    \n\t"  // real part of alpha
-	"vbroadcastss	       4(%4), %%ymm1		    \n\t"  // imag part of alpha
-#if !defined(CONJ)
-	"vmulps		(%5), %%ymm1 , %%ymm1		    \n\t"
-#else
-	"vmulps		(%5), %%ymm0 , %%ymm0		    \n\t"
-#endif
-
-	".align 16				            \n\t"
-	"1:				            \n\t"
-
-	"vmovups        (%2,%0,4), %%ymm5                   \n\t" // 4 complex values from x
-	".align 2					    \n\t"
-	"vmovups      32(%2,%0,4), %%ymm7                   \n\t" // 4 complex values from x
-	"vmovups      64(%2,%0,4), %%ymm9                   \n\t" // 4 complex values from x
-	"vmovups      96(%2,%0,4), %%ymm11                  \n\t" // 4 complex values from x
-
-	"vpermilps	$0xb1 , %%ymm5 , %%ymm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm7 , %%ymm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm9 , %%ymm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%ymm11, %%ymm10 	    \n\t"  // exchange real and imag part
-
-	"vmulps	        %%ymm5 , %%ymm0 , %%ymm5	    \n\t"
-	"vmulps	        %%ymm7 , %%ymm0 , %%ymm7	    \n\t"
-	"vmulps	        %%ymm9 , %%ymm0 , %%ymm9	    \n\t"
-	"vmulps	        %%ymm11, %%ymm0 , %%ymm11           \n\t"
-
-	"vaddps	        (%3,%0,4), %%ymm5 , %%ymm5          \n\t"
-	"vaddps	      32(%3,%0,4), %%ymm7 , %%ymm7          \n\t"
-	"vaddps	      64(%3,%0,4), %%ymm9 , %%ymm9          \n\t"
-	"vaddps	      96(%3,%0,4), %%ymm11, %%ymm11         \n\t"
-
-	"vmulps	        %%ymm4 , %%ymm1 , %%ymm4	    \n\t"
-	"vmulps	        %%ymm6 , %%ymm1 , %%ymm6	    \n\t"
-	"vmulps	        %%ymm8 , %%ymm1 , %%ymm8	    \n\t"
-	"vmulps	        %%ymm10, %%ymm1 , %%ymm10           \n\t"
-
-	"vaddps         %%ymm4 , %%ymm5 , %%ymm5            \n\t"
-	"vaddps         %%ymm6 , %%ymm7 , %%ymm7            \n\t"
-	"vaddps         %%ymm8 , %%ymm9 , %%ymm9            \n\t"
-	"vaddps         %%ymm10, %%ymm11, %%ymm11           \n\t"
-
-	"vmovups	%%ymm5 ,   (%3,%0,4)		    \n\t"
-	".align 2					    \n\t"
-	"vmovups	%%ymm7 , 32(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm9 , 64(%3,%0,4)		    \n\t"
-	"vmovups	%%ymm11, 96(%3,%0,4)		    \n\t"
-
-	"addq		$32, %0	  	 	             \n\t"
-	"subq	        $16, %1			             \n\t"		
-	"jnz		1b		             \n\t"
-	"vzeroupper					    \n\t"
-
-	:
-        : 
-          "r" (i),	// 0	
-	  "r" (n),  	// 1
-          "r" (x),      // 2
-          "r" (y),      // 3
-          "r" (alpha),  // 4
-          "r" (mvec)    // 5
-	: "cc", 
-	  "%xmm0", "%xmm1",
-	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
-	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
-	  "%xmm12", "%xmm13", "%xmm14", "%xmm15", 
-	  "memory"
-	);
-
-
-} 
-

kernel/x86_64/caxpy_microk_steamroller-2.c

@@ -1,200 +0,0 @@
-/***************************************************************************
-Copyright (c) 2014, The OpenBLAS Project
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-3. Neither the name of the OpenBLAS project nor the names of
-its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBLAS PROJECT OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-#define HAVE_KERNEL_8 1
-static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y , FLOAT *alpha) __attribute__ ((noinline));
-
-static void caxpy_kernel_8( BLASLONG n, FLOAT *x, FLOAT *y, FLOAT *alpha)
-{
-
-#if !defined(CONJ)
-	FLOAT mvec[4] = { -1.0, 1.0, -1.0, 1.0 };
-#else
-	FLOAT mvec[4] = { 1.0, -1.0, 1.0, -1.0 };
-#endif
-
-	BLASLONG register i = 0;
-
-  if ( n <= 2048 )
-  {
-
-	__asm__  __volatile__
-	(
-	"vzeroupper					    \n\t"
-	"vbroadcastss		(%4), %%xmm0		    \n\t"  // real part of alpha
-	"vbroadcastss	       4(%4), %%xmm1		    \n\t"  // imag part of alpha
-#if !defined(CONJ)
-	"vmulps		(%5), %%xmm1 , %%xmm1		    \n\t"
-#else
-	"vmulps		(%5), %%xmm0 , %%xmm0		    \n\t"
-#endif
-
-	".align 16				            \n\t"
-	"1:				            \n\t"
-
-	"vmovups        (%2,%0,4), %%xmm5                   \n\t" // 2 complex values from x
-	".align 2					    \n\t"
-	"vmovups      16(%2,%0,4), %%xmm7                   \n\t" // 2 complex values from x
-	"vmovups      32(%2,%0,4), %%xmm9                   \n\t" // 2 complex values from x
-	"vmovups      48(%2,%0,4), %%xmm11                  \n\t" // 2 complex values from x
-
-	"vmovups      64(%2,%0,4), %%xmm12                  \n\t" // 2 complex values from x
-	"vmovups      80(%2,%0,4), %%xmm13                  \n\t" // 2 complex values from x
-	"vmovups      96(%2,%0,4), %%xmm14                  \n\t" // 2 complex values from x
-	"vmovups     112(%2,%0,4), %%xmm15                  \n\t" // 2 complex values from x
-
-	"vpermilps	$0xb1 , %%xmm5 , %%xmm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm7 , %%xmm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm9 , %%xmm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm11, %%xmm10 	    \n\t"  // exchange real and imag part
-
-	"vfmadd213ps    (%3,%0,4), %%xmm0 , %%xmm5          \n\t"
-	".align 2					    \n\t"
-	"vfmadd213ps  16(%3,%0,4), %%xmm0 , %%xmm7          \n\t"
-	"vfmadd213ps  32(%3,%0,4), %%xmm0 , %%xmm9          \n\t"
-	"vfmadd213ps  48(%3,%0,4), %%xmm0 , %%xmm11         \n\t"
-
-	"vfmadd231ps	%%xmm1 , %%xmm4 , %%xmm5   \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm6 , %%xmm7   \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm8 , %%xmm9   \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm10, %%xmm11  \n\t"
-
-	"vpermilps	$0xb1 , %%xmm12, %%xmm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm13, %%xmm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm14, %%xmm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm15, %%xmm10 	    \n\t"  // exchange real and imag part
-
-	"vfmadd213ps  64(%3,%0,4), %%xmm0 , %%xmm12   \n\t"
-	"vfmadd213ps  80(%3,%0,4), %%xmm0 , %%xmm13   \n\t"
-	"vfmadd213ps  96(%3,%0,4), %%xmm0 , %%xmm14   \n\t"
-	"vfmadd213ps 112(%3,%0,4), %%xmm0 , %%xmm15   \n\t"
-
-	"vfmadd231ps	%%xmm1 , %%xmm4 , %%xmm12  \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm6 , %%xmm13  \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm8 , %%xmm14  \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm10, %%xmm15  \n\t"
-
-	"vmovups	%%xmm5 ,   (%3,%0,4)		    \n\t"
-	".align 2					    \n\t"
-	"vmovups	%%xmm7 , 16(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm9 , 32(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm11, 48(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm12, 64(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm13, 80(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm14, 96(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm15,112(%3,%0,4)		    \n\t"
-
-	"addq		$32, %0	  	 	             \n\t"
-	"subq	        $16, %1			             \n\t"		
-	"jnz		1b		             \n\t"
-	"vzeroupper					    \n\t"
-
-	:
-        : 
-          "r" (i),	// 0	
-	  "r" (n),  	// 1
-          "r" (x),      // 2
-          "r" (y),      // 3
-          "r" (alpha),  // 4
-          "r" (mvec)    // 5
-	: "cc", 
-	  "%xmm0", "%xmm1",
-	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
-	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
-	  "%xmm12", "%xmm13", "%xmm14", "%xmm15",
-	  "memory"
-	);
-	return;
-  }
-
-	__asm__  __volatile__
-	(
-	"vzeroupper					    \n\t"
-	"vbroadcastss		(%4), %%xmm0		    \n\t"  // real part of alpha
-	"vbroadcastss	       4(%4), %%xmm1		    \n\t"  // imag part of alpha
-#if !defined(CONJ)
-	"vmulps		(%5), %%xmm1 , %%xmm1		    \n\t"
-#else
-	"vmulps		(%5), %%xmm0 , %%xmm0		    \n\t"
-#endif
-
-	".align 16				            \n\t"
-	"1:				            \n\t"
-
-	"prefetcht0	512(%2,%0,4)			    \n\t"
-	"vmovups        (%2,%0,4), %%xmm5                   \n\t" // 2 complex values from x
-	".align 2					    \n\t"
-	"vmovups      16(%2,%0,4), %%xmm7                   \n\t" // 2 complex values from x
-	"vmovups      32(%2,%0,4), %%xmm9                   \n\t" // 2 complex values from x
-	"vmovups      48(%2,%0,4), %%xmm11                  \n\t" // 2 complex values from x
-
-	"vpermilps	$0xb1 , %%xmm5 , %%xmm4 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm7 , %%xmm6 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm9 , %%xmm8 	    \n\t"  // exchange real and imag part
-	"vpermilps	$0xb1 , %%xmm11, %%xmm10 	    \n\t"  // exchange real and imag part
-
-	"prefetcht0	512(%3,%0,4)			    \n\t"
-	"vfmadd213ps    (%3,%0,4), %%xmm0 , %%xmm5          \n\t"
-	".align 2					    \n\t"
-	"vfmadd213ps  16(%3,%0,4), %%xmm0 , %%xmm7          \n\t"
-	"vfmadd213ps  32(%3,%0,4), %%xmm0 , %%xmm9          \n\t"
-	"vfmadd213ps  48(%3,%0,4), %%xmm0 , %%xmm11         \n\t"
-
-	"vfmadd231ps	%%xmm1 , %%xmm4 , %%xmm5   \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm6 , %%xmm7   \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm8 , %%xmm9   \n\t"
-	"vfmadd231ps	%%xmm1 , %%xmm10, %%xmm11  \n\t"
-
-	"vmovups	%%xmm5 ,   (%3,%0,4)		    \n\t"
-	".align 2					    \n\t"
-	"vmovups	%%xmm7 , 16(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm9 , 32(%3,%0,4)		    \n\t"
-	"vmovups	%%xmm11, 48(%3,%0,4)		    \n\t"
-
-	"addq		$16, %0	  	 	             \n\t"
-	"subq	        $8, %1			             \n\t"		
-	"jnz		1b		             \n\t"
-	"vzeroupper					    \n\t"
-
-	:
-        : 
-          "r" (i),	// 0	
-	  "r" (n),  	// 1
-          "r" (x),      // 2
-          "r" (y),      // 3
-          "r" (alpha),  // 4
-          "r" (mvec)    // 5
-	: "cc", 
-	  "%xmm0", "%xmm1",
-	  "%xmm4", "%xmm5", "%xmm6", "%xmm7", 
-	  "%xmm8", "%xmm9", "%xmm10", "%xmm11", 
-	  "memory"
-	);
-
-
-} 
-