[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.3, 1.4 Benchmark-BENCHPP.h, 1.3, 1.4 Benchmark-BENCHPP.libwrapper.h, 1.3, 1.4 Benchmark-BENCHPPLINUX.cpp, 1.6, 1.7 Benchmark-BENCHPPLINUX.h, 1.3, 1.4 Benchmark-BENCHPPLINUX.libwrapper.h, 1.3, 1.4 Benchmark-LINPACKC.cpp, 1.7, 1.8 Benchmark-LINPACKC.h, 1.5, 1.6 Benchmark-LINPACKC.libwrapper.h, 1.4, 1.5 Benchmark-SCIMARK2.cpp, 1.3, 1.4 Benchmark-SCIMARK2.h, 1.3, 1.4

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19477

Modified Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-BENCHPP.libwrapper.h Benchmark-BENCHPPLINUX.cpp 
	Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h 
	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h 
	Benchmark-LINPACKC.libwrapper.h Benchmark-SCIMARK2.cpp 
	Benchmark-SCIMARK2.h 
Log Message:
CBM namespace.

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPP.cpp	3 Jan 2007 22:06:26 -0000	1.3
--- Benchmark-BENCHPP.cpp	21 Jan 2007 20:46:46 -0000	1.4
***************
*** 8,42 ****
  #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h>
  
! CBMPackageBENCHPP::CBMPackageBENCHPP(CBMSystem *_system)
!   : CBMPackage(_system)
  {
  }
  
! std::string CBMPackageBENCHPP::downloadURL(void)
  {
    return("");
  }
  
! std::string CBMPackageBENCHPP::expectedMD5(void)
  {
    return("61f961031fd3ca116787fffd442ef872");
  }
  
! std::string CBMPackageBENCHPP::packageName(void)
  {
    return("benchpp");
  }
  
! std::string CBMPackageBENCHPP::packageVersion(void)
  {
    return("1.1");
  }
  
! int CBMPackageBENCHPP::packageSize(void)
  {
    return(177532);
  }
  
! std::string CBMPackageBENCHPP::packageComments(void)
  {
    return("The suite is based on the Ada PIWG suite, and therefore is " \
--- 8,42 ----
  #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h>
  
! PackageBENCHPP::PackageBENCHPP(CBM::System *_system)
!   : Package(_system)
  {
  }
  
! std::string PackageBENCHPP::downloadURL(void)
  {
    return("");
  }
  
! std::string PackageBENCHPP::expectedMD5(void)
  {
    return("61f961031fd3ca116787fffd442ef872");
  }
  
! std::string PackageBENCHPP::packageName(void)
  {
    return("benchpp");
  }
  
! std::string PackageBENCHPP::packageVersion(void)
  {
    return("1.1");
  }
  
! int PackageBENCHPP::packageSize(void)
  {
    return(177532);
  }
  
! std::string PackageBENCHPP::packageComments(void)
  {
    return("The suite is based on the Ada PIWG suite, and therefore is " \
***************
*** 56,80 ****
  }
  
! std::string CBMPackageBENCHPP::localPackageName(void)
  {
    return("bench_plus_plus_1.1.tar.Z");
  }
  
! std::string CBMPackageBENCHPP::language(void)
  {
    return("C++");
  }
  
! char* CBMPackageBENCHPP::extractDirectory(void)
  {
    return("bench++");
  }
  
! int CBMPackageBENCHPP::hasPatch(void)
  {
    return(1);
  }
  
! int CBMPackageBENCHPP::patch(int _force)
  {
    std::string cmd;
--- 56,80 ----
  }
  
! std::string PackageBENCHPP::localPackageName(void)
  {
    return("bench_plus_plus_1.1.tar.Z");
  }
  
! std::string PackageBENCHPP::language(void)
  {
    return("C++");
  }
  
! char* PackageBENCHPP::extractDirectory(void)
  {
    return("bench++");
  }
  
! int PackageBENCHPP::hasPatch(void)
  {
    return(1);
  }
  
! int PackageBENCHPP::patch(int _force)
  {
    std::string cmd;
***************
*** 83,87 ****
    std::string patch;
  
!   patch+=system->temporaryDirectory(CBMSystem::Patches);
    patch+="/benchpp.patch.gz";
  
--- 83,87 ----
    std::string patch;
  
!   patch+=system->temporaryDirectory(CBM::System::Patches);
    patch+="/benchpp.patch.gz";
  
***************
*** 102,106 ****
  }
  
! int CBMPackageBENCHPP::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
--- 102,106 ----
  }
  
! int PackageBENCHPP::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
***************
*** 109,113 ****
  
    cmd+="cd ";
!   cmd+=system->temporaryDirectory(CBMSystem::Extract);
    cmd+=" && ";
    cmd+=CBM_PROG_ZCAT;
--- 109,113 ----
  
    cmd+="cd ";
!   cmd+=system->temporaryDirectory(CBM::System::Extract);
    cmd+=" && ";
    cmd+=CBM_PROG_ZCAT;
***************
*** 121,131 ****
  }
  
! int CBMPackageBENCHPP::preConfigure(int _force)
  {
    return(1);
  }
  
! int CBMPackageBENCHPP::configure(CBMCompiler        *_currentCompiler,
! 				   CBMCompilerOptions *_currentOptions)
  {
    std::string cmd;
--- 121,131 ----
  }
  
! int PackageBENCHPP::preConfigure(int _force)
  {
    return(1);
  }
  
! int PackageBENCHPP::configure(CBM::Compiler        *_currentCompiler,
! 			      CBM::CompilerOptions *_currentOptions)
  {
    std::string cmd;
***************
*** 150,154 ****
  }
  
! int CBMPackageBENCHPP::make(void)
  {
    std::string cmd;
--- 150,154 ----
  }
  
! int PackageBENCHPP::make(void)
  {
    std::string cmd;
***************
*** 188,192 ****
  }
  
! int CBMPackageBENCHPP::release(void)
  {
    std::string cmd;
--- 188,192 ----
  }
  
! int PackageBENCHPP::release(void)
  {
    std::string cmd;
***************
*** 202,235 ****
  }
  
! std::string CBMPackageBENCHPP::license(void)
  {
    return("Public domain");
  }
  
! std::string CBMPackageBENCHPP::homePage(void)
  {
    return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html");
  }
  
! std::string CBMPackageBENCHPP::author(void)
  {
    return("Joseph M. Orost");
  }
  
! int CBMPackageBENCHPP::benchmarkSize(void)
  {
    return(packageSize());
  }
  
! CBMPackageBENCHPP::~CBMPackageBENCHPP()
  {
  }
  
! CBMBenchmarkBENCHPP::CBMBenchmarkBENCHPP(CBMPackage *_package)
!   : CBMBenchmark(_package)
  {
  }
  
! std::string CBMBenchmarkBENCHPP::benchmarkComments(void)
  {
    std::string comment;
--- 202,235 ----
  }
  
! std::string PackageBENCHPP::license(void)
  {
    return("Public domain");
  }
  
! std::string PackageBENCHPP::homePage(void)
  {
    return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html");
  }
  
! std::string PackageBENCHPP::author(void)
  {
    return("Joseph M. Orost");
  }
  
! int PackageBENCHPP::benchmarkSize(void)
  {
    return(packageSize());
  }
  
! PackageBENCHPP::~PackageBENCHPP()
  {
  }
  
! BenchmarkBENCHPP::BenchmarkBENCHPP(CBM::Package *_package)
!   : Benchmark(_package)
  {
  }
  
! std::string BenchmarkBENCHPP::benchmarkComments(void)
  {
    std::string comment;
***************
*** 241,245 ****
  }
  
! std::string CBMBenchmarkBENCHPP::bench(void)
  {
    std::string cmd;
--- 241,245 ----
  }
  
! std::string BenchmarkBENCHPP::bench(void)
  {
    std::string cmd;
***************
*** 264,326 ****
  }
  
! CBMBenchmarkBENCHPP::~CBMBenchmarkBENCHPP()
  {
  }
  
! CBMBenchmarkBENCHPP_DHRYSTONE::CBMBenchmarkBENCHPP_DHRYSTONE(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP(_package)
  {
  }
  
! std::string CBMBenchmarkBENCHPP_DHRYSTONE::benchmarkName(void)
  {
    return("benchpp-dhrystone");
  }
  
! std::string CBMBenchmarkBENCHPP_DHRYSTONE::benchppBenchmark(void)
  {
    return("a000091");
  }
  
! std::string CBMBenchmarkBENCHPP_DHRYSTONE::benchmarkBENCHPPComments(void)
  {
    return("C++ implementation of the Dhrystone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html).");
  }
  
! CBMBenchmarkBENCHPP_DHRYSTONE::~CBMBenchmarkBENCHPP_DHRYSTONE()
  {
  }
  
! CBMBenchmarkBENCHPP_WHETSTONE::CBMBenchmarkBENCHPP_WHETSTONE(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP(_package)
  {
  }
  
! std::string CBMBenchmarkBENCHPP_WHETSTONE::benchmarkName(void)
  {
    return("benchpp-whetstone");
  }
  
! std::string CBMBenchmarkBENCHPP_WHETSTONE::benchppBenchmark(void)
  {
    return("a000092");
  }
  
! std::string CBMBenchmarkBENCHPP_WHETSTONE::benchmarkBENCHPPComments(void)
  {
    return("C++ implementation of the Whetstone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html).");
  }
  
! CBMBenchmarkBENCHPP_WHETSTONE::~CBMBenchmarkBENCHPP_WHETSTONE()
  {
  }
  
  
! CBMBenchmarkBENCHPP_STEPANOV::CBMBenchmarkBENCHPP_STEPANOV(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP(_package)
  {
  }
  
! std::string CBMBenchmarkBENCHPP_STEPANOV::bench(void)
  {
    std::string cmd;
--- 264,326 ----
  }
  
! BenchmarkBENCHPP::~BenchmarkBENCHPP()
  {
  }
  
! BenchmarkBENCHPP_DHRYSTONE::BenchmarkBENCHPP_DHRYSTONE(CBM::Package *_package)
!   : BenchmarkBENCHPP(_package)
  {
  }
  
! std::string BenchmarkBENCHPP_DHRYSTONE::benchmarkName(void)
  {
    return("benchpp-dhrystone");
  }
  
! std::string BenchmarkBENCHPP_DHRYSTONE::benchppBenchmark(void)
  {
    return("a000091");
  }
  
! std::string BenchmarkBENCHPP_DHRYSTONE::benchmarkBENCHPPComments(void)
  {
    return("C++ implementation of the Dhrystone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html).");
  }
  
! BenchmarkBENCHPP_DHRYSTONE::~BenchmarkBENCHPP_DHRYSTONE()
  {
  }
  
! BenchmarkBENCHPP_WHETSTONE::BenchmarkBENCHPP_WHETSTONE(CBM::Package *_package)
!   : BenchmarkBENCHPP(_package)
  {
  }
  
! std::string BenchmarkBENCHPP_WHETSTONE::benchmarkName(void)
  {
    return("benchpp-whetstone");
  }
  
! std::string BenchmarkBENCHPP_WHETSTONE::benchppBenchmark(void)
  {
    return("a000092");
  }
  
! std::string BenchmarkBENCHPP_WHETSTONE::benchmarkBENCHPPComments(void)
  {
    return("C++ implementation of the Whetstone benchmark (see http://www.cs.wisc.edu/~thomas/comp.benchmarks.FAQ.html).");
  }
  
! BenchmarkBENCHPP_WHETSTONE::~BenchmarkBENCHPP_WHETSTONE()
  {
  }
  
  
! BenchmarkBENCHPP_STEPANOV::BenchmarkBENCHPP_STEPANOV(CBM::Package *_package)
!   : BenchmarkBENCHPP(_package)
  {
  }
  
! std::string BenchmarkBENCHPP_STEPANOV::bench(void)
  {
    std::string cmd;
***************
*** 344,372 ****
  }
  
! CBMBenchmarkBENCHPP_STEPANOV::~CBMBenchmarkBENCHPP_STEPANOV()
  {
  }
  
! CBMBenchmarkBENCHPP_STEPANOV_AL12::CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMPackage *_package)
!   : CBMBenchmarkBENCHPP_STEPANOV(_package)
  {
  }
  
! std::string CBMBenchmarkBENCHPP_STEPANOV_AL12::benchmarkName(void)
  {
    return("benchpp-stepanov-al12");
  }
  
! std::string CBMBenchmarkBENCHPP_STEPANOV_AL12::benchppBenchmark(void)
  {
    return("s000005a");
  }
  
! std::string CBMBenchmarkBENCHPP_STEPANOV_AL12::benchmarkBENCHPPComments(void)
  {
    return("Stepanov AL-12 benchmark. Measures C++ overhead in a code which extensively uses abstraction.");
  }
  
! CBMBenchmarkBENCHPP_STEPANOV_AL12::~CBMBenchmarkBENCHPP_STEPANOV_AL12()
  {
  }
--- 344,372 ----
  }
  
! BenchmarkBENCHPP_STEPANOV::~BenchmarkBENCHPP_STEPANOV()
  {
  }
  
! BenchmarkBENCHPP_STEPANOV_AL12::BenchmarkBENCHPP_STEPANOV_AL12(CBM::Package *_package)
!   : BenchmarkBENCHPP_STEPANOV(_package)
  {
  }
  
! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchmarkName(void)
  {
    return("benchpp-stepanov-al12");
  }
  
! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchppBenchmark(void)
  {
    return("s000005a");
  }
  
! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchmarkBENCHPPComments(void)
  {
    return("Stepanov AL-12 benchmark. Measures C++ overhead in a code which extensively uses abstraction.");
  }
  
! BenchmarkBENCHPP_STEPANOV_AL12::~BenchmarkBENCHPP_STEPANOV_AL12()
  {
  }

Index: Benchmark-LINPACKC.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-LINPACKC.h	11 Jan 2007 20:14:06 -0000	1.5
--- Benchmark-LINPACKC.h	21 Jan 2007 20:46:47 -0000	1.6
***************
*** 13,134 ****
  #include <Benchmark/Package.h>
  
! /** \brief Defines the linpackc package.
!  */
! class CBMPackageLINPACKC : public CBMPackageAutotools
! {
!  public:
!  private:
!   virtual std::string downloadURL(void);
!   virtual std::string expectedMD5(void);
  
!   virtual std::string packageName(void);
  
!   virtual std::string packageVersion(void);
!   virtual int packageSize(void); /* in bytes */
  
!   virtual std::string packageComments(void);
!   virtual std::string localPackageName(void);
  		
  
!  protected:
!   virtual std::string language(void);
!   virtual char *extractDirectory(void);
  
!   virtual int preConfigure(int _force);
  
!  public:
!   CBMPackageLINPACKC(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
!   virtual std::string license(void);
!   virtual std::string homePage(void);
!   virtual std::string author(void);
  
!   virtual int benchmarkSize(void);
!   virtual ~CBMPackageLINPACKC();
! };
  
! /** \brief Abstract class for CBMPackageLINPACKC benchmarks
!  */
! class CBMBenchmarkLINPACKC : public CBMBenchmark
! {
!  protected:
!   CBMBenchmarkLINPACKC(CBMPackage *_package);
!   virtual std::string benchmarkComments(void);
!   virtual std::string benchmarkLINPACKCComments(void) = 0;
  
!   virtual std::string bench(void);
!   virtual ~CBMBenchmarkLINPACKC();
! };
  
! /** \brief Defines the single precision unrolled benchmark within linpackc package.
!  */
! class CBMBenchmarkLINPACKC_SP_UNROLL : public CBMBenchmarkLINPACKC
! {
!  public:
!  private:
!  protected:
!   virtual std::string benchmarkLINPACKCComments(void);
  
!  public:
!   CBMBenchmarkLINPACKC_SP_UNROLL(CBMPackage *_package);
  
!   virtual std::string benchmarkName(void);
  
!   virtual ~CBMBenchmarkLINPACKC_SP_UNROLL();
! };
  
! /** \brief Defines the single precision 'rolled' benchmark within linpackc package.
!  */
! class CBMBenchmarkLINPACKC_SP_ROLL : public CBMBenchmarkLINPACKC
! {
!  public:
!  private:
!  protected:
!   virtual std::string benchmarkLINPACKCComments(void);
  
!  public:
!   CBMBenchmarkLINPACKC_SP_ROLL(CBMPackage *_package);
  
!   virtual std::string benchmarkName(void);
  
!   virtual ~CBMBenchmarkLINPACKC_SP_ROLL();
  		
! };
  
! /** \brief Defines the double precision unrolled benchmark within linpackc package.
!  */
! class CBMBenchmarkLINPACKC_DP_UNROLL : public CBMBenchmarkLINPACKC
! {
!  public:
!  private:
!  protected:
!   virtual std::string benchmarkLINPACKCComments(void);
  
!  public:
!   CBMBenchmarkLINPACKC_DP_UNROLL(CBMPackage *_package);
  
!   virtual std::string benchmarkName(void);
  
!   virtual ~CBMBenchmarkLINPACKC_DP_UNROLL();
! };
  
! /** \brief Defines the double precision 'rolled' benchmark within linpackc package.
!  */
! class CBMBenchmarkLINPACKC_DP_ROLL : public CBMBenchmarkLINPACKC
! {
!  public:
!  private:
!  protected:
!   virtual std::string benchmarkLINPACKCComments(void);
  
!  public:
!   CBMBenchmarkLINPACKC_DP_ROLL(CBMPackage *_package);
  
!   virtual std::string benchmarkName(void);
  
!   virtual ~CBMBenchmarkLINPACKC_DP_ROLL();
  		
! };
  
  DLdeclare();
--- 13,136 ----
  #include <Benchmark/Package.h>
  
! namespace CBM {
!   /** \brief Defines the linpackc package.
!    */
!   class PackageLINPACKC : public PackageAutotools
!   {
!   public:
!   private:
!     virtual std::string downloadURL(void);
!     virtual std::string expectedMD5(void);
  
!     virtual std::string packageName(void);
  
!     virtual std::string packageVersion(void);
!     virtual int packageSize(void); /* in bytes */
  
!     virtual std::string packageComments(void);
!     virtual std::string localPackageName(void);
  		
  
!   protected:
!     virtual std::string language(void);
!     virtual char *extractDirectory(void);
  
!     virtual int preConfigure(int _force);
  
!   public:
!     PackageLINPACKC(class System *_system);
!     DLPackageWrapper_declare();
  
!     virtual std::string license(void);
!     virtual std::string homePage(void);
!     virtual std::string author(void);
  
!     virtual int benchmarkSize(void);
!     virtual ~PackageLINPACKC();
!   };
  
!   /** \brief Abstract class for PackageLINPACKC benchmarks
!    */
!   class BenchmarkLINPACKC : public Benchmark
!   {
!   protected:
!     BenchmarkLINPACKC(CBM::Package *_package);
!     virtual std::string benchmarkComments(void);
!     virtual std::string benchmarkLINPACKCComments(void) = 0;
  
!     virtual std::string bench(void);
!     virtual ~BenchmarkLINPACKC();
!   };
  
!   /** \brief Defines the single precision unrolled benchmark within linpackc package.
!    */
!   class BenchmarkLINPACKC_SP_UNROLL : public BenchmarkLINPACKC
!   {
!   public:
!   private:
!   protected:
!     virtual std::string benchmarkLINPACKCComments(void);
  
!   public:
!     BenchmarkLINPACKC_SP_UNROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
!     virtual ~BenchmarkLINPACKC_SP_UNROLL();
!   };
  
!   /** \brief Defines the single precision 'rolled' benchmark within linpackc package.
!    */
!   class BenchmarkLINPACKC_SP_ROLL : public BenchmarkLINPACKC
!   {
!   public:
!   private:
!   protected:
!     virtual std::string benchmarkLINPACKCComments(void);
  
!   public:
!     BenchmarkLINPACKC_SP_ROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
!     virtual ~BenchmarkLINPACKC_SP_ROLL();
  		
!   };
  
!   /** \brief Defines the double precision unrolled benchmark within linpackc package.
!    */
!   class BenchmarkLINPACKC_DP_UNROLL : public BenchmarkLINPACKC
!   {
!   public:
!   private:
!   protected:
!     virtual std::string benchmarkLINPACKCComments(void);
  
!   public:
!     BenchmarkLINPACKC_DP_UNROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
!     virtual ~BenchmarkLINPACKC_DP_UNROLL();
!   };
  
!   /** \brief Defines the double precision 'rolled' benchmark within linpackc package.
!    */
!   class BenchmarkLINPACKC_DP_ROLL : public BenchmarkLINPACKC
!   {
!   public:
!   private:
!   protected:
!     virtual std::string benchmarkLINPACKCComments(void);
  
!   public:
!     BenchmarkLINPACKC_DP_ROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
!     virtual ~BenchmarkLINPACKC_DP_ROLL();
  		
!   };
! }
  
  DLdeclare();

Index: Benchmark-SCIMARK2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-SCIMARK2.h	3 Jan 2007 22:06:27 -0000	1.3
--- Benchmark-SCIMARK2.h	21 Jan 2007 20:46:47 -0000	1.4
***************
*** 12,150 ****
  #include <Benchmark/Package.h>
  
  
! /** \brief Defines the scimark2 package.
!  */
! class CBMPackageSCIMARK2 : public CBMPackage
! {
!  public:
!  private:
!   virtual std::string downloadURL(void);
!   virtual std::string expectedMD5(void);
! 
!   virtual std::string packageName(void);
  
!   virtual std::string packageVersion(void);
!   virtual int packageSize(void); /* in bytes */
!   virtual std::string packageComments(void);
!   virtual std::string localPackageName(void);
  		
  
!  protected:
!   virtual std::string language(void);
  
!   virtual char* extractDirectory(void);
!   virtual int hasPatch(void);
!   virtual int patch(int _force = 0);
  
!   virtual int extract(int _force = 0);
!   virtual int preConfigure(int _force);
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
!   virtual int make(void);
!   virtual int release(void);
  
!  public:
!   CBMPackageSCIMARK2(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
!   virtual std::string license(void);
!   virtual std::string homePage(void);
!   virtual std::string author(void);
  
!   virtual int benchmarkSize(void);
!   virtual ~CBMPackageSCIMARK2();
  		
! };
  
! /** \brief Defines abstract benchmark for CBMPackageSCIMARK2
!  */
! class CBMBenchmarkSCIMARK2 : public CBMBenchmark
! {
!  protected:
!   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;
!   virtual std::string bench(void);
!   virtual ~CBMBenchmarkSCIMARK2();
! };
  
  
! /** \brief Defines the fourier benchmark within scimark2 package.
!  */
! class CBMBenchmarkSCIMARK2_FOURIER : public CBMBenchmarkSCIMARK2
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkSCIMARK2Comments(void);
  
!   virtual std::string scimark2BenchmarkLabel(void);
  
!  public:
!   CBMBenchmarkSCIMARK2_FOURIER(CBMPackage *_package);
!   virtual ~CBMBenchmarkSCIMARK2_FOURIER();
! };
  
! /** \brief Defines the sor benchmark within scimark2 package.
!  */
! class CBMBenchmarkSCIMARK2_SOR : public CBMBenchmarkSCIMARK2
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkSCIMARK2Comments(void);
  
!   virtual std::string scimark2BenchmarkLabel(void);
  
!  public:
!   CBMBenchmarkSCIMARK2_SOR(CBMPackage *_package);
!   virtual ~CBMBenchmarkSCIMARK2_SOR();
! };
  
! /** \brief Defines the mc benchmark within scimark2 package.
!  */
! class CBMBenchmarkSCIMARK2_MC : public CBMBenchmarkSCIMARK2
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkSCIMARK2Comments(void);
  
!   virtual std::string scimark2BenchmarkLabel(void);
  
!  public:
!   CBMBenchmarkSCIMARK2_MC(CBMPackage *_package);
!   virtual ~CBMBenchmarkSCIMARK2_MC();
! };
  
! /** \brief Defines the smm benchmark within scimark2 package.
!  */
! class CBMBenchmarkSCIMARK2_SMM : public CBMBenchmarkSCIMARK2
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkSCIMARK2Comments(void);
  
!   virtual std::string scimark2BenchmarkLabel(void);
  
!  public:
!   CBMBenchmarkSCIMARK2_SMM(CBMPackage *_package);
!   virtual ~CBMBenchmarkSCIMARK2_SMM();
! };
  
! /** \brief Defines the lu benchmark within scimark2 package.
!  */
! class CBMBenchmarkSCIMARK2_LU : public CBMBenchmarkSCIMARK2
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkSCIMARK2Comments(void);
  
!   virtual std::string scimark2BenchmarkLabel(void);
  
!  public:
!   CBMBenchmarkSCIMARK2_LU(CBMPackage *_package);
!   virtual ~CBMBenchmarkSCIMARK2_LU();
! };
  
  DLdeclare();
