compbench-devel

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-SCIMARK2.cpp, 1.1, 1.2 Benchmark-SCIMARK2.h, 1.1, 1.2

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

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

Modified Files:
	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h 
Log Message:
CBMPackage and new related API used.

Index: Benchmark-SCIMARK2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-SCIMARK2.h	28 Dec 2006 17:41:04 -0000	1.1
--- Benchmark-SCIMARK2.h	3 Jan 2007 19:04:46 -0000	1.2
***************
*** 10,18 ****
  
  #include <Benchmark/Benchmark.h>
  
  
  /** \brief Defines the scimark2 package.
   */
! class CBMBenchmarkSCIMARK2 : public CBMBenchmark
  {
   public:
--- 10,19 ----
  
  #include <Benchmark/Benchmark.h>
+ #include <Benchmark/Package.h>
  
  
  /** \brief Defines the scimark2 package.
   */
! class CBMPackageSCIMARK2 : public CBMPackage
  {
   public:
***************
*** 23,27 ****
    virtual std::string packageName(void);
    virtual std::string benchmarkName(void) = 0;
-   virtual std::string benchmarkComments(void);
  
    virtual std::string packageVersion(void);
--- 24,27 ----
***************
*** 32,41 ****
  
   protected:
- 
-   CBMBenchmarkSCIMARK2(class CBMSystem *_system);
- 
    virtual std::string language(void);
-   virtual std::string benchmarkSCIMARK2Comments(void) = 0;
-   virtual std::string scimark2BenchmarkLabel(void) = 0;
  
    virtual char* extractDirectory(void);
--- 32,36 ----
***************
*** 49,56 ****
  
    virtual int make(void);
-   virtual std::string bench(void);
    virtual int release(void);
  
   public:
    virtual std::string license(void);
    virtual std::string homePage(void);
--- 44,53 ----
  
    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);
***************
*** 58,65 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkSCIMARK2();
  		
  };
  
  /** \brief Defines the fourier benchmark within scimark2 package.
   */
--- 55,76 ----
  
    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 benchmarkSCIMARK2Comments(void) = 0;
+   virtual std::string scimark2BenchmarkLabel(void) = 0;
+   virtual std::string bench(void);
+   virtual ~CBMBenchmarkSCIMARK2();
+ };
+ 
+ 
  /** \brief Defines the fourier benchmark within scimark2 package.
   */
***************
*** 73,77 ****
  
   public:
!   CBMBenchmarkSCIMARK2_FOURIER(class CBMSystem *_system);
    virtual ~CBMBenchmarkSCIMARK2_FOURIER();
  };
--- 84,88 ----
  
   public:
!   CBMBenchmarkSCIMARK2_FOURIER(CBMPackage *_package);
    virtual ~CBMBenchmarkSCIMARK2_FOURIER();
  };
***************
*** 88,92 ****
  
   public:
!   CBMBenchmarkSCIMARK2_SOR(class CBMSystem *_system);
    virtual ~CBMBenchmarkSCIMARK2_SOR();
  };
--- 99,103 ----
  
   public:
!   CBMBenchmarkSCIMARK2_SOR(CBMPackage *_package);
    virtual ~CBMBenchmarkSCIMARK2_SOR();
  };
***************
*** 103,107 ****
  
   public:
!   CBMBenchmarkSCIMARK2_MC(class CBMSystem *_system);
    virtual ~CBMBenchmarkSCIMARK2_MC();
  };
--- 114,118 ----
  
   public:
!   CBMBenchmarkSCIMARK2_MC(CBMPackage *_package);
    virtual ~CBMBenchmarkSCIMARK2_MC();
  };
***************
*** 118,122 ****
  
   public:
!   CBMBenchmarkSCIMARK2_SMM(class CBMSystem *_system);
    virtual ~CBMBenchmarkSCIMARK2_SMM();
  };
--- 129,133 ----
  
   public:
!   CBMBenchmarkSCIMARK2_SMM(CBMPackage *_package);
    virtual ~CBMBenchmarkSCIMARK2_SMM();
  };
***************
*** 133,141 ****
  
   public:
!   CBMBenchmarkSCIMARK2_LU(class CBMSystem *_system);
    virtual ~CBMBenchmarkSCIMARK2_LU();
  };
  
! lib_declare();
  
  #endif
--- 144,152 ----
  
   public:
!   CBMBenchmarkSCIMARK2_LU(CBMPackage *_package);
    virtual ~CBMBenchmarkSCIMARK2_LU();
  };
  
! DLdeclare();
  
  #endif

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-SCIMARK2.cpp	28 Dec 2006 17:41:04 -0000	1.1
--- Benchmark-SCIMARK2.cpp	3 Jan 2007 19:04:46 -0000	1.2
***************
*** 6,75 ****
  #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h>
  
! CBMBenchmarkSCIMARK2::CBMBenchmarkSCIMARK2(CBMSystem *_system)
!   : CBMBenchmark(_system)
  {
  }
  
! std::string CBMBenchmarkSCIMARK2::downloadURL(void)
  {
    return("http://math.nist.gov/scimark2/scimark2_1c.zip");
  }
  
! std::string CBMBenchmarkSCIMARK2::expectedMD5(void)
  {
    return("6cc8d6d5312a07e32316c03580e0206b");
  }
  
! std::string CBMBenchmarkSCIMARK2::packageName(void)
  {
    return("scimark2");
  }
  
! std::string CBMBenchmarkSCIMARK2::benchmarkComments(void)
! {
!   std::string comment;
! 
!   comment+=benchmarkSCIMARK2Comments();
!   comment+=" (Comment from http://math.nist.gov/scimark2/about.html)";
! 
!   return(comment);
! }
! 
! std::string CBMBenchmarkSCIMARK2::packageVersion(void)
  {
    return("2.0");
  }
  
! int CBMBenchmarkSCIMARK2::packageSize(void)
  {
    return(13792);
  }
  
! std::string CBMBenchmarkSCIMARK2::packageComments(void)
  {
    return("Official SciMark 2.0 package. Yet, a minor patch held locally is applied by benchmark suite.");
  }
  
! std::string CBMBenchmarkSCIMARK2::localPackageName(void)
  {
    return("scimark2_1c.zip");
  }
  
! std::string CBMBenchmarkSCIMARK2::language(void)
  {
    return("C");
  }
  
! char* CBMBenchmarkSCIMARK2::extractDirectory(void)
  {
    return("scimark2");
  }
  
! int CBMBenchmarkSCIMARK2::hasPatch(void)
  {
    return(1);
  }
  
! int CBMBenchmarkSCIMARK2::patch(int _force)
  {
    std::string cmd;
--- 6,65 ----
  #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;
***************
*** 97,101 ****
  }
  
! int CBMBenchmarkSCIMARK2::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
--- 87,91 ----
  }
  
! int CBMPackageSCIMARK2::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
***************
*** 121,130 ****
  }
  
! int CBMBenchmarkSCIMARK2::preConfigure(int _force)
  {
    return(1);
  }
  
! int CBMBenchmarkSCIMARK2::configure(CBMCompiler        *_currentCompiler,
  				    CBMCompilerOptions *_currentOptions)
  {
--- 111,120 ----
  }
  
! int CBMPackageSCIMARK2::preConfigure(int _force)
  {
    return(1);
  }
  
! int CBMPackageSCIMARK2::configure(CBMCompiler        *_currentCompiler,
  				    CBMCompilerOptions *_currentOptions)
  {
***************
*** 132,136 ****
  }
  
! int CBMBenchmarkSCIMARK2::make(void)
  {
    std::string cmd;
--- 122,126 ----
  }
  
! int CBMPackageSCIMARK2::make(void)
  {
    std::string cmd;
***************
*** 170,198 ****
  }
  
! std::string CBMBenchmarkSCIMARK2::bench(void)
! {
!   std::string cmd;
!   std::string result;
! 
!   cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
!   cmd+=" && echo $(./scimark2 ";
!   cmd+=scimark2BenchmarkLabel();
!   cmd+=" | ";
!   cmd+=CBM_PROG_GREP;
!   cmd+=" '^CompBenchmarks:";
!   cmd+="' | ";
!   cmd+=CBM_PROG_CUT;
!   cmd+=" -f2 -d':')";
! 
!   if (system->exec(cmd, result)==0) {
!     return(result);
!   } else {
!     return("0");
!   }
! 
! }
! 
! int CBMBenchmarkSCIMARK2::release(void)
  {
    std::string cmd;
--- 160,164 ----
  }
  
! int CBMPackageSCIMARK2::release(void)
  {
    std::string cmd;
***************
*** 208,237 ****
  }
  
! std::string CBMBenchmarkSCIMARK2::license(void)
  {
    return("Not specified");
  }
  
! std::string CBMBenchmarkSCIMARK2::homePage(void)
  {
    return("http://math.nist.gov/scimark/");
  }
  
! std::string CBMBenchmarkSCIMARK2::author(void)
  {
    return("Roldan Pozo & Bruce R Miller");
  }
  
! int CBMBenchmarkSCIMARK2::benchmarkSize(void)
  {
    return(packageSize());
  }
  
  CBMBenchmarkSCIMARK2::~CBMBenchmarkSCIMARK2()
  {
  }
  
! CBMBenchmarkSCIMARK2_FOURIER::CBMBenchmarkSCIMARK2_FOURIER(CBMSystem *_system)
!   : CBMBenchmarkSCIMARK2(_system)
  {
  }
--- 174,250 ----
  }
  
! 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;
+ 
+   comment+=benchmarkSCIMARK2Comments();
+   comment+=" (Comment from http://math.nist.gov/scimark2/about.html)";
+ 
+   return(comment);
+ }
+ 
+ std::string CBMBenchmarkSCIMARK2::bench(void)
+ {
+   std::string cmd;
+   std::string result;
+ 
+   cmd="cd ";
+   cmd+=package->localPackageAbsoluteDirectory();
+   cmd+=" && echo $(./scimark2 ";
+   cmd+=scimark2BenchmarkLabel();
+   cmd+=" | ";
+   cmd+=CBM_PROG_GREP;
+   cmd+=" '^CompBenchmarks:";
+   cmd+="' | ";
+   cmd+=CBM_PROG_CUT;
+   cmd+=" -f2 -d':')";
+ 
+   if (System()->exec(cmd, result)==0) {
+     return(result);
+   } else {
+     return("0");
+   }
+ 
+ }
+ 
  CBMBenchmarkSCIMARK2::~CBMBenchmarkSCIMARK2()
  {
  }
  
! 
! CBMBenchmarkSCIMARK2_FOURIER::CBMBenchmarkSCIMARK2_FOURIER(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
***************
*** 264,269 ****
  }
  
! CBMBenchmarkSCIMARK2_SOR::CBMBenchmarkSCIMARK2_SOR(CBMSystem *_system)
!   : CBMBenchmarkSCIMARK2(_system)
  {
  }
--- 277,282 ----
  }
  
! CBMBenchmarkSCIMARK2_SOR::CBMBenchmarkSCIMARK2_SOR(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
***************
*** 296,301 ****
  }
  
! CBMBenchmarkSCIMARK2_MC::CBMBenchmarkSCIMARK2_MC(CBMSystem *_system)
!   : CBMBenchmarkSCIMARK2(_system)
  {
  }
--- 309,314 ----
  }
  
! CBMBenchmarkSCIMARK2_MC::CBMBenchmarkSCIMARK2_MC(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
***************
*** 328,333 ****
  }
  
! CBMBenchmarkSCIMARK2_SMM::CBMBenchmarkSCIMARK2_SMM(CBMSystem *_system)
!   : CBMBenchmarkSCIMARK2(_system)
  {
  }
--- 341,346 ----
  }
  
! CBMBenchmarkSCIMARK2_SMM::CBMBenchmarkSCIMARK2_SMM(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }
***************
*** 357,362 ****
  }
  
! CBMBenchmarkSCIMARK2_LU::CBMBenchmarkSCIMARK2_LU(CBMSystem *_system)
!   : CBMBenchmarkSCIMARK2(_system)
  {
  }
--- 370,375 ----
  }
  
! CBMBenchmarkSCIMARK2_LU::CBMBenchmarkSCIMARK2_LU(CBMPackage *_package)
!   : CBMBenchmarkSCIMARK2(_package)
  {
  }

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-NBENCH.cpp, 1.1, 1.2 Benchmark-NBENCH.h, 1.1, 1.2

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

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

Modified Files:
	Benchmark-NBENCH.cpp Benchmark-NBENCH.h 
Log Message:
CBMPackage and new related API used.

Index: Benchmark-NBENCH.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-NBENCH.h	28 Dec 2006 17:41:04 -0000	1.1
--- Benchmark-NBENCH.h	3 Jan 2007 18:53:17 -0000	1.2
***************
*** 11,18 ****
  
  #include <Benchmark/Benchmark.h>
  
  /** \brief Defines the nbench package.
   */
! class CBMBenchmarkNBENCH : public CBMBenchmark
  {
   public:
--- 11,19 ----
  
  #include <Benchmark/Benchmark.h>
+ #include <Benchmark/Package.h>
  
  /** \brief Defines the nbench package.
   */
! class CBMPackageNBENCH : public CBMPackage
  {
   public:
***************
*** 22,27 ****
  
    virtual std::string packageName(void);
-   virtual std::string benchmarkName(void) = 0;
-   virtual std::string benchmarkComments(void);
  
    virtual std::string packageVersion(void);
--- 23,26 ----
***************
*** 33,44 ****
   protected:
  
!   CBMBenchmarkNBENCH(class CBMSystem *_system);
  
    virtual std::string language(void);
-   virtual std::string nbyteBenchmark(void) = 0;
-   virtual std::string nbyteBenchmarkLabel(void) = 0;
-   virtual std::string benchmarkNBENCHComments(void) = 0;
- 
-   virtual int nbyteWriteDatFile(void);
  
    virtual char* extractDirectory(void);
--- 32,39 ----
   protected:
  
!   CBMPackageNBENCH(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
    virtual std::string language(void);
  
    virtual char* extractDirectory(void);
***************
*** 50,54 ****
  
    virtual int make(void);
-   virtual std::string bench(void);
    virtual int release(void);
  
--- 45,48 ----
***************
*** 59,66 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkNBENCH();
  		
  };
  
  /** \brief Defines the numsort benchmark within nbench package.
   */
--- 53,79 ----
  
    virtual int benchmarkSize(void);
!   virtual ~CBMPackageNBENCH();
  		
  };
  
+ /** \brief Abstract benchmark for CBMPackageNBENCH package.
+  */
+ class CBMBenchmarkNBENCH : public CBMBenchmark
+ {
+  protected:
+ 
+   virtual int nbyteWriteDatFile(void);
+ 
+   virtual std::string benchmarkComments(void);
+   virtual std::string nbyteBenchmark(void) = 0;
+   virtual std::string nbyteBenchmarkLabel(void) = 0;
+   virtual std::string benchmarkNBENCHComments(void) = 0;
+   
+   virtual std::string bench(void);
+ 
+   CBMBenchmarkNBENCH(CBMPackage *_package);
+   virtual ~CBMBenchmarkNBENCH();
+ };
+ 
  /** \brief Defines the numsort benchmark within nbench package.
   */
***************
*** 75,79 ****
  
   public:
!   CBMBenchmarkNBENCH_NUMSORT(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_NUMSORT();
  };
--- 88,92 ----
  
   public:
!   CBMBenchmarkNBENCH_NUMSORT(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_NUMSORT();
  };
***************
*** 91,95 ****
  
   public:
!   CBMBenchmarkNBENCH_STRINGSORT(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_STRINGSORT();
  };
--- 104,108 ----
  
   public:
!   CBMBenchmarkNBENCH_STRINGSORT(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_STRINGSORT();
  };
***************
*** 107,111 ****
  
   public:
!   CBMBenchmarkNBENCH_BITFIELD(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_BITFIELD();
  };
--- 120,124 ----
  
   public:
!   CBMBenchmarkNBENCH_BITFIELD(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_BITFIELD();
  };
***************
*** 123,127 ****
  
   public:
!   CBMBenchmarkNBENCH_EMF(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_EMF();
  };
--- 136,140 ----
  
   public:
!   CBMBenchmarkNBENCH_EMF(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_EMF();
  };
***************
*** 139,143 ****
  
   public:
!   CBMBenchmarkNBENCH_FOURIER(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_FOURIER();
  };
--- 152,156 ----
  
   public:
!   CBMBenchmarkNBENCH_FOURIER(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_FOURIER();
  };
***************
*** 155,159 ****
  
   public:
!   CBMBenchmarkNBENCH_ASSIGN(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_ASSIGN();
  };
--- 168,172 ----
  
   public:
!   CBMBenchmarkNBENCH_ASSIGN(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_ASSIGN();
  };
***************
*** 171,175 ****
  
   public:
!   CBMBenchmarkNBENCH_HUFFMAN(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_HUFFMAN();
  };
--- 184,188 ----
  
   public:
!   CBMBenchmarkNBENCH_HUFFMAN(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_HUFFMAN();
  };
***************
*** 187,191 ****
  
   public:
!   CBMBenchmarkNBENCH_IDEA(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_IDEA();
  };
--- 200,204 ----
  
   public:
!   CBMBenchmarkNBENCH_IDEA(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_IDEA();
  };
***************
*** 203,207 ****
  
   public:
!   CBMBenchmarkNBENCH_NNET(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_NNET();
  };
--- 216,220 ----
  
   public:
!   CBMBenchmarkNBENCH_NNET(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_NNET();
  };
***************
*** 219,227 ****
  
   public:
!   CBMBenchmarkNBENCH_LU(class CBMSystem *_system);
    virtual ~CBMBenchmarkNBENCH_LU();
  };
  
! lib_declare();
  
  #endif
--- 232,240 ----
  
   public:
!   CBMBenchmarkNBENCH_LU(CBMPackage *_package);
    virtual ~CBMBenchmarkNBENCH_LU();
  };
  
! DLdeclare();
  
  #endif

