[Math-atlas-commits] CVS: AtlasBase/Clint atlas-make.base, 1.241, 1.242 atlas-tlp.base, 1.60, 1.61
Brought to you by:
rwhaley,
tonyc040457
Menu
▾
▴
[Math-atlas-commits] CVS: AtlasBase/Clint atlas-make.base, 1.241, 1.242 atlas-tlp.base, 1.60, 1.61 atlas.base, 1.194, 1.195 atlconf.base, 1.200, 1.201
|
From: R. C. W. <rw...@us...> - 2009-11-18 18:57:21
|
Update of /cvsroot/math-atlas/AtlasBase/Clint In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15880/Clint Modified Files: atlas-make.base atlas-tlp.base atlas.base atlconf.base Log Message: Index: atlas-make.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-make.base,v retrieving revision 1.241 retrieving revision 1.242 diff -C2 -d -r1.241 -r1.242 *** atlas-make.base 17 Nov 2009 23:39:01 -0000 1.241 --- atlas-make.base 18 Nov 2009 18:57:07 -0000 1.242 *************** *** 2541,2552 **** echo "Arch Defaults allow us to skip tuning" ; \ else \ ! cd $(BLDdir)/tune/lapack ; $(MAKE) res/ATL_$(pre)GetNB_geqrf ; \ ! cp $(BLDdir/tune/lapack/res/ATL_$(pre)GetNB_geqrf $(INCAdir)/. \ fi if [ -s "$(INCAdir)/atlas_$(pre)tGetNB_geqrf.h" ]; then \ echo "Arch Defaults allow us to skip threaded tuning" ; \ elif [ -s "$(INCAdir)/atlas_pthreads.h" ]; then \ ! cd $(BLDdir)/tune/lapack ; $(MAKE) res/ATL_$(pre)tGetNB_geqrf ; \ ! cp $(BLDdir/tune/lapack/res/ATL_$(pre)tGetNB_geqrf $(INCAdir)/. \ fi @beginskip --- 2541,2554 ---- echo "Arch Defaults allow us to skip tuning" ; \ else \ ! cd $(BLDdir)/tune/lapack ; $(MAKE) res/ATL_$(pre)GetNB_geqrf ; \ ! cp $(BLDdir)/tune/lapack/res/ATL_$(pre)GetNB_geqrf.h \ ! $(INCAdir)/atlas_$(pre)GetNB_geqrf.h ; \ fi if [ -s "$(INCAdir)/atlas_$(pre)tGetNB_geqrf.h" ]; then \ echo "Arch Defaults allow us to skip threaded tuning" ; \ elif [ -s "$(INCAdir)/atlas_pthreads.h" ]; then \ ! cd $(BLDdir)/tune/lapack ; $(MAKE) res/ATL_$(pre)tGetNB_geqrf ; \ ! cp $(BLDdir)/tune/lapack/res/ATL_$(pre)tGetNB_geqrf \ ! $(INCAdir)/atlas_$(pre)tGetNB_geqrf.h ; \ fi @beginskip Index: atlas-tlp.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-tlp.base,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** atlas-tlp.base 17 Nov 2009 23:39:01 -0000 1.60 --- atlas-tlp.base 18 Nov 2009 18:57:07 -0000 1.61 *************** *** 5385,5389 **** * Try all multiples of NB between min & max NB */ ! i = ((minNB+NB-1)/NB)*NB; /* smallest mul of NB >= min */ nbB = Mmin(M,N)/2; if (!nbB) --- 5385,5389 ---- * Try all multiples of NB between min & max NB */ ! i = (minNB/NB)*NB; /* smallest mul of NB >= floor(min,NB) */ nbB = Mmin(M,N)/2; if (!nbB) Index: atlas.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas.base,v retrieving revision 1.194 retrieving revision 1.195 diff -C2 -d -r1.194 -r1.195 *** atlas.base 31 Oct 2009 00:04:23 -0000 1.194 --- atlas.base 18 Nov 2009 18:57:07 -0000 1.195 *************** *** 398,401 **** --- 398,403 ---- @ROUT mmsearch l1search mvsearch hcsearch @extract -b @(topd)/gen.inc what=cw + @ROUT mmsearch + #define VERB 1 @ROUT ummsearch @skip @extract -b @(topd)/gen.inc what=cw @(cw00) *************** *** 428,434 **** * them; If unknown arch is also 2-op, no problem will just search longer */ ! #if defined (ATL_GAS_x8632) || defined(ATL_GAS_x8664) ! #define TWO_OP_ASM ! #endif char LANG; --- 430,436 ---- * them; If unknown arch is also 2-op, no problem will just search longer */ ! @skip #if defined (ATL_GAS_x8632) || defined(ATL_GAS_x8664) ! @skip #define TWO_OP_ASM ! @skip #endif char LANG; *************** *** 3329,3333 **** gmmsearch(upre, muladd, Fku, nNBs, NBs, nreg, lat, Fnb); TimeAllKernels(pre, 0, 0, mmG); ! CreateFinalSumFile(pre, mmG, mmU); } mmU = mmG->next; --- 3331,3335 ---- gmmsearch(upre, muladd, Fku, nNBs, NBs, nreg, lat, Fnb); TimeAllKernels(pre, 0, 0, mmG); ! CreateFinalSumFile(pre, mmG, mmG->next); } mmU = mmG->next; *************** *** 4925,4928 **** --- 4927,4931 ---- else FindUClean(pre, nb0, which); KillAllRoutNodes(esumb); + fprintf(stderr, "SUCCESSFUL FINISH FOR %s\n\n", args[0]); exit(0); } *************** *** 5193,5197 **** --- 5196,5206 ---- if (ROUT == -2) { + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif RunTimes(prec); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif exit(0); } *************** *** 5199,5213 **** --- 5208,5240 ---- if (ROUT == -3) { + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif FindAllClean(prec); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif exit(0); } else if (ROUT == -4) { + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif FindAllUserClean0(prec); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif exit(0); } else if (ROUT == -5) /* produce ATL_mmnreg for sysinfo */ { + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif GetNumRegs(prec, Mmin(MaxL1Size,32), ATL_MAXNREG); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif exit(0); } *************** *** 5215,5222 **** --- 5242,5264 ---- prec, FRC, ForceLat, nreg, MaxL1Size); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif if (nreg == -1) nreg = GetNumRegsMM(upre, Mmin(MaxL1Size,32), ATL_MAXNREG); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif GetMMRES(prec, nreg, MaxL1Size, ForceLat); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif FindNoCopy(prec); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif FindAllClean(prec); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif @beginskip *************** *** 12322,12325 **** --- 12364,12368 ---- static int LD_AT_BOTTOM=0; /* load $C$ after K-loop, rather than before? */ static int TEMP_TYPE=0; /* type of temp regs: 0-TYPE, 1-double, 2-long double */ + #define VERB 1 typedef struct CleanNode CLEANNODE; *************** *** 16367,16370 **** --- 16410,16416 ---- ATL_mmnode_t *mmp; + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif GetGenRes(pre, muladd, &h, lat, nb, mu, nu, ku, ff, iff, nf, mf); mmp = ReadMMFileWithPath(pre, "res", "MMRES.sum"); *************** *** 16384,16387 **** --- 16430,16436 ---- } KillAllMMNodes(mmp); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif @beginskip sprintf(ln, "INSTALL_LOG/%cMMRES", pre); *************** *** 16456,16459 **** --- 16505,16511 ---- char beta[3] = {'0', '1', 'X'}; + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif mmp = ReadMMFileWithPath(pre, "res", "MMRES.sum"); assert(mmp); *************** *** 16474,16477 **** --- 16526,16532 ---- } } + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif return(umm); @beginskip *************** *** 16517,16520 **** --- 16572,16578 ---- if (pre == 'c' || pre == 'z') mulC = 2; + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif @beginskip sprintf(ln, "res/%cMMRES", pre); *************** *** 16570,16575 **** fp = fopen(fnam, "w"); assert(fp); ! emit_head(0, fp, pre, nb, muladd, lat, mu, nu, ku); fclose(fp); return(cp); } --- 16628,16647 ---- fp = fopen(fnam, "w"); assert(fp); ! #if VERB > 0 ! fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); ! #endif ! /* ! * If using the user kernel, make sure MU and NU match the user params, ! * not the generated. Use generated lat, muladd, since this info may ! * be bogus from user, and can't affect user cases ! */ ! if (umm) ! emit_head(0, fp, pre, nb, muladd, lat, umm->mu, umm->nu, umm->ku); ! else ! emit_head(0, fp, pre, nb, muladd, lat, mu, nu, ku); fclose(fp); + #if VERB > 0 + fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); + #endif return(cp); } *************** *** 16582,16592 **** assert(!system("make xummsearch")); /* create .dsc files indexing */ ! fprintf(stderr, "line %d of %s\n", __LINE__, __FILE__); cp[3] = DoNBmm(spc, pre, type, &nb); ! fprintf(stderr, "line %d of %s\n", __LINE__, __FILE__); DoNocopy(spc, pre, type); ! fprintf(stderr, "line %d of %s\n", __LINE__, __FILE__); kb = DoClean(spc, pre, type, cp); ! fprintf(stderr, "line %d of %s\n", __LINE__, __FILE__); GenMakefile(pre, nb, kb, 3, cbeta, cp); for (i=0; i < 3; i++) KillCleanNodes(cp[i]); --- 16654,16675 ---- assert(!system("make xummsearch")); /* create .dsc files indexing */ ! #if VERB > 0 ! fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); ! #endif cp[3] = DoNBmm(spc, pre, type, &nb); ! #if VERB > 0 ! fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); ! #endif DoNocopy(spc, pre, type); ! #if VERB > 0 ! fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); ! #endif ! #if VERB > 0 ! fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); ! #endif kb = DoClean(spc, pre, type, cp); ! #if VERB > 0 ! fprintf(stderr, "%d of %s\n", __LINE__, __FILE__); ! #endif GenMakefile(pre, nb, kb, 3, cbeta, cp); for (i=0; i < 3; i++) KillCleanNodes(cp[i]); Index: atlconf.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlconf.base,v retrieving revision 1.200 retrieving revision 1.201 diff -C2 -d -r1.200 -r1.201 *** atlconf.base 17 Nov 2009 23:39:01 -0000 1.200 --- atlconf.base 18 Nov 2009 18:57:07 -0000 1.201 *************** *** 287,292 **** @endifdef @ifdef -ad ! *latune = *bozol1 = 0; ! *UseArchDef = 1; @endifdef @ifdef -flapack --- 287,292 ---- @endifdef @ifdef -ad ! *bozol1 = 0; ! *latune = *UseArchDef = 1; @endifdef @ifdef -flapack |