[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.2, 1.3 Benchmark-BE
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.2, 1.3 Benchmark-BENCHPP.h, 1.2, 1.3 Benchmark-BENCHPP.libwrapper.h, 1.1, 1.2 Benchmark-BENCHPPLINUX.cpp, 1.3, 1.4 Benchmark-BENCHPPLINUX.h, 1.2, 1.3 Benchmark-BENCHPPLINUX.libwrapper.h, 1.1, 1.2 Benchmark-BZIP2.cpp, 1.3, 1.4 Benchmark-BZIP2.h, 1.2, 1.3 Benchmark-BZIP2.libwrapper.h, 1.1, 1.2 Benchmark-GZIP.cpp, 1.3, 1.4 Benchmark-GZIP.h, 1.2, 1.3 Benchmark-GZIP.libwrapper.h, 1.1, 1.2 Benchmark-LINPACKC.cpp, 1.2, 1.3 Benchmark-LINPACKC.h, 1.2, 1.3 Benchmark-LINPACKC.libwrapper.h, 1.1, 1.2 Benchmark-NBENCH.h, 1.2, 1.3 Benchmark-NBENCH.libwrapper.h, 1.1, 1.2 Benchmark-SCIMARK2.cpp, 1.2, 1.3 Benchmark-SCIMARK2.h, 1.2, 1.3 Benchmark-SCIMARK2.libwrapper.h, 1.1, 1.2
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24946 Modified Files: Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h Log Message: Improvements and adapations for CBMPackage and new related API usage. Index: Benchmark-BENCHPP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-BENCHPP.cpp 3 Jan 2007 19:15:51 -0000 1.2 --- Benchmark-BENCHPP.cpp 3 Jan 2007 22:06:26 -0000 1.3 *************** *** 28,41 **** } - std::string CBMPackageBENCHPP::benchmarkComments(void) - { - std::string comment; - - comment+=benchmarkBENCHPPComments(); - comment+=" (Comment from README file)"; - - return(comment); - } - std::string CBMPackageBENCHPP::packageVersion(void) { --- 28,31 ---- *************** *** 241,244 **** --- 231,244 ---- } + std::string CBMBenchmarkBENCHPP::benchmarkComments(void) + { + std::string comment; + + comment+=benchmarkBENCHPPComments(); + comment+=" (Comment from README file)"; + + return(comment); + } + std::string CBMBenchmarkBENCHPP::bench(void) { Index: Benchmark-NBENCH.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-NBENCH.h 3 Jan 2007 18:53:17 -0000 1.2 --- Benchmark-NBENCH.h 3 Jan 2007 22:06:27 -0000 1.3 *************** *** 31,38 **** protected: - - CBMPackageNBENCH(class CBMSystem *_system); - DLPackageWrapper_declare(); - virtual std::string language(void); --- 31,34 ---- *************** *** 48,51 **** --- 44,50 ---- public: + CBMPackageNBENCH(class CBMSystem *_system); + DLPackageWrapper_declare(); + virtual std::string license(void); virtual std::string homePage(void); Index: Benchmark-NBENCH.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-NBENCH.libwrapper.h 28 Dec 2006 17:41:04 -0000 1.1 --- Benchmark-NBENCH.libwrapper.h 3 Jan 2007 22:06:27 -0000 1.2 *************** *** 1,108 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkNBENCH_NUMSORT(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkNBENCH_STRINGSORT(_system)); ! ;; ! case 2: ! return(new CBMBenchmarkNBENCH_BITFIELD(_system)); ! ;; ! case 3: ! return(new CBMBenchmarkNBENCH_EMF(_system)); ! ;; ! case 4: ! return(new CBMBenchmarkNBENCH_FOURIER(_system)); ! ;; ! case 5: ! return(new CBMBenchmarkNBENCH_ASSIGN(_system)); ! ;; ! case 6: ! return(new CBMBenchmarkNBENCH_HUFFMAN(_system)); ! ;; ! case 7: ! return(new CBMBenchmarkNBENCH_IDEA(_system)); ! ;; ! case 8: ! return(new CBMBenchmarkNBENCH_NNET(_system)); ! ;; ! case 9: ! return(new CBMBenchmarkNBENCH_LU(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="nbench-numsort") { ! return(new CBMBenchmarkNBENCH_NUMSORT(_system)); ! } ! ! if (tmp=="nbench-stringsort") { ! return(new CBMBenchmarkNBENCH_STRINGSORT(_system)); ! } ! ! if (tmp=="nbench-bitfield") { ! return(new CBMBenchmarkNBENCH_BITFIELD(_system)); ! } ! ! if (tmp=="nbench-emf") { ! return(new CBMBenchmarkNBENCH_EMF(_system)); ! } ! ! if (tmp=="nbench-fourier") { ! return(new CBMBenchmarkNBENCH_FOURIER(_system)); ! } ! ! if (tmp=="nbench-assign") { ! return(new CBMBenchmarkNBENCH_ASSIGN(_system)); ! } ! ! if (tmp=="nbench-huffman") { ! return(new CBMBenchmarkNBENCH_HUFFMAN(_system)); ! } ! ! if (tmp=="nbench-idea") { ! return(new CBMBenchmarkNBENCH_IDEA(_system)); ! } ! ! if (tmp=="nbench-nnet") { ! return(new CBMBenchmarkNBENCH_NNET(_system)); ! } ! ! if (tmp=="nbench-lu") { ! return(new CBMBenchmarkNBENCH_LU(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(10); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; - - result.push_back("nbench-numsort"); - result.push_back("nbench-stringsort"); - result.push_back("nbench-bitfield"); - result.push_back("nbench-emf"); - result.push_back("nbench-fourier"); - result.push_back("nbench-assign"); - result.push_back("nbench-huffman"); - result.push_back("nbench-idea"); - result.push_back("nbench-nnet"); - result.push_back("nbench-lu"); ! return(result); } ! --- 1,61 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! #include <UI/UI.h> ! BenchmarkVector& CBMPackageNBENCH::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); } ! CBMBenchmark *CBMPackageNBENCH::Benchmark(std::string bid) { ! if (bid == "nbench-stringsort") { ! return(new CBMBenchmarkNBENCH_STRINGSORT(this)); ! } ! if (bid == "nbench-lu") { ! return(new CBMBenchmarkNBENCH_LU(this)); ! } ! if (bid == "nbench-assign") { ! return(new CBMBenchmarkNBENCH_ASSIGN(this)); ! } ! if (bid == "nbench-numsort") { ! return(new CBMBenchmarkNBENCH_NUMSORT(this)); ! } ! if (bid == "nbench-fourier") { ! return(new CBMBenchmarkNBENCH_FOURIER(this)); ! } ! if (bid == "nbench-bitfield") { ! return(new CBMBenchmarkNBENCH_BITFIELD(this)); ! } ! if (bid == "nbench-emf") { ! return(new CBMBenchmarkNBENCH_EMF(this)); ! } ! if (bid == "nbench-huffman") { ! return(new CBMBenchmarkNBENCH_HUFFMAN(this)); ! } ! if (bid == "nbench-nnet") { ! return(new CBMBenchmarkNBENCH_NNET(this)); ! } ! if (bid == "nbench-idea") { ! return(new CBMBenchmarkNBENCH_IDEA(this)); ! } ! UI->Fatal("Unknown benchmark"); ! return(0); } ! CBMPackage *package_NBENCH = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_NBENCH) { ! package_NBENCH=new CBMPackageNBENCH(cbmSystem); ! cbmlib_packages.push_back(package_NBENCH); ! } ! return(package_NBENCH); ! } Index: Benchmark-SCIMARK2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-SCIMARK2.h 3 Jan 2007 19:04:46 -0000 1.2 --- Benchmark-SCIMARK2.h 3 Jan 2007 22:06:27 -0000 1.3 *************** *** 23,27 **** virtual std::string packageName(void); - virtual std::string benchmarkName(void) = 0; virtual std::string packageVersion(void); --- 23,26 ---- *************** *** 66,69 **** --- 65,69 ---- CBMBenchmarkSCIMARK2(CBMPackage *_package); virtual std::string benchmarkComments(void); + virtual std::string benchmarkName(void) = 0; virtual std::string benchmarkSCIMARK2Comments(void) = 0; virtual std::string scimark2BenchmarkLabel(void) = 0; Index: Benchmark-GZIP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-GZIP.libwrapper.h 28 Dec 2006 17:41:03 -0000 1.1 --- Benchmark-GZIP.libwrapper.h 3 Jan 2007 22:06:27 -0000 1.2 *************** *** 1,44 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkGZIP1(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkGZIP9(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="gzip-1c") { ! return(new CBMBenchmarkGZIP1(_system)); ! } ! ! if (tmp=="gzip-9c") { ! return(new CBMBenchmarkGZIP9(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(2); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; - - result.push_back("gzip-1c"); - result.push_back("gzip-9c"); ! return(result); } ! --- 1,29 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! #include <UI/UI.h> ! BenchmarkVector& CBMPackageGZIP::Benchmarks(void) { ! if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("gzip-9c"); ! benchmarks.push_back("gzip-1c"); ! return(benchmarks); } ! CBMBenchmark *CBMPackageGZIP::Benchmark(std::string bid) { ! if (bid == "gzip-9c") { ! return(new CBMBenchmarkGZIP9(this)); ! } ! if (bid == "gzip-1c") { ! return(new CBMBenchmarkGZIP1(this)); ! } ! UI->Fatal("Unknown benchmark"); ! return(0); } ! CBMPackage *package_GZIP = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_GZIP) { ! package_GZIP=new CBMPackageGZIP(cbmSystem); ! cbmlib_packages.push_back(package_GZIP); ! } ! return(package_GZIP); ! } Index: Benchmark-LINPACKC.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-LINPACKC.libwrapper.h 28 Dec 2006 17:41:03 -0000 1.1 --- Benchmark-LINPACKC.libwrapper.h 3 Jan 2007 22:06:27 -0000 1.2 *************** *** 1,60 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkLINPACKC_SP_UNROLL(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkLINPACKC_SP_ROLL(_system)); ! ;; ! case 2: ! return(new CBMBenchmarkLINPACKC_DP_UNROLL(_system)); ! ;; ! case 3: ! return(new CBMBenchmarkLINPACKC_DP_ROLL(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="linpackc-sp-unroll") { ! return(new CBMBenchmarkLINPACKC_SP_UNROLL(_system)); ! } ! ! if (tmp=="linpackc-sp-roll") { ! return(new CBMBenchmarkLINPACKC_SP_ROLL(_system)); ! } ! ! if (tmp=="linpackc-dp-unroll") { ! return(new CBMBenchmarkLINPACKC_DP_UNROLL(_system)); ! } ! ! if (tmp=="linpackc-dp-roll") { ! return(new CBMBenchmarkLINPACKC_DP_ROLL(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(4); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; ! result.push_back("linpackc-sp-unroll"); ! result.push_back("linpackc-sp-roll"); ! result.push_back("linpackc-dp-unroll"); ! result.push_back("linpackc-dp-roll"); ! ! return(result); } - - --- 1,19 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! BenchmarkVector& CBMPackageLINPACKC::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); } ! CBMPackage *package_LINPACKC = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_LINPACKC) { ! package_LINPACKC=new CBMPackageLINPACKC(cbmSystem); ! cbmlib_packages.push_back(package_LINPACKC); ! } ! return(package_LINPACKC); } Index: Benchmark-GZIP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-GZIP.h 3 Jan 2007 18:49:56 -0000 1.2 --- Benchmark-GZIP.h 3 Jan 2007 22:06:27 -0000 1.3 *************** *** 39,43 **** DLPackageWrapper_declare(); - virtual std::string benchmarkProgram(void); virtual std::string license(void); virtual std::string homePage(void); --- 39,42 ---- *************** *** 49,55 **** }; /** \brief Defines the gzip benchmark using fastest compression level. */ ! class CBMBenchmarkGZIP1 : public CBMBenchmarkxZIP { protected: --- 48,63 ---- }; + /** \brief Abstract class for gzip benchmarks */ + class CBMBenchmarkGZIP : public CBMBenchmarkxZIP + { + protected: + CBMBenchmarkGZIP(CBMPackage *_package); + virtual std::string benchmarkProgram(void); + virtual ~CBMBenchmarkGZIP(); + }; + /** \brief Defines the gzip benchmark using fastest compression level. */ ! class CBMBenchmarkGZIP1 : public CBMBenchmarkGZIP { protected: *************** *** 65,69 **** /** \brief Defines the gzip benchmark using maximum compression level. */ ! class CBMBenchmarkGZIP9 : public CBMBenchmarkxZIP { protected: --- 73,77 ---- /** \brief Defines the gzip benchmark using maximum compression level. */ ! class CBMBenchmarkGZIP9 : public CBMBenchmarkGZIP { protected: Index: Benchmark-BENCHPPLINUX.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-BENCHPPLINUX.h 3 Jan 2007 19:56:16 -0000 1.2 --- Benchmark-BENCHPPLINUX.h 3 Jan 2007 22:06:26 -0000 1.3 *************** *** 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 + ------------------------------------------------------------------------- */ + #ifndef H_CBMBENCHMARKBENCHPPLINUX #define H_CBMBENCHMARKBENCHPPLINUX Index: Benchmark-BZIP2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BZIP2.cpp 3 Jan 2007 18:49:56 -0000 1.3 --- Benchmark-BZIP2.cpp 3 Jan 2007 22:06:26 -0000 1.4 *************** *** 122,130 **** } - std::string CBMPackageBZIP2::benchmarkProgram(void) - { - return("bzip2"); - } - std::string CBMPackageBZIP2::license(void) { --- 122,125 ---- *************** *** 150,156 **** { } CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMPackage *_package) ! : CBMBenchmarkxZIP(_package) { } --- 145,165 ---- { } + + CBMBenchmarkBZIP2::CBMBenchmarkBZIP2(CBMPackage *_package) + : CBMBenchmarkxZIP(_package) + { + } + + std::string CBMBenchmarkBZIP2::benchmarkProgram(void) + { + return("bzip2"); + } + + CBMBenchmarkBZIP2::~CBMBenchmarkBZIP2() + { + } CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMPackage *_package) ! : CBMBenchmarkBZIP2(_package) { } *************** *** 176,180 **** CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMPackage *_package) ! : CBMBenchmarkxZIP(_package) { } --- 185,189 ---- CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMPackage *_package) ! : CBMBenchmarkBZIP2(_package) { } Index: Benchmark-GZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-GZIP.cpp 3 Jan 2007 18:49:56 -0000 1.3 --- Benchmark-GZIP.cpp 3 Jan 2007 22:06:26 -0000 1.4 *************** *** 77,85 **** } - std::string CBMPackageGZIP::benchmarkProgram(void) - { - return("gzip"); - } - std::string CBMPackageGZIP::license(void) { --- 77,80 ---- *************** *** 105,114 **** { } ! ! CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMPackage *_package) : CBMBenchmarkxZIP(_package) { } std::string CBMBenchmarkGZIP1::benchmarkName(void) { --- 100,123 ---- { } ! ! CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMPackage *_package) : CBMBenchmarkxZIP(_package) { } + std::string CBMBenchmarkGZIP::benchmarkProgram(void) + { + return("gzip"); + } + + CBMBenchmarkGZIP::~CBMBenchmarkGZIP() + { + } + + CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMPackage *_package) + : CBMBenchmarkGZIP(_package) + { + } + std::string CBMBenchmarkGZIP1::benchmarkName(void) { *************** *** 131,135 **** CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMPackage *_package) ! : CBMBenchmarkxZIP(_package) { } --- 140,144 ---- CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMPackage *_package) ! : CBMBenchmarkGZIP(_package) { } Index: Benchmark-BENCHPPLINUX.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-BENCHPPLINUX.cpp 3 Jan 2007 19:56:16 -0000 1.3 --- Benchmark-BENCHPPLINUX.cpp 3 Jan 2007 22:06:26 -0000 1.4 *************** *** 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 <SupportedBenchmarks/Benchmark-BENCHPPLINUX.h> #include <System/System.h> Index: Benchmark-BENCHPP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-BENCHPP.libwrapper.h 28 Dec 2006 17:41:02 -0000 1.1 --- Benchmark-BENCHPP.libwrapper.h 3 Jan 2007 22:06:26 -0000 1.2 *************** *** 1,52 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkBENCHPP_DHRYSTONE(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkBENCHPP_WHETSTONE(_system)); ! ;; ! case 2: ! return(new CBMBenchmarkBENCHPP_STEPANOV_AL12(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="benchpp-dhrystone") { ! return(new CBMBenchmarkBENCHPP_DHRYSTONE(_system)); ! } ! ! if (tmp=="benchpp-whetstone") { ! return(new CBMBenchmarkBENCHPP_WHETSTONE(_system)); ! } ! ! if (tmp=="benchpp-stepanov-al12") { ! return(new CBMBenchmarkBENCHPP_STEPANOV_AL12(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(3); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; - - result.push_back("benchpp-dhrystone"); - result.push_back("benchpp-whetstone"); - result.push_back("benchpp-stepanov-al12"); ! return(result); } ! --- 1,33 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! #include <UI/UI.h> ! BenchmarkVector& CBMPackageBENCHPP::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); } ! CBMBenchmark *CBMPackageBENCHPP::Benchmark(std::string bid) { ! if (bid == "benchpp-stepanov-al12") { ! return(new CBMBenchmarkBENCHPP_STEPANOV_AL12(this)); ! } ! if (bid == "benchpp-whetstone") { ! return(new CBMBenchmarkBENCHPP_WHETSTONE(this)); ! } ! if (bid == "benchpp-dhrystone") { ! return(new CBMBenchmarkBENCHPP_DHRYSTONE(this)); ! } ! UI->Fatal("Unknown benchmark"); ! return(0); } ! CBMPackage *package_BENCHPP = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_BENCHPP) { ! package_BENCHPP=new CBMPackageBENCHPP(cbmSystem); ! cbmlib_packages.push_back(package_BENCHPP); ! } ! return(package_BENCHPP); ! } Index: Benchmark-BZIP2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-BZIP2.libwrapper.h 28 Dec 2006 17:41:02 -0000 1.1 --- Benchmark-BZIP2.libwrapper.h 3 Jan 2007 22:06:26 -0000 1.2 *************** *** 1,44 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkBZIP21(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkBZIP29(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="bzip2-1c") { ! return(new CBMBenchmarkBZIP21(_system)); ! } ! ! if (tmp=="bzip2-9c") { ! return(new CBMBenchmarkBZIP29(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(2); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; - - result.push_back("bzip2-1c"); - result.push_back("bzip2-9c"); ! return(result); } ! --- 1,29 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! #include <UI/UI.h> ! BenchmarkVector& CBMPackageBZIP2::Benchmarks(void) { ! if (benchmarks.size()) return(benchmarks); ! benchmarks.push_back("bzip2-1c"); ! benchmarks.push_back("bzip2-9c"); ! return(benchmarks); } ! CBMBenchmark *CBMPackageBZIP2::Benchmark(std::string bid) { ! if (bid == "bzip2-1c") { ! return(new CBMBenchmarkBZIP21(this)); ! } ! if (bid == "bzip2-9c") { ! return(new CBMBenchmarkBZIP29(this)); ! } ! UI->Fatal("Unknown benchmark"); ! return(0); } ! CBMPackage *package_BZIP2 = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_BZIP2) { ! package_BZIP2=new CBMPackageBZIP2(cbmSystem); ! cbmlib_packages.push_back(package_BZIP2); ! } ! return(package_BZIP2); ! } Index: Benchmark-BENCHPP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-BENCHPP.h 3 Jan 2007 19:15:51 -0000 1.2 --- Benchmark-BENCHPP.h 3 Jan 2007 22:06:26 -0000 1.3 *************** *** 23,28 **** virtual std::string packageName(void); - virtual std::string benchmarkName(void) = 0; - virtual std::string benchmarkComments(void); virtual std::string packageVersion(void); --- 23,26 ---- *************** *** 35,40 **** virtual std::string language(void); - virtual std::string benchmarkBENCHPPComments(void) = 0; - virtual char* extractDirectory(void); virtual int hasPatch(void); --- 33,36 ---- *************** *** 68,71 **** --- 64,70 ---- protected: CBMBenchmarkBENCHPP(CBMPackage *_package); + virtual std::string benchmarkComments(void); + virtual std::string benchmarkBENCHPPComments(void) = 0; + virtual std::string benchmarkName(void) = 0; virtual std::string benchppBenchmark(void) = 0; virtual std::string bench(void); Index: Benchmark-SCIMARK2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-SCIMARK2.cpp 3 Jan 2007 19:04:46 -0000 1.2 --- Benchmark-SCIMARK2.cpp 3 Jan 2007 22:06:27 -0000 1.3 *************** *** 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 <SupportedBenchmarks/Benchmark-SCIMARK2.h> #include <System/System.h> *************** *** 198,204 **** } - - - CBMBenchmarkSCIMARK2::CBMBenchmarkSCIMARK2(CBMPackage *_package) : CBMBenchmark(_package) --- 206,209 ---- Index: Benchmark-BENCHPPLINUX.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-BENCHPPLINUX.libwrapper.h 28 Dec 2006 17:41:02 -0000 1.1 --- Benchmark-BENCHPPLINUX.libwrapper.h 3 Jan 2007 22:06:26 -0000 1.2 *************** *** 1,308 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkBENCHPPLINUX_DHRYSTONE(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkBENCHPPLINUX_WHETSTONE(_system)); ! ;; ! case 2: ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(_system)); ! ;; ! case 3: ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_IF(_system)); ! ;; ! case 4: ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(_system)); ! ;; ! case 5: ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(_system)); ! ;; ! case 6: ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(_system)); ! ;; ! case 7: ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(_system)); ! ;; ! case 8: ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(_system)); ! ;; ! case 9: ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_VFC(_system)); ! ;; ! case 10: ! return(new CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(_system)); ! ;; ! case 11: ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS(_system)); ! ;; ! case 12: ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(_system)); ! ;; ! case 13: ! return(new CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(_system)); ! ;; ! case 14: ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP(_system)); ! ;; ! case 15: ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(_system)); ! ;; ! case 16: ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE(_system)); ! ;; ! case 17: ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(_system)); ! ;; ! case 18: ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE(_system)); ! ;; ! case 19: ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(_system)); ! ;; ! case 20: ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY(_system)); ! ;; ! case 21: ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(_system)); ! ;; ! case 22: ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION(_system)); ! ;; ! case 23: ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(_system)); ! ;; ! case 24: ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR(_system)); ! ;; ! case 25: ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(_system)); ! ;; ! case 26: ! return(new CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(_system)); ! ;; ! case 27: ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE(_system)); ! ;; ! case 28: ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(_system)); ! ;; ! case 29: ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(_system)); ! ;; ! case 30: ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(_system)); ! ;; ! case 31: ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE(_system)); ! ;; ! case 32: ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(_system)); ! ;; ! case 33: ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS(_system)); ! ;; ! case 34: ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="benchpplinux-dhrystone") { ! return(new CBMBenchmarkBENCHPPLINUX_DHRYSTONE(_system)); ! } ! ! if (tmp=="benchpplinux-whetstone") { ! return(new CBMBenchmarkBENCHPPLINUX_WHETSTONE(_system)); ! } ! ! if (tmp=="benchpplinux-bool-assign") { ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(_system)); ! } ! ! if (tmp=="benchpplinux-bool-if") { ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_IF(_system)); ! } ! ! if (tmp=="benchpplinux-2wifelse") { ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(_system)); ! } ! ! if (tmp=="benchpplinux-2wswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(_system)); ! } ! ! if (tmp=="benchpplinux-10wifelse") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(_system)); ! } ! ! if (tmp=="benchpplinux-10wswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(_system)); ! } ! ! if (tmp=="benchpplinux-10wsparseswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(_system)); ! } ! ! if (tmp=="benchpplinux-10wvfc") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_VFC(_system)); ! } ! ! if (tmp=="benchpplinux-packedbitarray") { ! return(new CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(_system)); ! } ! ! if (tmp=="benchpplinux-bitfields") { ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS(_system)); ! } ! ! if (tmp=="benchpplinux-bitfields-pba") { ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(_system)); ! } ! ! if (tmp=="benchpplinux-packunpackobjets") { ! return(new CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(_system)); ! } ! ! if (tmp=="benchpplinux-constantpropagation") { ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP(_system)); ! } ! ! if (tmp=="benchpplinux-constantpropagation-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(_system)); ! } ! ! if (tmp=="benchpplinux-localcommonse") { ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE(_system)); ! } ! ! if (tmp=="benchpplinux-localcommonse-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(_system)); ! } ! ! if (tmp=="benchpplinux-globalcommonse") { ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE(_system)); ! } ! ! if (tmp=="benchpplinux-globalcommonse-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(_system)); ! } ! ! if (tmp=="benchpplinux-unneccopy") { ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY(_system)); ! } ! ! if (tmp=="benchpplinux-unneccopy-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(_system)); ! } ! ! if (tmp=="benchpplinux-codemotion") { ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION(_system)); ! } ! ! if (tmp=="benchpplinux-codemotion-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(_system)); ! } ! ! if (tmp=="benchpplinux-inducvar") { ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR(_system)); ! } ! ! if (tmp=="benchpplinux-inducvar-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(_system)); ! } ! ! if (tmp=="benchpplinux-reducstrength-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(_system)); ! } ! ! if (tmp=="benchpplinux-deadcode") { ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE(_system)); ! } ! ! if (tmp=="benchpplinux-deadcode-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(_system)); ! } ! ! if (tmp=="benchpplinux-loopjamming") { ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(_system)); ! } ! ! if (tmp=="benchpplinux-loopjamming-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(_system)); ! } ! ! if (tmp=="benchpplinux-reduncode") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE(_system)); ! } ! ! if (tmp=="benchpplinux-reduncode-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(_system)); ! } ! ! if (tmp=="benchpplinux-stringops") { ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS(_system)); ! } ! ! if (tmp=="benchpplinux-stringops-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(35); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; ! result.push_back("benchpplinux-dhrystone"); ! result.push_back("benchpplinux-whetstone"); ! result.push_back("benchpplinux-bool-assign"); ! result.push_back("benchpplinux-bool-if"); ! result.push_back("benchpplinux-2wifelse"); ! result.push_back("benchpplinux-2wswitch"); ! result.push_back("benchpplinux-10wifelse"); ! result.push_back("benchpplinux-10wswitch"); ! result.push_back("benchpplinux-10wsparseswitch"); ! result.push_back("benchpplinux-10wvfc"); ! result.push_back("benchpplinux-packedbitarray"); ! result.push_back("benchpplinux-bitfields"); ! result.push_back("benchpplinux-bitfields-pba"); ! result.push_back("benchpplinux-packunpackobjets"); ! result.push_back("benchpplinux-constantpropagation"); ! result.push_back("benchpplinux-constantpropagation-ho"); ! result.push_back("benchpplinux-localcommonse"); ! result.push_back("benchpplinux-localcommonse-ho"); ! result.push_back("benchpplinux-globalcommonse"); ! result.push_back("benchpplinux-globalcommonse-ho"); ! result.push_back("benchpplinux-unneccopy"); ! result.push_back("benchpplinux-unneccopy-ho"); ! result.push_back("benchpplinux-codemotion"); ! result.push_back("benchpplinux-codemotion-ho"); ! result.push_back("benchpplinux-inducvar"); ! result.push_back("benchpplinux-inducvar-ho"); ! result.push_back("benchpplinux-reducstrength-ho"); ! result.push_back("benchpplinux-deadcode"); ! result.push_back("benchpplinux-deadcode-ho"); ! result.push_back("benchpplinux-loopjamming"); ! result.push_back("benchpplinux-loopjamming-ho"); ! result.push_back("benchpplinux-reduncode"); ! result.push_back("benchpplinux-reduncode-ho"); ! result.push_back("benchpplinux-stringops"); ! result.push_back("benchpplinux-stringops-ho"); ! ! return(result); } ! --- 1,161 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! #include <UI/UI.h> ! BenchmarkVector& CBMPackageBENCHPPLINUX::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); } ! CBMBenchmark *CBMPackageBENCHPPLINUX::Benchmark(std::string bid) { ! if (bid == "benchpplinux-bool-assign") { ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(this)); ! } ! if (bid == "benchpplinux-constantpropagation") { ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP(this)); ! } ! if (bid == "benchpplinux-10wsparseswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(this)); ! } ! if (bid == "benchpplinux-dhrystone") { ! return(new CBMBenchmarkBENCHPPLINUX_DHRYSTONE(this)); ! } ! if (bid == "benchpplinux-inducvar-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(this)); ! } ! if (bid == "benchpplinux-loopjamming-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(this)); ! } ! if (bid == "benchpplinux-codemotion") { ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION(this)); ! } ! if (bid == "benchpplinux-10wvfc") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_VFC(this)); ! } ! if (bid == "benchpplinux-2wifelse") { ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(this)); ! } ! if (bid == "benchpplinux-globalcommonse-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(this)); ! } ! if (bid == "benchpplinux-bitfields") { ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS(this)); ! } ! if (bid == "benchpplinux-globalcommonse") { ! return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE(this)); ! } ! if (bid == "benchpplinux-2wswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(this)); ! } ! if (bid == "benchpplinux-inducvar") { ! return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR(this)); ! } ! if (bid == "benchpplinux-bitfields-pba") { ! return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(this)); ! } ! if (bid == "benchpplinux-deadcode") { ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE(this)); ! } ! if (bid == "benchpplinux-reduncode-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(this)); ! } ! if (bid == "benchpplinux-10wifelse") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(this)); ! } ! if (bid == "benchpplinux-unneccopy-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(this)); ! } ! if (bid == "benchpplinux-10wswitch") { ! return(new CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(this)); ! } ! if (bid == "benchpplinux-packunpackobjets") { ! return(new CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(this)); ! } ! if (bid == "benchpplinux-bool-if") { ! return(new CBMBenchmarkBENCHPPLINUX_BOOL_IF(this)); ! } ! if (bid == "benchpplinux-unneccopy") { ! return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY(this)); ! } ! if (bid == "benchpplinux-reducstrength-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(this)); ! } ! if (bid == "benchpplinux-deadcode-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(this)); ! } ! if (bid == "benchpplinux-reduncode") { ! return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE(this)); ! } ! if (bid == "benchpplinux-constantpropagation-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(this)); ! } ! if (bid == "benchpplinux-codemotion-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(this)); ! } ! if (bid == "benchpplinux-whetstone") { ! return(new CBMBenchmarkBENCHPPLINUX_WHETSTONE(this)); ! } ! if (bid == "benchpplinux-stringops") { ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS(this)); ! } ! if (bid == "benchpplinux-localcommonse-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(this)); ! } ! if (bid == "benchpplinux-localcommonse") { ! return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE(this)); ! } ! if (bid == "benchpplinux-stringops-ho") { ! return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(this)); ! } ! if (bid == "benchpplinux-packedbitarray") { ! return(new CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(this)); ! } ! if (bid == "benchpplinux-loopjamming") { ! return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(this)); ! } ! UI->Fatal("Unknown benchmark"); ! return(0); } ! CBMPackage *package_BENCHPPLINUX = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_BENCHPPLINUX) { ! package_BENCHPPLINUX=new CBMPackageBENCHPPLINUX(cbmSystem); ! cbmlib_packages.push_back(package_BENCHPPLINUX); ! } ! return(package_BENCHPPLINUX); ! } Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-LINPACKC.cpp 3 Jan 2007 20:05:20 -0000 1.2 --- Benchmark-LINPACKC.cpp 3 Jan 2007 22:06:27 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- #include <SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h> + // !!! CBMPackageLINPACKC::CBMPackageLINPACKC(CBMSystem *_system) *************** *** 26,38 **** } - std::string CBMPackageLINPACKC::benchmarkComments(void) - { - std::string comment; - - comment="linpackc benchmark with specific compilation options :"; - comment+=benchmarkLINPACKCComments(); - return(comment); - } - std::string CBMPackageLINPACKC::packageVersion(void) { --- 27,30 ---- *************** *** 46,50 **** int CBMPackageLINPACKC::ContextMatches(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { std::string localFlags; --- 38,42 ---- int CBMPackageLINPACKC::ContextMatches(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) { std::string localFlags; *************** *** 260,263 **** --- 252,265 ---- } + std::string CBMBenchmarkLINPACKC::benchmarkComments(void) + { + std::string comment; + + comment="linpackc benchmark with specific compilation options :"; + comment+=benchmarkLINPACKCComments(); + return(comment); + } + + std::string CBMBenchmarkLINPACKC::bench(void) { Index: Benchmark-SCIMARK2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-SCIMARK2.libwrapper.h 28 Dec 2006 17:41:04 -0000 1.1 --- Benchmark-SCIMARK2.libwrapper.h 3 Jan 2007 22:06:27 -0000 1.2 *************** *** 1,68 **** ! CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system) ! { ! switch(idx) { ! case 0: ! return(new CBMBenchmarkSCIMARK2_FOURIER(_system)); ! ;; ! case 1: ! return(new CBMBenchmarkSCIMARK2_SOR(_system)); ! ;; ! case 2: ! return(new CBMBenchmarkSCIMARK2_MC(_system)); ! ;; ! case 3: ! return(new CBMBenchmarkSCIMARK2_SMM(_system)); ! ;; ! case 4: ! return(new CBMBenchmarkSCIMARK2_LU(_system)); ! ;; ! default: ! return(0); ! ;; ! } ! } ! ! CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system) ! { ! std::string tmp = bench_id; ! ! if (tmp=="scimark2-fourier") { ! return(new CBMBenchmarkSCIMARK2_FOURIER(_system)); ! } ! ! if (tmp=="scimark2-sor") { ! return(new CBMBenchmarkSCIMARK2_SOR(_system)); ! } ! ! if (tmp=="scimark2-mc") { ! return(new CBMBenchmarkSCIMARK2_MC(_system)); ! } ! ! if (tmp=="scimark2-smm") { ! return(new CBMBenchmarkSCIMARK2_SMM(_system)); ! } ! ! if (tmp=="scimark2-lu") { ! return(new CBMBenchmarkSCIMARK2_LU(_system)); ! } ! return(0); ! } ! int cbmlib_getBenchmarkNumber(void) ! { ! return(5); } - std::vector<std::string> cbmlib_getBenchmarks(void) - { - std::vector<std::string> result; - - result.push_back("scimark2-fourier"); - result.push_back("scimark2-sor"); - result.push_back("scimark2-mc"); - result.push_back("scimark2-smm"); - result.push_back("scimark2-lu"); ! return(result); } ! --- 1,41 ---- ! #include <Benchmark/Benchmark-DLLoader.h> ! #include <UI/UI.h> ! BenchmarkVector& CBMPackageSCIMARK2::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); } ! CBMBenchmark *CBMPackageSCIMARK2::Benchmark(std::string bid) { ! if (bid == "scimark2-smm") { ! return(new CBMBenchmarkSCIMARK2_SMM(this)); ! } ! if (bid == "scimark2-lu") { ! return(new CBMBenchmarkSCIMARK2_LU(this)); ! } ! if (bid == "scimark2-fourier") { ! return(new CBMBenchmarkSCIMARK2_FOURIER(this)); ! } ! if (bid == "scimark2-mc") { ! return(new CBMBenchmarkSCIMARK2_MC(this)); ! } ! if (bid == "scimark2-sor") { ! return(new CBMBenchmarkSCIMARK2_SOR(this)); ! } ! UI->Fatal("Unknown benchmark"); ! return(0); } ! CBMPackage *package_SCIMARK2 = 0; ! CBMPackage *cbmlib_getPackage(void) { ! if (!package_SCIMARK2) { ! package_SCIMARK2=new CBMPackageSCIMARK2(cbmSystem); ! cbmlib_packages.push_back(package_SCIMARK2); ! } ! return(package_SCIMARK2); ! } Index: Benchmark-BZIP2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-BZIP2.h 3 Jan 2007 18:49:56 -0000 1.2 --- Benchmark-BZIP2.h 3 Jan 2007 22:06:26 -0000 1.3 *************** *** 48,54 **** }; /** \brief Defines the bzip2 benchmark using fastest compression level. */ ! class CBMBenchmarkBZIP21 : public CBMBenchmarkxZIP { protected: --- 48,63 ---- }; + /** \brief Abstract class for bzip2 benchmarks */ + class CBMBenchmarkBZIP2 : public CBMBenchmarkxZIP + { + protected: + CBMBenchmarkBZIP2(CBMPackage *_package); + virtual std::string benchmarkProgram(void); + virtual ~CBMBenchmarkBZIP2(); + }; + /** \brief Defines the bzip2 benchmark using fastest compression level. */ ! class CBMBenchmarkBZIP21 : public CBMBenchmarkBZIP2 { protected: *************** *** 64,68 **** /** \brief Defines the bzip2 benchmark using maximum compression level. */ ! class CBMBenchmarkBZIP29 : public CBMBenchmarkxZIP { protected: --- 73,77 ---- /** \brief Defines the bzip2 benchmark using maximum compression level. */ ! class CBMBenchmarkBZIP29 : public CBMBenchmarkBZIP2 { protected: Index: Benchmark-LINPACKC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-LINPACKC.h 3 Jan 2007 20:05:20 -0000 1.2 --- Benchmark-LINPACKC.h 3 Jan 2007 22:06:27 -0000 1.3 *************** *** 23,27 **** virtual std::string packageName(void); - virtual std::string benchmarkComments(void); virtual std::string packageVersion(void); --- 23,26 ---- *************** *** 43,53 **** protected: - virtual std::string linpackPrecisionFlags(void) = 0; - virtual std::string linpackRollFlags(void) = 0; - virtual std::string language(void); - virtual std::string benchmarkLINPACKCComments(void) = 0; - virtual char* extractDirectory(void); virtual int hasPatch(void); --- 42,47 ---- *************** *** 81,84 **** --- 75,83 ---- protected: CBMBenchmarkLINPACKC(CBMPackage *_package); + virtual std::string benchmarkComments(void); + virtual std::string linpackPrecisionFlags(void) = 0; + virtual std::string linpackRollFlags(void) = 0; + virtual std::string benchmarkLINPACKCComments(void) = 0; + virtual std::string bench(void); virtual ~CBMBenchmarkLINPACKC(); |