Index: Benchmark-NBENCH.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-NBENCH.cpp	28 Dec 2006 17:41:04 -0000	1.1
--- Benchmark-NBENCH.cpp	3 Jan 2007 18:53:17 -0000	1.2
***************
*** 7,90 ****
  #include <SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h>
  
! CBMBenchmarkNBENCH::CBMBenchmarkNBENCH(CBMSystem *_system)
!   : CBMBenchmark(_system)
  {
  }
  
! std::string CBMBenchmarkNBENCH::downloadURL(void)
  {
    return("http://www.tux.org/~mayer/linux/nbench-byte-2.2.2.tar.gz");
  }
  
! std::string CBMBenchmarkNBENCH::expectedMD5(void)
  {
    return("174c1917eea8f74bd3e78522592e0658");
  }
  
! std::string CBMBenchmarkNBENCH::packageName(void)
  {
    return("nbench");
  }
  
! std::string CBMBenchmarkNBENCH::benchmarkComments(void)
! {
!   std::string comment;
! 
!   comment+=benchmarkNBENCHComments();
!   comment+=" (Comment from http://www.byte.com/bmark/bdoc.htm)";
! 
!   return(comment);
! }
! 
! std::string CBMBenchmarkNBENCH::packageVersion(void)
  {
    return("2.2.2");
  }
  
! int CBMBenchmarkNBENCH::nbyteWriteDatFile(void)
! {
!   std::ofstream OUT;
!   std::string   fileName;
!   std::string   contains = "CUSTOMRUN=T\n";
! 
!   contains+=nbyteBenchmark();
!   contains+="=T\n";
!   
!   fileName+=localPackageAbsoluteDirectory();
!   fileName+="/COMPBENCH.DAT";
!   
!   OUT.open(fileName.c_str(), std::ios::out);
!   OUT << contains;
!   OUT.close();
! 
!   return(1);
! }
! 
! int CBMBenchmarkNBENCH::packageSize(void)
  {
    return(111751);
  }
  
! std::string CBMBenchmarkNBENCH::packageComments(void)
  {
    return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program");
  }
  
! std::string CBMBenchmarkNBENCH::localPackageName(void)
  {
    return("nbench-byte-2.2.2.tar.gz");
  }
  
! std::string CBMBenchmarkNBENCH::language(void)
  {
    return("C");
  }
  
! char* CBMBenchmarkNBENCH::extractDirectory(void)
  {
    return("nbench-byte-2.2.2");
  }
  
! int CBMBenchmarkNBENCH::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
--- 7,61 ----
  #include <SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h>
  
! CBMPackageNBENCH::CBMPackageNBENCH(CBMSystem *_system)
!   : CBMPackage(_system)
  {
  }
  
! std::string CBMPackageNBENCH::downloadURL(void)
  {
    return("http://www.tux.org/~mayer/linux/nbench-byte-2.2.2.tar.gz");
  }
  
! std::string CBMPackageNBENCH::expectedMD5(void)
  {
    return("174c1917eea8f74bd3e78522592e0658");
  }
  
! std::string CBMPackageNBENCH::packageName(void)
  {
    return("nbench");
  }
  
! std::string CBMPackageNBENCH::packageVersion(void)
  {
    return("2.2.2");
  }
  
! int CBMPackageNBENCH::packageSize(void)
  {
    return(111751);
  }
  
! std::string CBMPackageNBENCH::packageComments(void)
  {
    return("Uwe F. Mayer's UNIX port of BYTE Magazine's BYTEmark benchmark program");
  }
  
! std::string CBMPackageNBENCH::localPackageName(void)
  {
    return("nbench-byte-2.2.2.tar.gz");
  }
  
! std::string CBMPackageNBENCH::language(void)
  {
    return("C");
  }
  
! char* CBMPackageNBENCH::extractDirectory(void)
  {
    return("nbench-byte-2.2.2");
  }
  
! int CBMPackageNBENCH::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
***************
*** 105,109 ****
  }
  
! int CBMBenchmarkNBENCH::preConfigure(int _force)
  {
    /* !!! */
--- 76,80 ----
  }
  
! int CBMPackageNBENCH::preConfigure(int _force)
  {
    /* !!! */
***************
*** 111,115 ****
  }
  
! int CBMBenchmarkNBENCH::configure(CBMCompiler        *_currentCompiler,
  				  CBMCompilerOptions *_currentOptions)
  {
--- 82,86 ----
  }
  
! int CBMPackageNBENCH::configure(CBMCompiler        *_currentCompiler,
  				  CBMCompilerOptions *_currentOptions)
  {
***************
*** 117,121 ****
  }
  
! int CBMBenchmarkNBENCH::make(void)
  {
    std::string cmd;
--- 88,92 ----
  }
  
! int CBMPackageNBENCH::make(void)
  {
    std::string cmd;
***************
*** 155,182 ****
  }
  
! std::string CBMBenchmarkNBENCH::bench(void)
! {
!   std::string cmd;
!   std::string result;
! 
!   nbyteWriteDatFile();
! 
!   cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
!   cmd+=" && echo $(./nbench -cCOMPBENCH.DAT | grep '^";
!   cmd+=nbyteBenchmarkLabel();
!   cmd+="' | ";
!   cmd+=CBM_PROG_CUT;
!   cmd+=" -f2 -d':')";
! 
!   if (system->exec(cmd, result)==0) {
!     return(result);
!   } else {
!     return("0");
!   }
! 
! }
! 
! int CBMBenchmarkNBENCH::release(void)
  {
    std::string cmd;
--- 126,130 ----
  }
  
! int CBMPackageNBENCH::release(void)
  {
    std::string cmd;
***************
*** 192,221 ****
  }
  
! std::string CBMBenchmarkNBENCH::license(void)
  {
    return("Not specified");
  }
  
! std::string CBMBenchmarkNBENCH::homePage(void)
  {
    return("http://www.tux.org/~mayer/linux/bmark.html");
  }
  
! std::string CBMBenchmarkNBENCH::author(void)
  {
    return("Uwe F. Mayer");
  }
  
! int CBMBenchmarkNBENCH::benchmarkSize(void)
  {
    return(packageSize());
  }
  
  CBMBenchmarkNBENCH::~CBMBenchmarkNBENCH()
  {
  }
  
! CBMBenchmarkNBENCH_NUMSORT::CBMBenchmarkNBENCH_NUMSORT(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 140,230 ----
  }
  
! std::string CBMPackageNBENCH::license(void)
  {
    return("Not specified");
  }
  
! std::string CBMPackageNBENCH::homePage(void)
  {
    return("http://www.tux.org/~mayer/linux/bmark.html");
  }
  
! std::string CBMPackageNBENCH::author(void)
  {
    return("Uwe F. Mayer");
  }
  
! int CBMPackageNBENCH::benchmarkSize(void)
  {
    return(packageSize());
  }
  
+ CBMPackageNBENCH::~CBMPackageNBENCH()
+ {
+ }
+ 
+ CBMBenchmarkNBENCH::CBMBenchmarkNBENCH(CBMPackage *_package)
+   : CBMBenchmark(_package)
+ {
+ }
+ 
+ int CBMBenchmarkNBENCH::nbyteWriteDatFile(void)
+ {
+   std::ofstream OUT;
+   std::string   fileName;
+   std::string   contains = "CUSTOMRUN=T\n";
+ 
+   contains+=nbyteBenchmark();
+   contains+="=T\n";
+   
+   fileName+=package->localPackageAbsoluteDirectory();
+   fileName+="/COMPBENCH.DAT";
+   
+   OUT.open(fileName.c_str(), std::ios::out);
+   OUT << contains;
+   OUT.close();
+ 
+   return(1);
+ }
+ 
+ std::string CBMBenchmarkNBENCH::benchmarkComments(void)
+ {
+   std::string comment;
+ 
+   comment+=benchmarkNBENCHComments();
+   comment+=" (Comment from http://www.byte.com/bmark/bdoc.htm)";
+ 
+   return(comment);
+ }
+ 
+ std::string CBMBenchmarkNBENCH::bench(void)
+ {
+   std::string cmd;
+   std::string result;
+ 
+   nbyteWriteDatFile();
+ 
+   cmd="cd ";
+   cmd+=package->localPackageAbsoluteDirectory();
+   cmd+=" && echo $(./nbench -cCOMPBENCH.DAT | grep '^";
+   cmd+=nbyteBenchmarkLabel();
+   cmd+="' | ";
+   cmd+=CBM_PROG_CUT;
+   cmd+=" -f2 -d':')";
+ 
+   if (System()->exec(cmd, result)==0) {
+     return(result);
+   } else {
+     return("0");
+   }
+ 
+ }
+ 
  CBMBenchmarkNBENCH::~CBMBenchmarkNBENCH()
  {
  }
  
! CBMBenchmarkNBENCH_NUMSORT::CBMBenchmarkNBENCH_NUMSORT(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 249,254 ****
  }
  
! CBMBenchmarkNBENCH_STRINGSORT::CBMBenchmarkNBENCH_STRINGSORT(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 258,263 ----
  }
  
! CBMBenchmarkNBENCH_STRINGSORT::CBMBenchmarkNBENCH_STRINGSORT(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 286,291 ****
  }
  
! CBMBenchmarkNBENCH_BITFIELD::CBMBenchmarkNBENCH_BITFIELD(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 295,300 ----
  }
  
! CBMBenchmarkNBENCH_BITFIELD::CBMBenchmarkNBENCH_BITFIELD(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 322,327 ****
  }
  
! CBMBenchmarkNBENCH_EMF::CBMBenchmarkNBENCH_EMF(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 331,336 ----
  }
  
! CBMBenchmarkNBENCH_EMF::CBMBenchmarkNBENCH_EMF(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 353,358 ****
  }
  
! CBMBenchmarkNBENCH_FOURIER::CBMBenchmarkNBENCH_FOURIER(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 362,367 ----
  }
  
! CBMBenchmarkNBENCH_FOURIER::CBMBenchmarkNBENCH_FOURIER(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 387,392 ****
  
  
! CBMBenchmarkNBENCH_ASSIGN::CBMBenchmarkNBENCH_ASSIGN(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 396,401 ----
  
  
! CBMBenchmarkNBENCH_ASSIGN::CBMBenchmarkNBENCH_ASSIGN(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 425,430 ****
  }
  
! CBMBenchmarkNBENCH_HUFFMAN::CBMBenchmarkNBENCH_HUFFMAN(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 434,439 ----
  }
  
! CBMBenchmarkNBENCH_HUFFMAN::CBMBenchmarkNBENCH_HUFFMAN(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 457,462 ****
  }
  
! CBMBenchmarkNBENCH_IDEA::CBMBenchmarkNBENCH_IDEA(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 466,471 ----
  }
  
! CBMBenchmarkNBENCH_IDEA::CBMBenchmarkNBENCH_IDEA(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 488,493 ****
  }
  
! CBMBenchmarkNBENCH_NNET::CBMBenchmarkNBENCH_NNET(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 497,502 ----
  }
  
! CBMBenchmarkNBENCH_NNET::CBMBenchmarkNBENCH_NNET(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }
***************
*** 522,527 ****
  }
  
! CBMBenchmarkNBENCH_LU::CBMBenchmarkNBENCH_LU(CBMSystem *_system)
!   : CBMBenchmarkNBENCH(_system)
  {
  }
--- 531,536 ----
  }
  
! CBMBenchmarkNBENCH_LU::CBMBenchmarkNBENCH_LU(CBMPackage *_package)
!   : CBMBenchmarkNBENCH(_package)
  {
  }

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BZIP2.cpp, 1.2, 1.3 Benchmark-BZIP2.h, 1.1, 1.2 Benchmark-GZIP.cpp, 1.2, 1.3 Benchmark-GZIP.h, 1.1, 1.2

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

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

Modified Files:
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp 
	Benchmark-GZIP.h 
Log Message:
CBMPackage and new related API used.

Index: Benchmark-GZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-GZIP.h	28 Dec 2006 17:41:03 -0000	1.1
--- Benchmark-GZIP.h	3 Jan 2007 18:49:56 -0000	1.2
***************
*** 14,18 ****
  /** \brief Defines the gzip package.
   */
! class CBMBenchmarkGZIP : public CBMBenchmarkxZIP
  {
   private:
--- 14,18 ----
  /** \brief Defines the gzip package.
   */
! class CBMPackageGZIP : public CBMPackagexZIP
  {
   private:
***************
*** 36,40 ****
  
   public:
!   CBMBenchmarkGZIP(class CBMSystem *_system);
  
    virtual std::string benchmarkProgram(void);
--- 36,41 ----
  
   public:
!   CBMPackageGZIP(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
    virtual std::string benchmarkProgram(void);
***************
*** 44,48 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkGZIP();
  		
  };
--- 45,49 ----
  
    virtual int benchmarkSize(void);
!   virtual ~CBMPackageGZIP();
  		
  };
***************
*** 50,54 ****
  /** \brief Defines the gzip benchmark using fastest compression level.
   */
! class CBMBenchmarkGZIP1 : public CBMBenchmarkGZIP
  {
   protected:
--- 51,55 ----
  /** \brief Defines the gzip benchmark using fastest compression level.
   */
! class CBMBenchmarkGZIP1 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 57,61 ****
  
   public:
!   CBMBenchmarkGZIP1(class CBMSystem *_system);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkGZIP1();
--- 58,62 ----
  
   public:
!   CBMBenchmarkGZIP1(CBMPackage *_package);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkGZIP1();
***************
*** 64,68 ****
  /** \brief Defines the gzip benchmark using maximum compression level.
   */
! class CBMBenchmarkGZIP9 : public CBMBenchmarkGZIP
  {
   protected:
--- 65,69 ----
  /** \brief Defines the gzip benchmark using maximum compression level.
   */
! class CBMBenchmarkGZIP9 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 71,75 ****
   public:
  
!   CBMBenchmarkGZIP9(class CBMSystem *_system);
  
    virtual std::string benchmarkName(void);
--- 72,76 ----
   public:
  
!   CBMBenchmarkGZIP9(CBMPackage *_package);
  
    virtual std::string benchmarkName(void);
***************
*** 77,80 ****
  };
  
! lib_declare();
  #endif
--- 78,81 ----
  };
  
! DLdeclare();
  #endif

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-GZIP.cpp	3 Jan 2007 17:29:50 -0000	1.2
--- Benchmark-GZIP.cpp	3 Jan 2007 18:49:56 -0000	1.3
***************
*** 8,62 ****
  #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h>
  
! CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMSystem *_system)
!   : CBMBenchmarkxZIP(_system)
  {
  }
  
! std::string CBMBenchmarkGZIP::downloadURL(void)
  {
    return("ftp://ftp.netscape.com/pub/unsupported/gnu/gzip-1.2.4.tar.Z");
  }
  
! std::string CBMBenchmarkGZIP::expectedMD5(void)
  {
    return("bfc104a6eaf1704be524c879bc9d29bc");
  }
  
! std::string CBMBenchmarkGZIP::packageName(void)
  {
    return("gzip");
  }
  
! std::string CBMBenchmarkGZIP::packageVersion(void)
  {
    return("1.2.4");
  }
  
! int CBMBenchmarkGZIP::packageSize(void)
  {
    return(327865);
  }
  
! std::string CBMBenchmarkGZIP::packageComments(void)
  {
    return("Official gzip-1.2.4 source package.");
  }
  
! std::string CBMBenchmarkGZIP::localPackageName(void)
  {
    return("gzip-1.2.4.tar.Z");
  }
  
! std::string CBMBenchmarkGZIP::language(void)
  {
    return("C");
  }
  
! int CBMBenchmarkGZIP::hasTest(void)
  {
    return(1);
  }
  
! int CBMBenchmarkGZIP::test(void)
  {
    std::string cmd;
--- 8,62 ----
  #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h>
  
! CBMPackageGZIP::CBMPackageGZIP(CBMSystem *_system)
!   : CBMPackagexZIP(_system)
  {
  }
  
! std::string CBMPackageGZIP::downloadURL(void)
  {
    return("ftp://ftp.netscape.com/pub/unsupported/gnu/gzip-1.2.4.tar.Z");
  }
  
! std::string CBMPackageGZIP::expectedMD5(void)
  {
    return("bfc104a6eaf1704be524c879bc9d29bc");
  }
  
! std::string CBMPackageGZIP::packageName(void)
  {
    return("gzip");
  }
  
! std::string CBMPackageGZIP::packageVersion(void)
  {
    return("1.2.4");
  }
  
! int CBMPackageGZIP::packageSize(void)
  {
    return(327865);
  }
  
! std::string CBMPackageGZIP::packageComments(void)
  {
    return("Official gzip-1.2.4 source package.");
  }
  
! std::string CBMPackageGZIP::localPackageName(void)
  {
    return("gzip-1.2.4.tar.Z");
  }
  
! std::string CBMPackageGZIP::language(void)
  {
    return("C");
  }
  
! int CBMPackageGZIP::hasTest(void)
  {
    return(1);
  }
  
! int CBMPackageGZIP::test(void)
  {
    std::string cmd;
***************
*** 72,111 ****
  }
  
! char* CBMBenchmarkGZIP::extractDirectory(void)
  {
    return("gzip-1.2.4");
  }
  
! std::string CBMBenchmarkGZIP::benchmarkProgram(void)
  {
    return("gzip");
  }
  
! std::string CBMBenchmarkGZIP::license(void)
  {
    return("GPL v2");
  }
  
! std::string CBMBenchmarkGZIP::homePage(void)
  {
    return("http://www.gzip.org");
  }
  
! std::string CBMBenchmarkGZIP::author(void)
  {
    return("Jean-loup Gailly & Mark Adler");
  }
  
! int CBMBenchmarkGZIP::benchmarkSize(void)
  {
    return(76546048);
  }
  
! CBMBenchmarkGZIP::~CBMBenchmarkGZIP()
  {
  }
    
! CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMSystem *_system)
!   : CBMBenchmarkGZIP(_system)
  {
  }
--- 72,111 ----
  }
  
! char* CBMPackageGZIP::extractDirectory(void)
  {
    return("gzip-1.2.4");
  }
  