--- 12,151 ----
  #include <Benchmark/Package.h>
  
+ namespace CBM {
+   /** \brief Defines the scimark2 package.
+    */
+   class PackageSCIMARK2 : public Package
+   {
+   public:
+   private:
+     virtual std::string downloadURL(void);
+     virtual std::string expectedMD5(void);
  
!     virtual std::string packageName(void);
  
!     virtual std::string packageVersion(void);
!     virtual int packageSize(void); /* in bytes */
!     virtual std::string packageComments(void);
!     virtual std::string localPackageName(void);
  		
  
!   protected:
!     virtual std::string language(void);
  
!     virtual char* extractDirectory(void);
!     virtual int hasPatch(void);
!     virtual int patch(int _force = 0);
  
!     virtual int extract(int _force = 0);
!     virtual int preConfigure(int _force);
!     virtual int configure(Compiler        *_currentCompiler,
! 			  CompilerOptions *_currentOptions);
  
!     virtual int make(void);
!     virtual int release(void);
  
!   public:
!     PackageSCIMARK2(class System *_system);
!     DLPackageWrapper_declare();
  
!     virtual std::string license(void);
!     virtual std::string homePage(void);
!     virtual std::string author(void);
  
!     virtual int benchmarkSize(void);
!     virtual ~PackageSCIMARK2();
  		
!   };
  
!   /** \brief Defines abstract benchmark for PackageSCIMARK2
!    */
!   class BenchmarkSCIMARK2 : public Benchmark
!   {
!   protected:
!     BenchmarkSCIMARK2(CBM::Package *_package);
!     virtual std::string benchmarkComments(void);
!     virtual std::string benchmarkName(void) = 0;
!     virtual std::string benchmarkSCIMARK2Comments(void) = 0;
!     virtual std::string scimark2BenchmarkLabel(void) = 0;
!     virtual std::string bench(void);
!     virtual ~BenchmarkSCIMARK2();
!   };
  
  
!   /** \brief Defines the fourier benchmark within scimark2 package.
!    */
!   class BenchmarkSCIMARK2_FOURIER : public BenchmarkSCIMARK2
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkSCIMARK2Comments(void);
  
!     virtual std::string scimark2BenchmarkLabel(void);
  
!   public:
!     BenchmarkSCIMARK2_FOURIER(CBM::Package *_package);
!     virtual ~BenchmarkSCIMARK2_FOURIER();
!   };
  
