Thread: [Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPPLINUX.h, 1.4, 1.5 Benchmark

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-serv30770

Modified Files:
	Benchmark-BENCHPPLINUX.h Benchmark-BZIP2.cpp Benchmark-BZIP2.h 
	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-LINPACKC.cpp 
	Benchmark-LINPACKC.h Benchmark-NBENCH.cpp Benchmark-NBENCH.h 
	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h 
Log Message:
API changes on CBM::Package

Index: Benchmark-NBENCH.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-NBENCH.h	18 Jan 2007 18:44:36 -0000	1.4
--- Benchmark-NBENCH.h	21 Jan 2007 21:16:33 -0000	1.5
***************
*** 23,32 ****
      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);

--- 23,32 ----
      virtual std::string expectedMD5(void);

!     virtual std::string Name(void);

!     virtual std::string Version(void);
!     virtual int Size(void); /* in bytes */
!     virtual std::string Comments(void);
!     virtual std::string localName(void);

***************
*** 52,56 ****
      virtual std::string author(void);

!     virtual int benchmarkSize(void);
      virtual ~PackageNBENCH();

--- 52,56 ----
      virtual std::string author(void);

!     virtual int totalSize(void);
      virtual ~PackageNBENCH();

Index: Benchmark-LINPACKC.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark-LINPACKC.h	21 Jan 2007 20:46:47 -0000	1.6
--- Benchmark-LINPACKC.h	21 Jan 2007 21:16:33 -0000	1.7
***************
*** 23,33 ****
      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);

--- 23,33 ----
      virtual std::string expectedMD5(void);

!     virtual std::string Name(void);

!     virtual std::string Version(void);
!     virtual int Size(void); /* in bytes */

!     virtual std::string Comments(void);
!     virtual std::string localName(void);

***************
*** 46,50 ****
      virtual std::string author(void);

!     virtual int benchmarkSize(void);
      virtual ~PackageLINPACKC();
    };
--- 46,50 ----
      virtual std::string author(void);

!     virtual int totalSize(void);
      virtual ~PackageLINPACKC();
    };

Index: Benchmark-SCIMARK2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-SCIMARK2.h	21 Jan 2007 20:46:47 -0000	1.4
--- Benchmark-SCIMARK2.h	21 Jan 2007 21:16:34 -0000	1.5
***************
*** 22,31 ****
      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);

--- 22,31 ----
      virtual std::string expectedMD5(void);

!     virtual std::string Name(void);

!     virtual std::string Version(void);
!     virtual int Size(void); /* in bytes */
!     virtual std::string Comments(void);
!     virtual std::string localName(void);

***************
*** 53,57 ****
      virtual std::string author(void);

!     virtual int benchmarkSize(void);
      virtual ~PackageSCIMARK2();

--- 53,57 ----
      virtual std::string author(void);

!     virtual int totalSize(void);
      virtual ~PackageSCIMARK2();

Index: Benchmark-NBENCH.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-NBENCH.cpp	18 Jan 2007 18:44:36 -0000	1.3
--- Benchmark-NBENCH.cpp	21 Jan 2007 21:16:33 -0000	1.4
***************
*** 24,48 ****
  }

! std::string PackageNBENCH::packageName(void)
  {
    return("nbench");
  }

! std::string PackageNBENCH::packageVersion(void)
  {
    return("2.2.2");
  }

! int PackageNBENCH::packageSize(void)
  {
    return(111751);
  }

! std::string PackageNBENCH::packageComments(void)
  {
    return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program");
  }

! std::string PackageNBENCH::localPackageName(void)
  {
    return("nbench-byte-2.2.2.tar.gz");
--- 24,48 ----
  }

! std::string PackageNBENCH::Name(void)
  {
    return("nbench");
  }

! std::string PackageNBENCH::Version(void)
  {
    return("2.2.2");
  }

! int PackageNBENCH::Size(void)
  {
    return(111751);
  }

! std::string PackageNBENCH::Comments(void)
  {
    return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program");
  }