! std::string CBMPackageGZIP::benchmarkProgram(void)
  {
    return("gzip");
  }
  
! std::string CBMPackageGZIP::license(void)
  {
    return("GPL v2");
  }
  
! std::string CBMPackageGZIP::homePage(void)
  {
    return("http://www.gzip.org");
  }
  
! std::string CBMPackageGZIP::author(void)
  {
    return("Jean-loup Gailly & Mark Adler");
  }
  
! int CBMPackageGZIP::benchmarkSize(void)
  {
    return(76546048);
  }
  
! CBMPackageGZIP::~CBMPackageGZIP()
  {
  }
    
! CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }
***************
*** 130,135 ****
  }
  
! CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMSystem *_system)
!   : CBMBenchmarkGZIP(_system)
  {
  }
--- 130,135 ----
  }
  
! CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }

Index: Benchmark-BZIP2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BZIP2.h	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-BZIP2.h	3 Jan 2007 18:49:56 -0000	1.2
***************
*** 6,10 ****
  /** \brief Defines the bzip2 package.
   */
! class CBMBenchmarkBZIP2 : public CBMBenchmarkxZIP
  {
   private:
--- 6,10 ----
  /** \brief Defines the bzip2 package.
   */
! class CBMPackageBZIP2 : public CBMPackagexZIP
  {
   private:
***************
*** 35,39 ****
    virtual int test(void);
   public:
!   CBMBenchmarkBZIP2(class CBMSystem *_system);
  
    virtual std::string benchmarkProgram(void);
--- 35,40 ----
    virtual int test(void);
   public:
!   CBMPackageBZIP2(class CBMSystem *_system);
!   DLPackageWrapper_declare();
  
    virtual std::string benchmarkProgram(void);
***************
*** 43,47 ****
  
    virtual int benchmarkSize(void);
!   virtual ~CBMBenchmarkBZIP2();
  		
  };
--- 44,48 ----
  
    virtual int benchmarkSize(void);
!   virtual ~CBMPackageBZIP2();
  		
  };
***************
*** 49,53 ****
  /** \brief Defines the bzip2 benchmark using fastest compression level.
   */
! class CBMBenchmarkBZIP21 : public CBMBenchmarkBZIP2
  {
   protected:
--- 50,54 ----
  /** \brief Defines the bzip2 benchmark using fastest compression level.
   */
! class CBMBenchmarkBZIP21 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 56,60 ****
  
   public:
!   CBMBenchmarkBZIP21(class CBMSystem *_system);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkBZIP21();
--- 57,61 ----
  
   public:
!   CBMBenchmarkBZIP21(CBMPackage *_package);
    virtual std::string benchmarkName(void);
    virtual ~CBMBenchmarkBZIP21();
***************
*** 63,67 ****
  /** \brief Defines the bzip2 benchmark using maximum compression level.
   */
! class CBMBenchmarkBZIP29 : public CBMBenchmarkBZIP2
  {
   protected:
--- 64,68 ----
  /** \brief Defines the bzip2 benchmark using maximum compression level.
   */
! class CBMBenchmarkBZIP29 : public CBMBenchmarkxZIP
  {
   protected:
***************
*** 70,74 ****
   public:
  
!   CBMBenchmarkBZIP29(class CBMSystem *_system);
  
    virtual std::string benchmarkName(void);
--- 71,75 ----
   public:
  
!   CBMBenchmarkBZIP29(CBMPackage *_package);
  
    virtual std::string benchmarkName(void);
***************
*** 76,80 ****
  };
  
! lib_declare();
  
  #endif
--- 77,81 ----
  };
  
! DLdeclare();
  
  #endif

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BZIP2.cpp	3 Jan 2007 17:29:50 -0000	1.2
--- Benchmark-BZIP2.cpp	3 Jan 2007 18:49:56 -0000	1.3
***************
*** 9,58 ****
  #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h>
  
! CBMBenchmarkBZIP2::CBMBenchmarkBZIP2(CBMSystem *_system)
!   : CBMBenchmarkxZIP(_system)
  {
  }
  
! std::string CBMBenchmarkBZIP2::downloadURL(void)
  {
    return("http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz");
  }
  
! std::string CBMBenchmarkBZIP2::expectedMD5(void)
  {
    return("8a716bebecb6e647d2e8a29ea5d8447f");
  }
  
! std::string CBMBenchmarkBZIP2::packageName(void)
  {
    return("bzip2");
  }
  
! std::string CBMBenchmarkBZIP2::packageVersion(void)
  {
    return("1.0.3");
  }
  
! int CBMBenchmarkBZIP2::packageSize(void)
  {
    return(669075);
  }
  
! std::string CBMBenchmarkBZIP2::packageComments(void)
  {
    return("Official bzip2-1.0.3 source package.");
  }
  
! std::string CBMBenchmarkBZIP2::localPackageName(void)
  {
    return("bzip2-1.0.3.tar.Z");
  }
  
! std::string CBMBenchmarkBZIP2::language(void)
  {
    return("C");
  }
  
! int CBMBenchmarkBZIP2::configure(CBMCompiler        *_currentCompiler,
  				 CBMCompilerOptions *_currentOptions)
  {
--- 9,58 ----
  #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h>
  
! CBMPackageBZIP2::CBMPackageBZIP2(CBMSystem *_system)
!   : CBMPackagexZIP(_system)
  {
  }
  
! std::string CBMPackageBZIP2::downloadURL(void)
  {
    return("http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz");
  }
  
! std::string CBMPackageBZIP2::expectedMD5(void)
  {
    return("8a716bebecb6e647d2e8a29ea5d8447f");
  }
  
! std::string CBMPackageBZIP2::packageName(void)
  {
    return("bzip2");
  }
  
! std::string CBMPackageBZIP2::packageVersion(void)
  {
    return("1.0.3");
  }
  
! int CBMPackageBZIP2::packageSize(void)
  {
    return(669075);
  }
  
! std::string CBMPackageBZIP2::packageComments(void)
  {
    return("Official bzip2-1.0.3 source package.");
  }
  
! std::string CBMPackageBZIP2::localPackageName(void)
  {
    return("bzip2-1.0.3.tar.Z");
  }
  
! std::string CBMPackageBZIP2::language(void)
  {
    return("C");
  }
  
! int CBMPackageBZIP2::configure(CBMCompiler        *_currentCompiler,
  				 CBMCompilerOptions *_currentOptions)
  {
***************
*** 60,64 ****
  }
  
! int CBMBenchmarkBZIP2::make(void)
  {
    std::string cmd;
--- 60,64 ----
  }
  
! int CBMPackageBZIP2::make(void)
  {
    std::string cmd;
***************
*** 98,107 ****
  }
  
! int CBMBenchmarkBZIP2::hasTest(void)
  {
    return(1);
  }
  
! int CBMBenchmarkBZIP2::test(void)
  {
    std::string cmd;
--- 98,107 ----
  }
  
! int CBMPackageBZIP2::hasTest(void)
  {
    return(1);
  }
  
! int CBMPackageBZIP2::test(void)
  {
    std::string cmd;
***************
*** 117,156 ****
  }
  
! char* CBMBenchmarkBZIP2::extractDirectory(void)
  {
    return("bzip2-1.0.3");
  }
  
! std::string CBMBenchmarkBZIP2::benchmarkProgram(void)
  {
    return("bzip2");
  }
  
! std::string CBMBenchmarkBZIP2::license(void)
  {
    return("BSD-style");
  }
  
! std::string CBMBenchmarkBZIP2::homePage(void)
  {
    return("http://www.bzip.org");
  }
  
! std::string CBMBenchmarkBZIP2::author(void)
  {
    return("Julian Seward");
  }
  
! int CBMBenchmarkBZIP2::benchmarkSize(void)
  {
    return(76546048);
  }
  
! CBMBenchmarkBZIP2::~CBMBenchmarkBZIP2()
  {
  }
    
! CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMSystem *_system)
!   : CBMBenchmarkBZIP2(_system)
  {
  }
--- 117,156 ----
  }
  
! char* CBMPackageBZIP2::extractDirectory(void)
  {
    return("bzip2-1.0.3");
  }
  
! std::string CBMPackageBZIP2::benchmarkProgram(void)
  {
    return("bzip2");
  }
  
! std::string CBMPackageBZIP2::license(void)
  {
    return("BSD-style");
  }
  
! std::string CBMPackageBZIP2::homePage(void)
  {
    return("http://www.bzip.org");
  }
  
! std::string CBMPackageBZIP2::author(void)
  {
    return("Julian Seward");
  }
  
! int CBMPackageBZIP2::benchmarkSize(void)
  {
    return(76546048);
  }
  
! CBMPackageBZIP2::~CBMPackageBZIP2()
  {
  }
    
! CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }
***************
*** 175,180 ****
  }
  
! CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMSystem *_system)
!   : CBMBenchmarkBZIP2(_system)
  {
  }
--- 175,180 ----
  }
  
! CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMPackage *_package)
!   : CBMBenchmarkxZIP(_package)
  {
  }

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPPLINUX.cpp, 1.1, 1.2 Benchmark-BZIP2.cpp, 1.1, 1.2 Benchmark-GZIP.cpp, 1.1, 1.2

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

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

Modified Files:
	Benchmark-BENCHPPLINUX.cpp Benchmark-BZIP2.cpp 
	Benchmark-GZIP.cpp 
Log Message:
Author fixed.

Index: Benchmark-BENCHPPLINUX.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BENCHPPLINUX.cpp	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-BENCHPPLINUX.cpp	3 Jan 2007 17:29:50 -0000	1.2
***************
*** 190,194 ****
  std::string CBMBenchmarkBENCHPPLINUX::author(void)
  {
!   return("Joseph M. Orost");
  }
  
--- 190,194 ----
  std::string CBMBenchmarkBENCHPPLINUX::author(void)
  {
!   return("Marcos Marado");
  }
  

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-GZIP.cpp	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-GZIP.cpp	3 Jan 2007 17:29:50 -0000	1.2
***************
*** 94,98 ****
  std::string CBMBenchmarkGZIP::author(void)
  {
!   return("Written by Jean-loup Gailly & Mark Adler");
  }
  
--- 94,98 ----
  std::string CBMBenchmarkGZIP::author(void)
  {
!   return("Jean-loup Gailly & Mark Adler");
  }
  

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-BZIP2.cpp	28 Dec 2006 17:41:02 -0000	1.1
--- Benchmark-BZIP2.cpp	3 Jan 2007 17:29:50 -0000	1.2
***************
*** 139,143 ****
  std::string CBMBenchmarkBZIP2::author(void)
  {
!   return("Written by Julian Seward");
  }
  
--- 139,143 ----
  std::string CBMBenchmarkBZIP2::author(void)
  {
!   return("Julian Seward");
  }
  

[Compbench-devel] CompBenchmarks++/CBM-PI/t 00-CBMSystem-public.pl, 1.2, 1.3 01-CBMSystem-protected.pl, 1.1, 1.2 02-CBMBenchmarkSelector-public.pl, 1.2, 1.3 03-CBMCompilerSelector-public.pl, 1.1, 1.2

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10377

Modified Files:
	00-CBMSystem-public.pl 01-CBMSystem-protected.pl 
	02-CBMBenchmarkSelector-public.pl 
	03-CBMCompilerSelector-public.pl 
Log Message:
Common code moved to ./lib/

Index: 02-CBMBenchmarkSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMBenchmarkSelector-public.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 17:41:36 -0000	1.2
--- 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 18:52:32 -0000	1.3
***************
*** 4,9 ****
  use Test::More;
  
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
  
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
--- 4,10 ----
  use Test::More;
  
! require "libtest.pl";
! 
! our $top_srcdir;
  
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
***************
*** 13,40 ****
  my $sys;
  
- 
- sub check_simple {
-   my $str = shift;
- 
-   ok($str ne "");
-   if ($str =~ /\n/) {
-     ok(0);
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ /^ +(.*)/) {
-     ok(0, "'$str' starts with space(s)");
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ / $/) {
-     ok(0, "'$str' ends with space(s)");
-   } else {
-     ok(1);
-   }
- }
- 
  $sys = CBM::Init();
  
--- 14,17 ----