!   /** \brief Defines the sor benchmark within scimark2 package.
!    */
!   class BenchmarkSCIMARK2_SOR : public BenchmarkSCIMARK2
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkSCIMARK2Comments(void);
  
!     virtual std::string scimark2BenchmarkLabel(void);
  
!   public:
!     BenchmarkSCIMARK2_SOR(CBM::Package *_package);
!     virtual ~BenchmarkSCIMARK2_SOR();
!   };
  
!   /** \brief Defines the mc benchmark within scimark2 package.
!    */
!   class BenchmarkSCIMARK2_MC : public BenchmarkSCIMARK2
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkSCIMARK2Comments(void);
  
!     virtual std::string scimark2BenchmarkLabel(void);
  
!   public:
!     BenchmarkSCIMARK2_MC(CBM::Package *_package);
!     virtual ~BenchmarkSCIMARK2_MC();
!   };
  
!   /** \brief Defines the smm benchmark within scimark2 package.
!    */
!   class BenchmarkSCIMARK2_SMM : public BenchmarkSCIMARK2
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkSCIMARK2Comments(void);
  
!     virtual std::string scimark2BenchmarkLabel(void);
  
!   public:
!     BenchmarkSCIMARK2_SMM(CBM::Package *_package);
!     virtual ~BenchmarkSCIMARK2_SMM();
!   };
  
