compbench-devel Mailing List for CompBenchmarks (Page 24)
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-02-15 18:55:54
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19726 Modified Files: Config.cpp Log Message: current plan is deleted if a new one is given in setPlan(); Index: Config.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Config.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Config.cpp 25 Jan 2007 22:15:59 -0000 1.9 --- Config.cpp 15 Feb 2007 18:55:46 -0000 1.10 *************** *** 361,367 **** void Config::setPlan(CBM::XMLNode *_plan) { ! delete(plan); changes=1; - plan=_plan; root->add(_plan); } --- 361,371 ---- void Config::setPlan(CBM::XMLNode *_plan) { ! if (plan!=_plan) { ! if (plan) ! delete(plan); ! plan=_plan; ! } ! changes=1; root->add(_plan); } |
|
From: Frederic T. <xf...@us...> - 2007-02-15 18:54:14
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19317 Modified Files: benchmarks-genlibwrapper.pl Log Message: Unique instance for each benchmark. Index: benchmarks-genlibwrapper.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/benchmarks-genlibwrapper.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** benchmarks-genlibwrapper.pl 26 Jan 2007 01:41:57 -0000 1.4 --- benchmarks-genlibwrapper.pl 15 Feb 2007 18:54:10 -0000 1.5 *************** *** 30,55 **** sub generate { print "#include <Benchmark/Benchmark-DLLoader.h>\n"; ! print "#include <UI/UI.h>\n\n"; print "using namespace CBM;\n\n"; my $n = (keys %{$DATA{$PACKAGE}})+0; - print "int Package$PACKAGE\::benchmarkNumber(void) {\n"; print " return($n);\n}\n\n"; print "CBM::BenchmarkVector& Package$PACKAGE\::Benchmarks(void) {\n"; print " if (benchmarks.size()) return(benchmarks);\n"; ! foreach(keys %{$DATA{$PACKAGE}}) { ! print " benchmarks.push_back(\"$_\");\n"; } print " return(benchmarks);\n"; print "}\n\n"; print "CBM::Benchmark *Package$PACKAGE\::Benchmark(std::string bid) {\n"; ! foreach(keys %{$DATA{$PACKAGE}}) { print " if (bid == \"$_\") {\n"; ! print " return(new CBM::Benchmark$DATA{$PACKAGE}->{$_}(this));\n"; print " }\n"; } print " return(0);\n"; --- 30,63 ---- sub generate { print "#include <Benchmark/Benchmark-DLLoader.h>\n"; ! # print "#include <UI/UI.h>\n\n"; print "using namespace CBM;\n\n"; my $n = (keys %{$DATA{$PACKAGE}})+0; print "int Package$PACKAGE\::benchmarkNumber(void) {\n"; print " return($n);\n}\n\n"; print "CBM::BenchmarkVector& Package$PACKAGE\::Benchmarks(void) {\n"; + print " CBM::BenchmarkCached *ptr;\n"; print " if (benchmarks.size()) return(benchmarks);\n"; ! foreach(sort keys %{$DATA{$PACKAGE}}) { ! print " ptr=new BenchmarkCached;\n"; ! print " ptr->id=\"$_\";\n"; ! print " ptr->instance=0;\n"; ! print " benchmarks.push_back(ptr);\n"; } print " return(benchmarks);\n"; print "}\n\n"; + my $idx = 0; print "CBM::Benchmark *Package$PACKAGE\::Benchmark(std::string bid) {\n"; ! print " Benchmarks();\n"; ! foreach(sort keys %{$DATA{$PACKAGE}}) { print " if (bid == \"$_\") {\n"; ! print " if (!benchmarks[$idx]->instance)\n"; ! print " benchmarks[$idx]->instance=new CBM::Benchmark$DATA{$PACKAGE}->{$_}(this);\n"; ! print " return(benchmarks[$idx]->instance);\n"; print " }\n"; + $idx++; } print " return(0);\n"; |
|
From: Frederic T. <xf...@us...> - 2007-02-15 18:53:17
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18808 Modified Files: Benchmark-BENCHPP.libwrapper.h Benchmark-BENCHPPLINUX.libwrapper.h Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.libwrapper.h Benchmark-LINPACKC.libwrapper.h Benchmark-NBENCH.libwrapper.h Benchmark-SCIMARK2.libwrapper.h Log Message: Changes due to benchmarks-genlibwrapper.pl modifications. Index: Benchmark-NBENCH.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-NBENCH.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 --- Benchmark-NBENCH.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.6 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,56 **** CBM::BenchmarkVector& PackageNBENCH::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("nbench-stringsort"); ! benchmarks.push_back("nbench-lu"); ! benchmarks.push_back("nbench-assign"); ! benchmarks.push_back("nbench-numsort"); ! benchmarks.push_back("nbench-fourier"); ! benchmarks.push_back("nbench-bitfield"); ! benchmarks.push_back("nbench-emf"); ! benchmarks.push_back("nbench-huffman"); ! benchmarks.push_back("nbench-nnet"); ! benchmarks.push_back("nbench-idea"); return(benchmarks); } CBM::Benchmark *PackageNBENCH::Benchmark(std::string bid) { ! if (bid == "nbench-stringsort") { ! return(new CBM::BenchmarkNBENCH_STRINGSORT(this)); ! } ! if (bid == "nbench-lu") { ! return(new CBM::BenchmarkNBENCH_LU(this)); ! } if (bid == "nbench-assign") { ! return(new CBM::BenchmarkNBENCH_ASSIGN(this)); ! } ! if (bid == "nbench-numsort") { ! return(new CBM::BenchmarkNBENCH_NUMSORT(this)); ! } ! if (bid == "nbench-fourier") { ! return(new CBM::BenchmarkNBENCH_FOURIER(this)); } if (bid == "nbench-bitfield") { ! return(new CBM::BenchmarkNBENCH_BITFIELD(this)); } if (bid == "nbench-emf") { ! return(new CBM::BenchmarkNBENCH_EMF(this)); } if (bid == "nbench-huffman") { ! return(new CBM::BenchmarkNBENCH_HUFFMAN(this)); } if (bid == "nbench-nnet") { ! return(new CBM::BenchmarkNBENCH_NNET(this)); } ! if (bid == "nbench-idea") { ! return(new CBM::BenchmarkNBENCH_IDEA(this)); } return(0); --- 7,106 ---- CBM::BenchmarkVector& PackageNBENCH::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="nbench-assign"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-bitfield"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-emf"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-fourier"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-huffman"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-idea"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-lu"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-nnet"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-numsort"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="nbench-stringsort"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageNBENCH::Benchmark(std::string bid) { ! Benchmarks(); if (bid == "nbench-assign") { ! if (!benchmarks[0]->instance) ! benchmarks[0]->instance=new CBM::BenchmarkNBENCH_ASSIGN(this); ! return(benchmarks[0]->instance); } if (bid == "nbench-bitfield") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkNBENCH_BITFIELD(this); ! return(benchmarks[1]->instance); } if (bid == "nbench-emf") { ! if (!benchmarks[2]->instance) ! benchmarks[2]->instance=new CBM::BenchmarkNBENCH_EMF(this); ! return(benchmarks[2]->instance); ! } ! if (bid == "nbench-fourier") { ! if (!benchmarks[3]->instance) ! benchmarks[3]->instance=new CBM::BenchmarkNBENCH_FOURIER(this); ! return(benchmarks[3]->instance); } if (bid == "nbench-huffman") { ! if (!benchmarks[4]->instance) ! benchmarks[4]->instance=new CBM::BenchmarkNBENCH_HUFFMAN(this); ! return(benchmarks[4]->instance); ! } ! if (bid == "nbench-idea") { ! if (!benchmarks[5]->instance) ! benchmarks[5]->instance=new CBM::BenchmarkNBENCH_IDEA(this); ! return(benchmarks[5]->instance); ! } ! if (bid == "nbench-lu") { ! if (!benchmarks[6]->instance) ! benchmarks[6]->instance=new CBM::BenchmarkNBENCH_LU(this); ! return(benchmarks[6]->instance); } if (bid == "nbench-nnet") { ! if (!benchmarks[7]->instance) ! benchmarks[7]->instance=new CBM::BenchmarkNBENCH_NNET(this); ! return(benchmarks[7]->instance); } ! if (bid == "nbench-numsort") { ! if (!benchmarks[8]->instance) ! benchmarks[8]->instance=new CBM::BenchmarkNBENCH_NUMSORT(this); ! return(benchmarks[8]->instance); ! } ! if (bid == "nbench-stringsort") { ! if (!benchmarks[9]->instance) ! benchmarks[9]->instance=new CBM::BenchmarkNBENCH_STRINGSORT(this); ! return(benchmarks[9]->instance); } return(0); Index: Benchmark-GZIP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-GZIP.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 --- Benchmark-GZIP.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.6 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,24 **** CBM::BenchmarkVector& PackageGZIP::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("gzip-9c"); ! benchmarks.push_back("gzip-1c"); return(benchmarks); } CBM::Benchmark *PackageGZIP::Benchmark(std::string bid) { ! if (bid == "gzip-9c") { ! return(new CBM::BenchmarkGZIP9(this)); ! } if (bid == "gzip-1c") { ! return(new CBM::BenchmarkGZIP1(this)); } return(0); --- 7,34 ---- CBM::BenchmarkVector& PackageGZIP::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="gzip-1c"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="gzip-9c"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageGZIP::Benchmark(std::string bid) { ! Benchmarks(); if (bid == "gzip-1c") { ! if (!benchmarks[0]->instance) ! benchmarks[0]->instance=new CBM::BenchmarkGZIP1(this); ! return(benchmarks[0]->instance); ! } ! if (bid == "gzip-9c") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkGZIP9(this); ! return(benchmarks[1]->instance); } return(0); Index: Benchmark-LINPACKC.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-LINPACKC.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.6 --- Benchmark-LINPACKC.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.7 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,32 **** CBM::BenchmarkVector& PackageLINPACKC::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("linpackc-sp-unroll"); ! benchmarks.push_back("linpackc-dp-roll"); ! benchmarks.push_back("linpackc-dp-unroll"); ! benchmarks.push_back("linpackc-sp-roll"); return(benchmarks); } CBM::Benchmark *PackageLINPACKC::Benchmark(std::string bid) { ! if (bid == "linpackc-sp-unroll") { ! return(new CBM::BenchmarkLINPACKC_SP_UNROLL(this)); ! } if (bid == "linpackc-dp-roll") { ! return(new CBM::BenchmarkLINPACKC_DP_ROLL(this)); } if (bid == "linpackc-dp-unroll") { ! return(new CBM::BenchmarkLINPACKC_DP_UNROLL(this)); } if (bid == "linpackc-sp-roll") { ! return(new CBM::BenchmarkLINPACKC_SP_ROLL(this)); } return(0); --- 7,52 ---- CBM::BenchmarkVector& PackageLINPACKC::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="linpackc-dp-roll"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="linpackc-dp-unroll"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="linpackc-sp-roll"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="linpackc-sp-unroll"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageLINPACKC::Benchmark(std::string bid) { ! Benchmarks(); if (bid == "linpackc-dp-roll") { ! if (!benchmarks[0]->instance) ! benchmarks[0]->instance=new CBM::BenchmarkLINPACKC_DP_ROLL(this); ! return(benchmarks[0]->instance); } if (bid == "linpackc-dp-unroll") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkLINPACKC_DP_UNROLL(this); ! return(benchmarks[1]->instance); } if (bid == "linpackc-sp-roll") { ! if (!benchmarks[2]->instance) ! benchmarks[2]->instance=new CBM::BenchmarkLINPACKC_SP_ROLL(this); ! return(benchmarks[2]->instance); ! } ! if (bid == "linpackc-sp-unroll") { ! if (!benchmarks[3]->instance) ! benchmarks[3]->instance=new CBM::BenchmarkLINPACKC_SP_UNROLL(this); ! return(benchmarks[3]->instance); } return(0); Index: Benchmark-BENCHPP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BENCHPP.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 --- Benchmark-BENCHPP.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.6 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,28 **** CBM::BenchmarkVector& PackageBENCHPP::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("benchpp-stepanov-al12"); ! benchmarks.push_back("benchpp-whetstone"); ! benchmarks.push_back("benchpp-dhrystone"); return(benchmarks); } CBM::Benchmark *PackageBENCHPP::Benchmark(std::string bid) { if (bid == "benchpp-stepanov-al12") { ! return(new CBM::BenchmarkBENCHPP_STEPANOV_AL12(this)); } if (bid == "benchpp-whetstone") { ! return(new CBM::BenchmarkBENCHPP_WHETSTONE(this)); ! } ! if (bid == "benchpp-dhrystone") { ! return(new CBM::BenchmarkBENCHPP_DHRYSTONE(this)); } return(0); --- 7,43 ---- CBM::BenchmarkVector& PackageBENCHPP::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="benchpp-dhrystone"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpp-stepanov-al12"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpp-whetstone"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageBENCHPP::Benchmark(std::string bid) { + Benchmarks(); + if (bid == "benchpp-dhrystone") { + if (!benchmarks[0]->instance) + benchmarks[0]->instance=new CBM::BenchmarkBENCHPP_DHRYSTONE(this); + return(benchmarks[0]->instance); + } if (bid == "benchpp-stepanov-al12") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkBENCHPP_STEPANOV_AL12(this); ! return(benchmarks[1]->instance); } if (bid == "benchpp-whetstone") { ! if (!benchmarks[2]->instance) ! benchmarks[2]->instance=new CBM::BenchmarkBENCHPP_WHETSTONE(this); ! return(benchmarks[2]->instance); } return(0); Index: Benchmark-BZIP2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BZIP2.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 --- Benchmark-BZIP2.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.6 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,24 **** CBM::BenchmarkVector& PackageBZIP2::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("bzip2-1c"); ! benchmarks.push_back("bzip2-9c"); return(benchmarks); } CBM::Benchmark *PackageBZIP2::Benchmark(std::string bid) { if (bid == "bzip2-1c") { ! return(new CBM::BenchmarkBZIP21(this)); } if (bid == "bzip2-9c") { ! return(new CBM::BenchmarkBZIP29(this)); } return(0); --- 7,34 ---- CBM::BenchmarkVector& PackageBZIP2::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="bzip2-1c"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="bzip2-9c"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageBZIP2::Benchmark(std::string bid) { + Benchmarks(); if (bid == "bzip2-1c") { ! if (!benchmarks[0]->instance) ! benchmarks[0]->instance=new CBM::BenchmarkBZIP21(this); ! return(benchmarks[0]->instance); } if (bid == "bzip2-9c") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkBZIP29(this); ! return(benchmarks[1]->instance); } return(0); Index: Benchmark-BENCHPPLINUX.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-BENCHPPLINUX.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 --- Benchmark-BENCHPPLINUX.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.6 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,156 **** CBM::BenchmarkVector& PackageBENCHPPLINUX::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("benchpplinux-bool-assign"); ! benchmarks.push_back("benchpplinux-constantpropagation"); ! benchmarks.push_back("benchpplinux-10wsparseswitch"); ! benchmarks.push_back("benchpplinux-dhrystone"); ! benchmarks.push_back("benchpplinux-inducvar-ho"); ! benchmarks.push_back("benchpplinux-loopjamming-ho"); ! benchmarks.push_back("benchpplinux-codemotion"); ! benchmarks.push_back("benchpplinux-10wvfc"); ! benchmarks.push_back("benchpplinux-2wifelse"); ! benchmarks.push_back("benchpplinux-globalcommonse-ho"); ! benchmarks.push_back("benchpplinux-bitfields"); ! benchmarks.push_back("benchpplinux-globalcommonse"); ! benchmarks.push_back("benchpplinux-2wswitch"); ! benchmarks.push_back("benchpplinux-inducvar"); ! benchmarks.push_back("benchpplinux-bitfields-pba"); ! benchmarks.push_back("benchpplinux-deadcode"); ! benchmarks.push_back("benchpplinux-reduncode-ho"); ! benchmarks.push_back("benchpplinux-10wifelse"); ! benchmarks.push_back("benchpplinux-unneccopy-ho"); ! benchmarks.push_back("benchpplinux-10wswitch"); ! benchmarks.push_back("benchpplinux-packunpackobjets"); ! benchmarks.push_back("benchpplinux-bool-if"); ! benchmarks.push_back("benchpplinux-unneccopy"); ! benchmarks.push_back("benchpplinux-reducstrength-ho"); ! benchmarks.push_back("benchpplinux-deadcode-ho"); ! benchmarks.push_back("benchpplinux-reduncode"); ! benchmarks.push_back("benchpplinux-constantpropagation-ho"); ! benchmarks.push_back("benchpplinux-codemotion-ho"); ! benchmarks.push_back("benchpplinux-whetstone"); ! benchmarks.push_back("benchpplinux-stringops"); ! benchmarks.push_back("benchpplinux-localcommonse-ho"); ! benchmarks.push_back("benchpplinux-localcommonse"); ! benchmarks.push_back("benchpplinux-stringops-ho"); ! benchmarks.push_back("benchpplinux-packedbitarray"); ! benchmarks.push_back("benchpplinux-loopjamming"); return(benchmarks); } CBM::Benchmark *PackageBENCHPPLINUX::Benchmark(std::string bid) { ! if (bid == "benchpplinux-bool-assign") { ! return(new CBM::BenchmarkBENCHPPLINUX_BOOL_ASSIGN(this)); ! } ! if (bid == "benchpplinux-constantpropagation") { ! return(new CBM::BenchmarkBENCHPPLINUX_CONSTPROP(this)); } if (bid == "benchpplinux-10wsparseswitch") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(this)); ! } ! if (bid == "benchpplinux-dhrystone") { ! return(new CBM::BenchmarkBENCHPPLINUX_DHRYSTONE(this)); ! } ! if (bid == "benchpplinux-inducvar-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_INDUCVAR_HO(this)); ! } ! if (bid == "benchpplinux-loopjamming-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_LOOPJAMMING_HO(this)); } ! if (bid == "benchpplinux-codemotion") { ! return(new CBM::BenchmarkBENCHPPLINUX_CODEMOTION(this)); } if (bid == "benchpplinux-10wvfc") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_VFC(this)); } if (bid == "benchpplinux-2wifelse") { ! return(new CBM::BenchmarkBENCHPPLINUX_2WAY_IFELSE(this)); } ! if (bid == "benchpplinux-globalcommonse-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_GLOBALCSE_HO(this)); } if (bid == "benchpplinux-bitfields") { ! return(new CBM::BenchmarkBENCHPPLINUX_BITFIELDS(this)); } ! if (bid == "benchpplinux-globalcommonse") { ! return(new CBM::BenchmarkBENCHPPLINUX_GLOBALCSE(this)); } ! if (bid == "benchpplinux-2wswitch") { ! return(new CBM::BenchmarkBENCHPPLINUX_2WAY_SWITCH(this)); } ! if (bid == "benchpplinux-inducvar") { ! return(new CBM::BenchmarkBENCHPPLINUX_INDUCVAR(this)); } ! if (bid == "benchpplinux-bitfields-pba") { ! return(new CBM::BenchmarkBENCHPPLINUX_BITFIELDS_PBA(this)); } if (bid == "benchpplinux-deadcode") { ! return(new CBM::BenchmarkBENCHPPLINUX_DEADCODE(this)); } ! if (bid == "benchpplinux-reduncode-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_REDUNCODE_HO(this)); } ! if (bid == "benchpplinux-10wifelse") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_IFELSE(this)); } ! if (bid == "benchpplinux-unneccopy-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_UNNECCOPY_HO(this)); } ! if (bid == "benchpplinux-10wswitch") { ! return(new CBM::BenchmarkBENCHPPLINUX_10WAY_SWITCH(this)); } ! if (bid == "benchpplinux-packunpackobjets") { ! return(new CBM::BenchmarkBENCHPPLINUX_PACKUNPACKOBJ(this)); } ! if (bid == "benchpplinux-bool-if") { ! return(new CBM::BenchmarkBENCHPPLINUX_BOOL_IF(this)); } ! if (bid == "benchpplinux-unneccopy") { ! return(new CBM::BenchmarkBENCHPPLINUX_UNNECCOPY(this)); } ! if (bid == "benchpplinux-reducstrength-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(this)); } ! if (bid == "benchpplinux-deadcode-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_DEADCODE_HO(this)); } ! if (bid == "benchpplinux-reduncode") { ! return(new CBM::BenchmarkBENCHPPLINUX_REDUNCODE(this)); } ! if (bid == "benchpplinux-constantpropagation-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_CONSTPROP_HO(this)); } ! if (bid == "benchpplinux-codemotion-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_CODEMOTION_HO(this)); } ! if (bid == "benchpplinux-whetstone") { ! return(new CBM::BenchmarkBENCHPPLINUX_WHETSTONE(this)); } ! if (bid == "benchpplinux-stringops") { ! return(new CBM::BenchmarkBENCHPPLINUX_STRINGOPS(this)); } ! if (bid == "benchpplinux-localcommonse-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_LOCALCSE_HO(this)); } ! if (bid == "benchpplinux-localcommonse") { ! return(new CBM::BenchmarkBENCHPPLINUX_LOCALCSE(this)); } if (bid == "benchpplinux-stringops-ho") { ! return(new CBM::BenchmarkBENCHPPLINUX_STRINGOPS_HO(this)); } ! if (bid == "benchpplinux-packedbitarray") { ! return(new CBM::BenchmarkBENCHPPLINUX_PACKEDBITARRAY(this)); } ! if (bid == "benchpplinux-loopjamming") { ! return(new CBM::BenchmarkBENCHPPLINUX_LOOPJAMMING(this)); } return(0); --- 7,331 ---- CBM::BenchmarkVector& PackageBENCHPPLINUX::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-10wifelse"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-10wsparseswitch"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-10wswitch"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-10wvfc"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-2wifelse"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-2wswitch"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-bitfields"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-bitfields-pba"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-bool-assign"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-bool-if"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-codemotion"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-codemotion-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-constantpropagation"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-constantpropagation-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-deadcode"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-deadcode-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-dhrystone"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-globalcommonse"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-globalcommonse-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-inducvar"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-inducvar-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-localcommonse"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-localcommonse-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-loopjamming"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-loopjamming-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-packedbitarray"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-packunpackobjets"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-reducstrength-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-reduncode"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-reduncode-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-stringops"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-stringops-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-unneccopy"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-unneccopy-ho"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="benchpplinux-whetstone"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageBENCHPPLINUX::Benchmark(std::string bid) { ! Benchmarks(); ! if (bid == "benchpplinux-10wifelse") { ! if (!benchmarks[0]->instance) ! benchmarks[0]->instance=new CBM::BenchmarkBENCHPPLINUX_10WAY_IFELSE(this); ! return(benchmarks[0]->instance); } if (bid == "benchpplinux-10wsparseswitch") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(this); ! return(benchmarks[1]->instance); } ! if (bid == "benchpplinux-10wswitch") { ! if (!benchmarks[2]->instance) ! benchmarks[2]->instance=new CBM::BenchmarkBENCHPPLINUX_10WAY_SWITCH(this); ! return(benchmarks[2]->instance); } if (bid == "benchpplinux-10wvfc") { ! if (!benchmarks[3]->instance) ! benchmarks[3]->instance=new CBM::BenchmarkBENCHPPLINUX_10WAY_VFC(this); ! return(benchmarks[3]->instance); } if (bid == "benchpplinux-2wifelse") { ! if (!benchmarks[4]->instance) ! benchmarks[4]->instance=new CBM::BenchmarkBENCHPPLINUX_2WAY_IFELSE(this); ! return(benchmarks[4]->instance); } ! if (bid == "benchpplinux-2wswitch") { ! if (!benchmarks[5]->instance) ! benchmarks[5]->instance=new CBM::BenchmarkBENCHPPLINUX_2WAY_SWITCH(this); ! return(benchmarks[5]->instance); } if (bid == "benchpplinux-bitfields") { ! if (!benchmarks[6]->instance) ! benchmarks[6]->instance=new CBM::BenchmarkBENCHPPLINUX_BITFIELDS(this); ! return(benchmarks[6]->instance); } ! if (bid == "benchpplinux-bitfields-pba") { ! if (!benchmarks[7]->instance) ! benchmarks[7]->instance=new CBM::BenchmarkBENCHPPLINUX_BITFIELDS_PBA(this); ! return(benchmarks[7]->instance); } ! if (bid == "benchpplinux-bool-assign") { ! if (!benchmarks[8]->instance) ! benchmarks[8]->instance=new CBM::BenchmarkBENCHPPLINUX_BOOL_ASSIGN(this); ! return(benchmarks[8]->instance); } ! if (bid == "benchpplinux-bool-if") { ! if (!benchmarks[9]->instance) ! benchmarks[9]->instance=new CBM::BenchmarkBENCHPPLINUX_BOOL_IF(this); ! return(benchmarks[9]->instance); } ! if (bid == "benchpplinux-codemotion") { ! if (!benchmarks[10]->instance) ! benchmarks[10]->instance=new CBM::BenchmarkBENCHPPLINUX_CODEMOTION(this); ! return(benchmarks[10]->instance); ! } ! if (bid == "benchpplinux-codemotion-ho") { ! if (!benchmarks[11]->instance) ! benchmarks[11]->instance=new CBM::BenchmarkBENCHPPLINUX_CODEMOTION_HO(this); ! return(benchmarks[11]->instance); ! } ! if (bid == "benchpplinux-constantpropagation") { ! if (!benchmarks[12]->instance) ! benchmarks[12]->instance=new CBM::BenchmarkBENCHPPLINUX_CONSTPROP(this); ! return(benchmarks[12]->instance); ! } ! if (bid == "benchpplinux-constantpropagation-ho") { ! if (!benchmarks[13]->instance) ! benchmarks[13]->instance=new CBM::BenchmarkBENCHPPLINUX_CONSTPROP_HO(this); ! return(benchmarks[13]->instance); } if (bid == "benchpplinux-deadcode") { ! if (!benchmarks[14]->instance) ! benchmarks[14]->instance=new CBM::BenchmarkBENCHPPLINUX_DEADCODE(this); ! return(benchmarks[14]->instance); } ! if (bid == "benchpplinux-deadcode-ho") { ! if (!benchmarks[15]->instance) ! benchmarks[15]->instance=new CBM::BenchmarkBENCHPPLINUX_DEADCODE_HO(this); ! return(benchmarks[15]->instance); } ! if (bid == "benchpplinux-dhrystone") { ! if (!benchmarks[16]->instance) ! benchmarks[16]->instance=new CBM::BenchmarkBENCHPPLINUX_DHRYSTONE(this); ! return(benchmarks[16]->instance); } ! if (bid == "benchpplinux-globalcommonse") { ! if (!benchmarks[17]->instance) ! benchmarks[17]->instance=new CBM::BenchmarkBENCHPPLINUX_GLOBALCSE(this); ! return(benchmarks[17]->instance); } ! if (bid == "benchpplinux-globalcommonse-ho") { ! if (!benchmarks[18]->instance) ! benchmarks[18]->instance=new CBM::BenchmarkBENCHPPLINUX_GLOBALCSE_HO(this); ! return(benchmarks[18]->instance); } ! if (bid == "benchpplinux-inducvar") { ! if (!benchmarks[19]->instance) ! benchmarks[19]->instance=new CBM::BenchmarkBENCHPPLINUX_INDUCVAR(this); ! return(benchmarks[19]->instance); } ! if (bid == "benchpplinux-inducvar-ho") { ! if (!benchmarks[20]->instance) ! benchmarks[20]->instance=new CBM::BenchmarkBENCHPPLINUX_INDUCVAR_HO(this); ! return(benchmarks[20]->instance); } ! if (bid == "benchpplinux-localcommonse") { ! if (!benchmarks[21]->instance) ! benchmarks[21]->instance=new CBM::BenchmarkBENCHPPLINUX_LOCALCSE(this); ! return(benchmarks[21]->instance); } ! if (bid == "benchpplinux-localcommonse-ho") { ! if (!benchmarks[22]->instance) ! benchmarks[22]->instance=new CBM::BenchmarkBENCHPPLINUX_LOCALCSE_HO(this); ! return(benchmarks[22]->instance); } ! if (bid == "benchpplinux-loopjamming") { ! if (!benchmarks[23]->instance) ! benchmarks[23]->instance=new CBM::BenchmarkBENCHPPLINUX_LOOPJAMMING(this); ! return(benchmarks[23]->instance); } ! if (bid == "benchpplinux-loopjamming-ho") { ! if (!benchmarks[24]->instance) ! benchmarks[24]->instance=new CBM::BenchmarkBENCHPPLINUX_LOOPJAMMING_HO(this); ! return(benchmarks[24]->instance); } ! if (bid == "benchpplinux-packedbitarray") { ! if (!benchmarks[25]->instance) ! benchmarks[25]->instance=new CBM::BenchmarkBENCHPPLINUX_PACKEDBITARRAY(this); ! return(benchmarks[25]->instance); } ! if (bid == "benchpplinux-packunpackobjets") { ! if (!benchmarks[26]->instance) ! benchmarks[26]->instance=new CBM::BenchmarkBENCHPPLINUX_PACKUNPACKOBJ(this); ! return(benchmarks[26]->instance); } ! if (bid == "benchpplinux-reducstrength-ho") { ! if (!benchmarks[27]->instance) ! benchmarks[27]->instance=new CBM::BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(this); ! return(benchmarks[27]->instance); } ! if (bid == "benchpplinux-reduncode") { ! if (!benchmarks[28]->instance) ! benchmarks[28]->instance=new CBM::BenchmarkBENCHPPLINUX_REDUNCODE(this); ! return(benchmarks[28]->instance); } ! if (bid == "benchpplinux-reduncode-ho") { ! if (!benchmarks[29]->instance) ! benchmarks[29]->instance=new CBM::BenchmarkBENCHPPLINUX_REDUNCODE_HO(this); ! return(benchmarks[29]->instance); } ! if (bid == "benchpplinux-stringops") { ! if (!benchmarks[30]->instance) ! benchmarks[30]->instance=new CBM::BenchmarkBENCHPPLINUX_STRINGOPS(this); ! return(benchmarks[30]->instance); } if (bid == "benchpplinux-stringops-ho") { ! if (!benchmarks[31]->instance) ! benchmarks[31]->instance=new CBM::BenchmarkBENCHPPLINUX_STRINGOPS_HO(this); ! return(benchmarks[31]->instance); } ! if (bid == "benchpplinux-unneccopy") { ! if (!benchmarks[32]->instance) ! benchmarks[32]->instance=new CBM::BenchmarkBENCHPPLINUX_UNNECCOPY(this); ! return(benchmarks[32]->instance); } ! if (bid == "benchpplinux-unneccopy-ho") { ! if (!benchmarks[33]->instance) ! benchmarks[33]->instance=new CBM::BenchmarkBENCHPPLINUX_UNNECCOPY_HO(this); ! return(benchmarks[33]->instance); ! } ! if (bid == "benchpplinux-whetstone") { ! if (!benchmarks[34]->instance) ! benchmarks[34]->instance=new CBM::BenchmarkBENCHPPLINUX_WHETSTONE(this); ! return(benchmarks[34]->instance); } return(0); Index: Benchmark-SCIMARK2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-SCIMARK2.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 --- Benchmark-SCIMARK2.libwrapper.h 15 Feb 2007 18:53:07 -0000 1.6 *************** *** 1,5 **** #include <Benchmark/Benchmark-DLLoader.h> - #include <UI/UI.h> - using namespace CBM; --- 1,3 ---- *************** *** 9,36 **** CBM::BenchmarkVector& PackageSCIMARK2::Benchmarks(void) { if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("scimark2-smm"); ! benchmarks.push_back("scimark2-lu"); ! benchmarks.push_back("scimark2-fourier"); ! benchmarks.push_back("scimark2-mc"); ! benchmarks.push_back("scimark2-sor"); return(benchmarks); } CBM::Benchmark *PackageSCIMARK2::Benchmark(std::string bid) { ! if (bid == "scimark2-smm") { ! return(new CBM::BenchmarkSCIMARK2_SMM(this)); } if (bid == "scimark2-lu") { ! return(new CBM::BenchmarkSCIMARK2_LU(this)); ! } ! if (bid == "scimark2-fourier") { ! return(new CBM::BenchmarkSCIMARK2_FOURIER(this)); } if (bid == "scimark2-mc") { ! return(new CBM::BenchmarkSCIMARK2_MC(this)); } if (bid == "scimark2-sor") { ! return(new CBM::BenchmarkSCIMARK2_SOR(this)); } return(0); --- 7,61 ---- CBM::BenchmarkVector& PackageSCIMARK2::Benchmarks(void) { + CBM::BenchmarkCached *ptr; if (benchmarks.size()) return(benchmarks); ! ptr=new BenchmarkCached; ! ptr->id="scimark2-fourier"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="scimark2-lu"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="scimark2-mc"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="scimark2-smm"; ! ptr->instance=0; ! benchmarks.push_back(ptr); ! ptr=new BenchmarkCached; ! ptr->id="scimark2-sor"; ! ptr->instance=0; ! benchmarks.push_back(ptr); return(benchmarks); } CBM::Benchmark *PackageSCIMARK2::Benchmark(std::string bid) { ! Benchmarks(); ! if (bid == "scimark2-fourier") { ! if (!benchmarks[0]->instance) ! benchmarks[0]->instance=new CBM::BenchmarkSCIMARK2_FOURIER(this); ! return(benchmarks[0]->instance); } if (bid == "scimark2-lu") { ! if (!benchmarks[1]->instance) ! benchmarks[1]->instance=new CBM::BenchmarkSCIMARK2_LU(this); ! return(benchmarks[1]->instance); } if (bid == "scimark2-mc") { ! if (!benchmarks[2]->instance) ! benchmarks[2]->instance=new CBM::BenchmarkSCIMARK2_MC(this); ! return(benchmarks[2]->instance); ! } ! if (bid == "scimark2-smm") { ! if (!benchmarks[3]->instance) ! benchmarks[3]->instance=new CBM::BenchmarkSCIMARK2_SMM(this); ! return(benchmarks[3]->instance); } if (bid == "scimark2-sor") { ! if (!benchmarks[4]->instance) ! benchmarks[4]->instance=new CBM::BenchmarkSCIMARK2_SOR(this); ! return(benchmarks[4]->instance); } return(0); |
|
From: Frederic T. <xf...@us...> - 2007-02-07 17:37:03
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21629 Modified Files: cloptions.cpp Log Message: Fix regression on -q -c<COMPILER>. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** cloptions.cpp 7 Feb 2007 17:35:25 -0000 1.19 --- cloptions.cpp 7 Feb 2007 17:36:58 -0000 1.20 *************** *** 436,441 **** case DomainQuery: if ((!filter.benchmark) && (!filter.package) && ! (!filter.host) && (!filter.external_programs)) { ! std::cerr << "-q expects either -b, -p, -h, or -x option." << std::endl; parseExitValue=255; break; --- 436,442 ---- case DomainQuery: if ((!filter.benchmark) && (!filter.package) && ! (!filter.host) && (!filter.external_programs) && ! (!filter.compiler)) { ! std::cerr << "-q expects either -b, -p, -c, -h, or -x option." << std::endl; parseExitValue=255; break; |
|
From: Frederic T. <xf...@us...> - 2007-02-07 17:36:01
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21536 Modified Files: cloptions.cpp Log Message: Minor changes and updated help. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** cloptions.cpp 6 Feb 2007 19:31:52 -0000 1.18 --- cloptions.cpp 7 Feb 2007 17:35:25 -0000 1.19 *************** *** 52,84 **** void cbmOptionsHelp(void) { ! std::cout << "Usage: compbenchmarks-core [specs]" << std::endl ! << "Where specs is one of :" << std::endl << " --help | -h : this help" << std::endl ! << " --version | -v : display software version" << std::endl ! << " --install | -i <p-id> : download and pre-configure specified package" << std::endl ! << " --fetch | -f <b-id> <fn> : uses local file <fn> to prepare" << std::endl ! << " installation of <b-id>" << std::endl ! << " --uninstall <b-id> : remove specified benchmark" << std::endl ! << " --list-benchmarks : show information about supported benchmarks" << std::endl ! << " (including b-id)" << std::endl ! << " --host-infos : detect host system" << std::endl ! << " --program-infos : list used programs" << std::endl ! << " --compiler-infos <c-bin> : use specified binary as compiler and display " << std::endl ! << " information about it" << std::endl ! << " --benchmark-infos <b-id> : display benchmark's information" << std::endl ! << " --bench <b-id> <c-bin> [c-options]" << std::endl ! << " use specified compiler and options (if provided)" << std::endl ! << " to run benchmark b-id" << std::endl ! << std::endl ! << "Fine grained operations gives more specs :" << std::endl ! << " --package-download <b-id> : download a benchmark" << std::endl ! << " --extract <b-id> : extract a benchmark" << std::endl ! << " --patch <b-id> : patch a benchmark" << std::endl ! << " --package-preconfigure <b-id> : preconfigure a benchmark" << std::endl ! << " --test <b-id> : test a benchmark" << std::endl ! << " --release <b-id> : release a benchmark" << std::endl ! << std::endl ! << "Other options affecting behaviour :" << std::endl ! << " --disable-testsuite : disable package's test suite" << std::endl << " --force : force operation" << std::endl << std::endl; --- 52,84 ---- void cbmOptionsHelp(void) { ! std::cout << "Usage: compbenchmarks-core <OPTION...>" << std::endl ! << "Simple options :" << std::endl << " --help | -h : this help" << std::endl ! << " --version | -v : display software version" << std::endl << std::endl ! << "Query options (with -q or --query) :" << std::endl ! << " --all | -a : display all items" << std::endl ! << " --installed | -i : display only installed items" << std::endl ! << " --package | -p : display package(s)" << std::endl ! << " --benchmark | -b : display benchmark(s)" << std::endl ! << " --compiler | -c : display informations about compiler" << std::endl ! << " --host | -H : display informations about host" << std::endl ! << " --programs | -x : display informations about" << std::endl ! << " external programs used" << std::endl << std::endl ! << "Management options (with -m or --manage) :" << std::endl ! << " --install | -I : install package" << std::endl ! << " --uninstall | -U : uninstall package" << std::endl << std::endl ! << "Low-level management options (with -M or --low-level) :" << std::endl ! << " --package-download | -D : download package" << std::endl ! << " --package-fetch | -F : fetch package from a local file" << std::endl ! << " --package-extract | -E : extract package" << std::endl ! << " --package-patch | -P : patch package" << std::endl ! << " --package-preconfigure | -C : pre-configure package" << std::endl ! << " --package-test | -T : run package's testsuite" << std::endl ! << " --package-release | -R : clean compiled object" << std::endl << std::endl ! << "Benchmarking options (with -b or --bench) : " << std::endl ! << " [-b|--bench] <BID> <C> [O] : use compiler C with optional arguments" << std::endl ! << " O to build benchmark BID" << std::endl ! << " --disable-testsuite | -S : disable package's test suite" << std::endl << std::endl ! << "Other options that may affect behaviour :" << std::endl << " --force : force operation" << std::endl << std::endl; *************** *** 203,218 **** {"low-level", no_argument, 0, 'M'}, {"bench", required_argument, 0, 'B'}, ! {"filter-installed", no_argument, 0, 'i'}, {"install", required_argument, 0, 'I' }, {"uninstall", required_argument, 0, 'U' }, {"all", 0, 0, 'a' }, ! ! {"package", optional_argument, 0, 'p' }, {"benchmark", optional_argument, 0, 'b' }, - - /* {"package-benchmarks-info", 1, 0, 'I' }, */ - {"host", 0, 0, 'H' }, {"programs", no_argument, 0, 'P' }, --- 203,214 ---- {"low-level", no_argument, 0, 'M'}, {"bench", required_argument, 0, 'B'}, ! {"install", required_argument, 0, 'I' }, {"uninstall", required_argument, 0, 'U' }, {"all", 0, 0, 'a' }, ! {"installed", no_argument, 0, 'i'}, {"package", optional_argument, 0, 'p' }, {"benchmark", optional_argument, 0, 'b' }, {"host", 0, 0, 'H' }, {"programs", no_argument, 0, 'P' }, *************** *** 430,433 **** --- 426,433 ---- } break; + case DomainUndef: + std::cerr << "domain not defined." << std::endl; + parseExitValue=255; + break; case DomainHelp: cbmOptionsHelp(); *************** *** 435,438 **** --- 435,444 ---- break; case DomainQuery: + if ((!filter.benchmark) && (!filter.package) && + (!filter.host) && (!filter.external_programs)) { + std::cerr << "-q expects either -b, -p, -h, or -x option." << std::endl; + parseExitValue=255; + break; + } if ((!filter.all) && (!filter.installed)) { if (filter.host) { *************** *** 452,456 **** std::cout << "Compiler name : " << C->Name() << std::endl << "Version : " << C->Version() << std::endl ! << "Language : " << C->language() << std::endl << "Binary : " << C->Binary() << std::endl; parseExitValue=0; --- 458,462 ---- std::cout << "Compiler name : " << C->Name() << std::endl << "Version : " << C->Version() << std::endl ! << "Language : " << C->Language() << std::endl << "Binary : " << C->Binary() << std::endl; parseExitValue=0; |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:42:54
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22688 Modified Files: 03-CBMCompilerSelector-public.pl Log Message: Changes in CBM::Compiler method names. Index: 03-CBMCompilerSelector-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** 03-CBMCompilerSelector-public.pl 6 Feb 2007 19:27:04 -0000 1.5 --- 03-CBMCompilerSelector-public.pl 6 Feb 2007 19:42:51 -0000 1.6 *************** *** 43,47 **** %refdata=%{$references{$reffile}}; ! ok($refdata{language} eq $co->language()); ok($refdata{compiler} eq $co->compiler()); ok($refdata{compilerName} eq $co->Name()); --- 43,47 ---- %refdata=%{$references{$reffile}}; ! ok($refdata{language} eq $co->Language()); ok($refdata{compiler} eq $co->compiler()); ok($refdata{compilerName} eq $co->Name()); |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:42:21
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22668 Modified Files: Compiler.h Log Message: Changes in CBM::Compiler method names. Index: Compiler.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Compiler.h 6 Feb 2007 19:25:27 -0000 1.2 --- Compiler.h 6 Feb 2007 19:42:18 -0000 1.3 *************** *** 78,82 **** /** Gets compiler's language. \return C or C++. */ ! virtual char *language(void) = 0; /** Virtual destructor */ virtual ~Compiler(); --- 78,82 ---- /** Gets compiler's language. \return C or C++. */ ! virtual char *Language(void) = 0; /** Virtual destructor */ virtual ~Compiler(); |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:42:11
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22304 Modified Files: Compiler-TCC.cpp Compiler-TCC.h Log Message: Changes in CBM::Compiler method names. Index: Compiler-TCC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC/Compiler-TCC.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler-TCC.h 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler-TCC.h 6 Feb 2007 19:42:03 -0000 1.2 *************** *** 22,26 **** virtual std::string getCompilerName(void); virtual std::string getCompilerVersion(void); ! virtual char *language(void); public: --- 22,26 ---- virtual std::string getCompilerName(void); virtual std::string getCompilerVersion(void); ! virtual char *Language(void); public: Index: Compiler-TCC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-TCC/Compiler-TCC.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler-TCC.cpp 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler-TCC.cpp 6 Feb 2007 19:42:03 -0000 1.2 *************** *** 44,48 **** } ! char *CompilerTCC::language(void) { return("C"); --- 44,48 ---- } ! char *CompilerTCC::Language(void) { return("C"); |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:41:50
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22286 Modified Files: Compiler-GCC.cpp Compiler-GCC.h Log Message: Changes in CBM::Compiler method names. Index: Compiler-GCC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC/Compiler-GCC.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler-GCC.h 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler-GCC.h 6 Feb 2007 19:41:44 -0000 1.2 *************** *** 22,26 **** virtual std::string getCompilerName(void); virtual std::string getCompilerVersion(void); ! virtual char *language(void); public: --- 22,26 ---- virtual std::string getCompilerName(void); virtual std::string getCompilerVersion(void); ! virtual char *Language(void); public: *************** *** 42,46 **** virtual std::string getCompilerName(void); virtual std::string getCompilerVersion(void); ! virtual char *language(void); public: --- 42,46 ---- virtual std::string getCompilerName(void); virtual std::string getCompilerVersion(void); ! virtual char *Language(void); public: Index: Compiler-GCC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-GCC/Compiler-GCC.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler-GCC.cpp 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler-GCC.cpp 6 Feb 2007 19:41:44 -0000 1.2 *************** *** 67,71 **** } ! char *CompilerGCC::language(void) { return("C"); --- 67,71 ---- } ! char *CompilerGCC::Language(void) { return("C"); *************** *** 129,133 **** } ! char *CompilerGCC_cpp::language(void) { return("C++"); --- 129,133 ---- } ! char *CompilerGCC_cpp::Language(void) { return("C++"); |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:41:33
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22268 Modified Files: Package.cpp Log Message: Changes in CBM::Compiler method names. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Package.cpp 6 Feb 2007 17:54:02 -0000 1.8 --- Package.cpp 6 Feb 2007 19:41:24 -0000 1.9 *************** *** 345,349 **** } ! if (language()!=_currentCompiler->language()) { storeContext(_currentCompiler, --- 345,349 ---- } ! if (language()!=_currentCompiler->Language()) { storeContext(_currentCompiler, *************** *** 351,355 **** info=_currentCompiler->Binary(); info+=" is a "; ! info+=_currentCompiler->language(); info+=" compiler, while benchmark is in "; info+=language(); --- 351,355 ---- info=_currentCompiler->Binary(); info+=" is a "; ! info+=_currentCompiler->Language(); info+=" compiler, while benchmark is in "; info+=language(); |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:36:59
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20374 Modified Files: System.cpp System.h Log Message: Obsolete code removed. Banner added. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** System.cpp 6 Feb 2007 19:31:13 -0000 1.5 --- System.cpp 6 Feb 2007 19:36:45 -0000 1.6 *************** *** 1,2 **** --- 1,10 ---- + /* ---------------------------------------------------------------------------- + $Id$ + + This is free software. + For details, see the GNU Public License in the COPYING file, or + Look http://www.fsf.org + ------------------------------------------------------------------------- */ + #include <System/System.h> #include <Plan/Plan.h> *************** *** 450,492 **** return(r); } - /* - void System::display(void) - { - std::cout << "host::arch=" << arch() << std::endl - << "host::hostid=" << hostid() << std::endl - << "host::hostname=" << hostname() << std::endl - << "host::os=" << os() << std::endl - << "host::os_version=" << os_version() << std::endl - << "host::processor_name=" << processor_name() << std::endl - << "host::processor_mhz=" << processor_mhz() << std::endl - << "host::processor_cache=" << processor_cache() << std::endl - << "host::processor_number=" << processor_number() << std::endl; - } - */ - - /* - void System::displayPrograms(void) - { - std::cout << "BZIP2:" << CBM_PROG_BZIP2 << std::endl - << "CUT:" << CBM_PROG_CUT << std::endl - << "DD:" << CBM_PROG_DD << std::endl - << "DIALOG:" << CBM_PROG_DIALOG << std::endl - << "GREP:" << CBM_PROG_GREP << std::endl - << "GZIP:" << CBM_PROG_GZIP << std::endl - << "HEAD:" << CBM_PROG_HEAD << std::endl - << "MAKE:" << CBM_PROG_MAKE << std::endl - << "MKDIR:" << CBM_PROG_MKDIR << std::endl - << "PATCH:" << CBM_PROG_PATCH << std::endl - << "RM:" << CBM_PROG_RM << std::endl - << "TAIL:" << CBM_PROG_TAIL << std::endl - << "TAR:" << CBM_PROG_TAR << std::endl - << "UNZIP:" << CBM_PROG_UNZIP << std::endl - << "WGET:" << CBM_PROG_WGET << std::endl - << "ZCAT:" << CBM_PROG_ZCAT << std::endl - << "CAT:" << CBM_PROG_CAT << std::endl - << "PERL:" << CBM_PROG_PERL << std::endl; - - } - */ std::string System::exec0(std::string& command) --- 458,461 ---- Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** System.h 6 Feb 2007 19:31:13 -0000 1.5 --- System.h 6 Feb 2007 19:36:45 -0000 1.6 *************** *** 175,186 **** virtual class Benchmark *Benchmark(std::string bid); - /** Display informations about all packages - * Used by compbenchmarks-core */ - // virtual void displayAllPackages(void); - - /** Display informations about all benchmarks - * Used by compbenchmarks-core */ - // virtual void displayAllBenchmarks(void); - /** Split a std::string. * Split given string as sub-strings, according to an arbitrary delimiter. --- 175,178 ---- *************** *** 196,211 **** virtual void Chomp(std::string& str); - /** Describe host. - * Displays informations about processors, OS, and so on. - */ - // virtual void display(void); - virtual std::string Program(std::string pid); - /** Describe external programs. - * Displays informations about external programs used in CompBenchmarks or in - * compbenchmark-config program. */ - // virtual void displayPrograms(void); - /** External command execution. * Uses shell to execute command. --- 188,193 ---- |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:36:10
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20015 Modified Files: main.h Log Message: Doxygen documentation updated. Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/main.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.h 25 Jan 2007 01:51:54 -0000 1.8 --- main.h 6 Feb 2007 19:35:59 -0000 1.9 *************** *** 27,35 **** * CompBenchmarks suite has been (re)written in C++, to add more flexibility. * Its core rely on a few abstracts (as in C++) definitions (concepts) : ! * - \link CBMSystem operating system\endlink, ! * - \link CBMPackage package\endlink, ! * - \link CBMBenchmark benchmark\endlink, ! * - \link CBMCompiler compiler\endlink and \link CBMCompilerOptions compilation options\endlink, ! * - \link CBMUI user interface\endlink. * * Basically, operating system object is detected at CompBenchmarks --- 27,35 ---- * CompBenchmarks suite has been (re)written in C++, to add more flexibility. * Its core rely on a few abstracts (as in C++) definitions (concepts) : ! * - \link CBM::System operating system\endlink, ! * - \link CBM::Package package\endlink, ! * - \link CBM::Benchmark benchmark\endlink, ! * - \link CBM::Compiler compiler\endlink and \link CBM::CompilerOptions compilation options\endlink, ! * - \link CBM::UI user interface\endlink. * * Basically, operating system object is detected at CompBenchmarks |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:32:00
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18523 Modified Files: cloptions.cpp Log Message: -B option added. -q improved. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** cloptions.cpp 6 Feb 2007 17:49:56 -0000 1.17 --- cloptions.cpp 6 Feb 2007 19:31:52 -0000 1.18 *************** *** 34,37 **** --- 34,40 ---- unsigned int package:1; unsigned int benchmark:1; + unsigned int host:1; + unsigned int compiler:1; + unsigned int external_programs:1; } OptFilter; *************** *** 191,194 **** --- 194,198 ---- OptFilter filter = { 0 }; /* <empty>/all/installed */ std::string object_t; /* package/benchmark/host/compiler */ + int not_done = 1; static const struct option long_options[] = { *************** *** 198,202 **** {"manage", no_argument, 0, 'm'}, {"low-level", no_argument, 0, 'M'}, ! {"bench", no_argument, 0, 'B'}, {"filter-installed", no_argument, 0, 'i'}, {"install", required_argument, 0, 'I' }, --- 202,206 ---- {"manage", no_argument, 0, 'm'}, {"low-level", no_argument, 0, 'M'}, ! {"bench", required_argument, 0, 'B'}, {"filter-installed", no_argument, 0, 'i'}, {"install", required_argument, 0, 'I' }, *************** *** 211,217 **** /* {"package-benchmarks-info", 1, 0, 'I' }, */ ! {"host-info", 0, 0, 'H' }, ! {"programs-info", 0, 0, 'P' }, ! {"compiler-info", 1, 0, 'c' }, {"bench", 1, 0, 'B'}, --- 215,221 ---- /* {"package-benchmarks-info", 1, 0, 'I' }, */ ! {"host", 0, 0, 'H' }, ! {"programs", no_argument, 0, 'P' }, ! {"compiler", required_argument, 0, 'c' }, {"bench", 1, 0, 'B'}, *************** *** 229,233 **** }; ! while (1) { int option_index = 0; --- 233,237 ---- }; ! while (not_done) { int option_index = 0; *************** *** 235,239 **** break; ! c = getopt_long (argc, argv, "hviI:F:U:qp::b::aMmD:E:P:C:T:R:S:f", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { --- 239,243 ---- break; ! c = getopt_long (argc, argv, "hvxiI:F:U:qHc:p::B:b::aMmD:E:P:C:T:R:S:f", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { *************** *** 331,351 **** break; case 'H': ! /* cbmSystem->display(); */ /* !!! */ parseExitValue=0; break; ! case 'c': ! C=SC.select((char*) optarg); ! if (C) { ! /* C->display(); */ /* !!! */ ! parseExitValue=0; ! } else ! parseExitValue=1; break; ! case 045: /* !!! */ ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) { ! /* B->display(); */ /* !!! */ ! parseExitValue=0; ! } break; /* case 'f': !!! --- 335,349 ---- break; case 'H': ! filter.host=1; parseExitValue=0; break; ! case 'x': ! filter.external_programs=1; ! parseExitValue=0; break; ! case 'c': ! filter.compiler=1; ! if (optarg) ! C=SC.select((char*) optarg); break; /* case 'f': !!! *************** *** 388,396 **** break; case 'B': ! /* B=cbmOptionsExpectBenchmark(optarg); if (!B) break; optind++; if (optind<=argc) { compiler=argv[optind-1]; --- 386,395 ---- break; case 'B': ! domain=DomainBench; B=cbmOptionsExpectBenchmark(optarg); if (!B) break; optind++; + if (optind<=argc) { compiler=argv[optind-1]; *************** *** 400,410 **** break; } ! C=SC.select((char*) compiler.c_str()); ! if (!C) { ! std::cerr << "Compiler " << compiler.c_str() << " not found." << std::endl; ! parseExitValue=1; ! break; ! } ! optind++; if (optind<=argc) { --- 399,403 ---- break; } ! optind++; if (optind<=argc) { *************** *** 413,439 **** options=""; } ! O=new CBM::CompilerOptions(options); ! P=B->Package(); ! if (P->getStatus()<CBM::Package::Preconfigured) { ! std::cerr << "Package not properly installed" << std::endl; ! parseExitValue=1; ! break; ! } ! context=P->ContextMatches(C, O); ! ! status=P->getStatus(); ! if ((status>=CBM::Package::Configured) && (!context)) { ! P->Release(); ! } ! ! if (!context) { ! P->Configure(C, O); ! P->Make(UO_force); ! P->Test(UO_force); ! } ! B->Bench(); ! ! parseExitValue=0; ! */ break; case '?': --- 406,410 ---- options=""; } ! not_done=0; break; case '?': *************** *** 441,445 **** } } - switch(domain) { case DomainVersion: --- 412,415 ---- *************** *** 447,454 **** --- 417,431 ---- (!filter.installed) && (!filter.benchmark) && + (!filter.external_programs) && + (!filter.host) && (!filter.package) && + (!filter.external_programs) && + (!filter.compiler) && (action==ActionUndef)) { std::cout << VERSION << std::endl; parseExitValue=0; + } else { + std::cerr << "Invalid filter or action with -v" << std::endl; + parseExitValue=255; } break; *************** *** 458,462 **** --- 435,491 ---- break; case DomainQuery: + if ((!filter.all) && (!filter.installed)) { + if (filter.host) { + std::cout << "Architecture : " << cbmSystem->arch() << std::endl + << "Host ID : " << cbmSystem->hostid() << std::endl + << "Hostname : " << cbmSystem->hostname() << std::endl + << "OS : " << cbmSystem->os() << std::endl + << "OS Version : " << cbmSystem->os_version() << std::endl + << "Processor name : " << cbmSystem->processor_name() << std::endl + << "Processor speed (MHz) : " << cbmSystem->processor_mhz() << std::endl + << "Processor cache (Kb) : " << cbmSystem->processor_cache() << std::endl + << "Processor number : " << cbmSystem->processor_number() << std::endl; + parseExitValue=0; + break; + } + if (filter.compiler) { + std::cout << "Compiler name : " << C->Name() << std::endl + << "Version : " << C->Version() << std::endl + << "Language : " << C->language() << std::endl + << "Binary : " << C->Binary() << std::endl; + parseExitValue=0; + break; + } + + if (filter.external_programs) { + std::cout << "BZIP2:" << CBM_PROG_BZIP2 << std::endl + << "CUT:" << CBM_PROG_CUT << std::endl + << "DD:" << CBM_PROG_DD << std::endl + << "DIALOG:" << CBM_PROG_DIALOG << std::endl + << "GREP:" << CBM_PROG_GREP << std::endl + << "GZIP:" << CBM_PROG_GZIP << std::endl + << "HEAD:" << CBM_PROG_HEAD << std::endl + << "MAKE:" << CBM_PROG_MAKE << std::endl + << "MKDIR:" << CBM_PROG_MKDIR << std::endl + << "PATCH:" << CBM_PROG_PATCH << std::endl + << "RM:" << CBM_PROG_RM << std::endl + << "TAIL:" << CBM_PROG_TAIL << std::endl + << "TAR:" << CBM_PROG_TAR << std::endl + << "UNZIP:" << CBM_PROG_UNZIP << std::endl + << "WGET:" << CBM_PROG_WGET << std::endl + << "ZCAT:" << CBM_PROG_ZCAT << std::endl + << "CAT:" << CBM_PROG_CAT << std::endl + << "PERL:" << CBM_PROG_PERL << std::endl; + parseExitValue=0; + break; + } + } + if ((filter.all) || (filter.installed)) { + if (filter.host) { + std::cerr << "-H option incompatible in that query." << std::endl; + parseExitValue=255; + break; + } if ((filter.package) && (P)) { std::cerr << "-p must have no argument when -a or -i is used." << std::endl; *************** *** 584,591 **** --- 613,629 ---- } break; + default: case ActionUndef: std::cerr << "action not specified." << std::endl; + std::cerr << "Valid options are -I and -U." << std::endl; + break; } case DomainLowLevel: + if (filter.host) { + std::cerr << "-H and -M options not compatibles." << std::endl; + parseExitValue=1; + break; + } + switch(action) { case ActionLLDownload: *************** *** 593,599 **** parseExitValue=!P->Download(); } else { ! CBM::cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); } break; case ActionLLExtract: parseExitValue=!P->Extract(); --- 631,645 ---- parseExitValue=!P->Download(); } else { ! std::cerr << "Package is not known to be hosted anymore on the Internet. Use --fetch <tarball> option" << std::endl; ! parseExitValue=1; } break; + case ActionInstall: + case ActionUninstall: + std::cerr << "Incompatible option for action. You probably meant -m." << std::endl; + break; + case ActionLLFetch: + P->Fetch((char*) tarball.c_str(), UO_force); + break; case ActionLLExtract: parseExitValue=!P->Extract(); *************** *** 611,615 **** --- 657,699 ---- parseExitValue=!P->Test(); break; + default: + std::cerr << "Invalid or missing option for -M" << std::endl; + parseExitValue=255; + break; + } + break; + case DomainBench: + if (!B) { + std::cerr << "benchmark (BID) expected" << std::endl; + break; } + C=SC.select((char*) compiler.c_str()); + if (!C) { + std::cerr << "Compiler " << compiler.c_str() << " not found." << std::endl; + parseExitValue=1; + break; + } + O=new CBM::CompilerOptions(options); + P=B->Package(); + if (P->getStatus()<CBM::Package::Preconfigured) { + std::cerr << "Package not properly installed" << std::endl; + parseExitValue=1; + break; + } + context=P->ContextMatches(C, O); + + status=P->getStatus(); + if ((status>=CBM::Package::Configured) && (!context)) { + P->Release(); + } + + if (!context) { + P->Configure(C, O); + P->Make(UO_force); + P->Test(UO_force); + } + B->Bench(); + + parseExitValue=0; break; } |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:31:23
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18311 Modified Files: System.cpp System.h Log Message: displayPrograms() method obsoleted. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** System.cpp 5 Feb 2007 20:01:01 -0000 1.4 --- System.cpp 6 Feb 2007 19:31:13 -0000 1.5 *************** *** 450,454 **** return(r); } ! void System::display(void) { --- 450,454 ---- return(r); } ! /* void System::display(void) { *************** *** 463,467 **** --- 463,469 ---- << "host::processor_number=" << processor_number() << std::endl; } + */ + /* void System::displayPrograms(void) { *************** *** 486,489 **** --- 488,492 ---- } + */ std::string System::exec0(std::string& command) Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** System.h 5 Feb 2007 19:59:41 -0000 1.4 --- System.h 6 Feb 2007 19:31:13 -0000 1.5 *************** *** 199,203 **** * Displays informations about processors, OS, and so on. */ ! virtual void display(void); virtual std::string Program(std::string pid); --- 199,203 ---- * Displays informations about processors, OS, and so on. */ ! // virtual void display(void); virtual std::string Program(std::string pid); *************** *** 206,210 **** * Displays informations about external programs used in CompBenchmarks or in * compbenchmark-config program. */ ! virtual void displayPrograms(void); /** External command execution. --- 206,210 ---- * Displays informations about external programs used in CompBenchmarks or in * compbenchmark-config program. */ ! // virtual void displayPrograms(void); /** External command execution. |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:30:04
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17729 Modified Files: 07-compbenchmarks-core.pl Log Message: Many more tests. Index: 07-compbenchmarks-core.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/07-compbenchmarks-core.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 07-compbenchmarks-core.pl 6 Feb 2007 17:53:21 -0000 1.2 --- 07-compbenchmarks-core.pl 6 Feb 2007 19:29:59 -0000 1.3 *************** *** 11,34 **** use CBM::LibUI; ! use Test::Simple tests => 76; sub test_options { my @valid_options = ( ['-v', 0, '\d\.\d.\d'], ! ['-h', 0, '.*'], ! ['-qap', 0, '.*'], ! ['-qip', 0, '.*'], ['-qi -pgzip', 255, ''], ['-qa', 255, ''], ['-qa -pgzip', 255, ''], ! ['-q -pgzip', 0, '.*'], ['-qi', 255, ''], ! ['-qab', 0, '.*'], ['-qab -bgzip-1c', 255, ''], ! ['-qib', 0, '.*'], ['-qib -bgzip-1c', 255, ''], ! ['-q -bgzip-1c', 0, '.*'], ! ['-qb -pgzip', 0, '.*'], ['-I', 255, ''], ['-U', 255, ''], ['-M -I', 255, ''], ['-M -U', 255, ''], --- 11,39 ---- use CBM::LibUI; ! use Test::Simple tests => 105; sub test_options { my @valid_options = ( ['-v', 0, '\d\.\d.\d'], ! ['-h', 0, '.+'], ! ['-qap', 0, '.+'], ! ['-qip', 0, '.+'], ['-qi -pgzip', 255, ''], ['-qa', 255, ''], ['-qa -pgzip', 255, ''], ! ['-q -pgzip', 0, '.+'], ['-qi', 255, ''], ! ['-qH', 0, '.+'], ! ['-qc', 255, ''], ! ['-q -cgcc', 0, '.+'], ! ['-qx', 0, '.+'], ! ['-qab', 0, '.+'], ['-qab -bgzip-1c', 255, ''], ! ['-qib', 0, '.+'], ['-qib -bgzip-1c', 255, ''], ! ['-q -bgzip-1c', 0, '.+'], ! ['-qb -pgzip', 0, '.+'], ['-I', 255, ''], ['-U', 255, ''], + ['-B', 255, ''], ['-M -I', 255, ''], ['-M -U', 255, ''], *************** *** 38,47 **** my %incompatible_options = ( '-q' => ['-v', '-m', '-M', '-B', '', '-U', '-I' ], ! '-I' => ['-v', '', '-b'], ! '-qbp' => ['-a', '', '-i'], ! '-v' => ['-a', '-i', '-b', '-p', '-m' ], ! '-m' => ['-a', '-i', '-b', '-p', '-U', '-I' ], ! '-M' => ['-a', '-i', '-b', '-p' ], ! '-B' => ['-a', '-i', '-b', '-p', '-U', '-I' ], ); my $item; --- 43,52 ---- my %incompatible_options = ( '-q' => ['-v', '-m', '-M', '-B', '', '-U', '-I' ], ! '-I' => ['-v', '', '-b', '-x', '-c', '-H'], ! '-qbp' => ['-a', '', '-i', '-x', '-c', '-H'], ! '-v' => ['-a', '-i', '-b', '-p', '-m', '-x', '-H' ], ! '-m' => ['-a', '-i', '-b', '-p', '-U', '-I', '-x', '-c', '-H' ], ! '-M' => ['-a', '-i', '-b', '-p', '-I', '-U', '-x', '-c', '-H' ], ! '-B' => ['-a', '-i', '-b', '-p', '-U', '-I', '-x', '-c', '-H' ], ); my $item; |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:27:11
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16728 Modified Files: 03-CBMCompilerSelector-public.pl Log Message: Changes in CBM::Compiler method names. Index: 03-CBMCompilerSelector-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 03-CBMCompilerSelector-public.pl 21 Jan 2007 20:47:25 -0000 1.4 --- 03-CBMCompilerSelector-public.pl 6 Feb 2007 19:27:04 -0000 1.5 *************** *** 45,50 **** ok($refdata{language} eq $co->language()); ok($refdata{compiler} eq $co->compiler()); ! ok($refdata{compilerName} eq $co->compilerName()); ! ok($refdata{compilerVersion} eq $co->compilerVersion()); } --- 45,50 ---- ok($refdata{language} eq $co->language()); ok($refdata{compiler} eq $co->compiler()); ! ok($refdata{compilerName} eq $co->Name()); ! ok($refdata{compilerVersion} eq $co->Version()); } |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:25:58
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16240 Modified Files: Plan.cpp Log Message: Changes in CBM::Compiler method names. Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Plan.cpp 5 Feb 2007 20:05:14 -0000 1.5 --- Plan.cpp 6 Feb 2007 19:25:52 -0000 1.6 *************** *** 31,35 **** for(i=0; i<n; i++) { C=getCompiler(i); ! if (C->compilerName() == _compiler->compilerName()) { return(0); } --- 31,35 ---- for(i=0; i<n; i++) { C=getCompiler(i); ! if (C->Name() == _compiler->Name()) { return(0); } |
|
From: Frederic T. <xf...@us...> - 2007-02-06 19:25:41
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16218 Modified Files: Compiler.cpp Compiler.h Log Message: Changes in method names. Index: Compiler.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler.h 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler.h 6 Feb 2007 19:25:27 -0000 1.2 *************** *** 58,66 **** virtual std::string getCompilerVersion(void) = 0; public: - /** Display compiler's information. - * Format is strict. This output is used by compbenchmark-config. - */ - virtual void display(void); - /** Internal compiler id. \return std::string like 'gcc' or 'g++'. --- 58,61 ---- *************** *** 70,79 **** \sa getCompilerName() \return The compiler name. */ ! virtual std::string compilerName(void); /** Gets compiler's version. Do not overload. \sa getCompilerVersion() \return The compiler version. */ ! virtual std::string compilerVersion(void); /** Gets compiler's program (as specified in constructor). --- 65,74 ---- \sa getCompilerName() \return The compiler name. */ ! virtual std::string Name(void); /** Gets compiler's version. Do not overload. \sa getCompilerVersion() \return The compiler version. */ ! virtual std::string Version(void); /** Gets compiler's program (as specified in constructor). Index: Compiler.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler.cpp 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler.cpp 6 Feb 2007 19:25:27 -0000 1.2 *************** *** 23,27 **** } ! std::string Compiler::compilerName(void) { if (cacheCompilerName!="") --- 23,27 ---- } ! std::string Compiler::Name(void) { if (cacheCompilerName!="") *************** *** 33,37 **** } ! std::string Compiler::compilerVersion(void) { if (cacheCompilerVersion!="") --- 33,37 ---- } ! std::string Compiler::Version(void) { if (cacheCompilerVersion!="") *************** *** 48,60 **** } - void Compiler::display(void) - { - std::cout << "compiler::id=" << compiler() << std::endl - << "compiler::name=" << compilerName() << std::endl - << "compiler::version=" << compilerVersion() << std::endl - << "compiler::language=" << language() << std::endl - << "compiler::binary=" << Binary() << std::endl; - } - Compiler::~Compiler() { --- 48,51 ---- |
|
From: Frederic T. <xf...@us...> - 2007-02-06 17:54:14
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16650 Modified Files: Package.cpp Package.h Log Message: Obsolete code removed. Banner added. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Package.cpp 6 Feb 2007 17:51:44 -0000 1.7 --- Package.cpp 6 Feb 2007 17:54:02 -0000 1.8 *************** *** 1,2 **** --- 1,10 ---- + /* ---------------------------------------------------------------------------- + $Id$ + + This is free software. + For details, see the GNU Public License in the COPYING file, or + Look http://www.fsf.org + ------------------------------------------------------------------------- */ + #include <Benchmark/Package.h> #include <Benchmark/Benchmark.h> *************** *** 49,79 **** } - /* - void Package::display(void) - { - std::cout << "package::Name=" << Name() << std::endl - << "package::Url=" << downloadURL() << std::endl - << "package::Size=" << Size() << std::endl - << "package::Version=" << Version() << std::endl - << "package::Comments=" << Comments() << std::endl - << "package::License=" << license() << std::endl - << "package::Homepage=" << homePage() << std::endl - << "package::Author=" << author() << std::endl << std::endl; - } - - void Package::displayBenchmarks(void) - { - int i; - int n; - CBM::Benchmark *B; - - n=benchmarkNumber(); - for(i=0; i<n; i++) { - B=Benchmark(i); - B->display(); - } - } - */ - System *Package::System(void) { --- 57,60 ---- Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Package.h 6 Feb 2007 17:51:44 -0000 1.4 --- Package.h 6 Feb 2007 17:54:02 -0000 1.5 *************** *** 188,197 **** virtual int resetContext(void); - /** Display informations about package */ - // virtual void display(void); - - /** Display informations about all supported benchmarks */ - // virtual void displayBenchmarks(void); - /** Get system abstraction object \return CBM::System --- 188,191 ---- |
|
From: Frederic T. <xf...@us...> - 2007-02-06 17:53:37
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16577 Modified Files: 07-compbenchmarks-core.pl Log Message: Many more tests. Index: 07-compbenchmarks-core.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/07-compbenchmarks-core.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 07-compbenchmarks-core.pl 5 Feb 2007 19:53:45 -0000 1.1 --- 07-compbenchmarks-core.pl 6 Feb 2007 17:53:21 -0000 1.2 *************** *** 11,15 **** use CBM::LibUI; ! use Test::Simple tests => 58; sub test_options { --- 11,15 ---- use CBM::LibUI; ! use Test::Simple tests => 76; sub test_options { *************** *** 18,25 **** --- 18,32 ---- ['-qap', 0, '.*'], ['-qip', 0, '.*'], + ['-qi -pgzip', 255, ''], ['-qa', 255, ''], + ['-qa -pgzip', 255, ''], + ['-q -pgzip', 0, '.*'], ['-qi', 255, ''], ['-qab', 0, '.*'], + ['-qab -bgzip-1c', 255, ''], ['-qib', 0, '.*'], + ['-qib -bgzip-1c', 255, ''], + ['-q -bgzip-1c', 0, '.*'], + ['-qb -pgzip', 0, '.*'], ['-I', 255, ''], ['-U', 255, ''], *************** *** 32,36 **** ( '-q' => ['-v', '-m', '-M', '-B', '', '-U', '-I' ], '-I' => ['-v', '', '-b'], ! '-v' => ['-a', '-i', '-b', '-p' ], '-m' => ['-a', '-i', '-b', '-p', '-U', '-I' ], '-M' => ['-a', '-i', '-b', '-p' ], --- 39,44 ---- ( '-q' => ['-v', '-m', '-M', '-B', '', '-U', '-I' ], '-I' => ['-v', '', '-b'], ! '-qbp' => ['-a', '', '-i'], ! '-v' => ['-a', '-i', '-b', '-p', '-m' ], '-m' => ['-a', '-i', '-b', '-p', '-U', '-I' ], '-M' => ['-a', '-i', '-b', '-p' ], |
|
From: Frederic T. <xf...@us...> - 2007-02-06 17:52:01
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16207 Modified Files: Package.cpp Package.h Log Message: getStatusStr() added. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Package.cpp 5 Feb 2007 19:56:33 -0000 1.6 --- Package.cpp 6 Feb 2007 17:51:44 -0000 1.7 *************** *** 596,599 **** --- 596,636 ---- } + std::string Package::getStatusStr(void) + { + switch(getStatus()) { + case Unknown: + return("Uninstalled"); + break; + case Downloaded: + return("Downloaded"); + break; + case Extracted: + return("Extracted"); + break; + case Patched: + return("Patched"); + break; + case Preconfigured: + return("Preconfigured"); + break; + case Configured: + return("Configured"); + break; + case Made: + return("Compiled"); + break; + case Tested: + return("Tested"); + break; + case Benchmarked: + return("Benchmarked"); + break; + default: + return("Unknown"); + break; + } + return("<internal error>"); + } + Package::~Package() { Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Package.h 5 Feb 2007 19:55:25 -0000 1.3 --- Package.h 6 Feb 2007 17:51:44 -0000 1.4 *************** *** 430,436 **** /** Returns benchmark's status * \return status (enum). ! * \sa Package::Status */ virtual Status getStatus(void); /** Virtual destructor */ virtual ~Package(); --- 430,443 ---- /** Returns benchmark's status * \return status (enum). ! * \sa Package::Status ! * \sa Package::getStatusStr() */ virtual Status getStatus(void); + /** Returns benchmark's status + * \return status (as string) + * \sa Package::Status + * \sa Package::getStatus() */ + virtual std::string getStatusStr(void); + /** Virtual destructor */ virtual ~Package(); |
|
From: Frederic T. <xf...@us...> - 2007-02-06 17:50:05
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15716 Modified Files: cloptions.cpp Log Message: Querying operations vastly improved. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** cloptions.cpp 5 Feb 2007 20:08:42 -0000 1.16 --- cloptions.cpp 6 Feb 2007 17:49:56 -0000 1.17 *************** *** 37,41 **** typedef enum { ! ActionUndef, ActionInstall, ActionUninstall } OptAction; --- 37,44 ---- typedef enum { ! ActionUndef, ActionInstall, ActionUninstall, ! ActionLLDownload, ActionLLExtract, ActionLLPatch, ! ActionLLPreconfigure, ActionLLRelease, ! ActionLLTestsuite, ActionLLFetch } OptAction; *************** *** 182,185 **** --- 185,189 ---- std::string compiler; std::string options; + std::string tarball; OptDomain domain = DomainUndef; /* help/query/{install/uninstall : manage ?}/bench/version/low-level */ *************** *** 199,204 **** {"uninstall", required_argument, 0, 'U' }, - {"fetch", required_argument, 0, 'f'}, - {"all", 0, 0, 'a' }, --- 203,206 ---- *************** *** 209,216 **** /* {"package-benchmarks-info", 1, 0, 'I' }, */ - {"benchmarks-info", 0, 0, 'L'}, {"host-info", 0, 0, 'H' }, {"programs-info", 0, 0, 'P' }, ! {"compiler-info", 1, 0, 'C' }, {"bench", 1, 0, 'B'}, --- 211,217 ---- /* {"package-benchmarks-info", 1, 0, 'I' }, */ {"host-info", 0, 0, 'H' }, {"programs-info", 0, 0, 'P' }, ! {"compiler-info", 1, 0, 'c' }, {"bench", 1, 0, 'B'}, *************** *** 218,227 **** {"package-download", 1, 0, 'D' }, {"package-extract", 1, 0, 'E' }, ! {"package-patch", 1, 0, 1011 }, ! {"package-preconfigure", 1, 0, 'g' }, ! {"package-test", 1, 0, 't' }, ! {"package-release", 1, 0, 'r' }, ! {"disable-testsuite", 0, 0, 'T' }, ! {"force", 0, 0, 'F' }, { 0, 0, 0, 0} }; --- 219,229 ---- {"package-download", 1, 0, 'D' }, {"package-extract", 1, 0, 'E' }, ! {"package-patch", 1, 0, 'P' }, ! {"package-preconfigure", 1, 0, 'C' }, ! {"package-test", 1, 0, 'T' }, ! {"package-fetch", 1, 0, 'F' }, ! {"package-release", 1, 0, 'R' }, ! {"disable-testsuite", 0, 0, 'S' }, ! {"force", 0, 0, 'f' }, { 0, 0, 0, 0} }; *************** *** 233,237 **** break; ! c = getopt_long (argc, argv, "hviI:f:U:qp::b::aM", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { --- 235,239 ---- break; ! c = getopt_long (argc, argv, "hviI:F:U:qp::b::aMmD:E:P:C:T:R:S:f", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { *************** *** 244,255 **** break; case 'q': ! cbmSingleDomain(&domain, DomainQuery, "v"); ! // optQuery=1; break; case 'h': ! domain=DomainHelp; break; case 'm': ! domain=DomainManage; break; case 'a': --- 246,259 ---- break; case 'q': ! cbmSingleDomain(&domain, DomainQuery, "q"); break; case 'h': ! cbmSingleDomain(&domain, DomainHelp, "h"); break; case 'm': ! cbmSingleDomain(&domain, DomainManage, "m"); ! break; ! case 'M': ! cbmSingleDomain(&domain, DomainLowLevel, "M"); break; case 'a': *************** *** 261,284 **** case 'p': filter.package=1; - filter.benchmark=0; if (optarg) P=cbmOptionsExpectPackage(optarg); break; - /* - case 1011: - P=cbmOptionsExpectPackage(optarg); - if (P) - P->displayBenchmarks(); - parseExitValue=0; - break; - !!! - */ case 'b': - filter.package=0; filter.benchmark=1; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; ! case 'I': action=ActionInstall; --- 265,319 ---- case 'p': filter.package=1; if (optarg) P=cbmOptionsExpectPackage(optarg); break; case 'b': filter.benchmark=1; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; ! case 'D': ! action=ActionLLDownload; ! if (optarg) ! P=cbmOptionsExpectPackage(optarg); ! break; ! case 'E': ! action=ActionLLExtract; ! if (optarg) ! B=cbmOptionsExpectBenchmark(optarg); ! break; ! case 'P': ! action=ActionLLPatch; ! if (optarg) ! B=cbmOptionsExpectBenchmark(optarg); ! break; ! case 'C': ! action=ActionLLPreconfigure; ! if (optarg) ! B=cbmOptionsExpectBenchmark(optarg); ! break; ! case 'T': ! action=ActionLLTestsuite; ! if (optarg) ! B=cbmOptionsExpectBenchmark(optarg); ! break; ! case 'F': ! action=ActionLLFetch; ! P=cbmOptionsExpectPackage(optarg); ! if (!P) ! break; ! if (optind<=argc) { ! tarball=argv[optind-1]; ! } else { ! std::cerr << "tarball missing in argument line" << std::endl; ! parseExitValue=1; ! break; ! } ! break; ! case 'R': ! action=ActionLLRelease; ! if (optarg) ! B=cbmOptionsExpectBenchmark(optarg); ! break; case 'I': action=ActionInstall; *************** *** 289,300 **** P=cbmOptionsExpectPackage(optarg); break; ! case 'L': ! /* cbmSystem->displayAllBenchmarks(); */ /* !!! */ ! parseExitValue=0; ! break; ! case 'T': UO_enableTestSuite=0; break; ! case 'F': UO_force=1; break; --- 324,331 ---- P=cbmOptionsExpectPackage(optarg); break; ! case 'S': UO_enableTestSuite=0; break; ! case 'f': UO_force=1; break; *************** *** 303,311 **** parseExitValue=0; break; ! case 'P': ! /* cbmSystem->displayPrograms(); */ /* !!! */ ! parseExitValue=0; ! break; ! case 'C': C=SC.select((char*) optarg); if (C) { --- 334,338 ---- parseExitValue=0; break; ! case 'c': C=SC.select((char*) optarg); if (C) { *************** *** 322,352 **** } break; ! case 'f': ! P=cbmOptionsExpectPackage(optarg); ! if (!P) ! break; ! if (optind<=argc) { ! P->Fetch(argv[optind-1], UO_force); ! } else { ! std::cerr << "tarball missing in argument line" << std::endl; ! parseExitValue=1; ! break; ! } ! break; ! case 'D': ! P=cbmOptionsExpectPackage(optarg); ! if (P) { ! if (P->downloadURL()!="") { ! parseExitValue=!P->Download(); ! } else { ! CBM::cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); ! } ! } ! break; ! case 'E': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=!P->Extract(UO_force); ! break; case 1011: P=cbmOptionsExpectPackage(optarg); --- 349,365 ---- } break; ! /* case 'f': !!! ! P=cbmOptionsExpectPackage(optarg); ! if (!P) ! break; ! if (optind<=argc) { ! P->Fetch(argv[optind-1], UO_force); ! } else { ! std::cerr << "tarball missing in argument line" << std::endl; ! parseExitValue=1; ! break; ! } ! break; ! */ case 1011: P=cbmOptionsExpectPackage(optarg); *************** *** 445,448 **** --- 458,487 ---- break; case DomainQuery: + if ((filter.all) || (filter.installed)) { + if ((filter.package) && (P)) { + std::cerr << "-p must have no argument when -a or -i is used." << std::endl; + parseExitValue=255; + break; + } + if ((filter.benchmark) && (B)) { + std::cerr << "-b must have no argument when -a or -i is used." << std::endl; + parseExitValue=255; + break; + } + } + + if ((filter.package) && (filter.benchmark)) { + if ((!filter.all) && (!filter.installed) && (P)) { + int i; + int n = P->benchmarkNumber(); + for(i=0; i<n; i++) { + B=P->Benchmark(i); + std::cout << B->Name() << std::endl; + } + parseExitValue=0; + } + break; + } + if (filter.package) { if ((filter.all) && (!filter.installed)) { *************** *** 469,472 **** --- 508,527 ---- parseExitValue=0; } + if ((!filter.all) && (!filter.installed) && (P)) { + std::cout << "Package (PID) : " << P->Name() << std::endl; + std::cout << "Version : " << P->Version() << std::endl; + std::cout << "Size : " << P->Size() << std::endl; + std::cout << "Total size : " << P->totalSize() << std::endl; + std::cout << "Benchmarks : " << P->benchmarkNumber() << std::endl; + std::cout << "Language : " << P->language() << std::endl; + std::cout << "License : " << P->license() << std::endl; + std::cout << "Author : " << P->author() << std::endl; + std::cout << "Testsuite : " << (P->hasTest() ? "Yes" : "No") << std::endl; + std::cout << "Status : " << P->getStatusStr() << std::endl; + std::cout << "Comments : " << std::endl; + std::cout << P->Comments() << std::endl; + parseExitValue=0; + } + } else if (filter.benchmark) { if ((filter.all) && (!filter.installed)) { *************** *** 505,508 **** --- 560,571 ---- parseExitValue=0; } + + if ((!filter.all) && (!filter.installed) && (B)) { + std::cout << "Benchmark (PID) : " << B->Name() << std::endl; + std::cout << "Package (PID) : " << B->Package()->Name() << std::endl; + std::cout << "Comments : " << std::endl; + std::cout << B->Comments() << std::endl; + parseExitValue=0; + } } break; *************** *** 524,527 **** --- 587,616 ---- std::cerr << "action not specified." << std::endl; } + case DomainLowLevel: + switch(action) { + case ActionLLDownload: + if (P->downloadURL()!="") { + parseExitValue=!P->Download(); + } else { + CBM::cbmUI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); + } + break; + case ActionLLExtract: + parseExitValue=!P->Extract(); + break; + case ActionLLPatch: + parseExitValue=!P->Patch(); + break; + case ActionLLPreconfigure: + parseExitValue=!P->PreConfigure(); + break; + case ActionLLRelease: + parseExitValue=!P->Release(); + break; + case ActionLLTestsuite: + parseExitValue=!P->Test(); + break; + } + break; } |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:08:47
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21999 Modified Files: cloptions.cpp Log Message: Banner added. Obsolete include removed. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** cloptions.cpp 5 Feb 2007 20:07:41 -0000 1.15 --- cloptions.cpp 5 Feb 2007 20:08:42 -0000 1.16 *************** *** 1,6 **** #include <cloptions.h> #include <Benchmark/Package.h> #include <Benchmark/Benchmark.h> - // #include <Benchmark/Benchmark-Selector.h> #include <Compiler/Compiler.h> #include <System/System.h> --- 1,13 ---- + /* ---------------------------------------------------------------------------- + $Id$ + + This is free software. + For details, see the GNU Public License in the COPYING file, or + Look http://www.fsf.org + ------------------------------------------------------------------------- */ + #include <cloptions.h> #include <Benchmark/Package.h> #include <Benchmark/Benchmark.h> #include <Compiler/Compiler.h> #include <System/System.h> |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:07:48
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21607 Modified Files: cloptions.cpp Log Message: Many improvements : option categories. Handling refactored. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** cloptions.cpp 31 Jan 2007 20:45:48 -0000 1.14 --- cloptions.cpp 5 Feb 2007 20:07:41 -0000 1.15 *************** *** 17,27 **** using namespace CBM; extern int optind, opterr, optopt; int parseExitValue = -1; - int optQuery = 0; - int optQueryAll = 0; - void cbmOptionsHelp(void) { --- 17,40 ---- using namespace CBM; + typedef enum { + DomainUndef, DomainHelp, DomainQuery, DomainVersion, + DomainManage, DomainLowLevel, DomainBench + } OptDomain; + + typedef struct { + unsigned int all:1; + unsigned int installed:1; + unsigned int package:1; + unsigned int benchmark:1; + } OptFilter; + + typedef enum { + ActionUndef, ActionInstall, ActionUninstall + } OptAction; + extern int optind, opterr, optopt; int parseExitValue = -1; void cbmOptionsHelp(void) { *************** *** 59,62 **** --- 72,87 ---- } + void cbmSingleDomain(OptDomain *domain, OptDomain value, std::string opt) + { + std::string str; + if (*domain!=DomainUndef) { + str="Unexpected option : "; + str+=opt; + CBM::cbmUI->Fatal(str); + } else { + *domain=value; + } + } + void cbmUnknownBenchmark(char *bench) { *************** *** 151,167 **** std::string options; static const struct option long_options[] = { {"help", no_argument, 0, 'h' }, {"version", no_argument, 0, 'v'}, ! {"install", required_argument, 0, 'i' }, {"fetch", required_argument, 0, 'f'}, - {"uninstall", required_argument, 0, 'u' }, - {"query", 0, 0, 'q' }, {"all", 0, 0, 'a' }, {"package", optional_argument, 0, 'p' }, ! {"package-benchmarks-info", 1, 0, 'I' }, {"benchmarks-info", 0, 0, 'L'}, --- 176,204 ---- std::string options; + OptDomain domain = DomainUndef; /* help/query/{install/uninstall : manage ?}/bench/version/low-level */ + OptAction action = ActionUndef; /* (install/uninstall/fetch, etc.) */ + OptFilter filter = { 0 }; /* <empty>/all/installed */ + std::string object_t; /* package/benchmark/host/compiler */ + static const struct option long_options[] = { {"help", no_argument, 0, 'h' }, + {"query", no_argument, 0, 'q' }, {"version", no_argument, 0, 'v'}, ! {"manage", no_argument, 0, 'm'}, ! {"low-level", no_argument, 0, 'M'}, ! {"bench", no_argument, 0, 'B'}, ! {"filter-installed", no_argument, 0, 'i'}, ! {"install", required_argument, 0, 'I' }, ! {"uninstall", required_argument, 0, 'U' }, ! {"fetch", required_argument, 0, 'f'}, {"all", 0, 0, 'a' }, {"package", optional_argument, 0, 'p' }, ! {"benchmark", optional_argument, 0, 'b' }, ! ! /* {"package-benchmarks-info", 1, 0, 'I' }, */ {"benchmarks-info", 0, 0, 'L'}, *************** *** 189,193 **** break; ! c = getopt_long (argc, argv, "hvi:f:u:qp::a", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { --- 226,230 ---- break; ! c = getopt_long (argc, argv, "hviI:f:U:qp::b::aM", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { *************** *** 197,246 **** switch (c) { case 'v': ! std::cout << VERSION << std::endl; ! parseExitValue=0; break; case 'q': ! optQuery=1; break; case 'a': ! optQueryAll=1; break; ! case 'h': ! cbmOptionsHelp(); ! parseExitValue=0; break; case 'p': ! printf("-p optarg=%s\n", optarg); ! if (!optQuery) { ! std::cerr << "-p option requires -q" << std::endl; ! parseExitValue=1; ! break; ! } ! ! if ((optarg) && (!optQueryAll)) { P=cbmOptionsExpectPackage(optarg); - if (P) - P->display(); - parseExitValue=0; - } else { - if (optQueryAll) { - if (optarg) { - std::cerr << "-qap options' set don't expect any argument" << std::endl; - } else { - printf("qap\n"); - // !!! - } - } else { - printf("there %x\n", (unsigned int) optarg); - if (optarg) { - P=cbmOptionsExpectPackage(optarg); - if (P) - P->display(); - parseExitValue=0; - } else { - P=cbmOptionsExpectPackage(optarg); - } - } - } break; /* --- 234,260 ---- switch (c) { case 'v': ! cbmSingleDomain(&domain, DomainVersion, "v"); break; case 'q': ! cbmSingleDomain(&domain, DomainQuery, "v"); ! // optQuery=1; ! break; ! case 'h': ! domain=DomainHelp; ! break; ! case 'm': ! domain=DomainManage; break; case 'a': ! filter.all=1; break; ! case 'i': ! filter.installed=1; break; case 'p': ! filter.package=1; ! filter.benchmark=0; ! if (optarg) P=cbmOptionsExpectPackage(optarg); break; /* *************** *** 253,268 **** !!! */ ! case 'i': P=cbmOptionsExpectPackage(optarg); - if (P) - parseExitValue=P->Install(UO_force); break; ! case 'u': P=cbmOptionsExpectPackage(optarg); - if (P) - parseExitValue=P->Uninstall(); break; case 'L': ! cbmSystem->displayAllBenchmarks(); parseExitValue=0; break; --- 267,287 ---- !!! */ ! case 'b': ! filter.package=0; ! filter.benchmark=1; ! if (optarg) ! B=cbmOptionsExpectBenchmark(optarg); ! break; ! ! case 'I': ! action=ActionInstall; P=cbmOptionsExpectPackage(optarg); break; ! case 'U': ! action=ActionUninstall; P=cbmOptionsExpectPackage(optarg); break; case 'L': ! /* cbmSystem->displayAllBenchmarks(); */ /* !!! */ parseExitValue=0; break; *************** *** 274,282 **** break; case 'H': ! cbmSystem->display(); parseExitValue=0; break; case 'P': ! cbmSystem->displayPrograms(); parseExitValue=0; break; --- 293,301 ---- break; case 'H': ! /* cbmSystem->display(); */ /* !!! */ parseExitValue=0; break; case 'P': ! /* cbmSystem->displayPrograms(); */ /* !!! */ parseExitValue=0; break; *************** *** 284,296 **** C=SC.select((char*) optarg); if (C) { ! C->display(); parseExitValue=0; } else parseExitValue=1; break; ! case 'I': B=cbmOptionsExpectBenchmark(optarg); if (B) { ! B->display(); parseExitValue=0; } --- 303,315 ---- C=SC.select((char*) optarg); if (C) { ! /* C->display(); */ /* !!! */ parseExitValue=0; } else parseExitValue=1; break; ! case 045: /* !!! */ B=cbmOptionsExpectBenchmark(optarg); if (B) { ! /* B->display(); */ /* !!! */ parseExitValue=0; } *************** *** 349,352 **** --- 368,372 ---- break; case 'B': + /* B=cbmOptionsExpectBenchmark(optarg); if (!B) *************** *** 395,398 **** --- 415,419 ---- parseExitValue=0; + */ break; case '?': *************** *** 400,403 **** --- 421,522 ---- } } + + switch(domain) { + case DomainVersion: + if ((!filter.all) && + (!filter.installed) && + (!filter.benchmark) && + (!filter.package) && + (action==ActionUndef)) { + std::cout << VERSION << std::endl; + parseExitValue=0; + } + break; + case DomainHelp: + cbmOptionsHelp(); + parseExitValue=0; + break; + case DomainQuery: + if (filter.package) { + if ((filter.all) && (!filter.installed)) { + int i; + int n = cbmSystem->packageNumber(); + + for(i=0; i<n; i++) { + P=cbmSystem->Package(i); + std::cout << P->Name() << " " << P->Version() << std::endl; + } + parseExitValue=0; + } + + if ((!filter.all) && (filter.installed)) { + int i; + int n = cbmSystem->packageNumber(); + + for(i=0; i<n; i++) { + P=cbmSystem->Package(i); + if (P->getStatus()>=CBM::Package::Preconfigured) { + std::cout << P->Name() << " " << P->Version() << std::endl; + } + } + parseExitValue=0; + } + } else if (filter.benchmark) { + if ((filter.all) && (!filter.installed)) { + int i; + int n = cbmSystem->packageNumber(); + int j; + int m; + + for(i=0; i<n; i++) { + P=cbmSystem->Package(i); + m=P->benchmarkNumber(); + for(j=0; j<m; j++) { + B=P->Benchmark(j); + std::cout << B->Name() << std::endl; + } + } + parseExitValue=0; + } + + if ((!filter.all) && (filter.installed)) { + int i; + int n = cbmSystem->packageNumber(); + int j; + int m; + + for(i=0; i<n; i++) { + P=cbmSystem->Package(i); + if (P->getStatus()>=CBM::Package::Preconfigured) { + m=P->benchmarkNumber(); + for(j=0; j<m; j++) { + B=P->Benchmark(j); + std::cout << B->Name() << std::endl; + } + } + } + parseExitValue=0; + } + } + break; + case DomainManage: + switch(action) { + case ActionInstall: + if (P) + parseExitValue=!P->Install(UO_force); + break; + case ActionUninstall: + if (P) { + parseExitValue=!P->Uninstall(); + if (parseExitValue) { + std::cerr << "Can't uninstall package." << std::endl; + } + } + break; + case ActionUndef: + std::cerr << "action not specified." << std::endl; + } + } + cbmSystem->done(); exit(parseExitValue); |
|
From: Frederic T. <xf...@us...> - 2007-02-05 20:05:31
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20572 Modified Files: Plan.cpp Log Message: Preliminary usage of CBM::Result Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Plan.cpp 25 Jan 2007 22:08:46 -0000 1.4 --- Plan.cpp 5 Feb 2007 20:05:14 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- #include <Base/Config.h> #include <Base/XML.h> + #include <Base/Result.h> using namespace CBM; *************** *** 293,296 **** --- 294,303 ---- 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()) { *************** *** 303,310 **** if (!simule) { O=new CBM::CompilerOptions(o); P->Configure(C, O); ! P->Make(); ! B->Bench(); delete(O); } --- 310,338 ---- if (!simule) { + bmValue="0"; + buildTime="0"; + executionTime="0"; + tested="0"; + testOk="0"; + O=new CBM::CompilerOptions(o); P->Configure(C, O); ! if (P->Make()) { ! buildTime=P->buildTime(); ! if (P->hasTest()) { ! tested="1"; ! } ! ! if (P->Test()) { ! testOk="1"; ! } ! ! bmValue=B->Bench(); ! } ! result=new CBM::Result(bmValue, ! buildTime, ! executionTime, ! tested, ! testOk); delete(O); } |