Index: 00-CBMSystem-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 00-CBMSystem-public.pl	28 Dec 2006 13:18:17 -0000	1.2
--- 00-CBMSystem-public.pl	28 Dec 2006 18:52:32 -0000	1.3
***************
*** 3,11 ****
  use CBM;
  
  use Test::Simple tests => 34;
  
  my $sys;
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
  
  sub test_Split {
--- 3,12 ----
  use CBM;
  
+ require "libtest.pl";
+ 
  use Test::Simple tests => 34;
  
  my $sys;
! our $top_srcdir;
  
  sub test_Split {

Index: 01-CBMSystem-protected.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/01-CBMSystem-protected.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 01-CBMSystem-protected.pl	28 Dec 2006 00:39:28 -0000	1.1
--- 01-CBMSystem-protected.pl	28 Dec 2006 18:52:32 -0000	1.2
***************
*** 3,34 ****
  use CBM;
  
  use Test::Simple tests => 40;
  
  my $sys;
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
! 
! sub check_simple {
!   my $str = shift;
! 
!   ok($str ne "");
!   if ($str =~ /\n/) {
!     ok(0);
!   } else {
!     ok(1);
!   }
! 
!   if ($str =~ /^ +(.*)/) {
!     ok(0, "'$str' starts with space(s)");
!   } else {
!     ok(1);
!   }
! 
!   if ($str =~ / $/) {
!     ok(0, "'$str' ends with space(s)");
!   } else {
!     ok(1);
!   }
! }
  
  # !!! TODO ???
--- 3,12 ----
  use CBM;
  
+ require "libtest.pl";
+ 
  use Test::Simple tests => 40;
  
  my $sys;
! our $top_srcdir;
  
  # !!! TODO ???

Index: 03-CBMCompilerSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 03-CBMCompilerSelector-public.pl	28 Dec 2006 18:36:02 -0000	1.1
--- 03-CBMCompilerSelector-public.pl	28 Dec 2006 18:52:32 -0000	1.2
***************
*** 4,9 ****
  use Test::More;
  
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
  
  my $sys;
--- 4,10 ----
  use Test::More;
  
! require "libtest.pl";
! 
! our $top_srcdir;
  
  my $sys;
***************
*** 30,56 ****
  
  plan tests => (keys %references)*4;
- 		  
- sub check_simple {
-   my $str = shift;
- 
-   ok($str ne "");
-   if ($str =~ /\n/) {
-     ok(0);
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ /^ +(.*)/) {
-     ok(0, "'$str' starts with space(s)");
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ / $/) {
-     ok(0, "'$str' ends with space(s)");
-   } else {
-     ok(1);
-   }
- }
  
  $sys = CBM::Init();
--- 31,34 ----

[Compbench-devel] CompBenchmarks++/CBM-PI/t Makefile.am,1.3,1.4

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10022

Modified Files:
	Makefile.am 
Log Message:
New ./lib directory added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	28 Dec 2006 18:36:30 -0000	1.3
--- Makefile.am	28 Dec 2006 18:52:01 -0000	1.4
***************
*** 1,3 ****
! SUBDIRS		=	reference
  
  prog_tests	=	00-Glue.pl \
--- 1,3 ----
! SUBDIRS		=	lib reference
  
  prog_tests	=	00-Glue.pl \
***************
*** 15,17 ****
  
  test:
! 	export LD_LIBRARY_PATH=../../.libs:$$LD_LIBRARY_PATH && PERL_DL_NONLAZY=1 @CBM_PROG_PERL@ "-MExtUtils::Command::MM" "-e" "test_harness(0, '$(top_srcdir)/CBM-PI', '$(INST_ARCHLIB)')" $(tests)
\ No newline at end of file
--- 15,17 ----
  
  test:
! 	export LD_LIBRARY_PATH=../../.libs:$$LD_LIBRARY_PATH && PERL_DL_NONLAZY=1 @CBM_PROG_PERL@ "-MExtUtils::Command::MM" "-e" "test_harness(0, '$(top_srcdir)/CBM-PI:$(top_srcdir)/CBM-PI/t/lib', '$(INST_ARCHLIB)')" $(tests)
\ No newline at end of file

[Compbench-devel] CompBenchmarks++/CBM-PI/t/lib libtest.pl, NONE, 1.1 Makefile.am, NONE, 1.1

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10007

Added Files:
	libtest.pl Makefile.am 
Log Message:
First import.

--- NEW FILE: Makefile.am ---
data_DATA = libtest.pl
--- NEW FILE: libtest.pl ---
# -----------------------------------------------------------------------------
# $Id: libtest.pl,v 1.1 2006/12/28 18:51:42 xfred Exp $
#
# Description : Various utility functions for testsuite.
#
# This is free software.
# For details, see the GNU Public License in the COPYING file, or
# Look http://www.fsf.org
# -----------------------------------------------------------------------------

our $top_srcdir = $0;
$top_srcdir =~ s/(.+)\/.*/$1/;

sub check_simple {
  my $str = shift;

  ok($str ne "");
  if ($str =~ /\n/) {
    ok(0);
  } else {
    ok(1);
  }

  if ($str =~ /^ +(.*)/) {
    ok(0, "'$str' starts with space(s)");
  } else {
    ok(1);
  }

  if ($str =~ / $/) {
    ok(0, "'$str' ends with space(s)");
  } else {
    ok(1);
  }
}

1;

[Compbench-devel] CompBenchmarks++/CBM-PI/t/lib - New directory

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9975/lib

Log Message:
Directory /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib added to the repository

[Compbench-devel] CompBenchmarks++ configure.in,1.19,1.20

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

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

Modified Files:
	configure.in 
Log Message:
New directory added.

Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.in	28 Dec 2006 18:39:07 -0000	1.19
--- configure.in	28 Dec 2006 18:50:55 -0000	1.20
***************
*** 267,270 ****
--- 267,271 ----
  	  SupportedBenchmarks/Makefile
            CBM-PI/t/reference/Makefile
+ 	  CBM-PI/t/lib/Makefile
            CBM-PI/t/Makefile
  	  CBM-PI/Makefile

[Compbench-devel] CompBenchmarks++ Makefile.am,1.13,1.14

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

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

Modified Files:
	Makefile.am 
Log Message:
New directory added.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	28 Dec 2006 00:41:43 -0000	1.13
--- Makefile.am	28 Dec 2006 18:39:57 -0000	1.14
***************
*** 1,3 ****
! SUBDIRS				=	share System Compiler Benchmark UI CBM-PI
  lib_LTLIBRARIES			=	libcompbenchmarks.la
  
--- 1,4 ----
! SUBDIRS				=	share System Compiler Benchmark UI CBM-PI SupportedBenchmarks
! 
  lib_LTLIBRARIES			=	libcompbenchmarks.la
  

[Compbench-devel] CompBenchmarks++ config.h.in,1.11,1.12

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

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

Modified Files:
	config.h.in 
Log Message:
dirent.h checked.

Index: config.h.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/config.h.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** config.h.in	28 Dec 2006 00:39:57 -0000	1.11
--- config.h.in	28 Dec 2006 18:39:26 -0000	1.12
***************
*** 73,76 ****
--- 73,79 ----
  #undef HAVE_CTYPE_H
  
+ /* Define to 1 if you have the <dirent.h> header file. */
+ #undef HAVE_DIRENT_H
+ 
  /* Define to 1 if you have the <dlfcn.h> header file. */
  #undef HAVE_DLFCN_H

[Compbench-devel] CompBenchmarks++ configure.in,1.18,1.19

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

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

Modified Files:
	configure.in 
Log Message:
dirent.h checked. New directories.

Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** configure.in	28 Dec 2006 13:21:09 -0000	1.18
--- configure.in	28 Dec 2006 18:39:07 -0000	1.19
***************
*** 210,214 ****
  # Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS(string time.h stat.h types.h getopt.h dlfcn.h ctype.h)
  
  # Checks for typedefs, structures, and compiler characteristics.
--- 210,214 ----
  # Checks for header files.
  AC_HEADER_STDC
! AC_CHECK_HEADERS(string time.h stat.h types.h dirent.h getopt.h dlfcn.h ctype.h)
  
  # Checks for typedefs, structures, and compiler characteristics.
***************
*** 265,268 ****
--- 265,270 ----
  	  Benchmark/Makefile
  	  UI/Makefile
+ 	  SupportedBenchmarks/Makefile
+           CBM-PI/t/reference/Makefile
            CBM-PI/t/Makefile
  	  CBM-PI/Makefile

[Compbench-devel] CompBenchmarks++/CBM-PI Makefile.am,1.2,1.3

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4964

Modified Files:
	Makefile.am 
Log Message:
Explicit dependency on libcompbenchmarks.la

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	28 Dec 2006 13:23:38 -0000	1.2
--- Makefile.am	28 Dec 2006 18:38:13 -0000	1.3
***************
*** 14,18 ****
  	$(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts`
  
! CBM.so: CBM.o Glue.o
  	ld -G CBM_wrap.o Glue.o -o CBM.so -L ../.libs -lcompbenchmarks
  
--- 14,21 ----
  	$(CXX) $(INCLUDES) -c $(top_srcdir)/CBM-PI/CBM_wrap.cxx `$(PERL) -MExtUtils::Embed -e ccopts`
  
! ../libcompbenchmarks.la:
! 	make -C .. libcompbenchmarks.la
! 
! CBM.so: CBM.o Glue.o ../libcompbenchmarks.la
  	ld -G CBM_wrap.o Glue.o -o CBM.so -L ../.libs -lcompbenchmarks
  

[Compbench-devel] CompBenchmarks++/CBM-PI CBM.pm, 1.2, 1.3 CBM_wrap.cxx, 1.2, 1.3

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4604

Modified Files:
	CBM.pm CBM_wrap.cxx 
Log Message:
Various changes.

Index: CBM.pm
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CBM.pm	28 Dec 2006 13:22:57 -0000	1.2
--- CBM.pm	28 Dec 2006 18:37:37 -0000	1.3
***************
*** 67,70 ****
--- 67,71 ----
  *Configuration = *CBMc::CBMSystem_Configuration;
  *init = *CBMc::CBMSystem_init;
+ *bmList = *CBMc::CBMSystem_bmList;
  *Split = *CBMc::CBMSystem_Split;
  *Chomp = *CBMc::CBMSystem_Chomp;
***************
*** 197,200 ****
--- 198,216 ----
  *Tested = *CBMc::CBMBenchmark_Tested;
  *Benchmarked = *CBMc::CBMBenchmark_Benchmarked;
+ *packageName = *CBMc::CBMBenchmark_packageName;
+ *packageVersion = *CBMc::CBMBenchmark_packageVersion;
+ *packageSize = *CBMc::CBMBenchmark_packageSize;
+ *packageComments = *CBMc::CBMBenchmark_packageComments;
+ *localPackageName = *CBMc::CBMBenchmark_localPackageName;
+ *benchmarkName = *CBMc::CBMBenchmark_benchmarkName;
+ *benchmarkComments = *CBMc::CBMBenchmark_benchmarkComments;
+ *language = *CBMc::CBMBenchmark_language;
+ *license = *CBMc::CBMBenchmark_license;
+ *homePage = *CBMc::CBMBenchmark_homePage;
+ *author = *CBMc::CBMBenchmark_author;
+ *localPackageAbsoluteName = *CBMc::CBMBenchmark_localPackageAbsoluteName;
+ *localPackageAbsoluteDirectory = *CBMc::CBMBenchmark_localPackageAbsoluteDirectory;
+ *extractDirectory = *CBMc::CBMBenchmark_extractDirectory;
+ *hasTest = *CBMc::CBMBenchmark_hasTest;
  *downloadURL = *CBMc::CBMBenchmark_downloadURL;
  *display = *CBMc::CBMBenchmark_display;
***************
*** 379,382 ****
--- 395,399 ----
  *CBM_SYSTEM_LINUX = *CBMc::CBM_SYSTEM_LINUX;
  *HAVE_CTYPE_H = *CBMc::HAVE_CTYPE_H;
+ *HAVE_DIRENT_H = *CBMc::HAVE_DIRENT_H;
  *HAVE_DLFCN_H = *CBMc::HAVE_DLFCN_H;
  *HAVE_GETOPT_H = *CBMc::HAVE_GETOPT_H;

Index: CBM_wrap.cxx
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CBM_wrap.cxx	28 Dec 2006 13:22:57 -0000	1.2
--- CBM_wrap.cxx	28 Dec 2006 18:37:37 -0000	1.3
***************
*** 1390,1396 ****
  #define SWIGTYPE_p_char swig_types[8]
  #define SWIGTYPE_p_std__string swig_types[9]
! #define SWIGTYPE_p_time_t swig_types[10]
! static swig_type_info *swig_types[12];
! static swig_module_info swig_module = {swig_types, 11, 0, 0, 0, 0};
  #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
  #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
--- 1390,1397 ----
  #define SWIGTYPE_p_char swig_types[8]
  #define SWIGTYPE_p_std__string swig_types[9]
! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[10]
! #define SWIGTYPE_p_time_t swig_types[11]
! static swig_type_info *swig_types[13];
! static swig_module_info swig_module = {swig_types, 12, 0, 0, 0, 0};
  #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
  #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
***************
*** 1994,1997 ****
--- 1995,2027 ----
  
  
+ XS(_wrap_CBMSystem_bmList) {
+   {
+     CBMSystem *arg1 = (CBMSystem *) 0 ;
+     std::vector<std::string > result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMSystem_bmList(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMSystem, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMSystem_bmList" "', argument " "1"" of type '" "CBMSystem *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMSystem * >(argp1);
+     result = (arg1)->bmList();
+     
+     ST(argvi) = SWIG_NewPointerObj((new std::vector<std::string >(static_cast<const std::vector<std::string >& >(result))), SWIGTYPE_p_std__vectorTstd__string_t, SWIG_POINTER_OWN | 0); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
  XS(_wrap_CBMSystem_Split) {
    {
***************
*** 3334,3337 ****
--- 3364,3802 ----
  
  
+ XS(_wrap_CBMBenchmark_packageName) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_packageName(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_packageName" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->packageName();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_packageVersion) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_packageVersion(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_packageVersion" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->packageVersion();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_packageSize) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     int result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_packageSize(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_packageSize" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (int)(arg1)->packageSize();
+     
+     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_packageComments) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_packageComments(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_packageComments" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->packageComments();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_localPackageName) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_localPackageName(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_localPackageName" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->localPackageName();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_benchmarkName) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_benchmarkName(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_benchmarkName" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->benchmarkName();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_benchmarkComments) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_benchmarkComments(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_benchmarkComments" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->benchmarkComments();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_language) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_language(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_language" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->language();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_license) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_license(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_license" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->license();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_homePage) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_homePage(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_homePage" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->homePage();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_author) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_author(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_author" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->author();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_localPackageAbsoluteName) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_localPackageAbsoluteName(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_localPackageAbsoluteName" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->localPackageAbsoluteName();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_localPackageAbsoluteDirectory) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     std::string result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_localPackageAbsoluteDirectory(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_localPackageAbsoluteDirectory" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (arg1)->localPackageAbsoluteDirectory();
+     
+     ST(argvi) = SWIG_From_std_string  SWIG_PERL_CALL_ARGS_1(static_cast<std::string >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_extractDirectory) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     char *result = 0 ;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_extractDirectory(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_extractDirectory" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (char *)(arg1)->extractDirectory();
+     
+     ST(argvi) = SWIG_FromCharPtr(result); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
+ XS(_wrap_CBMBenchmark_hasTest) {
+   {
+     CBMBenchmark *arg1 = (CBMBenchmark *) 0 ;
+     int result;
+     void *argp1 = 0 ;
+     int res1 = 0 ;
+     int argvi = 0;
+     dXSARGS;
+     
+     if ((items < 1) || (items > 1)) {
+       SWIG_croak("Usage: CBMBenchmark_hasTest(self);");
+     }
+     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMBenchmark, 0 |  0 );
+     if (!SWIG_IsOK(res1)) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMBenchmark_hasTest" "', argument " "1"" of type '" "CBMBenchmark *""'"); 
+     }
+     arg1 = reinterpret_cast<CBMBenchmark * >(argp1);
+     result = (int)(arg1)->hasTest();
+     
+     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ;
+     
+     XSRETURN(argvi);
+   fail:
+     
+     SWIG_croak_null();
+   }
+ }
+ 
+ 
  XS(_wrap_CBMBenchmark_downloadURL) {
    {
***************
*** 5349,5352 ****
--- 5814,5818 ----
  static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
  static swig_type_info _swigt__p_std__string = {"_p_std__string", "std::string *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_std__vectorTstd__string_t = {"_p_std__vectorTstd__string_t", "std::vector<std::string > *", 0, 0, (void*)0, 0};
  static swig_type_info _swigt__p_time_t = {"_p_time_t", "time_t *", 0, 0, (void*)0, 0};
  
***************
*** 5362,5365 ****
--- 5828,5832 ----
    &_swigt__p_char,
    &_swigt__p_std__string,
+   &_swigt__p_std__vectorTstd__string_t,
    &_swigt__p_time_t,
  };
***************
*** 5375,5378 ****
--- 5842,5846 ----
  static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
  static swig_cast_info _swigc__p_std__string[] = {  {&_swigt__p_std__string, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_std__vectorTstd__string_t[] = {  {&_swigt__p_std__vectorTstd__string_t, 0, 0, 0},{0, 0, 0, 0}};
  static swig_cast_info _swigc__p_time_t[] = {  {&_swigt__p_time_t, 0, 0, 0},{0, 0, 0, 0}};
  
***************
*** 5388,5391 ****
--- 5856,5860 ----
    _swigc__p_char,
    _swigc__p_std__string,
+   _swigc__p_std__vectorTstd__string_t,
    _swigc__p_time_t,
  };
***************
*** 5411,5414 ****
--- 5880,5884 ----
  {"CBMc::setVerbosity", _wrap_setVerbosity},
  {"CBMc::CBMSystem_init", _wrap_CBMSystem_init},
+ {"CBMc::CBMSystem_bmList", _wrap_CBMSystem_bmList},
  {"CBMc::CBMSystem_Split", _wrap_CBMSystem_Split},
  {"CBMc::CBMSystem_Chomp", _wrap_CBMSystem_Chomp},
***************
*** 5447,5450 ****
--- 5917,5935 ----
  {"CBMc::CBMSystemLinux_processor_number", _wrap_CBMSystemLinux_processor_number},
  {"CBMc::delete_CBMSystemLinux", _wrap_delete_CBMSystemLinux},
+ {"CBMc::CBMBenchmark_packageName", _wrap_CBMBenchmark_packageName},
+ {"CBMc::CBMBenchmark_packageVersion", _wrap_CBMBenchmark_packageVersion},
+ {"CBMc::CBMBenchmark_packageSize", _wrap_CBMBenchmark_packageSize},
+ {"CBMc::CBMBenchmark_packageComments", _wrap_CBMBenchmark_packageComments},
+ {"CBMc::CBMBenchmark_localPackageName", _wrap_CBMBenchmark_localPackageName},
+ {"CBMc::CBMBenchmark_benchmarkName", _wrap_CBMBenchmark_benchmarkName},
+ {"CBMc::CBMBenchmark_benchmarkComments", _wrap_CBMBenchmark_benchmarkComments},
+ {"CBMc::CBMBenchmark_language", _wrap_CBMBenchmark_language},
+ {"CBMc::CBMBenchmark_license", _wrap_CBMBenchmark_license},
+ {"CBMc::CBMBenchmark_homePage", _wrap_CBMBenchmark_homePage},
+ {"CBMc::CBMBenchmark_author", _wrap_CBMBenchmark_author},
+ {"CBMc::CBMBenchmark_localPackageAbsoluteName", _wrap_CBMBenchmark_localPackageAbsoluteName},
+ {"CBMc::CBMBenchmark_localPackageAbsoluteDirectory", _wrap_CBMBenchmark_localPackageAbsoluteDirectory},
+ {"CBMc::CBMBenchmark_extractDirectory", _wrap_CBMBenchmark_extractDirectory},
+ {"CBMc::CBMBenchmark_hasTest", _wrap_CBMBenchmark_hasTest},
  {"CBMc::CBMBenchmark_downloadURL", _wrap_CBMBenchmark_downloadURL},
  {"CBMc::CBMBenchmark_display", _wrap_CBMBenchmark_display},
***************
*** 5866,5869 ****
--- 6351,6359 ----
    } while(0) /*@SWIG@*/;
    /*@SWIG:%set_constant@*/ do {
+     SV *sv = get_sv((char*) SWIG_prefix "HAVE_DIRENT_H", TRUE | 0x2);
+     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(1)));
+     SvREADONLY_on(sv);
+   } while(0) /*@SWIG@*/;
+   /*@SWIG:%set_constant@*/ do {
      SV *sv = get_sv((char*) SWIG_prefix "HAVE_DLFCN_H", TRUE | 0x2);
      sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(1)));
***************
*** 5972,5976 ****
    /*@SWIG:%set_constant@*/ do {
      SV *sv = get_sv((char*) SWIG_prefix "VERSION", TRUE | 0x2);
!     sv_setsv(sv, SWIG_FromCharPtr("0.4.1"));
      SvREADONLY_on(sv);
    } while(0) /*@SWIG@*/;
--- 6462,6466 ----
    /*@SWIG:%set_constant@*/ do {
      SV *sv = get_sv((char*) SWIG_prefix "VERSION", TRUE | 0x2);
!     sv_setsv(sv, SWIG_FromCharPtr("0.5.0"));
      SvREADONLY_on(sv);
    } while(0) /*@SWIG@*/;

[Compbench-devel] CompBenchmarks++/CBM-PI/t Makefile.am,1.2,1.3

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4221

Modified Files:
	Makefile.am 
Log Message:
New tests.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	28 Dec 2006 13:17:30 -0000	1.2
--- Makefile.am	28 Dec 2006 18:36:30 -0000	1.3
***************
*** 1,10 ****
  prog_tests	=	00-Glue.pl \
  			00-CBMSystem-public.pl 01-CBMSystem-protected.pl \
! 			02-CBMBenchmarkSelector-public.pl
  
  tests		=	$(top_srcdir)/CBM-PI/t/00-Glue.pl \
  			$(top_srcdir)/CBM-PI/t/00-CBMSystem-public.pl \
  			$(top_srcdir)/CBM-PI/t/01-CBMSystem-protected.pl \
! 			$(top_srcdir)/CBM-PI/t/02-CBMBenchmarkSelector-public.pl
  
  data_DATA 	=	$(prog_tests)
--- 1,14 ----
+ SUBDIRS		=	reference
+ 
  prog_tests	=	00-Glue.pl \
  			00-CBMSystem-public.pl 01-CBMSystem-protected.pl \
! 			02-CBMBenchmarkSelector-public.pl \
! 			03-CBMCompilerSelector-public.pl
  
  tests		=	$(top_srcdir)/CBM-PI/t/00-Glue.pl \
  			$(top_srcdir)/CBM-PI/t/00-CBMSystem-public.pl \
  			$(top_srcdir)/CBM-PI/t/01-CBMSystem-protected.pl \
! 			$(top_srcdir)/CBM-PI/t/02-CBMBenchmarkSelector-public.pl \
! 			$(top_srcdir)/CBM-PI/t/03-CBMCompilerSelector-public.pl
  
  data_DATA 	=	$(prog_tests)

[Compbench-devel] CompBenchmarks++/CBM-PI/t 03-CBMCompilerSelector-public.pl, NONE, 1.1

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3853

Added Files:
	03-CBMCompilerSelector-public.pl 
Log Message:
First import.

--- NEW FILE: 03-CBMCompilerSelector-public.pl ---
#!/usr/bin/perl -w -I ..
use strict;
use CBM;
use Test::More;

my $top_srcdir = $0;
$top_srcdir =~ s/(.+)\/.*/$1/;

my $sys;

my %references = ('compiler-fake-g++-4.1.1-13' =>
		  {'language' => 'C++',
		   'compiler' => 'g++',
		   'compilerName' => 'g++ (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13)',
		   'compilerVersion' => '4.1.2 20060901 (prerelease)'
		  },
		  'compiler-fake-gcc-4.1.1-13' =>
		  {'language' => 'C',
		   'compiler' => 'gcc',
 		   'compilerName' => 'gcc (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13)',
 		   'compilerVersion' => '4.1.2 20060901 (prerelease)'
		  },
		  'compiler-fake-tcc-0.9.23',
		  {'language' => 'C',
		   'compiler' => 'tcc',
 		   'compilerName' => 'Tiny C Compiler tcc version 0.9.23',
 		   'compilerVersion' => 'tcc version 0.9.23'
		  }
		 );

plan tests => (keys %references)*4;
		  
sub check_simple {
  my $str = shift;

  ok($str ne "");
  if ($str =~ /\n/) {
    ok(0);
  } else {
    ok(1);
  }

  if ($str =~ /^ +(.*)/) {
    ok(0, "'$str' starts with space(s)");
  } else {
    ok(1);
  }

  if ($str =~ / $/) {
    ok(0, "'$str' ends with space(s)");
  } else {
    ok(1);
  }
}

$sys = CBM::Init();

my $CS = CBM::CBMCompilerSelector->new($sys);
my $reffile;
my $co;
my %refdata;

foreach $reffile (keys %references) {
  $co=$CS->select("$top_srcdir/reference/$reffile");
  %refdata=%{$references{$reffile}};

  ok($refdata{language} eq $co->language());
  ok($refdata{compiler} eq $co->compiler());
  ok($refdata{compilerName} eq $co->compilerName());
  ok($refdata{compilerVersion} eq $co->compilerVersion());
}

$sys->done();

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-Selector.cpp, 1.8, 1.9

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

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

Modified Files:
	Benchmark-Selector.cpp 
Log Message:
displayList() improved.

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark-Selector.cpp	11 Dec 2006 20:21:21 -0000	1.8
--- Benchmark-Selector.cpp	28 Dec 2006 18:18:56 -0000	1.9
***************
*** 28,33 ****
  void CBMBenchmarkSelector::displayList(void)
  {
!   CBMBenchmark *B;
!   #include "Benchmark/Benchmark-Selector.liblist.h"
  }
  
--- 28,59 ----
  void CBMBenchmarkSelector::displayList(void)
  {
!   CBMBenchmark             *B;
!   std::vector<std::string> pack_id;
!   std::vector<std::string> benchs;
! 
!   int                      p_i;
!   int                      p_n;
! 
!   int                      b_i;
!   int                      b_n;
! 
!   cbmlib_internal          *pack;
! 
!   pack_id=system->bmList();
!   p_n=pack_id.size();
! 
!   for(p_i=0;p_i<p_n;p_i++) {
!     pack=cbmlib_load((char*) pack_id[p_i].c_str());
!     if (!pack)
!       continue;
!     benchs=pack->GetBenchmarks();
!     b_n=benchs.size();
!     for(b_i=0;b_i<b_n;b_i++) {
!       B=cbmlib_bench_load((char*) benchs[b_i].c_str(),
! 			  system);
!       B->display();
!       delete(B);
!     }
!   }
  }
  

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-DLLoader.cpp, 1.2, 1.3 Benchmark-DLLoader.h, 1.2, 1.3

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

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

Modified Files:
	Benchmark-DLLoader.cpp Benchmark-DLLoader.h 
Log Message:
Many improvements.

Index: Benchmark-DLLoader.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-DLLoader.cpp	28 Dec 2006 13:18:55 -0000	1.2
--- Benchmark-DLLoader.cpp	28 Dec 2006 18:18:15 -0000	1.3
***************
*** 61,64 ****
--- 61,81 ----
      }
  
+ 
+ 
+ 
+     if (UO_verbose)
+       std::cout << " Checking cbmlib_getBenchmarks... ";
+     r->GetBenchmarks=(cbmlib_internal_getBenchmarks_t) (dlsym(r->library, "cbmlib_getBenchmarks"));
+     if (!r->GetBenchmarks) {
+       dlclose(library);
+       if (UO_verbose)
+ 	std::cout << "N.A." << std::endl;
+       delete(r);
+       return(0);
+     } else {
+       if (UO_verbose)
+ 	std::cout << "found." << std::endl;
+     }
+     
      if (UO_verbose)
        std::cout << " Checking cbmlib_getBenchmark... ";
***************
*** 108,112 ****
    for(i=0; i<n; i++) {
      tmp=cbmlib_paths[i];
!     tmp+="/libcompbenchmarks-";
      tmp+=package_id;
      tmp+=".so";
--- 125,129 ----
    for(i=0; i<n; i++) {
      tmp=cbmlib_paths[i];
!     tmp+="/libcompbenchmarks-bm-";
      tmp+=package_id;
      tmp+=".so";

Index: Benchmark-DLLoader.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-DLLoader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-DLLoader.h	28 Dec 2006 13:18:55 -0000	1.2
--- Benchmark-DLLoader.h	28 Dec 2006 18:18:15 -0000	1.3
***************
*** 25,35 ****
  typedef CBMBenchmark* (*cbmlib_internal_benchbyname_t)(char*, CBMSystem*);
  
  /** Low-level internal benchmark's shared library object */
  typedef struct cbmlib_internal {
    void                          *library;
!   std::string                   package_id;
!   cbmlib_internal_number_t      Number;
!   cbmlib_internal_bench_t       Bench;
!   cbmlib_internal_benchbyname_t BenchByName;
  };
  
--- 25,40 ----
  typedef CBMBenchmark* (*cbmlib_internal_benchbyname_t)(char*, CBMSystem*);
  
+ /** Function prototype for getting all benchmarks wihtin a package */
+ typedef std::vector<std::string> (*cbmlib_internal_getBenchmarks_t)(void);
+ 
+ 
  /** Low-level internal benchmark's shared library object */
  typedef struct cbmlib_internal {
    void                          *library;
!   std::string                     package_id;
!   cbmlib_internal_number_t        Number;
!   cbmlib_internal_bench_t         Bench;
!   cbmlib_internal_benchbyname_t   BenchByName;
!   cbmlib_internal_getBenchmarks_t GetBenchmarks;
  };
  

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark.h, 1.11, 1.12

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

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

Modified Files:
	Benchmark.h 
Log Message:
Some protected methods have gone public (for Perl API).

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Benchmark.h	28 Dec 2006 13:19:47 -0000	1.11
--- Benchmark.h	28 Dec 2006 18:17:36 -0000	1.12
***************
*** 13,16 ****
--- 13,18 ----
  #include <Compiler/Compiler-Options.h>
  
+ #include <vector>
+ 
  class CBMSystem;
  
***************
*** 57,94 ****
    virtual std::string expectedMD5(void) = 0;
  
-   /** Package name
-    *  \return a std::string like 'gzip', without quotes */
-   virtual std::string packageName(void);
- 
-   /** Package version
-    *  \return a std::string like '1.2.4', without quotes */
-   virtual std::string packageVersion(void) = 0;
- 
-   /** Package size, in bytes
-    *  \return an integer coding the size of package's archive (to download) in bytes.
-    */
-   virtual int packageSize(void) = 0;
- 
-   /** Package comments
-    *  Gives comments about package. Short description, or what ever.
-    *  \return comments, as std::string
-    */
-   virtual std::string packageComments(void) = 0;
- 
-   /** Package local filename
-    *  \return a relative filename containing the local name of the uncompressed
-    *  package (like 'gzip-1.2.4.tar.Z', without quotes) */
-   virtual std::string localPackageName(void) = 0;
- 		
- 
-   /** Benchmark name
-       \return a std::string representing current benchmark's identification
-       (e.g. gzip-1c) */
-   virtual std::string benchmarkName(void) = 0;
- 
-   /** Benchmark comments
-       \return a std::string containing comments about current benchmark */
-   virtual std::string benchmarkComments(void) = 0;
-   
    /** Benchmark's status
     *  Initialise the status from file in the directory defined by CBMSystem::Status.
--- 59,62 ----
***************
*** 114,147 ****
    CBMBenchmark(class CBMSystem *_system);
  
-   /** Benchmark's language
-    *  \return std::string (C or C++) */
-   virtual std::string language(void) = 0;
- 
-   /** Returns package or benchmark license
-       \return a std::string describing license */
-   virtual std::string license(void) = 0;
- 
-   /** Returns package home page
-       \return URL in std::string */
-   virtual std::string homePage(void) = 0;
- 
-   /** Author(s) of package
-       \return std::string containing authors. */
-   virtual std::string author(void) = 0;
- 
-   /** Convenience method
-    *  \return local uncompressed absolute archive filename for benchmark.
-    *  \sa localPackageName() */
-   virtual std::string localPackageAbsoluteName(void);
-   /** Convenience method
-    *  \return directory used for extracting package
-    *  \sa CBMSystem::Extract */
-   virtual std::string localPackageAbsoluteDirectory(void);
- 
-   /** Relative directory to extract package
-    *  \return relative directory to use (or used, depending) for package extraction
-    *  \sa CBMSystem::Extract */
-   virtual char* extractDirectory(void) = 0;
- 
    /** Pure method to extract package
        \return 1 if ok
--- 82,85 ----
***************
*** 163,175 ****
    virtual int patch(int _force = 0);
  
- 
-   /** Indicates if the package provides a test method.
-    *  Must be overloaded if so. Returns 0 by default.
-    *  \return 0 by default, 1 if patch is needed.
-    *  \sa test()
-    *  \sa Test()
-    */
-   virtual int hasTest(void);
- 
    /** Method to test package.
     *  Must be overloaded to test package using a method provided by package
--- 101,104 ----
***************
*** 245,248 ****
--- 174,249 ----
   public:
  
+   /** Package name
+    *  \return a std::string like 'gzip', without quotes */
+   virtual std::string packageName(void);
+ 
+   /** Package version
+    *  \return a std::string like '1.2.4', without quotes */
+   virtual std::string packageVersion(void) = 0;
+ 
+   /** Package size, in bytes
+    *  \return an integer coding the size of package's archive (to download) in bytes.
+    */
+   virtual int packageSize(void) = 0;
+ 
+   /** Package comments
+    *  Gives comments about package. Short description, or what ever.
+    *  \return comments, as std::string
+    */
+   virtual std::string packageComments(void) = 0;
+ 
+   /** Package local filename
+    *  \return a relative filename containing the local name of the uncompressed
+    *  package (like 'gzip-1.2.4.tar.Z', without quotes) */
+   virtual std::string localPackageName(void) = 0;
+ 		
+ 
+   /** Benchmark name
+       \return a std::string representing current benchmark's identification
+       (e.g. gzip-1c) */
+   virtual std::string benchmarkName(void) = 0;
+ 
+   /** Benchmark comments
+       \return a std::string containing comments about current benchmark */
+   virtual std::string benchmarkComments(void) = 0;
+   
+   /** Benchmark's language
+    *  \return std::string (C or C++) */
+   virtual std::string language(void) = 0;
+ 
+   /** Returns package or benchmark license
+       \return a std::string describing license */
+   virtual std::string license(void) = 0;
+ 
+   /** Returns package home page
+       \return URL in std::string */
+   virtual std::string homePage(void) = 0;
+ 
+   /** Author(s) of package
+       \return std::string containing authors. */
+   virtual std::string author(void) = 0;
+ 
+   /** Convenience method
+    *  \return local uncompressed absolute archive filename for benchmark.
+    *  \sa localPackageName() */
+   virtual std::string localPackageAbsoluteName(void);
+   /** Convenience method
+    *  \return directory used for extracting package
+    *  \sa CBMSystem::Extract */
+   virtual std::string localPackageAbsoluteDirectory(void);
+ 
+   /** Relative directory to extract package
+    *  \return relative directory to use (or used, depending) for package extraction
+    *  \sa CBMSystem::Extract */
+   virtual char* extractDirectory(void) = 0;
+ 
+   /** Indicates if the package provides a test method.
+    *  Must be overloaded if so. Returns 0 by default.
+    *  \return 0 by default, 1 if patch is needed.
+    *  \sa test()
+    *  \sa Test()
+    */
+   virtual int hasTest(void);
+ 
    /** URL used for downloading package.
     *  \return std::string representing the URL of the package
***************
*** 405,409 ****
    extern "C" int cbmlib_getBenchmarkNumber(void); \
    extern "C" CBMBenchmark *cbmlib_getBenchmark(int idx, class CBMSystem *_system); \
!   extern "C"  CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, class CBMSystem *_system)
  
  #endif
--- 406,411 ----
    extern "C" int cbmlib_getBenchmarkNumber(void); \
    extern "C" CBMBenchmark *cbmlib_getBenchmark(int idx, class CBMSystem *_system); \
!   extern "C"  CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, class CBMSystem *_system); \
!   extern "C" std::vector<std::string> cbmlib_getBenchmarks(void)
  
  #endif

[Compbench-devel] CompBenchmarks++/System System.cpp, 1.13, 1.14 System.h, 1.13, 1.14

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

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

Modified Files:
	System.cpp System.h 
Log Message:
New function to get dynamicaly the list of benchmarks / packages according to present libraries.

Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** System.cpp	28 Dec 2006 13:14:30 -0000	1.13
--- System.cpp	28 Dec 2006 18:14:15 -0000	1.14
***************
*** 13,16 ****
--- 13,17 ----
  #include <unistd.h>
  #include <ctype.h>
+ #include <dirent.h>
  
  #include <config.h>
***************
*** 33,38 ****
  
    cbmlib_paths.push_back(tmp);
!   cbmlib_paths.push_back("./Benchmark/.libs");
!   cbmlib_paths.push_back("../../Benchmark/.libs");
  }
  
--- 34,39 ----
  
    cbmlib_paths.push_back(tmp);
!   cbmlib_paths.push_back("./SupportedBenchmarks/.libs");
!   cbmlib_paths.push_back("../../SupportedBenchmarks/.libs");
  }
  
***************
*** 115,118 ****
--- 116,172 ----
  
  
+ std::vector<std::string> CBMSystem::bmList(void)
+ {
+   DIR                      *fd;
+   struct dirent            *de;
+   std::vector<std::string> result;
+   std::string              dum;
+   unsigned int             e;
+   int                      p_i;
+   int                      p_n = cbmlib_paths.size();
+   std::string              dir;
+ 
+   int                      r_i;
+   int                      r_n;
+   int                      inserted;
+ 
+   for(p_i=0;p_i<p_n;p_i++) {
+     dir=cbmlib_paths[p_i];
+ 
+     fd=opendir(dir.c_str());
+     if (fd) {
+       while ( (de=readdir(fd)) != 0) {
+ 	dum=de->d_name;
+ 	if (dum.size()<=3)
+ 	  continue;
+ 	
+ 	if (dum.substr(dum.size()-3) != ".so")
+ 	  continue;
+ 	
+ 	if (dum.substr(0, 21) != "libcompbenchmarks-bm-")
+ 	  continue;
+ 
+ 	e=dum.find(".so", 0);
+ 	dum=dum.substr(21, e-21);
+ 
+ 	inserted=0;
+ 
+ 	r_n=result.size();
+ 	for(r_i=0;r_i<r_n;r_i++) {
+ 	  if (result[r_i] == dum) {
+ 	    inserted=1;
+ 	    break;
+ 	  }
+ 	}
+ 
+ 	if (!inserted)
+ 	  result.push_back(dum);
+       }
+     }
+     closedir(fd);
+   }
+ 
+   return(result);
+ }
  
  std::string CBMSystem::Split(const std::string& str, const std::string& delim, unsigned int wantedIndex)

Index: System.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** System.h	27 Dec 2006 18:22:30 -0000	1.13
--- System.h	28 Dec 2006 18:14:15 -0000	1.14
***************
*** 10,13 ****
--- 10,15 ----
  #define H_CBMSYSTEM
  
+ #include <vector>
+ 
  #include <string>
  #include <time.h>
***************
*** 112,115 ****
--- 114,122 ----
    virtual int init(void);
  
+   /** Give a list containing the compatible benchmarks
+    *  in declared directories.
+    *  \return a std::string list of benchmarks (id) */
+   virtual std::vector<std::string> bmList(void);
+ 
    /** Split a std::string.
     *  Split given string as sub-strings, according to an arbitrary delimiter.

[Compbench-devel] CompBenchmarks++/CBM-PI/t/reference compiler-fake-g++-4.1.1-13, NONE, 1.1 compiler-fake-gcc-4.1.1-13, NONE, 1.1 compiler-fake-tcc-0.9.23, NONE, 1.1 Makefile.am, NONE, 1.1

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28649

Added Files:
	compiler-fake-g++-4.1.1-13 compiler-fake-gcc-4.1.1-13 
	compiler-fake-tcc-0.9.23 Makefile.am 
Log Message:
First import.

--- NEW FILE: compiler-fake-tcc-0.9.23 ---
#!/bin/sh

echo "tcc version 0.9.23"

--- NEW FILE: Makefile.am ---
data_DATA = CBMSystem-copy.data compiler-fake-g++-4.1.1-13 compiler-fake-gcc-4.1.1-13 compiler-fake-tcc-0.9.23
--- NEW FILE: compiler-fake-gcc-4.1.1-13 ---
#!/bin/sh

cat <<EOF
gcc (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13)
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

EOF


--- NEW FILE: compiler-fake-g++-4.1.1-13 ---
#!/bin/sh

cat <<EOF
g++ (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13)
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

EOF

[Compbench-devel] CompBenchmarks++/CBM-PI/t 02-CBMBenchmarkSelector-public.pl, 1.1, 1.2

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17951

Modified Files:
	02-CBMBenchmarkSelector-public.pl 
Log Message:
Many tests added.

Index: 02-CBMBenchmarkSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMBenchmarkSelector-public.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 13:16:25 -0000	1.1
--- 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 17:41:36 -0000	1.2
***************
*** 7,13 ****
  $top_srcdir =~ s/(.+)\/.*/$1/;
  
! my @benchmarks = `cat $top_srcdir/../../Benchmark/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
  chomp(@benchmarks);
! plan tests => (@benchmarks+0)*5;
  
  my $sys;
--- 7,13 ----
  $top_srcdir =~ s/(.+)\/.*/$1/;
  
! my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
  chomp(@benchmarks);
! plan tests => (@benchmarks+0)*52;
  
  my $sys;
***************
*** 42,51 ****
  my $b;
  
  foreach(@benchmarks) {
    $b   = $BMS->select($_);
    ok(defined($b), "loading $_");
    if (!defined($b)) {
!     ok(0);
!     ok(0);
    }
  
--- 42,57 ----
  my $b;
  
+ my %bm_hash;
+ 
  foreach(@benchmarks) {
+   print ">$_\n";
    $b   = $BMS->select($_);
    ok(defined($b), "loading $_");
    if (!defined($b)) {
!     my $N = 14;
!     while ($N--) {
!       ok(0);
!     }
!     next;
    }
  
***************
*** 56,60 ****
    my $pack = "$_";
    $pack =~ s/^(.*?)-.+/$1/g;
!   ok($pack eq $b->packageName(), "checking packageName() for $_");
  }
  
--- 62,95 ----
    my $pack = "$_";
    $pack =~ s/^(.*?)-.+/$1/g;
!   ok($pack eq $b->packageName(), "checking packageName() for $_ : '$pack'/" . $b->packageName());
! 
!   check_simple($b->packageVersion());
! 
!   my $siz = $b->packageSize();
!   check_simple($siz);
!   ok($siz > 0);
! 
!   check_simple($b->packageComments());
!   check_simple($b->localPackageName());
! 
!   my $bn = $b->benchmarkName();
! 
!   check_simple($bn);
!   ok($bn eq $_, "checking benchmark's name : got '$bn', expected '$_'");
! 
!   check_simple($b->benchmarkComments());
! 
!   my $lang = $b->language();
!   check_simple($lang);
!   ok( ($lang eq "C") || ($lang eq "C++"));
! 
!   check_simple($b->license());
! 
!   check_simple($b->author());
!   check_simple($b->localPackageAbsoluteName());
!   check_simple($b->localPackageAbsoluteDirectory());
! 
!   my $hast = $b->hasTest();
!   ok( ($hast==0) || ($hast==1) );
  }
  

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, NONE, 1.1 Benchmark-BENCHPP.h, NONE, 1.1 Benchmark-BENCHPP.libwrapper.h, NONE, 1.1 Benchmark-BENCHPPLINUX.cpp, NONE, 1.1 Benchmark-BENCHPPLINUX.h, NONE, 1.1 Benchmark-BENCHPPLINUX.libwrapper.h, NONE, 1.1 Benchmark-BZIP2.cpp, NONE, 1.1 Benchmark-BZIP2.h, NONE, 1.1 Benchmark-BZIP2.libwrapper.h, NONE, 1.1 Benchmark-GZIP.cpp, NONE, 1.1 Benchmark-GZIP.h, NONE, 1.1 Benchmark-GZIP.libwrapper.h, NONE, 1.1 Benchmark-LINPACKC.cpp, NONE, 1.1 Benchmark-LINPACKC.h, NONE, 1.1 Benchmark-LINPACKC.libwrapper.h, NONE, 1.1 Benchmark-NBENCH.cpp, NONE, 1.1 Benchmark-NBENCH.h, NONE, 1.1 Benchmark-NBENCH.libwrapper.h, NONE, 1.1 Benchmark-SCIMARK2.cpp, NONE, 1.1 Benchmark-SCIMARK2.h, NONE, 1.1 Benchmark-SCIMARK2.libwrapper.h, NONE, 1.1 Benchmark-Selector.cpp, NONE, 1.1 Benchmark-Selector.h, NONE, 1.1 benchmarks-genlibwrapper.sh, NONE, 1.1 benchmarks.list, NONE, 1.1 Makefile.am, NONE, 1.1

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

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

Added Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-BENCHPP.libwrapper.h Benchmark-BENCHPPLINUX.cpp 
	Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h 
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h 
	Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.cpp 
	Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h 
	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h 
	Benchmark-LINPACKC.libwrapper.h Benchmark-NBENCH.cpp 
	Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h 
	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h 
	Benchmark-SCIMARK2.libwrapper.h Benchmark-Selector.cpp 
	Benchmark-Selector.h benchmarks-genlibwrapper.sh 
	benchmarks.list Makefile.am 
Log Message:
Sources have been re-organised.

--- NEW FILE: Benchmark-BENCHPP.cpp ---
#include <SupportedBenchmarks/Benchmark-BENCHPP.h>
#include <System/System.h>

#include <config.h>

#include <fstream>

#include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h>

CBMBenchmarkBENCHPP::CBMBenchmarkBENCHPP(CBMSystem *_system)
  : CBMBenchmark(_system)
{
}

std::string CBMBenchmarkBENCHPP::downloadURL(void)
{
  return("");
}

std::string CBMBenchmarkBENCHPP::expectedMD5(void)
{
  return("61f961031fd3ca116787fffd442ef872");
}

std::string CBMBenchmarkBENCHPP::packageName(void)
{
  return("benchpp");
}

std::string CBMBenchmarkBENCHPP::benchmarkComments(void)
{
  std::string comment;

  comment+=benchmarkBENCHPPComments();
  comment+=" (Comment from README file)";

  return(comment);
}

std::string CBMBenchmarkBENCHPP::packageVersion(void)
{
  return("1.1");
}

int CBMBenchmarkBENCHPP::packageSize(void)
{
  return(177532);
}

std::string CBMBenchmarkBENCHPP::packageComments(void)
{
  return("The suite is based on the Ada PIWG suite, and therefore is " \
	 "designed to test individual language features, with some small " \
	 "applications and \"traditional\" benchmarks thrown in." \
	 "The \"optimizer\" tests are based on: "\
	 "Benchmark Test to Estimate Optimization Quality of Compilers " \
	 "By Klerer & Liu.  SIGPLAN NOT. Oct 1988 " \
	 ". The Style tests are based on: " \
	 "OOPACK: a benchmark for comparing OOP vs. C-style programming "\
	 "Kuck & Associates "
	 "http://www.kai.com/oopack/oopack.html "
	 "Stepanov Benchmarks: measuring the data abstraction penalty " \
	 "Written by Alexander Stepanov, the author of the STL " \
	 "http://www.kai.com/benchmarks/stepanov/ . Comments from mirror http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html, since official site http://paul.rutgers.edu/~orost/bench_plus_plus.html is down.");

}

std::string CBMBenchmarkBENCHPP::localPackageName(void)
{
  return("bench_plus_plus_1.1.tar.Z");
}

std::string CBMBenchmarkBENCHPP::language(void)
{
  return("C++");
}

char* CBMBenchmarkBENCHPP::extractDirectory(void)
{
  return("bench++");
}

int CBMBenchmarkBENCHPP::hasPatch(void)
{
  return(1);
}

int CBMBenchmarkBENCHPP::patch(int _force)
{
  std::string cmd;
  std::string sstdout;
  int         r;
  std::string patch;

  patch+=system->temporaryDirectory(CBMSystem::Patches);
  patch+="/benchpp.patch.gz";

  cmd+="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && if test ! -f ";
  cmd+=patch;
  cmd+="; then exit 1; fi";
  cmd+=" && ";
  cmd+=CBM_PROG_GZIP;
  cmd+=" -dc ";
  cmd+=patch;
  cmd+=" | ";
  cmd+=CBM_PROG_PATCH;
  cmd+=" -p0 Configure";
  r=system->exec(cmd, sstdout);
  return(!r);
}

int CBMBenchmarkBENCHPP::extract(int _force)
{
  std::string localFile = localPackageAbsoluteName();
  std::string cmd;
  std::string sstdout;

  cmd+="cd ";
  cmd+=system->temporaryDirectory(CBMSystem::Extract);
  cmd+=" && ";
  cmd+=CBM_PROG_ZCAT;
  cmd+=" ";
  cmd+=localFile;
  cmd+=" | ";
  cmd+=CBM_PROG_TAR;
  cmd+=" xvf -";

  return(system->exec(cmd, sstdout)==0);
}

int CBMBenchmarkBENCHPP::preConfigure(int _force)
{
  return(1);
}

int CBMBenchmarkBENCHPP::configure(CBMCompiler        *_currentCompiler,
				   CBMCompilerOptions *_currentOptions)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  
  cmd+="echo -e \"";
  cmd+=_currentCompiler->Binary();
  cmd+="\n";
  if (_currentOptions->Options() != "") {
    cmd+=_currentOptions->Options();
  } else {
    cmd+="none";
  }
  cmd+="\n\n\n\"";
  cmd+=" | ./Configure";

  return(system->exec(cmd, sstdout)==0);
}

int CBMBenchmarkBENCHPP::make(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" a000091 a000092 s000005a s000005m ";

  if (language()=="C") {
    cmd+="CC=";
  } else {
    if (language()=="C++") {
      cmd+="CXX=";
    } else {
      /* !!! */
    }
  }
  cmd+=currentCompiler->Binary();
  if (language()=="C") {
    cmd+=" CFLAGS=";
  } else {
    if (language()=="C++") {
      cmd+=" CXXFLAGS=";
    } else {
      /* !!! */
    }
  }

  cmd+="'";
  cmd+=currentOptions->Options();
  cmd+="' 2> /dev/null";

  return(system->exec(cmd, sstdout)==0);
}

std::string CBMBenchmarkBENCHPP::bench(void)
{
  std::string cmd;
  std::string result;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && echo $(./";
  cmd+=benchppBenchmark();
  cmd+=" | ";
  cmd+=CBM_PROG_TAIL;
  cmd+=" -1 | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f2 -d':')";
  
  if (system->exec(cmd, result)==0) {
    return(result);
  } else {
    return("0");
  }

}

int CBMBenchmarkBENCHPP::release(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" clean 2> /dev/null";

  return(system->exec(cmd, sstdout)==0);
}

std::string CBMBenchmarkBENCHPP::license(void)
{
  return("Public domain");
}

std::string CBMBenchmarkBENCHPP::homePage(void)
{
  return("http://web.archive.org/web/20050307095704/www.research.att.com/~orost/bench_plus_plus.html");
}

std::string CBMBenchmarkBENCHPP::author(void)
{
  return("Joseph M. Orost");
}

int CBMBenchmarkBENCHPP::benchmarkSize(void)
{
  return(packageSize());
}

CBMBenchmarkBENCHPP::~CBMBenchmarkBENCHPP()
{
}

CBMBenchmarkBENCHPP_DHRYSTONE::CBMBenchmarkBENCHPP_DHRYSTONE(CBMSystem *_system)
  : CBMBenchmarkBENCHPP(_system)
{
}

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(CBMSystem *_system)
  : CBMBenchmarkBENCHPP(_system)
{
}

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(CBMSystem *_system)
  : CBMBenchmarkBENCHPP(_system)
{
}

std::string CBMBenchmarkBENCHPP_STEPANOV::bench(void)
{
  std::string cmd;
  std::string result;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && echo $(./";
  cmd+=benchppBenchmark();
  cmd+=" | ";
  cmd+=CBM_PROG_GREP;
  cmd+=" 'Iteration Count' | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f3 -d':')";
  
  if (system->exec(cmd, result)==0) {
    return(result);
  } else {
    return("0");
  }
}

CBMBenchmarkBENCHPP_STEPANOV::~CBMBenchmarkBENCHPP_STEPANOV()
{
}

CBMBenchmarkBENCHPP_STEPANOV_AL12::CBMBenchmarkBENCHPP_STEPANOV_AL12(CBMSystem *_system)
  : CBMBenchmarkBENCHPP_STEPANOV(_system)
{
}

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()
{
}

--- NEW FILE: Benchmark-LINPACKC.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-LINPACKC.h,v 1.1 2006/12/28 17:41:03 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARKLINPACKC
#define H_CBMBENCHMARKLINPACKC

#include <Benchmark/Benchmark.h>

/** \brief Defines the linpackc package.
 */
class CBMBenchmarkLINPACKC : public CBMBenchmark
{
 public:
 private:
  virtual std::string downloadURL(void);
  virtual std::string expectedMD5(void);

  virtual std::string packageName(void);
  virtual std::string benchmarkComments(void);

  virtual std::string packageVersion(void);
  virtual int packageSize(void); /* in bytes */

  /** Compairs previous compilation context to current one. Local options
   *  are also taken in context.
   *  \return 1 if they match.
   *  \sa contextID()
   *  \sa storeContext()
   *  \sa Make()
   */
  virtual int         ContextMatches(CBMCompiler        *_currentCompiler,
				     CBMCompilerOptions *_currentOptions);

  virtual std::string packageComments(void);
  virtual std::string localPackageName(void);
		

 protected:
  virtual std::string linpackPrecisionFlags(void) = 0;
  virtual std::string linpackRollFlags(void) = 0;

  CBMBenchmarkLINPACKC(class CBMSystem *_system);

  virtual std::string language(void);

  virtual std::string benchmarkLINPACKCComments(void) = 0;

  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 std::string bench(void);
  virtual int release(void);

 public:
  virtual std::string license(void);
  virtual std::string homePage(void);
  virtual std::string author(void);

  virtual int benchmarkSize(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 linpackPrecisionFlags(void);
  virtual std::string linpackRollFlags(void);


  virtual std::string benchmarkLINPACKCComments(void);

 public:
  CBMBenchmarkLINPACKC_SP_UNROLL(class CBMSystem *_system);

  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 linpackPrecisionFlags(void);
  virtual std::string linpackRollFlags(void);


  virtual std::string benchmarkLINPACKCComments(void);

 public:
  CBMBenchmarkLINPACKC_SP_ROLL(class CBMSystem *_system);

  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 linpackPrecisionFlags(void);
  virtual std::string linpackRollFlags(void);


  virtual std::string benchmarkLINPACKCComments(void);

 public:
  CBMBenchmarkLINPACKC_DP_UNROLL(class CBMSystem *_system);

  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 linpackPrecisionFlags(void);
  virtual std::string linpackRollFlags(void);


  virtual std::string benchmarkLINPACKCComments(void);

 public:
  CBMBenchmarkLINPACKC_DP_ROLL(class CBMSystem *_system);

  virtual std::string benchmarkName(void);

  virtual ~CBMBenchmarkLINPACKC_DP_ROLL();
		
};

lib_declare();

#endif

--- NEW FILE: Benchmark-SCIMARK2.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-SCIMARK2.h,v 1.1 2006/12/28 17:41:04 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */
#ifndef H_CBMBENCHMARKSCIMARK2
#define H_CBMBENCHMARKSCIMARK2

#include <Benchmark/Benchmark.h>


/** \brief Defines the scimark2 package.
 */
class CBMBenchmarkSCIMARK2 : public CBMBenchmark
{
 public:
 private:
  virtual std::string downloadURL(void);
  virtual std::string expectedMD5(void);

  virtual std::string packageName(void);
  virtual std::string benchmarkName(void) = 0;
  virtual std::string benchmarkComments(void);

  virtual std::string packageVersion(void);
  virtual int packageSize(void); /* in bytes */
  virtual std::string packageComments(void);
  virtual std::string localPackageName(void);
		

 protected:

  CBMBenchmarkSCIMARK2(class CBMSystem *_system);

  virtual std::string language(void);
  virtual std::string benchmarkSCIMARK2Comments(void) = 0;
  virtual std::string scimark2BenchmarkLabel(void) = 0;

  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 std::string bench(void);
  virtual int release(void);

 public:
  virtual std::string license(void);
  virtual std::string homePage(void);
  virtual std::string author(void);

  virtual int benchmarkSize(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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  virtual ~CBMBenchmarkSCIMARK2_LU();
};

lib_declare();

#endif

--- NEW FILE: Benchmark-BZIP2.cpp ---
#include <SupportedBenchmarks/Benchmark-BZIP2.h>
#include <System/System.h>

#include <config.h>

#include <fstream>


#include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h>

CBMBenchmarkBZIP2::CBMBenchmarkBZIP2(CBMSystem *_system)
  : CBMBenchmarkxZIP(_system)
{
}

std::string CBMBenchmarkBZIP2::downloadURL(void)
{
  return("http://www.bzip.org/1.0.3/bzip2-1.0.3.tar.gz");
}

std::string CBMBenchmarkBZIP2::expectedMD5(void)
{
  return("8a716bebecb6e647d2e8a29ea5d8447f");
}

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

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

int CBMBenchmarkBZIP2::packageSize(void)
{
  return(669075);
}

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

std::string CBMBenchmarkBZIP2::localPackageName(void)
{
  return("bzip2-1.0.3.tar.Z");
}

std::string CBMBenchmarkBZIP2::language(void)
{
  return("C");
}

int CBMBenchmarkBZIP2::configure(CBMCompiler        *_currentCompiler,
				 CBMCompilerOptions *_currentOptions)
{
  return(1);
}

int CBMBenchmarkBZIP2::make(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" bzip2 ";

  if (language()=="C") {
    cmd+="CC=";
  } else {
    if (language()=="C++") {
      cmd+="CXX=";
    } else {
      /* !!! */
    }
  }
  cmd+=currentCompiler->Binary();
  if (language()=="C") {
    cmd+=" CFLAGS=";
  } else {
    if (language()=="C++") {
      cmd+="CXXFLAGS=";
    } else {
      /* !!! */
    }
  }

  cmd+="'";
  cmd+=currentOptions->Options();
  cmd+="'";

  return(system->exec(cmd, sstdout)==0);
}

int CBMBenchmarkBZIP2::hasTest(void)
{
  return(1);
}

int CBMBenchmarkBZIP2::test(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" check 2> /dev/null";

  return(system->exec(cmd, sstdout)==0);
}

char* CBMBenchmarkBZIP2::extractDirectory(void)
{
  return("bzip2-1.0.3");
}

std::string CBMBenchmarkBZIP2::benchmarkProgram(void)
{
  return("bzip2");
}

std::string CBMBenchmarkBZIP2::license(void)
{
  return("BSD-style");
}

std::string CBMBenchmarkBZIP2::homePage(void)
{
  return("http://www.bzip.org");
}

std::string CBMBenchmarkBZIP2::author(void)
{
  return("Written by Julian Seward");
}

int CBMBenchmarkBZIP2::benchmarkSize(void)
{
  return(76546048);
}

CBMBenchmarkBZIP2::~CBMBenchmarkBZIP2()
{
}
  
CBMBenchmarkBZIP21::CBMBenchmarkBZIP21(CBMSystem *_system)
  : CBMBenchmarkBZIP2(_system)
{
}

std::string CBMBenchmarkBZIP21::benchmarkName(void)
{
  return("bzip2-1c");
}

char* CBMBenchmarkBZIP21::compressionLevel(void)
{
  return("1");
}

std::string CBMBenchmarkBZIP21::benchmarkComments(void)
{
  return("Uses generated bzip2 binary with fastest compression");
}

CBMBenchmarkBZIP21::~CBMBenchmarkBZIP21()
{
}

CBMBenchmarkBZIP29::CBMBenchmarkBZIP29(CBMSystem *_system)
  : CBMBenchmarkBZIP2(_system)
{
}

std::string CBMBenchmarkBZIP29::benchmarkName(void)
{
  return("bzip2-9c");
}

char* CBMBenchmarkBZIP29::compressionLevel(void)
{
  return("9");
}

std::string CBMBenchmarkBZIP29::benchmarkComments(void)
{
  return("Uses generated bzip2 binary with maximum compression");
}

CBMBenchmarkBZIP29::~CBMBenchmarkBZIP29()
{
}

--- NEW FILE: Benchmark-Selector.cpp ---
#include <Benchmark/Benchmark-Selector.h>
#include <UI/UI.h>

#include <Benchmark/Benchmark-DLLoader.h>

CBMBenchmarkSelector::CBMBenchmarkSelector(CBMSystem *_system)
{
  system=_system;
}

CBMBenchmark *CBMBenchmarkSelector::select(char *benchmarkName)
{
  CBMBenchmark *result;
  std::string  tmp;

  result=cbmlib_bench_load(benchmarkName, system);
  if (!result) {
    tmp="Unknown benchmark '";
    tmp+=benchmarkName;
    tmp+="'";
    UI->Fatal(tmp);
    return(0);
  } else
    return(result);
}


void CBMBenchmarkSelector::displayList(void)
{
  CBMBenchmark *B;
  #include "Benchmark/Benchmark-Selector.liblist.h"
}


CBMBenchmarkSelector::~CBMBenchmarkSelector()
{
}


--- NEW FILE: Benchmark-Selector.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-Selector.h,v 1.1 2006/12/28 17:41:04 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARKSELECTOR
#define H_CBMBENCHMARKSELECTOR

#include <Benchmark/Benchmark.h>

/** \brief Gives a benchmark object according to internal benchmark's name.
 *
 *  This class creates CBMBenchmark objects. It is only instancied once, and I
 *  currently see no need to derivate it.
 *  \sa CBMBenchmark::benchmarkName()
 */
class CBMBenchmarkSelector
{
 private:
 protected:
  class CBMSystem *system;

 public:
  /** Constructor */
  CBMBenchmarkSelector(class CBMSystem *_system);
  
  /** Main method.
   *  Returns a CBMBenchmarks object.
   *  \param benchmarkName Internal name of the benchmark object to get
   *  \sa CBMBenchmark::benchmarkName()
   */
  virtual CBMBenchmark *select(char *benchmarkName);

  /** Display all benchmarks.
   *  Display all known benchmarks regardless of their status.
   *  \sa CBMBenchmark::display()
   */  
  virtual void displayList(void);

  /** Virtual destructor */
  virtual ~CBMBenchmarkSelector();

};

#endif

--- NEW FILE: Benchmark-BENCHPPLINUX.h ---
#ifndef H_CBMBENCHMARKBENCHPPLINUX
#define H_CBMBENCHMARKBENCHPPLINUX

#include <Benchmark/Benchmark.h>

/** \brief Defines the benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX : public CBMBenchmark
{
 public:
 private:
  virtual std::string downloadURL(void);
  virtual std::string expectedMD5(void);

  virtual std::string packageName(void);
  virtual std::string benchmarkName(void) = 0;
  virtual std::string benchmarkComments(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);
		

 protected:

  CBMBenchmarkBENCHPPLINUX(class CBMSystem *_system);

  virtual std::string benchppBenchmark(void) = 0;

  virtual std::string benchmarkBENCHPPLINUXComments(void) = 0;

  virtual char* extractDirectory(void);

  virtual int preConfigure(int _force);
  virtual int extract(int _force = 0);
  virtual int configure(CBMCompiler        *_currentCompiler,
			CBMCompilerOptions *_currentOptions);

  virtual int make(void);
  virtual std::string bench(void);
  virtual int release(void);

 public:
  virtual std::string license(void);
  virtual std::string homePage(void);
  virtual std::string author(void);

  virtual int benchmarkSize(void);
  virtual ~CBMBenchmarkBENCHPPLINUX();
		
};

/** \brief Defines the dhrystone benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_DHRYSTONE : public CBMBenchmarkBENCHPPLINUX
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);

  virtual std::string benchppBenchmark(void);


 public:
  CBMBenchmarkBENCHPPLINUX_DHRYSTONE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_DHRYSTONE();
};

/** \brief Defines the whetstone benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_WHETSTONE : public CBMBenchmarkBENCHPPLINUX
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);

  virtual std::string benchppBenchmark(void);


 public:
  CBMBenchmarkBENCHPPLINUX_WHETSTONE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_WHETSTONE();
};

/** \brief Defines a generic class to get benchmark in benchpp-linux according
 *  to an iteration number and the internal compbenchmarks' timer. */
class CBMBenchmarkBENCHPPLINUX_IterationsPerSec : public CBMBenchmarkBENCHPPLINUX
{
 protected:
  CBMBenchmarkBENCHPPLINUX_IterationsPerSec(class CBMSystem *_system);

  virtual std::string bench(void);
  virtual ~CBMBenchmarkBENCHPPLINUX_IterationsPerSec();
};


/** \brief Defines the boolean assignment benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN();
};


/** \brief Defines the 'boolean if' benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_BOOL_IF : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_BOOL_IF(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_BOOL_IF();
};

/** \brief Defines the 'two-way if/else' benchmark within benchpp-linux
 *   package.
 */
class CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE();
};


/** \brief Defines the 'two-way switch' benchmark within benchpp-linux
 *   package.
 */
class CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH();
};


/** \brief Defines the '10-way if/else' benchmark within benchpp-linux
 *   package.
 */
class CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE();
};


/** \brief Defines the '10-way switch' benchmark within benchpp-linux
 *   package.
 */
class CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH();
};

/** \brief Defines the '10-way sparse switch' benchmark within benchpp-linux
 *   package.
 */
class CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH();
};

/** \brief Defines the '10-way virtual function call' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_10WAY_VFC : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_10WAY_VFC(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_10WAY_VFC();
};

/** \brief Defines the 'packed bit arrays' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY();
};

/** \brief Defines the 'bit-fields' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_BITFIELDS : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_BITFIELDS(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_BITFIELDS();
};

/** \brief Defines the 'bit-fields and packed bit arrray' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA();
};

/** \brief Defines the 'pack and unpack class object' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ();
};

/** \brief Defines the 'Constant Propagation' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_CONSTPROP : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_CONSTPROP(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_CONSTPROP();
};

/** \brief Defines the 'Constant Propagation' (hand optimized) benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO();
};

/** \brief Defines the 'Local Common Sub-expression' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_LOCALCSE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_LOCALCSE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_LOCALCSE();
};

/** \brief Defines the 'Local Common Sub-expression' (hand optimized) benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO();
};


/** \brief Defines the 'Global Common Sub-expression' benchmark within
 *   benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_GLOBALCSE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_GLOBALCSE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_GLOBALCSE();
};

/** \brief Defines the 'Global Common Sub-expression' (Hand optimized)
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO();
};

/** \brief Defines the 'Unnecessary Copy'
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_UNNECCOPY : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_UNNECCOPY(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_UNNECCOPY();
};

/** \brief Defines the 'Unnecessary Copy' (Hand optimized)
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO();
};

/** \brief Defines the 'Code Motion (including math functions)'
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_CODEMOTION : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_CODEMOTION(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_CODEMOTION();
};

/** \brief Defines the 'Code Motion (including math functions)',
 *  hand optimized, benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO();
};

/** \brief Defines the 'Induction Variable',
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_INDUCVAR : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_INDUCVAR(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_INDUCVAR();
};

/** \brief Defines the 'Induction Variable' (hand optimized)
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO();
};

/** \brief Defines the 'Reduction in Strength (including math functions)',
 *  hand optimized, benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO();
};

/** \brief Defines the 'Dead Code'
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_DEADCODE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_DEADCODE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_DEADCODE();
};

/** \brief Defines the 'Dead Code', hand optimized,
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_DEADCODE_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_DEADCODE_HO();
};

/** \brief Defines the 'Loop Jamming'
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_LOOPJAMMING : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_LOOPJAMMING();
};


/** \brief Defines the 'Loop Jamming', hand optimized,
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO();
};

/** \brief Defines the 'Redundant Code'
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_REDUNCODE : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_REDUNCODE(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_REDUNCODE();
};


/** \brief Defines the 'Redundant Code' hand optimized
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO();
};

/** \brief Defines the 'String Ops'
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_STRINGOPS : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_STRINGOPS(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_STRINGOPS();
};

/** \brief Defines the 'String Ops', hand optimized,
 *  benchmark within benchpp-linux package.
 */
class CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO : public CBMBenchmarkBENCHPPLINUX_IterationsPerSec
{
 protected:
  virtual std::string benchmarkName(void);
  virtual std::string benchmarkBENCHPPLINUXComments(void);


  virtual std::string benchppBenchmark(void);

 public:
  CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO();
};

lib_declare();

#endif

--- NEW FILE: Benchmark-GZIP.libwrapper.h ---
CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system)
{
  switch(idx) {
  case 0:
    return(new CBMBenchmarkGZIP1(_system));
    ;;
  case 1:
    return(new CBMBenchmarkGZIP9(_system));
    ;;
  default:
    return(0);
    ;;
  }
}

 CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system)
{
    std::string tmp = bench_id;

    if (tmp=="gzip-1c") {
       return(new CBMBenchmarkGZIP1(_system));
    }

    if (tmp=="gzip-9c") {
       return(new CBMBenchmarkGZIP9(_system));
    }

    return(0);
}
int cbmlib_getBenchmarkNumber(void)
{
  return(2);
}
std::vector<std::string> cbmlib_getBenchmarks(void)
{
  std::vector<std::string> result;

  result.push_back("gzip-1c");
  result.push_back("gzip-9c");

  return(result);
}



