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)
|