!   /** \brief Defines the lu benchmark within scimark2 package.
!    */
!   class BenchmarkSCIMARK2_LU : public BenchmarkSCIMARK2
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkSCIMARK2Comments(void);
  
!     virtual std::string scimark2BenchmarkLabel(void);
  
!   public:
!     BenchmarkSCIMARK2_LU(CBM::Package *_package);
!     virtual ~BenchmarkSCIMARK2_LU();
!   };
! }
  
  DLdeclare();

Index: Benchmark-LINPACKC.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-LINPACKC.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.4
--- Benchmark-LINPACKC.libwrapper.h	21 Jan 2007 20:46:47 -0000	1.5
***************
*** 2,10 ****
  #include <UI/UI.h>
  
! int CBMPackageLINPACKC::benchmarkNumber(void) {
    return(4);
  }
  
! BenchmarkVector& CBMPackageLINPACKC::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);
    benchmarks.push_back("linpackc-sp-unroll");
--- 2,12 ----
  #include <UI/UI.h>
  
! using namespace CBM;
! 
! int PackageLINPACKC::benchmarkNumber(void) {
    return(4);
  }
  
! CBM::BenchmarkVector& PackageLINPACKC::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);
    benchmarks.push_back("linpackc-sp-unroll");
***************
*** 15,40 ****
  }
  