! std::string PackageNBENCH::localName(void)
  {
    return("nbench-byte-2.2.2.tar.gz");
***************
*** 61,65 ****
  int PackageNBENCH::extract(int _force)
  {
!   std::string localFile = localPackageAbsoluteName();
    std::string cmd;
    std::string sstdout;
--- 61,65 ----
  int PackageNBENCH::extract(int _force)
  {
!   std::string localFile = localAbsoluteName();
    std::string cmd;
    std::string sstdout;
***************
*** 96,100 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 96,100 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 134,138 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 134,138 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 157,163 ****
  }

! int PackageNBENCH::benchmarkSize(void)
  {
!   return(packageSize());
  }

--- 157,163 ----
  }

! int PackageNBENCH::totalSize(void)
  {
!   return(Size());
  }

***************
*** 180,184 ****
    contains+="=T\n";

!   fileName+=package->localPackageAbsoluteDirectory();
    fileName+="/COMPBENCH.DAT";

--- 180,184 ----
    contains+="=T\n";

!   fileName+=package->localAbsoluteDirectory();
    fileName+="/COMPBENCH.DAT";

***************
*** 208,212 ****

    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./nbench -cCOMPBENCH.DAT | grep '^";
    cmd+=nbyteBenchmarkLabel();
--- 208,212 ----

    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(./nbench -cCOMPBENCH.DAT | grep '^";
    cmd+=nbyteBenchmarkLabel();

Index: Benchmark-GZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-GZIP.h	18 Jan 2007 18:44:36 -0000	1.4
--- Benchmark-GZIP.h	21 Jan 2007 21:16:33 -0000	1.5
***************
*** 23,31 ****
      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);

      virtual char* extractDirectory(void);
--- 23,31 ----
      virtual std::string expectedMD5(void);

!     virtual std::string Name(void);
!     virtual std::string Version(void);
!     virtual int         Size(void); /* in bytes */
!     virtual std::string Comments(void);
!     virtual std::string localName(void);

      virtual char* extractDirectory(void);

Index: Benchmark-BENCHPPLINUX.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-BENCHPPLINUX.h	21 Jan 2007 20:46:46 -0000	1.4
--- Benchmark-BENCHPPLINUX.h	21 Jan 2007 21:16:33 -0000	1.5
***************
*** 23,34 ****
      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 language(void);
!     virtual std::string localPackageName(void);

--- 23,34 ----
      virtual std::string expectedMD5(void);

!     virtual std::string Name(void);

!     virtual std::string Version(void);
!     virtual int Size(void); /* in bytes */
!     virtual std::string Comments(void);

      virtual std::string language(void);
!     virtual std::string localName(void);

***************
*** 53,57 ****
      virtual std::string author(void);

!     virtual int benchmarkSize(void);
      virtual ~PackageBENCHPPLINUX();

--- 53,57 ----
      virtual std::string author(void);

!     virtual int totalSize(void);
      virtual ~PackageBENCHPPLINUX();

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-BZIP2.cpp	18 Jan 2007 18:44:36 -0000	1.5
--- Benchmark-BZIP2.cpp	21 Jan 2007 21:16:33 -0000	1.6
***************
*** 25,49 ****
  }

! std::string PackageBZIP2::packageName(void)
  {
    return("bzip2");
  }

! std::string PackageBZIP2::packageVersion(void)
  {
    return("1.0.3");
  }

! int PackageBZIP2::packageSize(void)
  {
    return(669075);
  }

! std::string PackageBZIP2::packageComments(void)
  {
    return("Official bzip2-1.0.3 source package.");
  }

! std::string PackageBZIP2::localPackageName(void)
  {
    return("bzip2-1.0.3.tar.Z");
--- 25,49 ----
  }

! std::string PackageBZIP2::Name(void)
  {
    return("bzip2");
  }

! std::string PackageBZIP2::Version(void)
  {
    return("1.0.3");
  }

! int PackageBZIP2::Size(void)
  {
    return(669075);
  }

! std::string PackageBZIP2::Comments(void)
  {
    return("Official bzip2-1.0.3 source package.");
  }

! std::string PackageBZIP2::localName(void)
  {
    return("bzip2-1.0.3.tar.Z");
***************
*** 67,71 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 67,71 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 110,114 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 110,114 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-GZIP.cpp	18 Jan 2007 18:44:36 -0000	1.5
--- Benchmark-GZIP.cpp	21 Jan 2007 21:16:33 -0000	1.6
***************
*** 27,51 ****
  }

! std::string PackageGZIP::packageName(void)
  {
    return("gzip");
  }

! std::string PackageGZIP::packageVersion(void)
  {
    return("1.2.4");
  }

! int PackageGZIP::packageSize(void)
  {
    return(327865);
  }

! std::string PackageGZIP::packageComments(void)
  {
    return("Official gzip-1.2.4 source package.");
  }

! std::string PackageGZIP::localPackageName(void)
  {
    return("gzip-1.2.4.tar.Z");
--- 27,51 ----
  }

! std::string PackageGZIP::Name(void)
  {
    return("gzip");
  }

! std::string PackageGZIP::Version(void)
  {
    return("1.2.4");
  }

! int PackageGZIP::Size(void)
  {
    return(327865);
  }

! std::string PackageGZIP::Comments(void)
  {
    return("Official gzip-1.2.4 source package.");
  }

! std::string PackageGZIP::localName(void)
  {
    return("gzip-1.2.4.tar.Z");
***************
*** 68,72 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 68,72 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-SCIMARK2.cpp	21 Jan 2007 20:46:47 -0000	1.4
--- Benchmark-SCIMARK2.cpp	21 Jan 2007 21:16:33 -0000	1.5
***************
*** 31,55 ****
  }

! 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");
--- 31,55 ----
  }

! std::string PackageSCIMARK2::Name(void)
  {
    return("scimark2");
  }