--- NEW FILE: Benchmark-LINPACKC.libwrapper.h ---
CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system)
{
  switch(idx) {
  case 0:
    return(new CBMBenchmarkLINPACKC_SP_UNROLL(_system));
    ;;
  case 1:
    return(new CBMBenchmarkLINPACKC_SP_ROLL(_system));
    ;;
  case 2:
    return(new CBMBenchmarkLINPACKC_DP_UNROLL(_system));
    ;;
  case 3:
    return(new CBMBenchmarkLINPACKC_DP_ROLL(_system));
    ;;
  default:
    return(0);
    ;;
  }
}

 CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system)
{
    std::string tmp = bench_id;

    if (tmp=="linpackc-sp-unroll") {
       return(new CBMBenchmarkLINPACKC_SP_UNROLL(_system));
    }

    if (tmp=="linpackc-sp-roll") {
       return(new CBMBenchmarkLINPACKC_SP_ROLL(_system));
    }

    if (tmp=="linpackc-dp-unroll") {
       return(new CBMBenchmarkLINPACKC_DP_UNROLL(_system));
    }

    if (tmp=="linpackc-dp-roll") {
       return(new CBMBenchmarkLINPACKC_DP_ROLL(_system));
    }

    return(0);
}
int cbmlib_getBenchmarkNumber(void)
{
  return(4);
}
std::vector<std::string> cbmlib_getBenchmarks(void)
{
  std::vector<std::string> result;

  result.push_back("linpackc-sp-unroll");
  result.push_back("linpackc-sp-roll");
  result.push_back("linpackc-dp-unroll");
  result.push_back("linpackc-dp-roll");

  return(result);
}