! CBMBenchmark *CBMPackageLINPACKC::Benchmark(std::string bid) {
    if (bid == "linpackc-sp-unroll") {
!      return(new CBMBenchmarkLINPACKC_SP_UNROLL(this));
    }
    if (bid == "linpackc-dp-roll") {
!      return(new CBMBenchmarkLINPACKC_DP_ROLL(this));
    }
    if (bid == "linpackc-dp-unroll") {
!      return(new CBMBenchmarkLINPACKC_DP_UNROLL(this));
    }
    if (bid == "linpackc-sp-roll") {
!      return(new CBMBenchmarkLINPACKC_SP_ROLL(this));
    }
!   UI->Fatal("Unknown benchmark");
    return(0);
  }
  
! 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);
--- 17,42 ----
  }
  
! 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));
    }
!   CBM::cbmUI->Fatal("Unknown benchmark");
    return(0);
  }
  
! CBM::Package *package_LINPACKC = 0;
! CBM::Package *cbmlib_getPackage(void) {
    if (!package_LINPACKC) {
!      package_LINPACKC=new PackageLINPACKC(CBM::cbmSystem);
!      CBM::cbmlib_packages.push_back(package_LINPACKC);
    }
    return(package_LINPACKC);

Index: Benchmark-BENCHPPLINUX.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPPLINUX.h	3 Jan 2007 22:06:26 -0000	1.3
--- Benchmark-BENCHPPLINUX.h	21 Jan 2007 20:46:46 -0000	1.4
***************
*** 13,685 ****
  #include <Benchmark/Package.h>
  
! /** \brief Defines the benchpp-linux package.
!  */
! class CBMPackageBENCHPPLINUX : public CBMPackage
! {
!  public:
!  private:
!   virtual std::string downloadURL(void);
!   virtual std::string expectedMD5(void);
[...1319 lines suppressed...]
  
!   /** \brief Defines the 'String Ops', hand optimized,
!    *  benchmark within benchpp-linux package.
!    */
!   class BenchmarkBENCHPPLINUX_STRINGOPS_HO : public BenchmarkBENCHPPLINUX_IterationsPerSec
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkBENCHPPLINUXComments(void);
  
  
!     virtual std::string benchppBenchmark(void);
  
!   public:
!     BenchmarkBENCHPPLINUX_STRINGOPS_HO(CBM::Package *_package);
!     virtual ~BenchmarkBENCHPPLINUX_STRINGOPS_HO();
!   };
! }
  
  DLdeclare();

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-SCIMARK2.cpp	3 Jan 2007 22:06:27 -0000	1.3
--- Benchmark-SCIMARK2.cpp	21 Jan 2007 20:46:47 -0000	1.4
***************
*** 14,73 ****
  #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h>
  
! CBMPackageSCIMARK2::CBMPackageSCIMARK2(CBMSystem *_system)
!   : CBMPackage(_system)
  {
  }
  
! std::string CBMPackageSCIMARK2::downloadURL(void)
  {
    return("http://math.nist.gov/scimark2/scimark2_1c.zip");
  }
  
! std::string CBMPackageSCIMARK2::expectedMD5(void)
  {
    return("6cc8d6d5312a07e32316c03580e0206b");
  }
  
! std::string CBMPackageSCIMARK2::packageName(void)
  {
    return("scimark2");
  }
  
! std::string CBMPackageSCIMARK2::packageVersion(void)
  {
    return("2.0");
  }
  
! int CBMPackageSCIMARK2::packageSize(void)
  {
    return(13792);
  }
  
! std::string CBMPackageSCIMARK2::packageComments(void)
  {
    return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite.");
  }
  
! std::string CBMPackageSCIMARK2::localPackageName(void)
  {
    return("scimark2_1c.zip");
  }
  
! std::string CBMPackageSCIMARK2::language(void)
  {
    return("C");
  }
  
! char* CBMPackageSCIMARK2::extractDirectory(void)
  {
    return("scimark2");
  }
  
! int CBMPackageSCIMARK2::hasPatch(void)
  {
    return(1);
  }
  
! int CBMPackageSCIMARK2::patch(int _force)
  {
    std::string cmd;
--- 14,75 ----
  #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h>
  
! using namespace CBM;
! 
! PackageSCIMARK2::PackageSCIMARK2(CBM::System *_system)
!   : Package(_system)
  {
  }
  
! std::string PackageSCIMARK2::downloadURL(void)
  {
    return("http://math.nist.gov/scimark2/scimark2_1c.zip");
  }
  
! std::string PackageSCIMARK2::expectedMD5(void)
  {
    return("6cc8d6d5312a07e32316c03580e0206b");
  }
  
! std::string PackageSCIMARK2::packageName(void)
  {
    return("scimark2");
  }
  
! std::string PackageSCIMARK2::packageVersion(void)
  {
    return("2.0");
  }
  
! int PackageSCIMARK2::packageSize(void)
  {
    return(13792);
  }
  
! std::string PackageSCIMARK2::packageComments(void)
  {
    return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite.");
  }
  
! std::string PackageSCIMARK2::localPackageName(void)
  {
    return("scimark2_1c.zip");
  }
  
! std::string PackageSCIMARK2::language(void)
  {
    return("C");
  }
  
! char* PackageSCIMARK2::extractDirectory(void)
  {
    return("scimark2");
  }
  
! int PackageSCIMARK2::hasPatch(void)
  {
    return(1);
  }
  
! int PackageSCIMARK2::patch(int _force)
  {
    std::string cmd;
***************
*** 76,80 ****
    std::string patch;
  
!   patch+=system->temporaryDirectory(CBMSystem::Patches);
    patch+="/scimark2.patch.gz";
  
--- 78,82 ----
    std::string patch;
  
!   patch+=system->temporaryDirectory(CBM::System::Patches);
    patch+="/scimark2.patch.gz";
  
***************
*** 95,99 ****
  }
  
! int CBMPackageSCIMARK2::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
--- 97,101 ----
  }
  
