[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.libwrapper.h, 1.5, 1.6 Be
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.libwrapper.h, 1.5, 1.6 Benchmark-BENCHPPLINUX.libwrapper.h, 1.5, 1.6 Benchmark-BZIP2.libwrapper.h, 1.5, 1.6 Benchmark-GZIP.libwrapper.h, 1.5, 1.6 Benchmark-LINPACKC.libwrapper.h, 1.6, 1.7 Benchmark-NBENCH.libwrapper.h, 1.5, 1.6 Benchmark-SCIMARK2.libwrapper.h, 1.5, 1.6
|
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); |