--- NEW FILE: Benchmark-GZIP.cpp ---
#include <SupportedBenchmarks/Benchmark-GZIP.h>
#include <System/System.h>

#include <fstream>

#include <config.h>

#include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h>

CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMSystem *_system)
  : CBMBenchmarkxZIP(_system)
{
}

std::string CBMBenchmarkGZIP::downloadURL(void)
{
  return("ftp://ftp.netscape.com/pub/unsupported/gnu/gzip-1.2.4.tar.Z");
}

std::string CBMBenchmarkGZIP::expectedMD5(void)
{
  return("bfc104a6eaf1704be524c879bc9d29bc");
}

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

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

int CBMBenchmarkGZIP::packageSize(void)
{
  return(327865);
}

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

std::string CBMBenchmarkGZIP::localPackageName(void)
{
  return("gzip-1.2.4.tar.Z");
}

std::string CBMBenchmarkGZIP::language(void)
{
  return("C");
}

int CBMBenchmarkGZIP::hasTest(void)
{
  return(1);
}

int CBMBenchmarkGZIP::test(void)
{
  std::string cmd;
  std::string sstdout;

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_MAKE;
  cmd+=" test 2> /dev/null";

  return(system->exec(cmd, sstdout)==0);
}

char* CBMBenchmarkGZIP::extractDirectory(void)
{
  return("gzip-1.2.4");
}