! int PackageSCIMARK2::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
***************
*** 102,106 ****
  
    cmd+="cd ";
!   cmd+=system->temporaryDirectory(CBMSystem::Extract);
    cmd+=" && ";
    cmd+=CBM_PROG_MKDIR;
--- 104,108 ----
  
    cmd+="cd ";
!   cmd+=system->temporaryDirectory(CBM::System::Extract);
    cmd+=" && ";
    cmd+=CBM_PROG_MKDIR;
***************
*** 112,116 ****
    cmd+=CBM_PROG_UNZIP;
    cmd+=" ";
!   cmd+=system->temporaryDirectory(CBMSystem::Download);
    cmd+="/";
    cmd+=localPackageName();
--- 114,118 ----
    cmd+=CBM_PROG_UNZIP;
    cmd+=" ";
!   cmd+=system->temporaryDirectory(CBM::System::Download);
    cmd+="/";
    cmd+=localPackageName();
***************
*** 119,134 ****
  }
  
! int CBMPackageSCIMARK2::preConfigure(int _force)
  {
    return(1);
  }
  
! int CBMPackageSCIMARK2::configure(CBMCompiler        *_currentCompiler,
! 				    CBMCompilerOptions *_currentOptions)
  {
    return(1);
  }
  
! int CBMPackageSCIMARK2::make(void)
  {
    std::string cmd;
--- 121,136 ----
  }
  
! int PackageSCIMARK2::preConfigure(int _force)
  {
    return(1);
  }
  
! int PackageSCIMARK2::configure(CBM::Compiler        *_currentCompiler,
! 			       CBM::CompilerOptions *_currentOptions)
  {
    return(1);
  }
  
! int PackageSCIMARK2::make(void)
  {
    std::string cmd;
***************
*** 168,172 ****
  }
  
! int CBMPackageSCIMARK2::release(void)
  {
    std::string cmd;
--- 170,174 ----
  }
  
! int PackageSCIMARK2::release(void)
  {
    std::string cmd;
***************
*** 182,215 ****
  }
  
! std::string CBMPackageSCIMARK2::license(void)
  {
    return("Not specified");
  }
  
! std::string CBMPackageSCIMARK2::homePage(void)
  {
    return("http://math.nist.gov/scimark/");
  }
  
! std::string CBMPackageSCIMARK2::author(void)
  {
    return("Roldan Pozo & Bruce R Miller");
  }
  
! int CBMPackageSCIMARK2::benchmarkSize(void)
  {
    return(packageSize());
  }
  
! CBMPackageSCIMARK2::~CBMPackageSCIMARK2()
  {
  }
  
! CBMBenchmarkSCIMARK2::CBMBenchmarkSCIMARK2(CBMPackage *_package)
!   : CBMBenchmark(_package)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2::benchmarkComments(void)
  {
    std::string comment;
--- 184,217 ----
  }
  
! std::string PackageSCIMARK2::license(void)
  {
    return("Not specified");
  }
  
! std::string PackageSCIMARK2::homePage(void)
  {
    return("http://math.nist.gov/scimark/");
  }
  
! std::string PackageSCIMARK2::author(void)
  {
    return("Roldan Pozo & Bruce R Miller");
  }
  
! int PackageSCIMARK2::benchmarkSize(void)
  {
    return(packageSize());
  }
  
! PackageSCIMARK2::~PackageSCIMARK2()
  {
  }
  
! BenchmarkSCIMARK2::BenchmarkSCIMARK2(CBM::Package *_package)
!   : Benchmark(_package)
  {
  }
  
! std::string BenchmarkSCIMARK2::benchmarkComments(void)
  {
    std::string comment;
***************
*** 221,225 ****
  }
  
! std::string CBMBenchmarkSCIMARK2::bench(void)
  {
    std::string cmd;
--- 223,227 ----
  }
  
! std::string BenchmarkSCIMARK2::bench(void)
  {
    std::string cmd;
***************
*** 245,269 ****
  }
  
! CBMBenchmarkSCIMARK2::~CBMBenchmarkSCIMARK2()
  {
  }
  
  
