From 2ff66e661d2a2c2cb37df4c7cd316803e6be4c6c Mon Sep 17 00:00:00 2001 From: wernsaar Date: Mon, 19 May 2014 13:35:32 +0200 Subject: [PATCH] enabled and tested optimized laswp lapack function --- interface/Makefile | 16 ++--- interface/lapack/zlauu2.c | 129 --------------------------------- interface/lapack/zlauum.c | 141 ------------------------------------- lapack-netlib/SRC/Makefile | 8 +-- 4 files changed, 12 insertions(+), 282 deletions(-) delete mode 100644 interface/lapack/zlauu2.c delete mode 100644 interface/lapack/zlauum.c diff --git a/interface/Makefile b/interface/Makefile index 42e9f50b5..8b87127ef 100644 --- a/interface/Makefile +++ b/interface/Makefile @@ -349,7 +349,7 @@ XBLASOBJS = $(XBLAS1OBJS) $(XBLAS2OBJS) $(XBLAS3OBJS) SLAPACKOBJS = \ sgetrf.$(SUFFIX) sgetrs.$(SUFFIX) spotrf.$(SUFFIX) sgetf2.$(SUFFIX) \ - spotf2.$(SUFFIX) + spotf2.$(SUFFIX) slaswp.$(SUFFIX) #DLAPACKOBJS = \ @@ -359,7 +359,7 @@ SLAPACKOBJS = \ DLAPACKOBJS = \ dgetrf.$(SUFFIX) dgetrs.$(SUFFIX) dpotrf.$(SUFFIX) dgetf2.$(SUFFIX) \ - dpotf2.$(SUFFIX) + dpotf2.$(SUFFIX) dlaswp.$(SUFFIX) QLAPACKOBJS = \ @@ -374,7 +374,7 @@ QLAPACKOBJS = \ CLAPACKOBJS = \ cgetrf.$(SUFFIX) cgetrs.$(SUFFIX) cpotrf.$(SUFFIX) cgetf2.$(SUFFIX) \ - cpotf2.$(SUFFIX) + cpotf2.$(SUFFIX) claswp.$(SUFFIX) #ZLAPACKOBJS = \ @@ -384,7 +384,7 @@ CLAPACKOBJS = \ ZLAPACKOBJS = \ zgetrf.$(SUFFIX) zgetrs.$(SUFFIX) zpotrf.$(SUFFIX) zgetf2.$(SUFFIX) \ - zpotf2.$(SUFFIX) + zpotf2.$(SUFFIX) zlaswp.$(SUFFIX) @@ -1896,19 +1896,19 @@ ztrtri.$(SUFFIX) ztrtri.$(PSUFFIX) : ztrtri.c xtrtri.$(SUFFIX) xtrtri.$(PSUFFIX) : ztrtri.c $(CC) -c $(CFLAGS) $< -o $(@F) -slaswp.$(SUFFIX) slaswp.$(PSUFFIX) : laswp.c +slaswp.$(SUFFIX) slaswp.$(PSUFFIX) : lapack/laswp.c $(CC) -c $(CFLAGS) $< -o $(@F) -dlaswp.$(SUFFIX) dlaswp.$(PSUFFIX) : laswp.c +dlaswp.$(SUFFIX) dlaswp.$(PSUFFIX) : lapack/laswp.c $(CC) -c $(CFLAGS) $< -o $(@F) qlaswp.$(SUFFIX) qlaswp.$(PSUFFIX) : laswp.c $(CC) -c $(CFLAGS) $< -o $(@F) -claswp.$(SUFFIX) claswp.$(PSUFFIX) : zlaswp.c +claswp.$(SUFFIX) claswp.$(PSUFFIX) : lapack/zlaswp.c $(CC) -c $(CFLAGS) $< -o $(@F) -zlaswp.$(SUFFIX) zlaswp.$(PSUFFIX) : zlaswp.c +zlaswp.$(SUFFIX) zlaswp.$(PSUFFIX) : lapack/zlaswp.c $(CC) -c $(CFLAGS) $< -o $(@F) xlaswp.$(SUFFIX) xlaswp.$(PSUFFIX) : zlaswp.c diff --git a/interface/lapack/zlauu2.c b/interface/lapack/zlauu2.c deleted file mode 100644 index 05603fe1b..000000000 --- a/interface/lapack/zlauu2.c +++ /dev/null @@ -1,129 +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 -#include "common.h" -#ifdef FUNCTION_PROFILE -#include "functable.h" -#endif - -#ifdef XDOUBLE -#define ERROR_NAME "QLAUU2" -#elif defined(DOUBLE) -#define ERROR_NAME "ZLAUU2" -#else -#define ERROR_NAME "CLAUU2" -#endif - -static blasint (*lauu2[])(blas_arg_t *, BLASLONG *, BLASLONG *, FLOAT *, FLOAT *, BLASLONG) = { - -#ifdef XDOUBLE - xlauu2_U, xlauu2_L, -#elif defined(DOUBLE) - zlauu2_U, zlauu2_L, -#else - clauu2_U, clauu2_L, -#endif - }; - -int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ - - blas_arg_t args; - - blasint uplo_arg = *UPLO; - blasint uplo; - blasint info; - FLOAT *buffer; -#ifdef PPC440 - extern -#endif - FLOAT *sa, *sb; - - PRINT_DEBUG_NAME; - - args.n = *N; - args.a = (void *)a; - args.lda = *ldA; - - TOUPPER(uplo_arg); - - uplo = -1; - if (uplo_arg == 'U') uplo = 0; - if (uplo_arg == 'L') uplo = 1; - - info = 0; - if (args.lda < MAX(1,args.n)) info = 4; - if (args.n < 0) info = 2; - if (uplo < 0) info = 1; - if (info) { - BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME)); - *Info = - info; - return 0; - } - - *Info = 0; - - if (args.n <= 0) return 0; - - IDEBUG_START; - - FUNCTION_PROFILE_START(); - -#ifndef PPC440 - buffer = (FLOAT *)blas_memory_alloc(1); - - sa = (FLOAT *)((BLASLONG)buffer + GEMM_OFFSET_A); - sb = (FLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B); -#endif - - info = (lauu2[uplo])(&args, NULL, NULL, sa, sb, 0); - - *Info = info; - -#ifndef PPC440 - blas_memory_free(buffer); -#endif - - FUNCTION_PROFILE_END(1, .5 * args.n * args.n, - 2. * args.n * (1./3. + args.n * ( 1./2. + args.n * 1./6.)) - + 6. * 1./6. * args.n * (args.n * args.n - 1)); - - IDEBUG_END; - - return 0; -} diff --git a/interface/lapack/zlauum.c b/interface/lapack/zlauum.c deleted file mode 100644 index 23990e8e4..000000000 --- a/interface/lapack/zlauum.c +++ /dev/null @@ -1,141 +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 -#include "common.h" -#ifdef FUNCTION_PROFILE -#include "functable.h" -#endif - -#ifdef XDOUBLE -#define ERROR_NAME "XLAUUM" -#elif defined(DOUBLE) -#define ERROR_NAME "ZLAUUM" -#else -#define ERROR_NAME "CLAUUM" -#endif - -static blasint (*lauum_single[])(blas_arg_t *, BLASLONG *, BLASLONG *, FLOAT *, FLOAT *, BLASLONG) = { - LAUUM_U_SINGLE, LAUUM_L_SINGLE, -}; - -#ifdef SMP -static blasint (*lauum_parallel[])(blas_arg_t *, BLASLONG *, BLASLONG *, FLOAT *, FLOAT *, BLASLONG) = { - LAUUM_U_PARALLEL, LAUUM_L_PARALLEL, -}; -#endif - -int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ - - blas_arg_t args; - - blasint uplo_arg = *UPLO; - blasint uplo; - blasint info; - FLOAT *buffer; -#ifdef PPC440 - extern -#endif - FLOAT *sa, *sb; - - PRINT_DEBUG_NAME; - - args.n = *N; - args.a = (void *)a; - args.lda = *ldA; - - TOUPPER(uplo_arg); - - uplo = -1; - if (uplo_arg == 'U') uplo = 0; - if (uplo_arg == 'L') uplo = 1; - - info = 0; - if (args.lda < MAX(1,args.n)) info = 4; - if (args.n < 0) info = 2; - if (uplo < 0) info = 1; - if (info) { - BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME)); - *Info = - info; - return 0; - } - - *Info = 0; - - if (args.n == 0) return 0; - - IDEBUG_START; - - FUNCTION_PROFILE_START(); - -#ifndef PPC440 - buffer = (FLOAT *)blas_memory_alloc(1); - - sa = (FLOAT *)((BLASLONG)buffer + GEMM_OFFSET_A); - sb = (FLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B); -#endif - -#ifdef SMP - args.common = NULL; - args.nthreads = num_cpu_avail(4); - - if (args.nthreads == 1) { -#endif - - *Info = (lauum_single[uplo])(&args, NULL, NULL, sa, sb, 0); - -#ifdef SMP - } else { - - *Info = (lauum_parallel[uplo])(&args, NULL, NULL, sa, sb, 0); - - } -#endif - -#ifndef PPC440 - blas_memory_free(buffer); -#endif - - FUNCTION_PROFILE_END(1, .5 * args.n * args.n, - 2. * args.n * (1./3. + args.n * ( 1./2. + args.n * 1./6.)) - + args.n * (args.n * args.n - 1)); - - IDEBUG_END; - - return 0; -} diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 40bb5625c..bacb13928 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -118,7 +118,7 @@ SLASRC = \ slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \ slarf.o slarfb.o slarfg.o slarfgp.o slarft.o slarfx.o slargv.o \ slarrv.o slartv.o \ - slarz.o slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o slasyf_rook.o \ + slarz.o slarzb.o slarzt.o slasy2.o slasyf.o slasyf_rook.o \ slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o slatzm.o \ slauu2.o slauum.o sopgtr.o sopmtr.o sorg2l.o sorg2r.o \ sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o sorgqr.o sorgr2.o \ @@ -207,7 +207,7 @@ CLASRC = \ clarf.o clarfb.o clarfg.o clarft.o clarfgp.o \ clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \ clarz.o clarzb.o clarzt.o clascl.o claset.o clasr.o classq.o \ - claswp.o clasyf.o clasyf_rook.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \ + clasyf.o clasyf_rook.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \ clatzm.o clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \ cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \ cposv.o cposvx.o cpotri.o cpstrf.o cpstf2.o \ @@ -278,7 +278,7 @@ DLASRC = \ dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \ dlarf.o dlarfb.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o \ dlargv.o dlarrv.o dlartv.o \ - dlarz.o dlarzb.o dlarzt.o dlaswp.o dlasy2.o dlasyf.o dlasyf_rook.o \ + dlarz.o dlarzb.o dlarzt.o dlasy2.o dlasyf.o dlasyf_rook.o \ dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlatzm.o dlauu2.o \ dlauum.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o \ dorgbr.o dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \ @@ -368,7 +368,7 @@ ZLASRC = \ zlarfg.o zlarft.o zlarfgp.o \ zlarfx.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \ zlarz.o zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o \ - zlassq.o zlaswp.o zlasyf.o zlasyf_rook.o \ + zlassq.o zlasyf.o zlasyf_rook.o \ zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \ zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o \ zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \