Thread: [Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.3, 1.4 Benchmark-BE

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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);