! CBMBenchmarkSCIMARK2_FOURIER::CBMBenchmarkSCIMARK2_FOURIER(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2_FOURIER::benchmarkName(void)
  {
    return("scimark2-fourier");
  }
  
! std::string CBMBenchmarkSCIMARK2_FOURIER::scimark2BenchmarkLabel(void)
  {
    return("FFT");
  }
  
! std::string CBMBenchmarkSCIMARK2_FOURIER::benchmarkSCIMARK2Comments(void)
  {
    return("Fast Fourier Transform (FFT) performs a" \
--- 247,271 ----
  }
  
! BenchmarkSCIMARK2::~BenchmarkSCIMARK2()
  {
  }
  
  
! BenchmarkSCIMARK2_FOURIER::BenchmarkSCIMARK2_FOURIER(CBM::Package *_package)
!   : BenchmarkSCIMARK2(_package)
  {
  }
  
! std::string BenchmarkSCIMARK2_FOURIER::benchmarkName(void)
  {
    return("scimark2-fourier");
  }
  
! std::string BenchmarkSCIMARK2_FOURIER::scimark2BenchmarkLabel(void)
  {
    return("FFT");
  }
  
! std::string BenchmarkSCIMARK2_FOURIER::benchmarkSCIMARK2Comments(void)
  {
    return("Fast Fourier Transform (FFT) performs a" \
***************
*** 278,301 ****
  }
  
! CBMBenchmarkSCIMARK2_FOURIER::~CBMBenchmarkSCIMARK2_FOURIER()
  {
  }
  
! CBMBenchmarkSCIMARK2_SOR::CBMBenchmarkSCIMARK2_SOR(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2_SOR::benchmarkName(void)
  {
    return("scimark2-sor");
  }
  
! std::string CBMBenchmarkSCIMARK2_SOR::scimark2BenchmarkLabel(void)
  {
    return("SOR");
  }
  
! std::string CBMBenchmarkSCIMARK2_SOR::benchmarkSCIMARK2Comments(void)
  {
    return("Jacobi Successive Over-relaxation (SOR) on " \
--- 280,303 ----
  }
  
! BenchmarkSCIMARK2_FOURIER::~BenchmarkSCIMARK2_FOURIER()
  {
  }
  
! BenchmarkSCIMARK2_SOR::BenchmarkSCIMARK2_SOR(CBM::Package *_package)
!   : BenchmarkSCIMARK2(_package)
  {
  }
  
! std::string BenchmarkSCIMARK2_SOR::benchmarkName(void)
  {
    return("scimark2-sor");
  }
  
! std::string BenchmarkSCIMARK2_SOR::scimark2BenchmarkLabel(void)
  {
    return("SOR");
  }
  
! std::string BenchmarkSCIMARK2_SOR::benchmarkSCIMARK2Comments(void)
  {
    return("Jacobi Successive Over-relaxation (SOR) on " \
***************
*** 310,333 ****
  }
  
! CBMBenchmarkSCIMARK2_SOR::~CBMBenchmarkSCIMARK2_SOR()
  {
  }
  
! CBMBenchmarkSCIMARK2_MC::CBMBenchmarkSCIMARK2_MC(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2_MC::benchmarkName(void)
  {
    return("scimark2-mc");
  }
  
! std::string CBMBenchmarkSCIMARK2_MC::scimark2BenchmarkLabel(void)
  {
    return("MC");
  }
  
! std::string CBMBenchmarkSCIMARK2_MC::benchmarkSCIMARK2Comments(void)
  {
    return("Monte Carlo integration  approximates the " \
--- 312,335 ----
  }
  
! BenchmarkSCIMARK2_SOR::~BenchmarkSCIMARK2_SOR()
  {
  }
  
! BenchmarkSCIMARK2_MC::BenchmarkSCIMARK2_MC(CBM::Package *_package)
!   : BenchmarkSCIMARK2(_package)
  {
  }
  
! std::string BenchmarkSCIMARK2_MC::benchmarkName(void)
  {
    return("scimark2-mc");
  }
  
! std::string BenchmarkSCIMARK2_MC::scimark2BenchmarkLabel(void)
  {
    return("MC");
  }
  
! std::string BenchmarkSCIMARK2_MC::benchmarkSCIMARK2Comments(void)
  {
    return("Monte Carlo integration  approximates the " \
***************
*** 342,365 ****
  }
  
! CBMBenchmarkSCIMARK2_MC::~CBMBenchmarkSCIMARK2_MC()
  {
  }
  
! CBMBenchmarkSCIMARK2_SMM::CBMBenchmarkSCIMARK2_SMM(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2_SMM::benchmarkName(void)
  {
    return("scimark2-smm");
  }
  
! std::string CBMBenchmarkSCIMARK2_SMM::scimark2BenchmarkLabel(void)
  {
    return("SMM");
  }
  
! std::string CBMBenchmarkSCIMARK2_SMM::benchmarkSCIMARK2Comments(void)
  {
    return("Sparse matrix multiply uses an " \
--- 344,367 ----
  }
  
! BenchmarkSCIMARK2_MC::~BenchmarkSCIMARK2_MC()
  {
  }
  
! BenchmarkSCIMARK2_SMM::BenchmarkSCIMARK2_SMM(CBM::Package *_package)
!   : BenchmarkSCIMARK2(_package)
  {
  }
  
! std::string BenchmarkSCIMARK2_SMM::benchmarkName(void)
  {
    return("scimark2-smm");
  }
  
! std::string BenchmarkSCIMARK2_SMM::scimark2BenchmarkLabel(void)
  {
    return("SMM");
  }
  
! std::string BenchmarkSCIMARK2_SMM::benchmarkSCIMARK2Comments(void)
  {
    return("Sparse matrix multiply uses an " \
***************
*** 371,394 ****
  }
  
! CBMBenchmarkSCIMARK2_SMM::~CBMBenchmarkSCIMARK2_SMM()
  {
  }
  
! CBMBenchmarkSCIMARK2_LU::CBMBenchmarkSCIMARK2_LU(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2_LU::benchmarkName(void)
  {
    return("scimark2-lu");
  }
  
! std::string CBMBenchmarkSCIMARK2_LU::scimark2BenchmarkLabel(void)
  {
    return("LU");
  }
  
! std::string CBMBenchmarkSCIMARK2_LU::benchmarkSCIMARK2Comments(void)
  {
    return("Dense LU matrix factorization; computes " \
--- 373,396 ----
  }
  
! BenchmarkSCIMARK2_SMM::~BenchmarkSCIMARK2_SMM()
  {
  }
  
! BenchmarkSCIMARK2_LU::BenchmarkSCIMARK2_LU(CBM::Package *_package)
!   : BenchmarkSCIMARK2(_package)
  {
  }
  
! std::string BenchmarkSCIMARK2_LU::benchmarkName(void)
  {
    return("scimark2-lu");
  }
  
! std::string BenchmarkSCIMARK2_LU::scimark2BenchmarkLabel(void)
  {
    return("LU");
  }
  
! std::string BenchmarkSCIMARK2_LU::benchmarkSCIMARK2Comments(void)
  {
    return("Dense LU matrix factorization; computes " \
***************
*** 401,405 ****
  }
  
! CBMBenchmarkSCIMARK2_LU::~CBMBenchmarkSCIMARK2_LU()
  {
  }
--- 403,407 ----
  }
  
! BenchmarkSCIMARK2_LU::~BenchmarkSCIMARK2_LU()
  {
  }

Index: Benchmark-BENCHPP.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPP.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.3
--- Benchmark-BENCHPP.libwrapper.h	21 Jan 2007 20:46:46 -0000	1.4
***************
*** 2,10 ****
  #include <UI/UI.h>
  
! int CBMPackageBENCHPP::benchmarkNumber(void) {
    return(3);
  }
  
! BenchmarkVector& CBMPackageBENCHPP::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);
    benchmarks.push_back("benchpp-stepanov-al12");
--- 2,12 ----
  #include <UI/UI.h>
  
! using namespace CBM;
! 
! int PackageBENCHPP::benchmarkNumber(void) {
    return(3);
  }
  
! CBM::BenchmarkVector& PackageBENCHPP::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);
    benchmarks.push_back("benchpp-stepanov-al12");
***************
*** 14,36 ****
  }
  
! 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);
--- 16,38 ----
  }
  
! 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));
    }
!   CBM::cbmUI->Fatal("Unknown benchmark");
    return(0);
  }
  
! CBM::Package *package_BENCHPP = 0;
! CBM::Package *cbmlib_getPackage(void) {
    if (!package_BENCHPP) {
!      package_BENCHPP=new PackageBENCHPP(CBM::cbmSystem);
!      CBM::cbmlib_packages.push_back(package_BENCHPP);
    }
    return(package_BENCHPP);

Index: Benchmark-BENCHPP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPP.h	3 Jan 2007 22:06:26 -0000	1.3
--- Benchmark-BENCHPP.h	21 Jan 2007 20:46:46 -0000	1.4
***************
*** 13,131 ****
  #include <Benchmark/Package.h>
  
! /** \brief Defines the benchpp package.
!  */
! class CBMPackageBENCHPP : public CBMPackage
! {
!  public:
!  private:
!   virtual std::string downloadURL(void);
!   virtual std::string expectedMD5(void);
  
!   virtual std::string packageName(void);
  
!   virtual std::string packageVersion(void);
!   virtual int packageSize(void); /* in bytes */
!   virtual std::string packageComments(void);
!   virtual std::string localPackageName(void);
  		
  
!  protected:
!   virtual std::string language(void);
  
!   virtual char* extractDirectory(void);
!   virtual int hasPatch(void);
!   virtual int patch(int _force = 0);
  
!   virtual int extract(int _force = 0);
!   virtual int preConfigure(int _force);
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
!   virtual int make(void);
!   virtual int release(void);
  
!  public:
!   CBMPackageBENCHPP(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
!   virtual std::string license(void);
!   virtual std::string homePage(void);
!   virtual std::string author(void);
  
!   virtual int benchmarkSize(void);
!   virtual ~CBMPackageBENCHPP();
  		
! };
  
! /** \brief Abstract benchmark definition for CBMPackageBENCHPP
!  */
! class CBMBenchmarkBENCHPP : public CBMBenchmark
! {
!  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);
!   virtual ~CBMBenchmarkBENCHPP();
! };
  
! /** \brief Defines the dhrystone benchmark within benchpp package.
!  */
! class CBMBenchmarkBENCHPP_DHRYSTONE : public CBMBenchmarkBENCHPP
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkBENCHPPComments(void);
  
!   virtual std::string benchppBenchmark(void);
  
  
!  public:
!   CBMBenchmarkBENCHPP_DHRYSTONE(CBMPackage *_package);
!   virtual ~CBMBenchmarkBENCHPP_DHRYSTONE();
! };
  
! /** \brief Defines the whetstone benchmark within benchpp package.
!  */
! class CBMBenchmarkBENCHPP_WHETSTONE : public CBMBenchmarkBENCHPP
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkBENCHPPComments(void);
  
!   virtual std::string benchppBenchmark(void);
  
  
!  public:
!   CBMBenchmarkBENCHPP_WHETSTONE(CBMPackage *_package);
!   virtual ~CBMBenchmarkBENCHPP_WHETSTONE();
! };
  
! /** \brief Defines base stuff for stephanov benchmarks within benchpp package.
!  */
! class CBMBenchmarkBENCHPP_STEPANOV : public CBMBenchmarkBENCHPP
! {
!  protected:
!   virtual std::string bench(void);
!  public:
!   CBMBenchmarkBENCHPP_STEPANOV(CBMPackage *_package);
!   virtual ~CBMBenchmarkBENCHPP_STEPANOV();
! };
  
! /** \brief Defines the stephanov-al12 benchmark within benchpp package.
!  */
! class CBMBenchmarkBENCHPP_STEPANOV_AL12 : public CBMBenchmarkBENCHPP_STEPANOV
! {
!  protected:
!   virtual std::string benchmarkName(void);
!   virtual std::string benchmarkBENCHPPComments(void);
  
!   virtual std::string benchppBenchmark(void);
!  public:
!   CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMPackage *_package);
!   virtual ~CBMBenchmarkBENCHPP_STEPANOV_AL12();
! };
  
  DLdeclare();
--- 13,133 ----
  #include <Benchmark/Package.h>
  
! namespace CBM {
!   /** \brief Defines the benchpp package.
!    */
!   class PackageBENCHPP : public Package
!   {
!   public:
!   private:
!     virtual std::string downloadURL(void);
!     virtual std::string expectedMD5(void);
  
!     virtual std::string packageName(void);
  
!     virtual std::string packageVersion(void);
!     virtual int packageSize(void); /* in bytes */
!     virtual std::string packageComments(void);
!     virtual std::string localPackageName(void);
  		
  
!   protected:
!     virtual std::string language(void);
  
!     virtual char* extractDirectory(void);
!     virtual int hasPatch(void);
!     virtual int patch(int _force = 0);
  
!     virtual int extract(int _force = 0);
!     virtual int preConfigure(int _force);
!     virtual int configure(CBM::Compiler        *_currentCompiler,
! 			  CBM::CompilerOptions *_currentOptions);
  
!     virtual int make(void);
!     virtual int release(void);
  
!   public:
!     PackageBENCHPP(class System *_system);
!     DLPackageWrapper_declare();
  
!     virtual std::string license(void);
!     virtual std::string homePage(void);
!     virtual std::string author(void);
  
!     virtual int benchmarkSize(void);
!     virtual ~PackageBENCHPP();
  		
!   };
  
!   /** \brief Abstract benchmark definition for PackageBENCHPP
!    */
!   class BenchmarkBENCHPP : public Benchmark
!   {
!   protected:
!     BenchmarkBENCHPP(CBM::Package *_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);
!     virtual ~BenchmarkBENCHPP();
!   };
  
!   /** \brief Defines the dhrystone benchmark within benchpp package.
!    */
!   class BenchmarkBENCHPP_DHRYSTONE : public BenchmarkBENCHPP
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkBENCHPPComments(void);
  
!     virtual std::string benchppBenchmark(void);
  
  
!   public:
!     BenchmarkBENCHPP_DHRYSTONE(CBM::Package *_package);
!     virtual ~BenchmarkBENCHPP_DHRYSTONE();
!   };
  
!   /** \brief Defines the whetstone benchmark within benchpp package.
!    */
!   class BenchmarkBENCHPP_WHETSTONE : public BenchmarkBENCHPP
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkBENCHPPComments(void);
  
!     virtual std::string benchppBenchmark(void);
  
  
!   public:
!     BenchmarkBENCHPP_WHETSTONE(CBM::Package *_package);
!     virtual ~BenchmarkBENCHPP_WHETSTONE();
!   };
  
!   /** \brief Defines base stuff for stephanov benchmarks within benchpp package.
!    */
!   class BenchmarkBENCHPP_STEPANOV : public BenchmarkBENCHPP
!   {
!   protected:
!     virtual std::string bench(void);
!   public:
!     BenchmarkBENCHPP_STEPANOV(CBM::Package *_package);
!     virtual ~BenchmarkBENCHPP_STEPANOV();
!   };
  
!   /** \brief Defines the stephanov-al12 benchmark within benchpp package.
!    */
!   class BenchmarkBENCHPP_STEPANOV_AL12 : public BenchmarkBENCHPP_STEPANOV
!   {
!   protected:
!     virtual std::string benchmarkName(void);
!     virtual std::string benchmarkBENCHPPComments(void);
  
!     virtual std::string benchppBenchmark(void);
!   public:
!     BenchmarkBENCHPP_STEPANOV_AL12(CBM::Package *_package);
!     virtual ~BenchmarkBENCHPP_STEPANOV_AL12();
!   };
! }
  
  DLdeclare();

Index: Benchmark-BENCHPPLINUX.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPPLINUX.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.3
--- Benchmark-BENCHPPLINUX.libwrapper.h	21 Jan 2007 20:46:47 -0000	1.4
***************
*** 2,10 ****
  #include <UI/UI.h>
  
! int CBMPackageBENCHPPLINUX::benchmarkNumber(void) {
    return(35);
  }
  
! BenchmarkVector& CBMPackageBENCHPPLINUX::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);
    benchmarks.push_back("benchpplinux-bool-assign");
--- 2,12 ----
  #include <UI/UI.h>
  
! using namespace CBM;
! 
! int PackageBENCHPPLINUX::benchmarkNumber(void) {
    return(35);
  }
  
! CBM::BenchmarkVector& PackageBENCHPPLINUX::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);
    benchmarks.push_back("benchpplinux-bool-assign");
***************
*** 46,164 ****
  }
  
! 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);
--- 48,166 ----
  }
  
! 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_LOCALC...
 
[truncated message content]