[Math-atlas-commits] CVS: AtlasBase/Clint atlas-lvl2.base, 1.236, 1.237 atlas-parse.base, 1.111, 1.
Brought to you by:
rwhaley,
tonyc040457
Menu
▾
▴
[Math-atlas-commits] CVS: AtlasBase/Clint atlas-lvl2.base, 1.236, 1.237 atlas-parse.base, 1.111, 1.112 atlconf.base, 1.221, 1.222
|
From: R. C. W. <rw...@us...> - 2011-01-18 00:47:36
|
Update of /cvsroot/math-atlas/AtlasBase/Clint In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30217/Clint Modified Files: atlas-lvl2.base atlas-parse.base atlconf.base Log Message: Index: atlas-lvl2.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-lvl2.base,v retrieving revision 1.236 retrieving revision 1.237 diff -C2 -d -r1.236 -r1.237 *** atlas-lvl2.base 13 Jan 2011 18:05:20 -0000 1.236 --- atlas-lvl2.base 18 Jan 2011 00:47:27 -0000 1.237 *************** *** 10612,10616 **** printf("DEFAULT imf=%d %cDISTANCE IS BEST (%.2f)\n", imf, arrc, kb->mflop[imf]); ! if (DEFFLAG) { free(kb->cflags); --- 10612,10616 ---- printf("DEFAULT imf=%d %cDISTANCE IS BEST (%.2f)\n", imf, arrc, kb->mflop[imf]); ! if (DEFFLAGS) { free(kb->cflags); *************** *** 11214,11218 **** printf("lcmM=%d, lcmN=%d\n", lcmM, lcmN); printf("Mooc=%d, Nooc=%d; ML2=%d, NL2=%d; ML1=%d NL1=%d\n", ! Mooc, Nooc, Ml2, Nl2, Ml1, Nl1); if (lvl & 2) { --- 11214,11218 ---- printf("lcmM=%d, lcmN=%d\n", lcmM, lcmN); printf("Mooc=%d, Nooc=%d; ML2=%d, NL2=%d; ML1=%d NL1=%d\n", ! (int)Mooc, (int)Nooc, Ml2, Nl2, Ml1, Nl1); if (lvl & 2) { *************** *** 11221,11225 **** */ printf("\nTIMING OUT-OF-CACHE CASES WITH NO BLOCKING, M=%d, N=%d\n", ! Mooc, Nooc); for (r1p=r1b; r1p; r1p = r1p->next) { --- 11221,11225 ---- */ printf("\nTIMING OUT-OF-CACHE CASES WITH NO BLOCKING, M=%d, N=%d\n", ! (int)Mooc, (int)Nooc); for (r1p=r1b; r1p; r1p = r1p->next) { *************** *** 11272,11277 **** for (r1p=r1b; r1p; r1p = r1p->next) printf(" %d:%s, M=%d, N=%d, CacheElts=%d, gets =%.2f MFLOPS\n", ! r1p->ID, r1p->rout, (Mooc/r1p->MU)*r1p->MU, ! (Nooc/r1p->NU)*r1p->NU, r1p->CacheElts, r1p->mflop[2]); } if (lvl & 8) /* timed L1-blocked OOC? */ --- 11272,11277 ---- for (r1p=r1b; r1p; r1p = r1p->next) printf(" %d:%s, M=%d, N=%d, CacheElts=%d, gets =%.2f MFLOPS\n", ! r1p->ID, r1p->rout, (int)(Mooc/r1p->MU)*r1p->MU, ! (int)(Nooc/r1p->NU)*r1p->NU, r1p->CacheElts, r1p->mflop[2]); } if (lvl & 8) /* timed L1-blocked OOC? */ *************** *** 11281,11286 **** for (r1p=r1L1b; r1p; r1p = r1p->next) printf(" %d:%s, M=%d, N=%d, CacheElts=%d, gets =%.2f MFLOPS\n", ! r1p->ID, r1p->rout, (Mooc/r1p->MU)*r1p->MU, ! (Nooc/r1p->NU)*r1p->NU, r1p->CacheElts, r1p->mflop[0]); } if (lvl & 4) /* timed L2-blocked OOC? */ --- 11281,11286 ---- for (r1p=r1L1b; r1p; r1p = r1p->next) printf(" %d:%s, M=%d, N=%d, CacheElts=%d, gets =%.2f MFLOPS\n", ! r1p->ID, r1p->rout, (int)(Mooc/r1p->MU)*r1p->MU, ! (int)(Nooc/r1p->NU)*r1p->NU, r1p->CacheElts, r1p->mflop[0]); } if (lvl & 4) /* timed L2-blocked OOC? */ *************** *** 11290,11295 **** for (r1p=r1L2b; r1p; r1p = r1p->next) printf(" %d:%s, M=%d, N=%d, CacheElts=%d, gets =%.2f MFLOPS\n", ! r1p->ID, r1p->rout, (Mooc/r1p->MU)*r1p->MU, ! (Nooc/r1p->NU)*r1p->NU, r1p->CacheElts, r1p->mflop[1]); } } --- 11290,11295 ---- for (r1p=r1L2b; r1p; r1p = r1p->next) printf(" %d:%s, M=%d, N=%d, CacheElts=%d, gets =%.2f MFLOPS\n", ! r1p->ID, r1p->rout, (int)(Mooc/r1p->MU)*r1p->MU, ! (int)(Nooc/r1p->NU)*r1p->NU, r1p->CacheElts, r1p->mflop[1]); } } *************** *** 11302,11306 **** */ printf("\nTIMING OUT-OF-CACHE CASES WITH L1 BLOCKING, M=%d, N=%d\n", ! Mooc, Nooc); for (r1p=r1b; r1p; r1p = r1p->next) { --- 11302,11306 ---- */ printf("\nTIMING OUT-OF-CACHE CASES WITH L1 BLOCKING, M=%d, N=%d\n", ! (int)Mooc, (int)Nooc); for (r1p=r1b; r1p; r1p = r1p->next) { *************** *** 11315,11319 **** { printf("\nTIMING OUT-OF-CACHE CASES WITH L2 BLOCKING, M=%d, N=%d\n", ! Mooc, Nooc); for (r1p=r1b; r1p; r1p = r1p->next) { --- 11315,11319 ---- { printf("\nTIMING OUT-OF-CACHE CASES WITH L2 BLOCKING, M=%d, N=%d\n", ! (int)Mooc, (int)Nooc); for (r1p=r1b; r1p; r1p = r1p->next) { *************** *** 11425,11429 **** fprintf(fpout, "#\n# Mooc=%d, Nooc=%d, Ml2=%d, Nl2=%d, Ml1=%d Nl1=%d\n#\n#\n", ! Mooc, Nooc, Ml2, Nl2, Ml1, Nl1); fprintf(fpout, "# ==========================\n"); fprintf(fpout, "# Performance of all kernels\n"); --- 11425,11429 ---- fprintf(fpout, "#\n# Mooc=%d, Nooc=%d, Ml2=%d, Nl2=%d, Ml1=%d Nl1=%d\n#\n#\n", ! (int)Mooc, (int)Nooc, Ml2, Nl2, Ml1, Nl1); fprintf(fpout, "# ==========================\n"); fprintf(fpout, "# Performance of all kernels\n"); Index: atlas-parse.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-parse.base,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** atlas-parse.base 23 Dec 2010 18:37:47 -0000 1.111 --- atlas-parse.base 18 Jan 2011 00:47:27 -0000 1.112 *************** *** 2032,2036 **** FirstTime = 0; ! tmpnam(outnam); } /* --- 2032,2036 ---- FirstTime = 0; ! assert(tmpnam(outnam)); } /* *************** *** 2164,2168 **** FirstTime = 0; ! tmpnam(outnam); } /* --- 2164,2168 ---- FirstTime = 0; ! assert(tmpnam(outnam)); } /* Index: atlconf.base =================================================================== RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlconf.base,v retrieving revision 1.221 retrieving revision 1.222 diff -C2 -d -r1.221 -r1.222 *** atlconf.base 11 Jan 2011 17:02:13 -0000 1.221 --- atlconf.base 18 Jan 2011 00:47:27 -0000 1.222 *************** *** 6212,6216 **** { fprintf(fpout, " waitfile = wfdefault\n"); ! fprintf(fpout, "waitfile:\n\tcd $(BINdir) ; make xatlas_waitfile\n"); fprintf(fpout, "\t$(ATLFWAIT) -s %d -f $(waitfile)\n", delay); } --- 6212,6216 ---- { fprintf(fpout, " waitfile = wfdefault\n"); ! fprintf(fpout, "waitfile:\n\tcd $(BINdir) ; $(MAKE) xatlas_waitfile\n"); fprintf(fpout, "\t$(ATLFWAIT) -s %d -f $(waitfile)\n", delay); } |