compbench-devel Mailing List for CompBenchmarks (Page 7)
Brought to you by:
xfred
Menu
▾
▴
compbench-devel
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(48) |
Oct
(51) |
Nov
(66) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(242) |
Feb
(56) |
Mar
(95) |
Apr
(120) |
May
(127) |
Jun
(32) |
Jul
(10) |
Aug
(55) |
Sep
(114) |
Oct
(3) |
Nov
|
Dec
|
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:52:52
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1727 Modified Files: UI-Msg.h Log Message: Useless spaces removed. Index: UI-Msg.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Msg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UI-Msg.h 1 Aug 2007 19:48:38 -0000 1.6 --- UI-Msg.h 21 Aug 2007 19:52:50 -0000 1.7 *************** *** 64,67 **** --- 64,68 ---- PlanRun }; + private: XMLNode *outputNode; *************** *** 312,319 **** }; - - - - class UIMsgGroup : public UIMsg { public: --- 313,316 ---- |
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:50:37
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv904 Modified Files: System.cpp Log Message: Minor fix in Program(); Cosmetic changes in XML host representation. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** System.cpp 20 Aug 2007 17:07:43 -0000 1.18 --- System.cpp 21 Aug 2007 19:50:34 -0000 1.19 *************** *** 214,218 **** data+="\" version=\""; data+=os_version(); ! data+="\"/>"; data+=" <processors name=\""; data+=processor_name(); --- 214,218 ---- data+="\" version=\""; data+=os_version(); ! data+="\"/>\n"; data+=" <processors name=\""; data+=processor_name(); *************** *** 492,496 **** if (r == "") { ! cbmUI->msgFatal("No such external program"); } --- 492,499 ---- if (r == "") { ! r="No such external program ("; ! r+=pid; ! r+=")"; ! cbmUI->msgFatal(r); } |
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:49:48
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv490 Modified Files: Plan-Batch.cpp Log Message: Compiler descriptions added in output directory. Index: Plan-Batch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Plan-Batch.cpp 20 Aug 2007 17:08:50 -0000 1.11 --- Plan-Batch.cpp 21 Aug 2007 19:49:45 -0000 1.12 *************** *** 542,546 **** plan->outputDirectoryCopyHost(); plan->outputDirectoryCopyPlan(); ! } else { printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); --- 542,546 ---- plan->outputDirectoryCopyHost(); plan->outputDirectoryCopyPlan(); ! plan->outputDirectoryCopyCompilers(); } else { printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); |
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:49:12
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv460 Modified Files: Plan.cpp Plan.h Log Message: Compiler descriptions added in output directory. Index: Plan.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Plan.h 20 Aug 2007 17:08:22 -0000 1.9 --- Plan.h 21 Aug 2007 19:49:09 -0000 1.10 *************** *** 51,54 **** --- 51,55 ---- int hostCopied; int planCopied; + int compilerCopied; virtual CBM_PB *batchForIteration(int *it_in_plan); *************** *** 62,65 **** --- 63,67 ---- virtual int outputDirectoryCopyHost(void); virtual int outputDirectoryCopyPlan(void); + virtual int outputDirectoryCopyCompilers(void); virtual CBM_PB *addBatch(CBM_PB *_ps); *************** *** 87,91 **** virtual void reset(void); ! virtual int store(std::string _filename = ""); virtual int restore(std::string _filename); --- 89,93 ---- virtual void reset(void); ! virtual int store(std::string _filename = "", int _keepFilename=1); virtual int restore(std::string _filename); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Plan.cpp 20 Aug 2007 17:08:22 -0000 1.18 --- Plan.cpp 21 Aug 2007 19:49:09 -0000 1.19 *************** *** 30,33 **** --- 30,34 ---- planCopied=0; hostCopied=0; + compilerCopied=0; } *************** *** 89,96 **** fn+="host.xml"; ! if (cbmSystem->fileExists(fn)) return(1); ! ! return(cbmSystem->storeHost(fn)); } --- 90,96 ---- fn+="host.xml"; ! if (cbmSystem->fileExists(fn)) return(1); ! return(cbmSystem->storeHost(fn)); } *************** *** 98,101 **** --- 98,102 ---- { std::string fn; + int r; fn=outputDirectory; *************** *** 103,108 **** fn+="plan.xml"; ! return(cbmSystem->storeConfiguration(fn)); } --- 104,158 ---- fn+="plan.xml"; + r=store(fn, 0); + + return(r); + } + + int Plan::outputDirectoryCopyCompilers(void) + { + int i, n = batchNumber(); + int j, m; + PlanBatch *PB; + std::string data = "<compilers>\n"; + Compiler *C; + std::string fn; + + if (compilerCopied) + return(1); + + fn=outputDirectory; + fn+="/"; + fn+="compilers.xml"; + + if (cbmSystem->fileExists(fn)) + return(1); ! for(i=0;i<n;i++) { ! PB=getBatch(i); ! m=PB->compilerNumber(); ! for(j=0; j<m; j++) { ! C=PB->getCompiler(j); ! data+=" <compiler binary=\""; ! data+=C->Binary(); ! data+="\">"; ! ! data+=" <name id=\""; ! data+=C->Name(); ! data+="\"/>\n"; ! ! data+=" <version id=\""; ! data+=C->Version(); ! data+="\" vanilla=\""; ! data+=C->VanillaVersion(); ! data+="\"/>\n"; ! ! data+=" <language id=\""; ! data+=C->Language(); ! data+="\"/>\n"; ! } ! } ! data+="</compilers>\n"; ! ! return(cbmSystem->fileWrite(fn, data)); } *************** *** 269,272 **** --- 319,323 ---- { XMLNode *root = new CBM::XMLNode("libcompbenchmarks-plan"); + XMLNode *outp = new CBM::XMLNode("output-directory"); XMLNode *batchs = new CBM::XMLNode("plan-batchs"); XMLNode *run = new CBM::XMLNode("run"); *************** *** 277,280 **** --- 328,333 ---- int i, n = batchNumber(); + outp->addAttribute("name", outputDirectory); + root->add(outp); root->add(batchs); *************** *** 293,297 **** void Plan::stop(void) { ! int i, n = batchNumber(); for(i=0;i<n;i++) { --- 346,352 ---- void Plan::stop(void) { ! int i, n = batchNumber(); ! std::string rm; ! std::string out; for(i=0;i<n;i++) { *************** *** 299,303 **** --- 354,369 ---- } + if (outputDirectory=="") + return; + + printf("stop %s\n", outputDirectory.c_str()); iteration=0; + + rm="cd "; + rm+=outputDirectory; + rm+=" && "; + rm+=cbmSystem->Program("RM"); + rm+=" -f *.xml && exit 0"; + cbmSystem->exec(rm, out); } *************** *** 311,315 **** } ! int Plan::store(std::string _filename) { int r; --- 377,381 ---- } ! int Plan::store(std::string _filename, int _keepFilename) { int r; *************** *** 318,323 **** delete(root); ! if (_filename!="") ! filename=_filename; // !!! default... --- 384,390 ---- delete(root); ! if (_keepFilename) ! if (_filename!="") ! filename=_filename; // !!! default... *************** *** 337,340 **** --- 404,408 ---- XMLNode *PBs; XMLNode *R; + XMLNode *outp; XMLNode *CI; XMLNode *tmp; *************** *** 354,358 **** planRootNode=r.read(filename); - reset(); if (!planRootNode) { --- 422,425 ---- *************** *** 360,364 **** return(0); } - if (planRootNode->Name()!="libcompbenchmarks-plan") { cbmUI->outputKO("Invalid plan file : root object is not libcompbenchmarks-plan"); --- 427,430 ---- *************** *** 379,384 **** pb->restore(tmp); planBatch.push_back(pb); ! } ! } --- 445,449 ---- pb->restore(tmp); planBatch.push_back(pb); ! } } *************** *** 388,391 **** --- 453,467 ---- return(0); } + outp=planRootNode->getNode("output-directory"); + if (!outp) { + cbmUI->outputKO("Can't retrieve output directory"); + return(0); + } + A=outp->getAttribute("name"); + if (!A) { + cbmUI->outputKO("Can't get name of output directory"); + return(0); + } + setOutputDirectory(A->Value()); CI=R->getNode("iteration"); *************** *** 403,407 **** iteration=atoi(A->Value().c_str()); - pb=batchForIteration(&bi); --- 479,482 ---- |
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:45:43
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31469 Modified Files: cloptions.cpp Log Message: Configurable output directory. Results can be archived. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/cloptions.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cloptions.cpp 2 Aug 2007 19:12:32 -0000 1.8 --- cloptions.cpp 21 Aug 2007 19:45:41 -0000 1.9 *************** *** 37,41 **** ActionRegisterOption, ActionUnregisterOption, ActionListOption, ActionRegisterBenchmark, ActionUnregisterBenchmark, ActionListBenchmark, ! ActionRun } OptAction; --- 37,41 ---- ActionRegisterOption, ActionUnregisterOption, ActionListOption, ActionRegisterBenchmark, ActionUnregisterBenchmark, ActionListBenchmark, ! ActionRun, ActionArchive } OptAction; *************** *** 53,56 **** --- 53,58 ---- << "Plan management :" << std::endl << " --plan-register <file> [--default] : create file[.xml] plan." << std::endl + << " --output-directory <directory> : defines the directory holding results" << std::endl + << " for new plan." << std::endl << " --plan-unregister <file> : remove a plan (including file)." << std::endl << " --plan-use <fil> : explicitly use given plan." << std::endl *************** *** 80,83 **** --- 82,86 ---- << "Benchmarking : " << std::endl << " --run : start/resume benchmark." << std::endl + << " --archive <file.tar.gz> : archive results." << std::endl << std::endl; } *************** *** 184,187 **** --- 187,219 ---- } + int archiveResults(CBM::Plan *P, std::string fn) + { + std::string cmd = cbmSystem->Program("TAR"); + std::string output; + + cmd+=" c "; + cmd+=P->getOutputDirectory(); + cmd+="/* | "; + cmd+=cbmSystem->Program("GZIP"); + cmd+=" -9 > "; + cmd+=fn; + + cmd+=" && "; + cmd+=cbmSystem->Program("RM"); + cmd+=" -rf "; + cmd+=P->getOutputDirectory(); + + std::cout << "Archiving " << P->getOutputDirectory() << " in " + << fn << ", and removing directory... "; + + if (!cbmSystem->exec(cmd, output)) { + std::cout << "done."; + } else { + std::cout << output; + } + std::cout << std::endl; + return(0); + } + int cbmPlanOptionsParse(int argc, char *argv[]) { *************** *** 200,203 **** --- 232,237 ---- std::string option; std::string benchmarkName; + std::string outputDirectoryName; + std::string archiveName; CBM::Plan *P = 0; *************** *** 248,251 **** --- 282,289 ---- {"run", no_argument, 0, 8001}, + {"output-directory", required_argument, 0, 9001}, + + {"archive", required_argument, 0, 10001}, + { 0, 0, 0, 0 } }; *************** *** 365,368 **** --- 403,413 ---- action=ActionRun; break; + case 9001: + outputDirectoryName=optarg; + break; + case 10001: + action=ActionArchive; + archiveName=optarg; + break; default: case '?': *************** *** 382,385 **** --- 427,436 ---- } P = new CBM::Plan; + + if (outputDirectoryName=="") { + std::cerr << "Please, specify an output directory name (see --output-directory)" << std::endl; + break; + } + P->setOutputDirectory(outputDirectoryName); storePlan(P, planFileName); *************** *** 924,931 **** cbmUI->msgPlanRun("plan"); while (P->nextIteration(0)); ! delete(P); break; default: printf("?\n"); --- 975,996 ---- cbmUI->msgPlanRun("plan"); while (P->nextIteration(0)); ! std::cout << "Results and settings (*.xml) in directory " << P->getOutputDirectory() << " ." << std::endl; ! std::cout << "You can now launch compbenchmarks-plan with --store <filename.tar.gz> to keep results." << std::endl; delete(P); break; + case ActionArchive: + if (!getPlanFileName(planFileName)) + break; + + P=restorePlan(planFileName); + + if (!P) + break; + + archiveResults(P, archiveName); + + delete(P); + break; default: printf("?\n"); |
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:44:52
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31086 Modified Files: ChangeLog Log Message: BETA2 comments. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ChangeLog 24 May 2007 17:56:33 -0000 1.23 --- ChangeLog 21 Aug 2007 19:44:49 -0000 1.24 *************** *** 1,2 **** --- 1,9 ---- + 0.5.0-BETA2 + * compbenchmarks-plan introduced to handle plan and + benchmarking processes. + * Plans are not global anymore. + * New directory for compbenchmarks-core. + * Internal XML based messages (e.g. for console clients). + 0.5.0-BETA1 * Removed useless UI script. *************** *** 20,24 **** 0.4.0 ! * benchpplinux support improved (25 more benchmarks). * Better dependencies' checking in compbenchmarks' re-build process. * Irrevelant script call removed. --- 27,31 ---- 0.4.0 ! * benchpplinux support improved (25 benchmarks added). * Better dependencies' checking in compbenchmarks' re-build process. * Irrevelant script call removed. |
|
From: Frederic T. <xf...@us...> - 2007-08-21 19:12:31
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19334 Modified Files: compbenchmarks-ui-qt4.pro Log Message: More synthetic outputs during compilation. Index: compbenchmarks-ui-qt4.pro =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** compbenchmarks-ui-qt4.pro 22 May 2007 17:29:12 -0000 1.5 --- compbenchmarks-ui-qt4.pro 21 Aug 2007 19:12:22 -0000 1.6 *************** *** 5,12 **** --- 5,15 ---- TEMPLATE = app TARGET = compbenchmarks-ui-qt4 + VERSION = 0.1.0 DEPENDPATH += . Package Status CONFIG += warn_on QMAKE_CXX = @./tool.sh compile $$QMAKE_CXX + QMAKE_MOC = @./tool.sh moc $$QMAKE_MOC + # QMAKE_RCC = @./tool.sh rcc $$QMAKE_RCC INCLUDEPATH += . ../libcompbenchmarks ../testing/libcompbenchmarks |
|
From: Frederic T. <xf...@us...> - 2007-08-20 17:08:54
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9724 Modified Files: Plan-Batch.cpp Log Message: Host configuration and settings are stored in results' output directory. Index: Plan-Batch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Plan-Batch.cpp 2 Aug 2007 17:08:28 -0000 1.10 --- Plan-Batch.cpp 20 Aug 2007 17:08:50 -0000 1.11 *************** *** 538,549 **** return(0); } ! B->Bench(C, O); ! /* ! result=new CBM::Result(bmValue, ! buildTime, ! executionTime, ! tested, ! testOk); ! */ } else { printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); --- 538,546 ---- return(0); } ! result=B->Bench(C, O); ! plan->outputDirectoryAdd(result); ! plan->outputDirectoryCopyHost(); ! plan->outputDirectoryCopyPlan(); ! } else { printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); |
|
From: Frederic T. <xf...@us...> - 2007-08-20 17:08:25
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9703 Modified Files: Plan.cpp Plan.h Log Message: Host configuration and settings can be stored in results' output directory. Index: Plan.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Plan.h 30 May 2007 17:04:03 -0000 1.8 --- Plan.h 20 Aug 2007 17:08:22 -0000 1.9 *************** *** 10,13 **** --- 10,14 ---- #include <Base/XML.h> + #include <Base/Result.h> #ifdef SWIG *************** *** 47,50 **** --- 48,54 ---- int iteration; std::string filename; + std::string outputDirectory; + int hostCopied; + int planCopied; virtual CBM_PB *batchForIteration(int *it_in_plan); *************** *** 53,56 **** --- 57,66 ---- Plan(); + virtual int setOutputDirectory(std::string _outputDirectory); + virtual std::string getOutputDirectory(void); + virtual int outputDirectoryAdd(CBM::Result *_result); + virtual int outputDirectoryCopyHost(void); + virtual int outputDirectoryCopyPlan(void); + virtual CBM_PB *addBatch(CBM_PB *_ps); virtual int removeBatch(CBM_PB *_ps); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Plan.cpp 2 Aug 2007 17:07:53 -0000 1.17 --- Plan.cpp 20 Aug 2007 17:08:22 -0000 1.18 *************** *** 27,30 **** --- 27,108 ---- { iteration=0; + outputDirectory=""; + planCopied=0; + hostCopied=0; + } + + int Plan::setOutputDirectory(std::string _outputDirectory) + { + int ok = 0; + + outputDirectory=_outputDirectory; + if (!cbmSystem->checkDirectory(outputDirectory)) { + ok=cbmSystem->mkdir(outputDirectory); + } + + return(ok); + } + + std::string Plan::getOutputDirectory(void) + { + return(outputDirectory); + } + + int Plan::outputDirectoryAdd(CBM::Result *_result) + { + int ok = 0; + std::string fn; + static int idx = 1; + std::string data; + char tmp[32]; + int fExists = 1; + time_t tme; + + while (fExists) { + sprintf(tmp, "%d", idx); + tme=time(NULL); + data=ctime(&tme); + fn=outputDirectory; + fn+="/"; + fn+="r-"; + fn+=cbmSystem->md5(data); + fn+=".xml"; + + idx++; + fExists=cbmSystem->fileExists(fn); + } + + ok=cbmSystem->fileWrite(fn, + _result->resultNode()->str()); + return(ok); + } + + int Plan::outputDirectoryCopyHost(void) + { + std::string fn; + + if (hostCopied) + return(1); + + fn=outputDirectory; + fn+="/"; + fn+="host.xml"; + + if (cbmSystem->fileExists(fn)) + return(1); + + return(cbmSystem->storeHost(fn)); + } + + int Plan::outputDirectoryCopyPlan(void) + { + std::string fn; + + fn=outputDirectory; + fn+="/"; + fn+="plan.xml"; + + + return(cbmSystem->storeConfiguration(fn)); } |
|
From: Frederic T. <xf...@us...> - 2007-08-20 17:07:52
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9333 Modified Files: System.cpp System.h Log Message: Host configuration and settings can be stored in results' output directory. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** System.cpp 6 Jun 2007 15:59:16 -0000 1.17 --- System.cpp 20 Aug 2007 17:07:43 -0000 1.18 *************** *** 188,196 **** } ! int System::storeConfiguration(void) { std::string data = Config()->str(); ! return(fileWrite(configurationFile, data)); } --- 188,230 ---- } ! ! int System::storeConfiguration(std::string fn) { std::string data = Config()->str(); ! if (fn=="") ! fn=configurationFile; ! ! return(fileWrite(fn, data)); ! } ! ! int System::storeHost(std::string fn) ! { ! std::string data = "<host>\n <arch id=\""; ! data+=arch(); ! data+="\">\n"; ! data+=" <host-id id=\""; ! data+=hostid(); ! data+="\">\n"; ! data+=" <hostname=\""; ! data+=hostname(); ! data+="\">\n"; ! data+=" <os name=\""; ! data+=os(); ! data+="\" version=\""; ! data+=os_version(); ! data+="\"/>"; ! data+=" <processors name=\""; ! data+=processor_name(); ! data+="\" mhz=\""; ! data+=processor_mhz(); ! data+="\" cache=\""; ! data+=processor_cache(); ! data+="\" number=\""; ! data+=processor_number(); ! data+="\"/>\n"; ! data+="</host>\n"; ! ! return(fileWrite(fn, data)); } Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** System.h 28 May 2007 18:06:26 -0000 1.10 --- System.h 20 Aug 2007 17:07:43 -0000 1.11 *************** *** 96,100 **** class Config *Config(void); ! virtual int storeConfiguration(void); virtual std::string env(std::string _var); --- 96,101 ---- class Config *Config(void); ! virtual int storeConfiguration(std::string fn = ""); ! virtual int storeHost(std::string fn); virtual std::string env(std::string _var); |
|
From: Frederic T. <xf...@us...> - 2007-08-02 19:12:36
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4774 Modified Files: cloptions.cpp Log Message: Help's now up-to-date. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/cloptions.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cloptions.cpp 1 Aug 2007 19:44:46 -0000 1.7 --- cloptions.cpp 2 Aug 2007 19:12:32 -0000 1.8 *************** *** 52,57 **** std::cout << "Usage: compbenchmarks-plan [OPTIONS]" << std::endl << "Plan management :" << std::endl ! << " --plan-register <file> [--default] : Create file[.xml] plan." << std::endl ! << " --plan-unregister <file> : Remove a plan." << std::endl << std::endl; } --- 52,83 ---- std::cout << "Usage: compbenchmarks-plan [OPTIONS]" << std::endl << "Plan management :" << std::endl ! << " --plan-register <file> [--default] : create file[.xml] plan." << std::endl ! << " --plan-unregister <file> : remove a plan (including file)." << std::endl ! << " --plan-use <fil> : explicitly use given plan." << std::endl ! << std::endl << "Batch management :" << std::endl ! << " --batch-register <id> : register a new batch." << std::endl ! << " --batch-unregister <id> : unregister batch." << std::endl ! << " --batch-use <id> : use given batch." << std::endl ! << " --batch-list : list defined batchs." << std::endl ! << std::endl << "Compiler management :" << std::endl ! << " --compiler-register <binary> : register a new compiler. " << std::endl ! << " --compiler-unregister <binary> : unregister a compiler. " << std::endl ! << " --compiler-list : list defined compilers. " << std::endl ! << std::endl << "Optionset management :" << std::endl ! << " --optionset-register <id> : register a new optionset. " << std::endl ! << " --optionset-unregister <id> : unregister an optionset. " << std::endl ! << " --optionset-use <id> : use an optionset. " << std::endl ! << " --optionset-list : list optionsets." << std::endl ! << std::endl << "Option (group) management :" << std::endl ! << " --options-register <id> : register a new option group." << std::endl ! << " --options-unregister <id> : unregister an option group. " << std::endl ! << " --options-use <id> : use an option group. " << std::endl ! << " --options-list : list option group." << std::endl ! << std::endl << "Compiler(s) option management :" << std::endl ! << " --option-register <option[s]> : register option[s]." << std::endl ! << " --option-unregister <option[s]> : unregister option[s]." << std::endl ! << std::endl ! << "Benchmarking : " << std::endl ! << " --run : start/resume benchmark." << std::endl << std::endl; } |
|
From: Frederic T. <xf...@us...> - 2007-08-02 17:08:30
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22692 Modified Files: Plan-Batch.cpp Log Message: Send OK status if batch has already been completed. Index: Plan-Batch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Plan-Batch.cpp 1 Aug 2007 19:46:18 -0000 1.9 --- Plan-Batch.cpp 2 Aug 2007 17:08:28 -0000 1.10 *************** *** 516,519 **** --- 516,520 ---- if (currentIteration()>=totalIterations()) { + cbmUI->outputOK(); return(0); } |
|
From: Frederic T. <xf...@us...> - 2007-08-02 17:07:58
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22281 Modified Files: Plan.cpp Log Message: Send OK status if plan has already been completed. Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Plan.cpp 1 Aug 2007 19:47:53 -0000 1.16 --- Plan.cpp 2 Aug 2007 17:07:53 -0000 1.17 *************** *** 167,170 **** --- 167,171 ---- if (currentIteration()>=totalIterations()) { + cbmUI->outputOK(); return(0); } |
|
From: Frederic T. <xf...@us...> - 2007-08-02 17:06:54
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21841 Modified Files: Benchmark.cpp Log Message: Bench() returns a CBM::Result instance. Few changes in UI::Msgs used. Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Benchmark.cpp 6 Jun 2007 21:36:28 -0000 1.12 --- Benchmark.cpp 2 Aug 2007 17:06:51 -0000 1.13 *************** *** 52,62 **** } ! std::string Benchmark::Bench(Compiler *C, ! CompilerOptions *O) { ! std::string r; std::string info; double end; char tmp[128]; int p_cm; --- 52,67 ---- } ! CBM::Result *Benchmark::Bench(Compiler *C, ! CompilerOptions *O) { ! std::string r = "0"; ! std::string r_hasTest = "0"; ! std::string r_test = "1"; ! std::string r_buildTime = "-1"; ! std::string r_execTime = "-1"; std::string info; double end; char tmp[128]; + CBM::Result *R = 0; int p_cm; *************** *** 64,69 **** cbmUI->msgGroup("Benchmark"); - p_cm=Package()->ContextMatches(C, O); p_status=Package()->getStatus(); --- 69,74 ---- cbmUI->msgGroup("Benchmark"); p_cm=Package()->ContextMatches(C, O); + r_hasTest=Package()->hasTest() ? "1" : "0"; p_status=Package()->getStatus(); *************** *** 71,79 **** Package()->Release(); } ! if (!p_cm) { Package()->Configure(C, O); Package()->Make(UO_force); ! Package()->Test(UO_force); } --- 76,85 ---- Package()->Release(); } ! if (!p_cm) { Package()->Configure(C, O); Package()->Make(UO_force); ! r_buildTime=Package()->buildTime(); ! r_test=Package()->Test(UO_force) ? "1" : "0"; } *************** *** 85,118 **** cbmUI->outputKO(info); cbmUI->outputKO(info); ! return("0"); } ! System()->startTimer(); ! r=bench(); ! Package()->System()->Chomp(r); ! if (r!="0") { ! end=System()->endTimer(); ! sprintf(tmp, "%f", end); ! lastExecutionTime=tmp; ! Package()->storeStatus(Package::Benchmarked); ! std::string i_tme = "Execution time : "; ! i_tme+=tmp; ! std::string i_r = "Result : "; ! i_r+=r; ! cbmUI->outputInfo(i_tme); ! cbmUI->outputInfo(i_r); ! cbmUI->outputOK(); ! cbmUI->outputOK(); ! } else { ! cbmUI->outputKO(); ! info="Benchmarking failed for "; ! info+=Package()->Name(); ! cbmUI->msgFatal(info); ! cbmUI->outputKO(); } ! return(r); } --- 91,124 ---- cbmUI->outputKO(info); cbmUI->outputKO(info); ! R=new CBM::Result(r, r_buildTime, r_execTime, ! r_hasTest, r_test); } ! if (!R) { ! System()->startTimer(); ! r=bench(); ! Package()->System()->Chomp(r); ! if (r!="0") { ! end=System()->endTimer(); ! sprintf(tmp, "%f", end); ! r_execTime=lastExecutionTime=tmp; ! Package()->storeStatus(Package::Benchmarked); ! } else { ! cbmUI->outputKO(); ! info="Benchmarking failed for "; ! info+=Package()->Name(); ! cbmUI->msgFatal(info); ! cbmUI->outputKO(); ! } ! R=new CBM::Result(r, r_buildTime, r_execTime, ! r_hasTest, r_test); } + cbmUI->outputInfo(R); + cbmUI->outputOK(); + cbmUI->outputOK(); ! return(R); } |
|
From: Frederic T. <xf...@us...> - 2007-08-02 17:06:34
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21801 Modified Files: Benchmark.h Log Message: Bench() returns a CBM::Result instance. Index: Benchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark.h 6 Jun 2007 21:36:28 -0000 1.7 --- Benchmark.h 2 Aug 2007 17:06:28 -0000 1.8 *************** *** 12,15 **** --- 12,16 ---- #include <Compiler/Compiler.h> #include <Compiler/Compiler-Options.h> + #include <Base/Result.h> #include <vector> *************** *** 67,76 **** * Uses bench(). Overloading is unadvised. * This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked. ! * \return benchmark's result (performance) as a non-null positive number. May changes status. * \sa Make() * \sa executionTime() * \sa status */ ! virtual std::string Bench(Compiler *C, ! CompilerOptions *O); /** Give execution time. --- 68,77 ---- * Uses bench(). Overloading is unadvised. * This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked. ! * \return benchmark's result (performance) as a non-null positive number in a CBM::Result instance. May changes status. * \sa Make() * \sa executionTime() * \sa status */ ! virtual Result *Bench(Compiler *C, ! CompilerOptions *O); /** Give execution time. |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:48:41
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14745 Modified Files: UI-Console.cpp UI-Console.h UI.cpp UI.h UI-Msg.cpp UI-Msg.h Log Message: New message for Plan run. Fixes on Progress messages' handling. Index: UI-Console.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Console.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UI-Console.h 6 Jun 2007 15:54:38 -0000 1.1 --- UI-Console.h 1 Aug 2007 19:48:38 -0000 1.2 *************** *** 23,26 **** --- 23,27 ---- std::string curmsg; int lastisLF; + int lastprogressmayneedLF; virtual void LF(void); Index: UI.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** UI.h 31 Jul 2007 17:25:44 -0000 1.10 --- UI.h 1 Aug 2007 19:48:38 -0000 1.11 *************** *** 71,74 **** --- 71,75 ---- virtual UIMsg *msgPlanBenchmarkRegister(std::string _name); virtual UIMsg *msgPlanBenchmarkUnregister(std::string _name); + virtual UIMsg *msgPlanRun(std::string _name); virtual UIMsg *outputInfo(std::string _text); Index: UI-Console.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Console.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UI-Console.cpp 31 Jul 2007 17:25:44 -0000 1.5 --- UI-Console.cpp 1 Aug 2007 19:48:38 -0000 1.6 *************** *** 17,27 **** --- 17,30 ---- { lastisLF=0; + lastprogressmayneedLF=0; } void UIConsole::LF(void) { + if (!lastisLF) { std::cout << std::endl; lastisLF=1; + lastprogressmayneedLF=0; } } *************** *** 139,142 **** --- 142,150 ---- } + if (lastprogressmayneedLF) { + lastisLF=0; + LF(); + } + curmsg=""; *************** *** 270,273 **** --- 278,285 ---- break; + case UIMsg::PlanRun: + curmsg+="Running benchmark plan "; + curmsg+=objectField(_msg, "name"); + break; default: *************** *** 295,298 **** --- 307,312 ---- printf("\r%s%0.2f%%", curmsg.c_str(), progress(_msg)); + lastprogressmayneedLF=1; + fflush(stdout); } Index: UI.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** UI.cpp 31 Jul 2007 17:25:44 -0000 1.11 --- UI.cpp 1 Aug 2007 19:48:38 -0000 1.12 *************** *** 322,325 **** --- 322,334 ---- } + UIMsg *UI::msgPlanRun(std::string _name) + { + UIMsg *msg = new UIMsgPlanRun(_name); + postMsg(msg); + + return(msg); + } + + UIMsg *UI::outputInfo(std::string _test) Index: UI-Msg.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Msg.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UI-Msg.h 31 Jul 2007 17:25:44 -0000 1.5 --- UI-Msg.h 1 Aug 2007 19:48:38 -0000 1.6 *************** *** 61,65 **** PlanOptionsRegister, PlanOptionsUnregister, PlanOptionRegister, PlanOptionUnregister, ! PlanBenchmarkRegister, PlanBenchmarkUnregister }; private: --- 61,66 ---- PlanOptionsRegister, PlanOptionsUnregister, PlanOptionRegister, PlanOptionUnregister, ! PlanBenchmarkRegister, PlanBenchmarkUnregister, ! PlanRun }; private: *************** *** 305,308 **** --- 306,315 ---- }; + class UIMsgPlanRun : public UIMsg { + public: + UIMsgPlanRun(std::string _name); + virtual ~UIMsgPlanRun(); + }; + Index: UI-Msg.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Msg.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UI-Msg.cpp 31 Jul 2007 17:25:44 -0000 1.5 --- UI-Msg.cpp 1 Aug 2007 19:48:38 -0000 1.6 *************** *** 478,481 **** --- 478,491 ---- } + UIMsgPlanRun::UIMsgPlanRun(std::string _name) + : UIMsg(Progress) + { + addObject(UndefObject, _name); + addAction(PlanRun); + } + + UIMsgPlanRun::~UIMsgPlanRun() + { + } |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:47:57
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14374 Modified Files: Plan.cpp Log Message: store() method called after nextIteration(); Fixes PlanBatch iteration initialization. Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Plan.cpp 31 Jul 2007 18:34:44 -0000 1.15 --- Plan.cpp 1 Aug 2007 19:47:53 -0000 1.16 *************** *** 20,23 **** --- 20,24 ---- #include <UI/UI.h> + #include <libcompbenchmarks.h> using namespace CBM; *************** *** 174,177 **** --- 175,187 ---- iteration++; + if (!simule) { + Verbosity b = UO_verbose; + + UO_verbose=CBM::None; + store(); + UO_verbose=b; + } + + return(r); } *************** *** 257,260 **** --- 267,271 ---- XMLReader r; + int bi; *************** *** 314,317 **** --- 325,333 ---- iteration=atoi(A->Value().c_str()); + pb=batchForIteration(&bi); + + if (pb) + pb->setIteration(bi); + cbmUI->outputOK(); return(1); |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:46:30
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13974 Modified Files: Plan-Batch.cpp Log Message: Progress update changes. store() method moved in Plan object. Index: Plan-Batch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Plan-Batch.cpp 31 Jul 2007 20:58:40 -0000 1.8 --- Plan-Batch.cpp 1 Aug 2007 19:46:18 -0000 1.9 *************** *** 20,25 **** #include <UI/UI.h> - #include <libcompbenchmarks.h> - using namespace CBM; --- 20,23 ---- *************** *** 464,467 **** --- 462,470 ---- } + void PlanBatch::setIteration(int _it) + { + iteration=_it; + } + CBM::Compiler *PlanBatch::currentCompiler(void) { *************** *** 515,518 **** --- 518,522 ---- return(0); } + C=currentCompiler(); O=currentCompilerOptions(); *************** *** 520,523 **** --- 524,529 ---- P=B->Package(); + cbmUI->Progress(((currentIteration())*100.0)/totalIterations()); + if (!simule) { bmValue="0"; *************** *** 551,562 **** iteration++; ! if (!simule) { ! Verbosity b = UO_verbose; ! ! UO_verbose=CBM::None; ! plan->store(); ! UO_verbose=b; ! } ! return(currentIteration()<totalIterations()); } --- 557,564 ---- iteration++; ! cbmUI->Progress((currentIteration()*100.0)/totalIterations()); ! if (currentIteration()==totalIterations()) ! cbmUI->outputOK(); ! return(currentIteration()<totalIterations()); } |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:45:25
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13587 Modified Files: Plan-Batch.h Log Message: setIteration() added. Index: Plan-Batch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Plan-Batch.h 31 Jul 2007 17:24:03 -0000 1.4 --- Plan-Batch.h 1 Aug 2007 19:45:21 -0000 1.5 *************** *** 107,110 **** --- 107,112 ---- virtual int currentIteration(void); + virtual void setIteration(int _it); + virtual class Compiler* currentCompiler(void); virtual CBM_OP *currentCompilerOptions(void); |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:44:54
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13198 Modified Files: cloptions.cpp Log Message: Message for Plan benchmarking introduced. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/cloptions.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cloptions.cpp 31 Jul 2007 18:34:16 -0000 1.6 --- cloptions.cpp 1 Aug 2007 19:44:46 -0000 1.7 *************** *** 896,900 **** --- 896,902 ---- break; + cbmUI->msgPlanRun("plan"); while (P->nextIteration(0)); + delete(P); break; |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:44:15
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13159 Modified Files: Makefile.am Log Message: Fix link-time bug to libxml2 (for ARM but probably apply to some others targets). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 May 2007 17:49:46 -0000 1.1 --- Makefile.am 1 Aug 2007 19:44:10 -0000 1.2 *************** *** 14,18 **** libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_plan_LDADD = ../libcompbenchmarks/libcompbenchmarks.la compbenchmarks_plan_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la --- 14,18 ---- libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_plan_LDADD = ../libcompbenchmarks/libcompbenchmarks.la @XML_LIBS@ -lpthread compbenchmarks_plan_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la |
|
From: Frederic T. <xf...@us...> - 2007-08-01 19:44:04
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12797 Modified Files: Makefile.am Log Message: Fix link-time bug to libxml2 (for ARM but probably apply to some others targets). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 27 May 2007 16:06:19 -0000 1.1 --- Makefile.am 1 Aug 2007 19:43:54 -0000 1.2 *************** *** 14,18 **** libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_core_LDADD = ../libcompbenchmarks/libcompbenchmarks.la compbenchmarks_core_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la --- 14,18 ---- libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_core_LDADD = ../libcompbenchmarks/libcompbenchmarks.la @XML_LIBS@ -lpthread compbenchmarks_core_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la |
|
From: Frederic T. <xf...@us...> - 2007-07-31 20:58:45
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15960 Modified Files: Plan-Batch.cpp Log Message: Verbosity to None before storing Plan. Bench() method used instead of Configure(), Make(), etc. Index: Plan-Batch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Plan-Batch.cpp 31 Jul 2007 18:34:44 -0000 1.7 --- Plan-Batch.cpp 31 Jul 2007 20:58:40 -0000 1.8 *************** *** 20,23 **** --- 20,25 ---- #include <UI/UI.h> + #include <libcompbenchmarks.h> + using namespace CBM; *************** *** 525,547 **** testOk="0"; ! P->Configure(C, O); ! if (P->Make()) { ! buildTime=P->buildTime(); ! if (P->hasTest()) { ! tested="1"; ! } ! ! if (P->Test()) { ! testOk="1"; ! } ! ! // bmValue=B->Bench(C, O); arf. !!! } ! result=new CBM::Result(bmValue, ! buildTime, ! executionTime, ! tested, ! testOk); ! delete(O); } else { printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); --- 527,542 ---- testOk="0"; ! if (P->getStatus()<CBM::Package::Preconfigured) { ! // std::cerr << "Package not properly installed !!!" << std::endl; ! return(0); } ! B->Bench(C, O); ! /* ! result=new CBM::Result(bmValue, ! buildTime, ! executionTime, ! tested, ! testOk); ! */ } else { printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); *************** *** 556,561 **** iteration++; ! if (!simule) plan->store(); return(currentIteration()<totalIterations()); --- 551,561 ---- iteration++; ! if (!simule) { ! Verbosity b = UO_verbose; ! ! UO_verbose=CBM::None; plan->store(); + UO_verbose=b; + } return(currentIteration()<totalIterations()); |
|
From: Frederic T. <xf...@us...> - 2007-07-31 18:34:57
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22964 Modified Files: Plan-Batch.cpp Plan.cpp Log Message: Fixes related to nextIteration(); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Plan.cpp 31 Jul 2007 17:25:01 -0000 1.14 --- Plan.cpp 31 Jul 2007 18:34:44 -0000 1.15 *************** *** 162,217 **** int Plan::nextIteration(int simule) { ! CBM::Compiler *C; ! CBM::CompilerOptions *O; ! std::string o; ! CBM::Benchmark *B; ! CBM::Package *P; ! std::string bmValue; ! std::string buildTime; ! std::string executionTime; ! std::string tested; ! std::string testOk; ! CBM::Result *result; if (currentIteration()>=totalIterations()) { return(0); } - C=currentCompiler(); - B=currentBenchmark(); - P=B->Package(); - - if (!simule) { - bmValue="0"; - buildTime="0"; - executionTime="0"; - tested="0"; - testOk="0"; - - O=currentCompilerOptions(); ! P->Configure(C, O); ! if (P->Make()) { ! buildTime=P->buildTime(); ! if (P->hasTest()) { ! tested="1"; ! } ! ! if (P->Test()) { ! testOk="1"; ! } ! ! // bmValue=B->Bench(); arf. !!! ! } ! result=new CBM::Result(bmValue, ! buildTime, ! executionTime, ! tested, ! testOk); ! delete(O); ! } iteration++; ! return(currentIteration()<totalIterations()); } --- 162,178 ---- int Plan::nextIteration(int simule) { ! CBM::PlanBatch *PB; ! int r; if (currentIteration()>=totalIterations()) { return(0); } ! PB=batchForIteration(&iteration); ! r=PB->nextIteration(simule); iteration++; ! return(r); } Index: Plan-Batch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Plan-Batch.cpp 31 Jul 2007 17:24:02 -0000 1.6 --- Plan-Batch.cpp 31 Jul 2007 18:34:44 -0000 1.7 *************** *** 544,551 **** --- 544,562 ---- testOk); delete(O); + } else { + printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations()); + + + printf("Iteration : %d/%d\n", currentIteration(), totalIterations()); + printf(" * Compiler : %s\n", C->Binary().c_str()); + printf(" * Options : %s\n", O->Options().c_str()); + printf(" * Benchmark : %s\n", B->Name().c_str()); } iteration++; + if (!simule) + plan->store(); + return(currentIteration()<totalIterations()); } *************** *** 601,604 **** --- 612,616 ---- if (iteration) cbmUI->outputInfo("Context changed : current plan benchmarking will be restarted."); + iteration=0; if (_broadcast) |
|
From: Frederic T. <xf...@us...> - 2007-07-31 18:34:55
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22936 Modified Files: cloptions.cpp Log Message: --run added. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/cloptions.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cloptions.cpp 31 Jul 2007 17:22:27 -0000 1.5 --- cloptions.cpp 31 Jul 2007 18:34:16 -0000 1.6 *************** *** 36,40 **** ActionRegisterOptions, ActionUnregisterOptions, ActionListOptions, ActionRegisterOption, ActionUnregisterOption, ActionListOption, ! ActionRegisterBenchmark, ActionUnregisterBenchmark, ActionListBenchmark } OptAction; --- 36,41 ---- ActionRegisterOptions, ActionUnregisterOptions, ActionListOptions, ActionRegisterOption, ActionUnregisterOption, ActionListOption, ! ActionRegisterBenchmark, ActionUnregisterBenchmark, ActionListBenchmark, ! ActionRun } OptAction; *************** *** 218,221 **** --- 219,224 ---- {"benchmark-unregister", required_argument, 0, 7002}, {"benchmark-list", no_argument, 0, 7003}, + + {"run", no_argument, 0, 8001}, { 0, 0, 0, 0 } *************** *** 333,336 **** --- 336,342 ---- action=ActionListBenchmark; break; + case 8001: + action=ActionRun; + break; default: case '?': *************** *** 881,884 **** --- 887,903 ---- delete(P); break; + case ActionRun: + if (!getPlanFileName(planFileName)) + break; + + P=restorePlan(planFileName); + + if (!P) + break; + + while (P->nextIteration(0)); + delete(P); + break; + default: printf("?\n"); |