! std::string PackageSCIMARK2::Version(void)
  {
    return("2.0");
  }

! int PackageSCIMARK2::Size(void)
  {
    return(13792);
  }

! std::string PackageSCIMARK2::Comments(void)
  {
    return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite.");
  }

! std::string PackageSCIMARK2::localName(void)
  {
    return("scimark2_1c.zip");
***************
*** 82,86 ****

    cmd+="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && if test ! -f ";
    cmd+=patch;
--- 82,86 ----

    cmd+="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && if test ! -f ";
    cmd+=patch;
***************
*** 99,103 ****
  int PackageSCIMARK2::extract(int _force)
  {
!   std::string localFile = localPackageAbsoluteName();
    std::string cmd;
    std::string sstdout;
--- 99,103 ----
  int PackageSCIMARK2::extract(int _force)
  {
!   std::string localFile = localAbsoluteName();
    std::string cmd;
    std::string sstdout;
***************
*** 116,120 ****
    cmd+=system->temporaryDirectory(CBM::System::Download);
    cmd+="/";
!   cmd+=localPackageName();

    return(system->exec(cmd, sstdout)==0);
--- 116,120 ----
    cmd+=system->temporaryDirectory(CBM::System::Download);
    cmd+="/";
!   cmd+=localName();

    return(system->exec(cmd, sstdout)==0);
***************
*** 138,142 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 138,142 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 176,180 ****

    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 176,180 ----

    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 199,205 ****
  }

! int PackageSCIMARK2::benchmarkSize(void)
  {
!   return(packageSize());
  }

--- 199,205 ----
  }

! int PackageSCIMARK2::totalSize(void)
  {
!   return(Size());
  }

***************
*** 229,233 ****

    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./scimark2 ";
    cmd+=scimark2BenchmarkLabel();
--- 229,233 ----

    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(./scimark2 ";
    cmd+=scimark2BenchmarkLabel();

Index: Benchmark-LINPACKC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark-LINPACKC.cpp	21 Jan 2007 20:46:47 -0000	1.8
--- Benchmark-LINPACKC.cpp	21 Jan 2007 21:16:33 -0000	1.9
***************
*** 23,37 ****
  }

! std::string PackageLINPACKC::packageName(void)
  {
    return("linpackc");
  }

! std::string PackageLINPACKC::packageVersion(void)
  {
    return("0.1.1");
  }

! int PackageLINPACKC::packageSize(void)
  {
    return(75029);
--- 23,37 ----
  }

! std::string PackageLINPACKC::Name(void)
  {
    return("linpackc");
  }

! std::string PackageLINPACKC::Version(void)
  {
    return("0.1.1");
  }

! int PackageLINPACKC::Size(void)
  {
    return(75029);
***************
*** 39,48 ****

! std::string PackageLINPACKC::packageComments(void)
  {
    return("This is the former linpackc benchmark translated to C by Bonnie Toy, which has been modified to suit compbenchmarks requirements.");
  }

! std::string PackageLINPACKC::localPackageName(void)
  {
    return("cbm-bm-linpackc");
--- 39,48 ----

! std::string PackageLINPACKC::Comments(void)
  {
    return("This is the former linpackc benchmark translated to C by Bonnie Toy, which has been modified to suit compbenchmarks requirements.");
  }

! std::string PackageLINPACKC::localName(void)
  {
    return("cbm-bm-linpackc");
***************
*** 58,62 ****
    std::string dum = "cbm-bm-linpackc-";

!   dum+=packageVersion();
    return((char*) dum.c_str());
  }
--- 58,62 ----
    std::string dum = "cbm-bm-linpackc-";

!   dum+=Version();
    return((char*) dum.c_str());
  }
***************
*** 82,88 ****
  }

! int PackageLINPACKC::benchmarkSize(void)
  {
!   return(packageSize());
  }

--- 82,88 ----
  }

! int PackageLINPACKC::totalSize(void)
  {
!   return(Size());
  }

***************
*** 91,96 ****
  }

- 
- 
  BenchmarkLINPACKC::BenchmarkLINPACKC(CBM::Package *_package)
    : Benchmark(_package)
--- 91,94 ----
***************
*** 115,119 ****

    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(";
    cmd+="./";
--- 113,117 ----

    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(";
    cmd+="./";

Index: Benchmark-BZIP2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-BZIP2.h	18 Jan 2007 18:44:36 -0000	1.5
--- Benchmark-BZIP2.h	21 Jan 2007 21:16:33 -0000	1.6
***************
*** 23,31 ****
      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);

      virtual char* extractDirectory(void);
--- 23,31 ----
      virtual std::string expectedMD5(void);

!     virtual std::string Name(void);
!     virtual std::string Version(void);
!     virtual int         Size(void); /* in bytes */
!     virtual std::string Comments(void);
!     virtual std::string localName(void);

      virtual char* extractDirectory(void);

Thread: [Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPPLINUX.h, 1.4, 1.5 Benchmark

compbench-devel