Thread: [Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPPLINUX.cpp, 1.2, 1.3 Benchma
Brought to you by:
xfred
From: Frederic T. <xf...@us...> - 2007-01-03 19:56:20
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8680 Modified Files: Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Log Message: CBMPackage and new related API used. Index: Benchmark-BENCHPPLINUX.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-BENCHPPLINUX.h 28 Dec 2006 17:41:02 -0000 1.1 --- Benchmark-BENCHPPLINUX.h 3 Jan 2007 19:56:16 -0000 1.2 *************** *** 3,10 **** #include <Benchmark/Benchmark.h> /** \brief Defines the benchpp-linux package. */ ! class CBMBenchmarkBENCHPPLINUX : public CBMBenchmark { public: --- 3,11 ---- #include <Benchmark/Benchmark.h> + #include <Benchmark/Package.h> /** \brief Defines the benchpp-linux package. */ ! class CBMPackageBENCHPPLINUX : public CBMPackage { public: *************** *** 14,19 **** virtual std::string packageName(void); - virtual std::string benchmarkName(void) = 0; - virtual std::string benchmarkComments(void); virtual std::string packageVersion(void); --- 15,18 ---- *************** *** 27,36 **** protected: - CBMBenchmarkBENCHPPLINUX(class CBMSystem *_system); - - virtual std::string benchppBenchmark(void) = 0; - - virtual std::string benchmarkBENCHPPLINUXComments(void) = 0; - virtual char* extractDirectory(void); --- 26,29 ---- *************** *** 41,48 **** virtual int make(void); - virtual std::string bench(void); virtual int release(void); public: virtual std::string license(void); virtual std::string homePage(void); --- 34,43 ---- virtual int make(void); virtual int release(void); public: + CBMPackageBENCHPPLINUX(class CBMSystem *_system); + DLPackageWrapper_declare(); + virtual std::string license(void); virtual std::string homePage(void); *************** *** 50,57 **** virtual int benchmarkSize(void); ! virtual ~CBMBenchmarkBENCHPPLINUX(); }; /** \brief Defines the dhrystone benchmark within benchpp-linux package. */ --- 45,68 ---- virtual int benchmarkSize(void); ! virtual ~CBMPackageBENCHPPLINUX(); }; + /** \brief Abstact class for CBMPackageBENCHPPLINUX benchmarks + */ + class CBMBenchmarkBENCHPPLINUX : public CBMBenchmark + { + protected: + CBMBenchmarkBENCHPPLINUX(CBMPackage *_package); + + virtual std::string bench(void); + virtual std::string benchmarkComments(void); + virtual std::string benchmarkName(void) = 0; + virtual std::string benchppBenchmark(void) = 0; + virtual std::string benchmarkBENCHPPLINUXComments(void) = 0; + + virtual ~CBMBenchmarkBENCHPPLINUX(); + }; + /** \brief Defines the dhrystone benchmark within benchpp-linux package. */ *************** *** 66,70 **** public: ! CBMBenchmarkBENCHPPLINUX_DHRYSTONE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_DHRYSTONE(); }; --- 77,81 ---- public: ! CBMBenchmarkBENCHPPLINUX_DHRYSTONE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_DHRYSTONE(); }; *************** *** 82,86 **** public: ! CBMBenchmarkBENCHPPLINUX_WHETSTONE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_WHETSTONE(); }; --- 93,97 ---- public: ! CBMBenchmarkBENCHPPLINUX_WHETSTONE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_WHETSTONE(); }; *************** *** 91,95 **** { protected: ! CBMBenchmarkBENCHPPLINUX_IterationsPerSec(class CBMSystem *_system); virtual std::string bench(void); --- 102,106 ---- { protected: ! CBMBenchmarkBENCHPPLINUX_IterationsPerSec(CBMPackage *_package); virtual std::string bench(void); *************** *** 110,114 **** public: ! CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(); }; --- 121,125 ---- public: ! CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(); }; *************** *** 127,131 **** public: ! CBMBenchmarkBENCHPPLINUX_BOOL_IF(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_IF(); }; --- 138,142 ---- public: ! CBMBenchmarkBENCHPPLINUX_BOOL_IF(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_IF(); }; *************** *** 144,148 **** public: ! CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(); }; --- 155,159 ---- public: ! CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(); }; *************** *** 162,166 **** public: ! CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(); }; --- 173,177 ---- public: ! CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(); }; *************** *** 180,184 **** public: ! CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(); }; --- 191,195 ---- public: ! CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(); }; *************** *** 198,202 **** public: ! CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(); }; --- 209,213 ---- public: ! CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(); }; *************** *** 215,219 **** public: ! CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(); }; --- 226,230 ---- public: ! CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(); }; *************** *** 232,236 **** public: ! CBMBenchmarkBENCHPPLINUX_10WAY_VFC(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_VFC(); }; --- 243,247 ---- public: ! CBMBenchmarkBENCHPPLINUX_10WAY_VFC(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_VFC(); }; *************** *** 249,253 **** public: ! CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(); }; --- 260,264 ---- public: ! CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(); }; *************** *** 266,270 **** public: ! CBMBenchmarkBENCHPPLINUX_BITFIELDS(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_BITFIELDS(); }; --- 277,281 ---- public: ! CBMBenchmarkBENCHPPLINUX_BITFIELDS(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_BITFIELDS(); }; *************** *** 283,287 **** public: ! CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(); }; --- 294,298 ---- public: ! CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(); }; *************** *** 300,304 **** public: ! CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(); }; --- 311,315 ---- public: ! CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(); }; *************** *** 317,321 **** public: ! CBMBenchmarkBENCHPPLINUX_CONSTPROP(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_CONSTPROP(); }; --- 328,332 ---- public: ! CBMBenchmarkBENCHPPLINUX_CONSTPROP(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_CONSTPROP(); }; *************** *** 334,338 **** public: ! CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(); }; --- 345,349 ---- public: ! CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(); }; *************** *** 351,355 **** public: ! CBMBenchmarkBENCHPPLINUX_LOCALCSE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_LOCALCSE(); }; --- 362,366 ---- public: ! CBMBenchmarkBENCHPPLINUX_LOCALCSE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_LOCALCSE(); }; *************** *** 368,372 **** public: ! CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(); }; --- 379,383 ---- public: ! CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(); }; *************** *** 386,390 **** public: ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_GLOBALCSE(); }; --- 397,401 ---- public: ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_GLOBALCSE(); }; *************** *** 403,407 **** public: ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(); }; --- 414,418 ---- public: ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(); }; *************** *** 420,424 **** public: ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_UNNECCOPY(); }; --- 431,435 ---- public: ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_UNNECCOPY(); }; *************** *** 437,441 **** public: ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(); }; --- 448,452 ---- public: ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(); }; *************** *** 454,458 **** public: ! CBMBenchmarkBENCHPPLINUX_CODEMOTION(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_CODEMOTION(); }; --- 465,469 ---- public: ! CBMBenchmarkBENCHPPLINUX_CODEMOTION(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_CODEMOTION(); }; *************** *** 471,475 **** public: ! CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(); }; --- 482,486 ---- public: ! CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(); }; *************** *** 488,492 **** public: ! CBMBenchmarkBENCHPPLINUX_INDUCVAR(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_INDUCVAR(); }; --- 499,503 ---- public: ! CBMBenchmarkBENCHPPLINUX_INDUCVAR(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_INDUCVAR(); }; *************** *** 505,509 **** public: ! CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(); }; --- 516,520 ---- public: ! CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(); }; *************** *** 522,526 **** public: ! CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(); }; --- 533,537 ---- public: ! CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(); }; *************** *** 539,543 **** public: ! CBMBenchmarkBENCHPPLINUX_DEADCODE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_DEADCODE(); }; --- 550,554 ---- public: ! CBMBenchmarkBENCHPPLINUX_DEADCODE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_DEADCODE(); }; *************** *** 556,560 **** public: ! CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(); }; --- 567,571 ---- public: ! CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(); }; *************** *** 573,577 **** public: ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(); }; --- 584,588 ---- public: ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(); }; *************** *** 591,595 **** public: ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(); }; --- 602,606 ---- public: ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(); }; *************** *** 608,612 **** public: ! CBMBenchmarkBENCHPPLINUX_REDUNCODE(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_REDUNCODE(); }; --- 619,623 ---- public: ! CBMBenchmarkBENCHPPLINUX_REDUNCODE(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_REDUNCODE(); }; *************** *** 626,630 **** public: ! CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(); }; --- 637,641 ---- public: ! CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(); }; *************** *** 643,647 **** public: ! CBMBenchmarkBENCHPPLINUX_STRINGOPS(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_STRINGOPS(); }; --- 654,658 ---- public: ! CBMBenchmarkBENCHPPLINUX_STRINGOPS(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_STRINGOPS(); }; *************** *** 660,668 **** public: ! CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(class CBMSystem *_system); virtual ~CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(); }; ! lib_declare(); #endif --- 671,679 ---- public: ! CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(CBMPackage *_package); virtual ~CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(); }; ! DLdeclare(); #endif Index: Benchmark-BENCHPPLINUX.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-BENCHPPLINUX.cpp 3 Jan 2007 17:29:50 -0000 1.2 --- Benchmark-BENCHPPLINUX.cpp 3 Jan 2007 19:56:16 -0000 1.3 *************** *** 10,54 **** #include <SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h> ! CBMBenchmarkBENCHPPLINUX::CBMBenchmarkBENCHPPLINUX(CBMSystem *_system) ! : CBMBenchmark(_system) { } ! std::string CBMBenchmarkBENCHPPLINUX::downloadURL(void) { return("http://downloads.sourceforge.net/benchpplinux/bench_plus_plus_1.1_linux5.tgz"); } ! std::string CBMBenchmarkBENCHPPLINUX::expectedMD5(void) { return("003deea400b98ec0bc14f4227a99f2c5"); } ! std::string CBMBenchmarkBENCHPPLINUX::packageName(void) { return("benchpplinux"); } ! std::string CBMBenchmarkBENCHPPLINUX::benchmarkComments(void) ! { ! std::string comment; ! ! comment+=benchmarkBENCHPPLINUXComments(); ! comment+=" (Comment from README file)"; ! ! return(comment); ! } ! ! std::string CBMBenchmarkBENCHPPLINUX::packageVersion(void) { return("1.1v5"); } ! int CBMBenchmarkBENCHPPLINUX::packageSize(void) { return(83702); } ! std::string CBMBenchmarkBENCHPPLINUX::packageComments(void) { return("Bench++ for Linux was initially a port of Bench++ (based on" \ --- 10,44 ---- #include <SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h> ! CBMPackageBENCHPPLINUX::CBMPackageBENCHPPLINUX(CBMSystem *_system) ! : CBMPackage(_system) { } ! std::string CBMPackageBENCHPPLINUX::downloadURL(void) { return("http://downloads.sourceforge.net/benchpplinux/bench_plus_plus_1.1_linux5.tgz"); } ! std::string CBMPackageBENCHPPLINUX::expectedMD5(void) { return("003deea400b98ec0bc14f4227a99f2c5"); } ! std::string CBMPackageBENCHPPLINUX::packageName(void) { return("benchpplinux"); } ! std::string CBMPackageBENCHPPLINUX::packageVersion(void) { return("1.1v5"); } ! int CBMPackageBENCHPPLINUX::packageSize(void) { return(83702); } ! std::string CBMPackageBENCHPPLINUX::packageComments(void) { return("Bench++ for Linux was initially a port of Bench++ (based on" \ *************** *** 56,75 **** } ! std::string CBMBenchmarkBENCHPPLINUX::localPackageName(void) { return("bench_plus_plus_1.1_linux5.tgz"); } ! std::string CBMBenchmarkBENCHPPLINUX::language(void) { return("C++"); } ! char* CBMBenchmarkBENCHPPLINUX::extractDirectory(void) { return("bench++-linux"); } ! int CBMBenchmarkBENCHPPLINUX::extract(int _force) { std::string localFile = localPackageAbsoluteName(); --- 46,65 ---- } ! std::string CBMPackageBENCHPPLINUX::localPackageName(void) { return("bench_plus_plus_1.1_linux5.tgz"); } ! std::string CBMPackageBENCHPPLINUX::language(void) { return("C++"); } ! char* CBMPackageBENCHPPLINUX::extractDirectory(void) { return("bench++-linux"); } ! int CBMPackageBENCHPPLINUX::extract(int _force) { std::string localFile = localPackageAbsoluteName(); *************** *** 92,101 **** } ! int CBMBenchmarkBENCHPPLINUX::preConfigure(int _force) { return(1); } ! int CBMBenchmarkBENCHPPLINUX::configure(CBMCompiler *_currentCompiler, CBMCompilerOptions *_currentOptions) { --- 82,91 ---- } ! int CBMPackageBENCHPPLINUX::preConfigure(int _force) { return(1); } ! int CBMPackageBENCHPPLINUX::configure(CBMCompiler *_currentCompiler, CBMCompilerOptions *_currentOptions) { *************** *** 119,123 **** } ! int CBMBenchmarkBENCHPPLINUX::make(void) { std::string cmd; --- 109,113 ---- } ! int CBMPackageBENCHPPLINUX::make(void) { std::string cmd; *************** *** 141,168 **** } ! std::string CBMBenchmarkBENCHPPLINUX::bench(void) ! { ! std::string cmd; ! std::string result; ! ! cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); ! cmd+=" && echo $(./"; ! cmd+=benchppBenchmark(); ! cmd+=" | "; ! cmd+=CBM_PROG_TAIL; ! cmd+=" -1 | "; ! cmd+=CBM_PROG_CUT; ! cmd+=" -f2 -d':')"; ! ! if (system->exec(cmd, result)==0) { ! return(result); ! } else { ! return("0"); ! } ! ! } ! ! int CBMBenchmarkBENCHPPLINUX::release(void) { std::string cmd; --- 131,135 ---- } ! int CBMPackageBENCHPPLINUX::release(void) { std::string cmd; *************** *** 178,207 **** } ! std::string CBMBenchmarkBENCHPPLINUX::license(void) { return("Public domain"); } ! std::string CBMBenchmarkBENCHPPLINUX::homePage(void) { return("http://benchpplinux.sf.net"); } ! std::string CBMBenchmarkBENCHPPLINUX::author(void) { return("Marcos Marado"); } ! int CBMBenchmarkBENCHPPLINUX::benchmarkSize(void) { return(packageSize()); } CBMBenchmarkBENCHPPLINUX::~CBMBenchmarkBENCHPPLINUX() { } ! CBMBenchmarkBENCHPPLINUX_DHRYSTONE::CBMBenchmarkBENCHPPLINUX_DHRYSTONE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX(_system) { } --- 145,220 ---- } ! std::string CBMPackageBENCHPPLINUX::license(void) { return("Public domain"); } ! std::string CBMPackageBENCHPPLINUX::homePage(void) { return("http://benchpplinux.sf.net"); } ! std::string CBMPackageBENCHPPLINUX::author(void) { return("Marcos Marado"); } ! int CBMPackageBENCHPPLINUX::benchmarkSize(void) { return(packageSize()); } + CBMPackageBENCHPPLINUX::~CBMPackageBENCHPPLINUX() + { + } + + CBMBenchmarkBENCHPPLINUX::CBMBenchmarkBENCHPPLINUX(CBMPackage *_package) + : CBMBenchmark(_package) + { + } + + std::string CBMBenchmarkBENCHPPLINUX::bench(void) + { + std::string cmd; + std::string result; + + cmd="cd "; + cmd+=package->localPackageAbsoluteDirectory(); + cmd+=" && echo $(./"; + cmd+=benchppBenchmark(); + cmd+=" | "; + cmd+=CBM_PROG_TAIL; + cmd+=" -1 | "; + cmd+=CBM_PROG_CUT; + cmd+=" -f2 -d':')"; + + if (System()->exec(cmd, result)==0) { + return(result); + } else { + return("0"); + } + + } + + std::string CBMBenchmarkBENCHPPLINUX::benchmarkComments(void) + { + std::string comment; + + comment+=benchmarkBENCHPPLINUXComments(); + comment+=" (Comment from README file)"; + + return(comment); + } + CBMBenchmarkBENCHPPLINUX::~CBMBenchmarkBENCHPPLINUX() { } ! ! ! ! ! CBMBenchmarkBENCHPPLINUX_DHRYSTONE::CBMBenchmarkBENCHPPLINUX_DHRYSTONE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX(_package) { } *************** *** 226,231 **** } ! CBMBenchmarkBENCHPPLINUX_WHETSTONE::CBMBenchmarkBENCHPPLINUX_WHETSTONE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX(_system) { } --- 239,244 ---- } ! CBMBenchmarkBENCHPPLINUX_WHETSTONE::CBMBenchmarkBENCHPPLINUX_WHETSTONE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX(_package) { } *************** *** 252,257 **** ! CBMBenchmarkBENCHPPLINUX_IterationsPerSec::CBMBenchmarkBENCHPPLINUX_IterationsPerSec(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX(_system) { } --- 265,270 ---- ! CBMBenchmarkBENCHPPLINUX_IterationsPerSec::CBMBenchmarkBENCHPPLINUX_IterationsPerSec(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX(_package) { } *************** *** 267,271 **** cmd="cd "; ! cmd+=localPackageAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); --- 280,284 ---- cmd="cd "; ! cmd+=package->localPackageAbsoluteDirectory(); cmd+=" && echo $(./"; cmd+=benchppBenchmark(); *************** *** 277,285 **** cmd+=" -f3 -d':')"; ! begint=system->Time(); ! if (system->exec(cmd, result)==0) { ! system->Chomp(result); it=atof(result.c_str()); ! endt=system->Time(); if (endt>begint) { sprintf(dum, "%0.0f", it/(endt-begint)); --- 290,298 ---- cmd+=" -f3 -d':')"; ! begint=System()->Time(); ! if (System()->exec(cmd, result)==0) { ! System()->Chomp(result); it=atof(result.c_str()); ! endt=System()->Time(); if (endt>begint) { sprintf(dum, "%0.0f", it/(endt-begint)); *************** *** 297,302 **** } ! CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 310,315 ---- } ! CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN::CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 322,327 **** } ! CBMBenchmarkBENCHPPLINUX_BOOL_IF::CBMBenchmarkBENCHPPLINUX_BOOL_IF(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 335,340 ---- } ! CBMBenchmarkBENCHPPLINUX_BOOL_IF::CBMBenchmarkBENCHPPLINUX_BOOL_IF(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 347,352 **** } ! CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 360,365 ---- } ! CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE::CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 371,376 **** } ! CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 384,389 ---- } ! CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH::CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 395,400 **** } ! CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 408,413 ---- } ! CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE::CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 419,424 **** } ! CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 432,437 ---- } ! CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH::CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 444,449 **** ! CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 457,462 ---- ! CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 468,473 **** } ! CBMBenchmarkBENCHPPLINUX_10WAY_VFC::CBMBenchmarkBENCHPPLINUX_10WAY_VFC(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 481,486 ---- } ! CBMBenchmarkBENCHPPLINUX_10WAY_VFC::CBMBenchmarkBENCHPPLINUX_10WAY_VFC(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 492,497 **** } ! CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY::CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 505,510 ---- } ! CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY::CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 516,521 **** } ! CBMBenchmarkBENCHPPLINUX_BITFIELDS::CBMBenchmarkBENCHPPLINUX_BITFIELDS(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 529,534 ---- } ! CBMBenchmarkBENCHPPLINUX_BITFIELDS::CBMBenchmarkBENCHPPLINUX_BITFIELDS(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 541,546 **** } ! CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA::CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 554,559 ---- } ! CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA::CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 567,572 **** } ! CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ::CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 580,585 ---- } ! CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ::CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 591,596 **** } ! CBMBenchmarkBENCHPPLINUX_CONSTPROP::CBMBenchmarkBENCHPPLINUX_CONSTPROP(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 604,609 ---- } ! CBMBenchmarkBENCHPPLINUX_CONSTPROP::CBMBenchmarkBENCHPPLINUX_CONSTPROP(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 615,620 **** } ! CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO::CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 628,633 ---- } ! CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO::CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 639,644 **** } ! CBMBenchmarkBENCHPPLINUX_LOCALCSE::CBMBenchmarkBENCHPPLINUX_LOCALCSE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 652,657 ---- } ! CBMBenchmarkBENCHPPLINUX_LOCALCSE::CBMBenchmarkBENCHPPLINUX_LOCALCSE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 663,668 **** } ! CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO::CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 676,681 ---- } ! CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO::CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 687,692 **** } ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE::CBMBenchmarkBENCHPPLINUX_GLOBALCSE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 700,705 ---- } ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE::CBMBenchmarkBENCHPPLINUX_GLOBALCSE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 711,716 **** } ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO::CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 724,729 ---- } ! CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO::CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 735,740 **** } ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY::CBMBenchmarkBENCHPPLINUX_UNNECCOPY(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 748,753 ---- } ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY::CBMBenchmarkBENCHPPLINUX_UNNECCOPY(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 759,764 **** } ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO::CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 772,777 ---- } ! CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO::CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 783,788 **** } ! CBMBenchmarkBENCHPPLINUX_CODEMOTION::CBMBenchmarkBENCHPPLINUX_CODEMOTION(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 796,801 ---- } ! CBMBenchmarkBENCHPPLINUX_CODEMOTION::CBMBenchmarkBENCHPPLINUX_CODEMOTION(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 807,812 **** } ! CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO::CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 820,825 ---- } ! CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO::CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 831,836 **** } ! CBMBenchmarkBENCHPPLINUX_INDUCVAR::CBMBenchmarkBENCHPPLINUX_INDUCVAR(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 844,849 ---- } ! CBMBenchmarkBENCHPPLINUX_INDUCVAR::CBMBenchmarkBENCHPPLINUX_INDUCVAR(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 855,860 **** } ! CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO::CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 868,873 ---- } ! CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO::CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 879,884 **** } ! CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO::CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 892,897 ---- } ! CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO::CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 903,908 **** } ! CBMBenchmarkBENCHPPLINUX_DEADCODE::CBMBenchmarkBENCHPPLINUX_DEADCODE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 916,921 ---- } ! CBMBenchmarkBENCHPPLINUX_DEADCODE::CBMBenchmarkBENCHPPLINUX_DEADCODE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 927,932 **** } ! CBMBenchmarkBENCHPPLINUX_DEADCODE_HO::CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 940,945 ---- } ! CBMBenchmarkBENCHPPLINUX_DEADCODE_HO::CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 952,957 **** ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING::CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 965,970 ---- ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING::CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 976,981 **** } ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO::CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 989,994 ---- } ! CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO::CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 1000,1005 **** } ! CBMBenchmarkBENCHPPLINUX_REDUNCODE::CBMBenchmarkBENCHPPLINUX_REDUNCODE(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 1013,1018 ---- } ! CBMBenchmarkBENCHPPLINUX_REDUNCODE::CBMBenchmarkBENCHPPLINUX_REDUNCODE(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 1024,1029 **** } ! CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO::CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 1037,1042 ---- } ! CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO::CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 1048,1053 **** } ! CBMBenchmarkBENCHPPLINUX_STRINGOPS::CBMBenchmarkBENCHPPLINUX_STRINGOPS(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 1061,1066 ---- } ! CBMBenchmarkBENCHPPLINUX_STRINGOPS::CBMBenchmarkBENCHPPLINUX_STRINGOPS(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } *************** *** 1072,1077 **** } ! CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO::CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(CBMSystem *_system) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_system) { } --- 1085,1090 ---- } ! CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO::CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(CBMPackage *_package) ! : CBMBenchmarkBENCHPPLINUX_IterationsPerSec(_package) { } |