std::string CBMBenchmarkGZIP::benchmarkProgram(void)
{
  return("gzip");
}

std::string CBMBenchmarkGZIP::license(void)
{
  return("GPL v2");
}

std::string CBMBenchmarkGZIP::homePage(void)
{
  return("http://www.gzip.org");
}

std::string CBMBenchmarkGZIP::author(void)
{
  return("Written by Jean-loup Gailly & Mark Adler");
}

int CBMBenchmarkGZIP::benchmarkSize(void)
{
  return(76546048);
}

CBMBenchmarkGZIP::~CBMBenchmarkGZIP()
{
}
  
CBMBenchmarkGZIP1::CBMBenchmarkGZIP1(CBMSystem *_system)
  : CBMBenchmarkGZIP(_system)
{
}

std::string CBMBenchmarkGZIP1::benchmarkName(void)
{
  return("gzip-1c");
}

char* CBMBenchmarkGZIP1::compressionLevel(void)
{
  return("1");
}

std::string CBMBenchmarkGZIP1::benchmarkComments(void)
{
  return("Uses generated gzip binary with fastest compression");
}

CBMBenchmarkGZIP1::~CBMBenchmarkGZIP1()
{
}

CBMBenchmarkGZIP9::CBMBenchmarkGZIP9(CBMSystem *_system)
  : CBMBenchmarkGZIP(_system)
{
}

std::string CBMBenchmarkGZIP9::benchmarkName(void)
{
  return("gzip-9c");
}

char* CBMBenchmarkGZIP9::compressionLevel(void)
{
  return("9");
}

std::string CBMBenchmarkGZIP9::benchmarkComments(void)
{
  return("Uses generated gzip binary with maximum compression");
}

CBMBenchmarkGZIP9::~CBMBenchmarkGZIP9()
{
}

--- NEW FILE: Makefile.am ---
# SupportedBenchmarks

lib_LTLIBRARIES				=	libcompbenchmarks-bm-gzip.la \
						libcompbenchmarks-bm-bzip2.la \
						libcompbenchmarks-bm-nbench.la \
						libcompbenchmarks-bm-scimark2.la \
						libcompbenchmarks-bm-benchpp.la \
						libcompbenchmarks-bm-benchpplinux.la \
						libcompbenchmarks-bm-linpackc.la

../libcompbenchmarks.la:
	make -C .. libcompbenchmarks.la

libcompbenchmarks_bm_gzip_la_LIBADD		= ../libcompbenchmarks.la
libcompbenchmarks_bm_bzip2_la_LIBADD		= ../libcompbenchmarks.la
libcompbenchmarks_bm_nbench_la_LIBADD		= ../libcompbenchmarks.la
libcompbenchmarks_bm_scimark2_la_LIBADD 	= ../libcompbenchmarks.la
libcompbenchmarks_bm_benchpp_la_LIBADD 		= ../libcompbenchmarks.la
libcompbenchmarks_bm_benchpplinux_la_LIBADD	= ../libcompbenchmarks.la
libcompbenchmarks_bm_linpackc_la_LIBADD 	= ../libcompbenchmarks.la

Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h
libcompbenchmarks_bm_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h

Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h
libcompbenchmarks_bm_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h

Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h
libcompbenchmarks_bm_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h

Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h
libcompbenchmarks_bm_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h

Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h
libcompbenchmarks_bm_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h

Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h
libcompbenchmarks_bm_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h

Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h
libcompbenchmarks_bm_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h

# libBenchmark_la_LIBADD			=	Compiler/libBenchmarkCompiler.la

INCLUDES				=	-I $(top_srcdir)

CBM_GENLIBWRAPPER			=	$(top_srcdir)/SupportedBenchmarks/benchmarks-genlibwrapper.sh


EXTRA_DIST				=	benchmarks-genlibwrapper.sh benchmarks.list

%.libwraXpper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
	echo ">>>>>>>>>>>>>>>> $@"
	@(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/SupportedBenchmarks/$@; then \
	doit=1; \
	fi; \
	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@.tmp; \
	if test $$doit = "1"; then \
	mv $@.tmp $@ && echo "created."; \
	else \
	diff $@.tmp $@ > /dev/null; \
	if test ! $$? == 0; then mv $@.tmp $@ && echo "updated."; else \
	echo "up-to-date."; \
	fi; \
	fi; \
	rm $@.tmp 2> /dev/null; exit 0)

$(top_srcdir)/SupportedBenchmarks/%.libwrapper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@

clean-all: rm *.libwrapper.h
--- NEW FILE: Benchmark-BENCHPP.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-BENCHPP.h,v 1.1 2006/12/28 17:41:02 xfred Exp $

   This is free software.
   For details, see the GNU Public License in the COPYING file, or
   Look http://www.fsf.org
   ------------------------------------------------------------------------- */

#ifndef H_CBMBENCHMARKBENCHPP
#define H_CBMBENCHMARKBENCHPP

#include <Benchmark/Benchmark.h>

/** \brief Defines the benchpp package.
 */
class CBMBenchmarkBENCHPP : public CBMBenchmark
{
 public:
 private:
  virtual std::string downloadURL(void);
  virtual std::string expectedMD5(void);

  virtual std::string packageName(void);
  virtual std::string benchmarkName(void) = 0;
  virtual std::string benchmarkComments(void);

  virtual std::string packageVersion(void);
  virtual int packageSize(void); /* in bytes */
  virtual std::string packageComments(void);
  virtual std::string localPackageName(void);
		

 protected:

  CBMBenchmarkBENCHPP(class CBMSystem *_system);

  virtual std::string language(void);
  virtual std::string benchppBenchmark(void) = 0;

  virtual std::string benchmarkBENCHPPComments(void) = 0;

  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 std::string bench(void);
  virtual int release(void);

 public:
  virtual std::string license(void);
  virtual std::string homePage(void);
  virtual std::string author(void);

  virtual int benchmarkSize(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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  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(class CBMSystem *_system);
  virtual ~CBMBenchmarkBENCHPP_STEPANOV_AL12();
};

lib_declare();

#endif

--- NEW FILE: Benchmark-BENCHPPLINUX.libwrapper.h ---
CBMBenchmark *cbmlib_getBenchmark(int idx, CBMSystem *_system)
{
  switch(idx) {
  case 0:
    return(new CBMBenchmarkBENCHPPLINUX_DHRYSTONE(_system));
    ;;
  case 1:
    return(new CBMBenchmarkBENCHPPLINUX_WHETSTONE(_system));
    ;;
  case 2:
    return(new CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(_system));
    ;;
  case 3:
    return(new CBMBenchmarkBENCHPPLINUX_BOOL_IF(_system));
    ;;
  case 4:
    return(new CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(_system));
    ;;
  case 5:
    return(new CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(_system));
    ;;
  case 6:
    return(new CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(_system));
    ;;
  case 7:
    return(new CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(_system));
    ;;
  case 8:
    return(new CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(_system));
    ;;
  case 9:
    return(new CBMBenchmarkBENCHPPLINUX_10WAY_VFC(_system));
    ;;
  case 10:
    return(new CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(_system));
    ;;
  case 11:
    return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS(_system));
    ;;
  case 12:
    return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(_system));
    ;;
  case 13:
    return(new CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(_system));
    ;;
  case 14:
    return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP(_system));
    ;;
  case 15:
    return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(_system));
    ;;
  case 16:
    return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE(_system));
    ;;
  case 17:
    return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(_system));
    ;;
  case 18:
    return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE(_system));
    ;;
  case 19:
    return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(_system));
    ;;
  case 20:
    return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY(_system));
    ;;
  case 21:
    return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(_system));
    ;;
  case 22:
    return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION(_system));
    ;;
  case 23:
    return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(_system));
    ;;
  case 24:
    return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR(_system));
    ;;
  case 25:
    return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(_system));
    ;;
  case 26:
    return(new CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(_system));
    ;;
  case 27:
    return(new CBMBenchmarkBENCHPPLINUX_DEADCODE(_system));
    ;;
  case 28:
    return(new CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(_system));
    ;;
  case 29:
    return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(_system));
    ;;
  case 30:
    return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(_system));
    ;;
  case 31:
    return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE(_system));
    ;;
  case 32:
    return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(_system));
    ;;
  case 33:
    return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS(_system));
    ;;
  case 34:
    return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(_system));
    ;;
  default:
    return(0);
    ;;
  }
}

 CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, CBMSystem *_system)
{
    std::string tmp = bench_id;

    if (tmp=="benchpplinux-dhrystone") {
       return(new CBMBenchmarkBENCHPPLINUX_DHRYSTONE(_system));
    }

    if (tmp=="benchpplinux-whetstone") {
       return(new CBMBenchmarkBENCHPPLINUX_WHETSTONE(_system));
    }

    if (tmp=="benchpplinux-bool-assign") {
       return(new CBMBenchmarkBENCHPPLINUX_BOOL_ASSIGN(_system));
    }

    if (tmp=="benchpplinux-bool-if") {
       return(new CBMBenchmarkBENCHPPLINUX_BOOL_IF(_system));
    }

    if (tmp=="benchpplinux-2wifelse") {
       return(new CBMBenchmarkBENCHPPLINUX_2WAY_IFELSE(_system));
    }

    if (tmp=="benchpplinux-2wswitch") {
       return(new CBMBenchmarkBENCHPPLINUX_2WAY_SWITCH(_system));
    }

    if (tmp=="benchpplinux-10wifelse") {
       return(new CBMBenchmarkBENCHPPLINUX_10WAY_IFELSE(_system));
    }

    if (tmp=="benchpplinux-10wswitch") {
       return(new CBMBenchmarkBENCHPPLINUX_10WAY_SWITCH(_system));
    }

    if (tmp=="benchpplinux-10wsparseswitch") {
       return(new CBMBenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH(_system));
    }

    if (tmp=="benchpplinux-10wvfc") {
       return(new CBMBenchmarkBENCHPPLINUX_10WAY_VFC(_system));
    }

    if (tmp=="benchpplinux-packedbitarray") {
       return(new CBMBenchmarkBENCHPPLINUX_PACKEDBITARRAY(_system));
    }

    if (tmp=="benchpplinux-bitfields") {
       return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS(_system));
    }

    if (tmp=="benchpplinux-bitfields-pba") {
       return(new CBMBenchmarkBENCHPPLINUX_BITFIELDS_PBA(_system));
    }

    if (tmp=="benchpplinux-packunpackobjets") {
       return(new CBMBenchmarkBENCHPPLINUX_PACKUNPACKOBJ(_system));
    }

    if (tmp=="benchpplinux-constantpropagation") {
       return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP(_system));
    }

    if (tmp=="benchpplinux-constantpropagation-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_CONSTPROP_HO(_system));
    }

    if (tmp=="benchpplinux-localcommonse") {
       return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE(_system));
    }

    if (tmp=="benchpplinux-localcommonse-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_LOCALCSE_HO(_system));
    }

    if (tmp=="benchpplinux-globalcommonse") {
       return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE(_system));
    }

    if (tmp=="benchpplinux-globalcommonse-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_GLOBALCSE_HO(_system));
    }

    if (tmp=="benchpplinux-unneccopy") {
       return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY(_system));
    }

    if (tmp=="benchpplinux-unneccopy-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_UNNECCOPY_HO(_system));
    }

    if (tmp=="benchpplinux-codemotion") {
       return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION(_system));
    }

    if (tmp=="benchpplinux-codemotion-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_CODEMOTION_HO(_system));
    }

    if (tmp=="benchpplinux-inducvar") {
       return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR(_system));
    }

    if (tmp=="benchpplinux-inducvar-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_INDUCVAR_HO(_system));
    }

    if (tmp=="benchpplinux-reducstrength-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO(_system));
    }

    if (tmp=="benchpplinux-deadcode") {
       return(new CBMBenchmarkBENCHPPLINUX_DEADCODE(_system));
    }

    if (tmp=="benchpplinux-deadcode-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_DEADCODE_HO(_system));
    }

    if (tmp=="benchpplinux-loopjamming") {
       return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING(_system));
    }

    if (tmp=="benchpplinux-loopjamming-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_LOOPJAMMING_HO(_system));
    }

    if (tmp=="benchpplinux-reduncode") {
       return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE(_system));
    }

    if (tmp=="benchpplinux-reduncode-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_REDUNCODE_HO(_system));
    }

    if (tmp=="benchpplinux-stringops") {
       return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS(_system));
    }

    if (tmp=="benchpplinux-stringops-ho") {
       return(new CBMBenchmarkBENCHPPLINUX_STRINGOPS_HO(_system));
    }

    return(0);
}
int cbmlib_getBenchmarkNumber(void)
{
  return(35);
}
std::vector<std::string> cbmlib_getBenchmarks(void)
{
  std::vector<std::string> result;

  result.push_back("benchpplinux-dhrystone");
  result.push_back("benchpplinux-whetstone");
  result.push_back("benchpplinux-bool-assign");
  result.push_back("benchpplinux-bool-if");
  result.push_back("benchpplinux-2wifelse");
  result.push_back("benchpplinux-2wswitch");
  result.push_back("benchpplinux-10wifelse");
  result.push_back("benchpplinux-10wswitch");
  result.push_back("benchpplinux-10wsparseswitch");
  result.push_back("benchpplinux-10wvfc");
  result.push_back("benchpplinux-packedbitarray");
  result.push_back("benchpplinux-bitfields");
  result.push_back("benchpplinux-bitfields-pba");
  result.push_back("benchpplinux-packunpackobjets");
  result.push_back("benchpplinux-constantpropagation");
  result.push_back("benchpplinux-constantpropagation-ho");
  result.push_back("benchpplinux-localcommonse");
  result.push_back("benchpplinux-localcommonse-ho");
  result.push_back("benchpplinux-globalcommonse");
  result.push_back("benchpplinux-globalcommonse-ho");
  result.push_back("benchpplinux-unneccopy");
  result.push_back("benchpplinux-unneccopy-ho");
  result.push_back("benchpplinux-codemotion");
  result.push_back("benchpplinux-codemotion-ho");
  result.push_back("benchpplinux-induc...
 
[truncated message content]

[Compbench-devel] CompBenchmarks++/Benchmark Makefile.am, 1.15, 1.16 Benchmark-BENCHPP.cpp, 1.7, NONE Benchmark-BENCHPP.h, 1.4, NONE Benchmark-BENCHPPLINUX.cpp, 1.6, NONE Benchmark-BENCHPPLINUX.h, 1.4, NONE Benchmark-BZIP2.cpp, 1.5, NONE Benchmark-BZIP2.h, 1.4, NONE Benchmark-GZIP.cpp, 1.6, NONE Benchmark-GZIP.h, 1.5, NONE Benchmark-LINPACKC.cpp, 1.2, NONE Benchmark-LINPACKC.h, 1.2, NONE Benchmark-NBENCH.cpp, 1.5, NONE Benchmark-NBENCH.h, 1.4, NONE Benchmark-SCIMARK2.cpp, 1.6, NONE Benchmark-SCIMARK2.h, 1.4, NONE benchmarks-genlibwrapper.sh, 1.2, NONE benchmarks.list, 1.7, NONE

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

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

Modified Files:
	Makefile.am 
Removed Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-BENCHPPLINUX.cpp 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 benchmarks-genlibwrapper.sh 
	benchmarks.list 
Log Message:
Sources have been re-organised.

--- Benchmark-BENCHPP.cpp DELETED ---

--- benchmarks.list DELETED ---

--- Benchmark-NBENCH.h DELETED ---

--- Benchmark-LINPACKC.h DELETED ---

--- Benchmark-SCIMARK2.h DELETED ---

--- Benchmark-NBENCH.cpp DELETED ---

--- Benchmark-GZIP.h DELETED ---

--- Benchmark-BENCHPPLINUX.h DELETED ---

--- Benchmark-BZIP2.cpp DELETED ---

--- Benchmark-GZIP.cpp DELETED ---

--- benchmarks-genlibwrapper.sh DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	28 Dec 2006 13:20:45 -0000	1.15
--- Makefile.am	28 Dec 2006 17:39:46 -0000	1.16
***************
*** 1,52 ****
! noinst_LTLIBRARIES			=	libBenchmark.la
! lib_LTLIBRARIES				=	libcompbenchmarks-gzip.la \
! 						libcompbenchmarks-bzip2.la \
! 						libcompbenchmarks-nbench.la \
! 						libcompbenchmarks-scimark2.la \
! 						libcompbenchmarks-benchpp.la \
! 						libcompbenchmarks-benchpplinux.la \
! 						libcompbenchmarks-linpackc.la
  
! # SUBDIRS					=	Compiler
  
  sources					=       Benchmark.cpp \
  						Benchmark-DLLoader.cpp \
- 						Benchmark-Selector.cpp \
  						Benchmark-Autotools.cpp \
! 						Benchmark-xZIP.cpp
! 
! 
! libcompbenchmarks_gzip_la_LIBADD		= ../libcompbenchmarks.la
! libcompbenchmarks_bzip2_la_LIBADD		= ../libcompbenchmarks.la
! libcompbenchmarks_nbench_la_LIBADD		= ../libcompbenchmarks.la
! libcompbenchmarks_scimark2_la_LIBADD 		= ../libcompbenchmarks.la
! libcompbenchmarks_benchpp_la_LIBADD 		= ../libcompbenchmarks.la
! libcompbenchmarks_benchpplinux_la_LIBADD	= ../libcompbenchmarks.la
! libcompbenchmarks_linpackc_la_LIBADD 		= ../libcompbenchmarks.la
! 
! Benchmark-Selector.cpp: Benchmark-Selector.liblist.h
! 
! Benchmark-GZIP.cpp: 
! libcompbenchmarks_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h
! 
! Benchmark-BZIP2.cpp:
! libcompbenchmarks_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h
! 
! Benchmark-NBENCH.cpp:
! libcompbenchmarks_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h
! 
! Benchmark-SCIMARK2.cpp:
! libcompbenchmarks_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h
! 
! Benchmark-BENCHPP.cpp:
! libcompbenchmarks_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
! 
! Benchmark-BENCHPPLINUX.cpp:
! libcompbenchmarks_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h
! 
! Benchmark-LINPACKC.cpp:
! libcompbenchmarks_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h
! 
! # libBenchmark_la_LIBADD			=	Compiler/libBenchmarkCompiler.la
  
  libBenchmark_la_SOURCES 		=	$(sources) 
--- 1,11 ----
! # Benchmark
  
! noinst_LTLIBRARIES			=	libBenchmark.la
  
  sources					=       Benchmark.cpp \
  						Benchmark-DLLoader.cpp \
  						Benchmark-Autotools.cpp \
! 						Benchmark-xZIP.cpp \
! 						Benchmark-Selector.cpp
  
  libBenchmark_la_SOURCES 		=	$(sources) 
***************
*** 55,95 ****
  libBenchmarkincludedir			=	$(includedir)/compbenchmarks/Benchmark
  
! INCLUDES				=	-I $(top_srcdir)
! 
! CBM_GENLIBWRAPPER			=	$(top_srcdir)/Benchmark/benchmarks-genlibwrapper.sh
! CBM_GENLIBLIST				=	$(top_srcdir)/Benchmark/benchmarks-genliblist.sh
! 
! 
! EXTRA_DIST				=	benchmarks-genlibwrapper.sh benchmarks-genliblist.sh benchmarks.list
! 
! %.libwrapper.h: $(top_srcdir)/Benchmark/benchmarks.list $(CBM_GENLIBWRAPPER)
! 	@(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/Benchmark/$@; then \
! 	doit=1; \
! 	fi; \
! 	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/Benchmark > $@.tmp; \
! 	if test $$doit = "1"; then \
! 	mv $@.tmp $@ && echo "created."; \
! 	else \
! 	diff $@.tmp $@ > /dev/null; \
! 	if test ! $$? == 0; then mv $@.tmp $@ && echo "updated."; else \
! 	echo "up-to-date."; \
! 	fi; \
! 	fi; \
! 	rm $@.tmp 2> /dev/null; exit 0)
! 
! Benchmark-Selector.liblist.h: $(top_srcdir)/Benchmark/benchmarks.list $(CBM_GENLIBLIST)
! 	@(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/Benchmark/$@; then \
! 	doit=1; \
! 	fi; \
! 	$(CBM_GENLIBLIST) $(top_srcdir)/Benchmark > $@.tmp; \
! 	if test $$doit = "0"; then \
! 	mv $@.tmp $@ && echo "created."; \
! 	else \
! 	diff $@.tmp $@ > /dev/null; \
! 	if test ! $$? == 0; then mv $@.tmp $@ && echo "updated."; else \
! 	echo "up-to-date."; \
! 	fi; \
! 	fi; \
! 	rm $@.tmp 2> /dev/null; exit 0)
! 
! clean-all: rm *.libwrapper.h *.liblist.h
\ No newline at end of file
--- 14,16 ----
  libBenchmarkincludedir			=	$(includedir)/compbenchmarks/Benchmark
  
! INCLUDES				=	-I $(top_srcdir)
\ No newline at end of file

--- Benchmark-BENCHPP.h DELETED ---

--- Benchmark-SCIMARK2.cpp DELETED ---

--- Benchmark-LINPACKC.cpp DELETED ---

--- Benchmark-BENCHPPLINUX.cpp DELETED ---

--- Benchmark-BZIP2.h DELETED ---

[Compbench-devel] CompBenchmarks++ README,1.10,1.11

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

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

Modified Files:
	README 
Log Message:
make test referenced.
Other minor changes.

Index: README
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** README	1 Nov 2006 14:22:38 -0000	1.10
--- README	28 Dec 2006 13:32:16 -0000	1.11
***************
*** 1,5 ****
  $Id$
  
! CompBenchmarks' suite 0.3.0
  
  This package integrates some of the well-known benchmarks and applications,
--- 1,5 ----
  $Id$
  
! CompBenchmarks' suite 0.5.0
  
  This package integrates some of the well-known benchmarks and applications,
***************
*** 30,33 ****
--- 30,38 ----
      * make
  
+ I use following command to check for regressions; that's not mandatory, yet that may
+ help spoting bugs with your compiled software :
+ 
+     * make test
+ 
  Optionnaly, you may want to install it on your system to make it accessible
  to all users :