[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BENCHPP.cpp, 1.5, 1.6 Benchmark-BENCHPP.h, 1.3, 1.4 Benchmark-BZIP2.cpp, 1.4, 1.5 Benchmark-BZIP2.h, 1.3, 1.4 Benchmark.cpp, 1.13, 1.14 Benchmark-GZIP.cpp, 1.5, 1.6 Benchmark-GZIP.h, 1.4, 1.5 Benchmark.h, 1.8, 1.9 Benchmark-LINPACKC.cpp, 1.1, 1.2 Benchmark-LINPACKC.h, 1.1, 1.2 Benchmark-NBENCH.cpp, 1.3, 1.4 Benchmark-NBENCH.h, 1.3, 1.4 Benchmark-SCIMARK2.cpp, 1.4, 1.5 Benchmark-SCIMARK2.h, 1.3, 1.4 Benchmark-Selector.cpp, 1.5, 1.6

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

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

Modified Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BZIP2.cpp 
	Benchmark-BZIP2.h Benchmark.cpp Benchmark-GZIP.cpp 
	Benchmark-GZIP.h Benchmark.h Benchmark-LINPACKC.cpp 
	Benchmark-LINPACKC.h Benchmark-NBENCH.cpp Benchmark-NBENCH.h 
	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h 
	Benchmark-Selector.cpp 
Log Message:
Some class names changed. Shared library interface.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark.h	10 Oct 2006 16:48:49 -0000	1.8
--- Benchmark.h	1 Nov 2006 12:59:56 -0000	1.9
***************
*** 10,15 ****
  #define H_CBMBENCHMARK
  
! #include <Benchmark/Compiler/BenchmarkContext-Compiler.h>
! #include <Benchmark/Compiler/BenchmarkContext-CompilerOptions.h>
  
  class CBMSystem;
--- 10,15 ----
  #define H_CBMBENCHMARK
  
! #include <Compiler/Compiler.h>
! #include <Compiler/Compiler-Options.h>
  
  class CBMSystem;
***************
*** 109,115 ****
   protected:
    /** Stores current compiler. */
!   CBMBenchmarkContextCompiler        *currentCompiler;
    /** Stores current (compiler) options. */
!   CBMBenchmarkContextCompilerOptions *currentOptions;
  
    /** System used */
--- 109,115 ----
   protected:
    /** Stores current compiler. */
!   CBMCompiler        *currentCompiler;
    /** Stores current (compiler) options. */
!   CBMCompilerOptions *currentOptions;
  
    /** System used */
***************
*** 195,200 ****
     *  \sa Configure()
     *  \return 1 if ok */
!   virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			CBMBenchmarkContextCompilerOptions *_currentOptions) = 0;
  
    /** Pure virtual method to build package
--- 195,200 ----
     *  \sa Configure()
     *  \return 1 if ok */
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions) = 0;
  
    /** Pure virtual method to build package
***************
*** 237,242 ****
     *  \sa ContextMatches()
    */
!   virtual std::string contextID(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    /** Stores (compilation) context ID
--- 237,242 ----
     *  \sa ContextMatches()
    */
!   virtual std::string contextID(CBMCompiler        *_currentCompiler,
! 				CBMCompilerOptions *_currentOptions);
  
    /** Stores (compilation) context ID
***************
*** 246,251 ****
     *  \return 1 if ok
     */
!   virtual int storeContext(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			   CBMBenchmarkContextCompilerOptions *_currentOptions);
   public:
  
--- 246,251 ----
     *  \return 1 if ok
     */
!   virtual int storeContext(CBMCompiler        *_currentCompiler,
! 			   CBMCompilerOptions *_currentOptions);
   public:
  
***************
*** 267,272 ****
     *  \sa Make()
     */
!   virtual int         ContextMatches(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				     CBMBenchmarkContextCompilerOptions *_currentOptions);
    /** Download package.
     *  Gets downloadURL() object from Internet and verify checksum.
--- 267,272 ----
     *  \sa Make()
     */
!   virtual int         ContextMatches(CBMCompiler        *_currentCompiler,
! 				     CBMCompilerOptions *_currentOptions);
    /** Download package.
     *  Gets downloadURL() object from Internet and verify checksum.
***************
*** 322,327 ****
     *  \sa Make().
     *  \sa status */
!   virtual int         Configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				CBMBenchmarkContextCompilerOptions *_currentOptions);
  
  
--- 322,327 ----
     *  \sa Make().
     *  \sa status */
!   virtual int         Configure(CBMCompiler        *_currentCompiler,
! 				CBMCompilerOptions *_currentOptions);
  
  
***************
*** 401,403 ****
--- 401,408 ----
  };
  
+ #define lib_declare() \
+   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

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-BENCHPP.cpp	12 Oct 2006 16:07:23 -0000	1.5
--- Benchmark-BENCHPP.cpp	1 Nov 2006 12:59:56 -0000	1.6
***************
*** 6,9 ****
--- 6,11 ----
  #include <fstream>
  
+ #include "Benchmark/Benchmark-BENCHPP.libwrapper.h"
+ 
  CBMBenchmarkBENCHPP::CBMBenchmarkBENCHPP(CBMSystem *_system)
    : CBMBenchmark(_system)
***************
*** 134,139 ****
  }
  
! int CBMBenchmarkBENCHPP::configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				  CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    std::string cmd;
--- 136,141 ----
  }
  
! int CBMBenchmarkBENCHPP::configure(CBMCompiler        *_currentCompiler,
! 				   CBMCompilerOptions *_currentOptions)
  {
    std::string cmd;

Index: Benchmark-NBENCH.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-NBENCH.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-NBENCH.h	19 Sep 2006 17:09:35 -0000	1.3
--- Benchmark-NBENCH.h	1 Nov 2006 12:59:56 -0000	1.4
***************
*** 46,51 ****
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    virtual int make(void);
--- 46,51 ----
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
    virtual int make(void);
***************
*** 223,225 ****
--- 223,227 ----
  };
  
+ lib_declare();
+ 
  #endif

Index: Benchmark-LINPACKC.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-LINPACKC.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-LINPACKC.h	1 Oct 2006 19:19:19 -0000	1.1
--- Benchmark-LINPACKC.h	1 Nov 2006 12:59:56 -0000	1.2
***************
*** 34,39 ****
     *  \sa Make()
     */
!   virtual int         ContextMatches(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				     CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    virtual std::string packageComments(void);
--- 34,39 ----
     *  \sa Make()
     */
!   virtual int         ContextMatches(CBMCompiler        *_currentCompiler,
! 				     CBMCompilerOptions *_currentOptions);
  
    virtual std::string packageComments(void);
***************
*** 58,63 ****
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    virtual int make(void);
--- 58,63 ----
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
    virtual int make(void);
***************
*** 160,165 ****
  };
  
! 
! 
  
  #endif
--- 160,164 ----
  };
  
! lib_declare();
  
  #endif

Index: Benchmark-SCIMARK2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-SCIMARK2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-SCIMARK2.h	19 Sep 2006 17:09:35 -0000	1.3
--- Benchmark-SCIMARK2.h	1 Nov 2006 12:59:56 -0000	1.4
***************
*** 45,50 ****
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    virtual int make(void);
--- 45,50 ----
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
    virtual int make(void);
***************
*** 137,139 ****
--- 137,141 ----
  };
  
+ lib_declare();
+ 
  #endif

Index: Benchmark-NBENCH.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-NBENCH.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-NBENCH.cpp	25 Sep 2006 15:38:51 -0000	1.3
--- Benchmark-NBENCH.cpp	1 Nov 2006 12:59:56 -0000	1.4
***************
*** 5,8 ****
--- 5,9 ----
  
  #include <fstream>
+ #include "Benchmark/Benchmark-NBENCH.libwrapper.h"
  
  CBMBenchmarkNBENCH::CBMBenchmarkNBENCH(CBMSystem *_system)
***************
*** 110,115 ****
  }
  
! int CBMBenchmarkNBENCH::configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				  CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    return(1);
--- 111,116 ----
  }
  
! int CBMBenchmarkNBENCH::configure(CBMCompiler        *_currentCompiler,
! 				  CBMCompilerOptions *_currentOptions)
  {
    return(1);

Index: Benchmark-GZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-GZIP.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-GZIP.h	3 Oct 2006 15:48:36 -0000	1.4
--- Benchmark-GZIP.h	1 Nov 2006 12:59:56 -0000	1.5
***************
*** 77,79 ****
--- 77,80 ----
  };
  
+ lib_declare();
  #endif

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BZIP2.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-BZIP2.cpp	4 Oct 2006 15:49:34 -0000	1.4
--- Benchmark-BZIP2.cpp	1 Nov 2006 12:59:56 -0000	1.5
***************
*** 6,9 ****
--- 6,12 ----
  #include <fstream>
  
+ 
+ #include "Benchmark/Benchmark-BZIP2.libwrapper.h"
+ 
  CBMBenchmarkBZIP2::CBMBenchmarkBZIP2(CBMSystem *_system)
    : CBMBenchmarkxZIP(_system)
***************
*** 51,56 ****
  }
  
! int CBMBenchmarkBZIP2::configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				 CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    return(1);
--- 54,59 ----
  }
  
! int CBMBenchmarkBZIP2::configure(CBMCompiler        *_currentCompiler,
! 				 CBMCompilerOptions *_currentOptions)
  {
    return(1);

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-GZIP.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-GZIP.cpp	4 Oct 2006 15:49:34 -0000	1.5
--- Benchmark-GZIP.cpp	1 Nov 2006 12:59:56 -0000	1.6
***************
*** 6,9 ****
--- 6,11 ----
  #include <config.h>
  
+ #include "Benchmark/Benchmark-GZIP.libwrapper.h"
+ 
  CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMSystem *_system)
    : CBMBenchmarkxZIP(_system)

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Benchmark.cpp	11 Oct 2006 16:34:11 -0000	1.13
--- Benchmark.cpp	1 Nov 2006 12:59:56 -0000	1.14
***************
*** 31,34 ****
--- 31,35 ----
  
    r=system->read((char*) id.c_str());
+ 
    if (r!="") {
      s=r.c_str()[0];
***************
*** 129,134 ****
  }
  
! std::string CBMBenchmark::contextID(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				    CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    std::string what = _currentCompiler->Binary();
--- 130,135 ----
  }
  
! std::string CBMBenchmark::contextID(CBMCompiler        *_currentCompiler,
! 				    CBMCompilerOptions *_currentOptions)
  {
    std::string what = _currentCompiler->Binary();
***************
*** 138,143 ****
  }
  
! int CBMBenchmark::storeContext(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			       CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    std::string context = contextID(_currentCompiler,
--- 139,144 ----
  }
  
! int CBMBenchmark::storeContext(CBMCompiler        *_currentCompiler,
! 			       CBMCompilerOptions *_currentOptions)
  {
    std::string context = contextID(_currentCompiler,
***************
*** 155,160 ****
  }
  
! int CBMBenchmark::ContextMatches(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				 CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    std::string previousContext;
--- 156,161 ----
  }
  
! int CBMBenchmark::ContextMatches(CBMCompiler        *_currentCompiler,
! 				 CBMCompilerOptions *_currentOptions)
  {
    std::string previousContext;
***************
*** 346,351 ****
  }
  
! int CBMBenchmark::Configure(CBMBenchmarkContextCompiler *_currentCompiler,
! 			    CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    int         r;
--- 347,352 ----
  }
  
! int CBMBenchmark::Configure(CBMCompiler *_currentCompiler,
! 			    CBMCompilerOptions *_currentOptions)
  {
    int         r;
***************
*** 494,497 ****
--- 495,499 ----
  
    r=bench();
+   system->Chomp(r);
  
    if (r!="0") {

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-Selector.cpp	10 Oct 2006 16:50:46 -0000	1.5
--- Benchmark-Selector.cpp	1 Nov 2006 12:59:56 -0000	1.6
***************
*** 2,11 ****
  #include <UI/UI.h>
  
! #include <Benchmark/Benchmark-GZIP.h>
! #include <Benchmark/Benchmark-BZIP2.h>
! #include <Benchmark/Benchmark-NBENCH.h>
! #include <Benchmark/Benchmark-SCIMARK2.h>
! #include <Benchmark/Benchmark-BENCHPP.h>
! #include <Benchmark/Benchmark-LINPACKC.h>
  
  CBMBenchmarkSelector::CBMBenchmarkSelector(CBMSystem *_system)
--- 2,6 ----
  #include <UI/UI.h>
  
! #include <Benchmark/Benchmark-DLLoader.h>
  
  CBMBenchmarkSelector::CBMBenchmarkSelector(CBMSystem *_system)
***************
*** 16,130 ****
  CBMBenchmark *CBMBenchmarkSelector::select(char *benchmarkName)
  {
!   std::string tmp = benchmarkName;
! 
!   if (tmp=="gzip-1c") {
!     return(new CBMBenchmarkGZIP1(system));
!   }
! 
!   if (tmp=="gzip-9c") {
!     return(new CBMBenchmarkGZIP9(system));
!   }
! 
!   if (tmp=="bzip2-1c") {
!     return(new CBMBenchmarkBZIP21(system));
!   }
! 
!   if (tmp=="bzip2-9c") {
!     return(new CBMBenchmarkBZIP29(system));
!   }
! 
!   if (tmp=="nbench-numsort") {
!     return(new CBMBenchmarkNBENCH_NUMSORT(system));
!   }
! 
!   if (tmp=="nbench-stringsort") {
!     return(new CBMBenchmarkNBENCH_STRINGSORT(system));
!   }
! 
!   if (tmp=="nbench-bitfield") {
!     return(new CBMBenchmarkNBENCH_BITFIELD(system));
!   }
! 
!   if (tmp=="nbench-emf") {
!     return(new CBMBenchmarkNBENCH_EMF(system));
!   }
! 
!   if (tmp=="nbench-fourier") {
!     return(new CBMBenchmarkNBENCH_FOURIER(system));
!   }
! 
!   if (tmp=="nbench-assign") {
!     return(new CBMBenchmarkNBENCH_ASSIGN(system));
!   }
! 
!   if (tmp=="nbench-huffman") {
!     return(new CBMBenchmarkNBENCH_HUFFMAN(system));
!   }
! 
!   if (tmp=="nbench-idea") {
!     return(new CBMBenchmarkNBENCH_IDEA(system));
!   }
! 
!   if (tmp=="nbench-nnet") {
!     return(new CBMBenchmarkNBENCH_NNET(system));
!   }
! 
!   if (tmp=="nbench-lu") {
!     return(new CBMBenchmarkNBENCH_LU(system));
!   }
! 
!   if (tmp=="scimark2-fourier") {
!     return(new CBMBenchmarkSCIMARK2_FOURIER(system));
!   }
! 
!   if (tmp=="scimark2-sor") {
!     return(new CBMBenchmarkSCIMARK2_SOR(system));
!   }
! 
!   if (tmp=="scimark2-mc") {
!     return(new CBMBenchmarkSCIMARK2_MC(system));
!   }
! 
!   if (tmp=="scimark2-smm") {
!     return(new CBMBenchmarkSCIMARK2_SMM(system));
!   }
! 
!   if (tmp=="scimark2-lu") {
!     return(new CBMBenchmarkSCIMARK2_LU(system));
!   }
! 
!   if (tmp=="benchpp-dhrystone") {
!     return(new CBMBenchmarkBENCHPP_DHRYSTONE(system));
!   }
! 
!   if (tmp=="benchpp-whetstone") {
!     return(new CBMBenchmarkBENCHPP_WHETSTONE(system));
!   }
! 
!   if (tmp=="benchpp-stepanov-al12") {
!     return(new CBMBenchmarkBENCHPP_STEPANOV_AL12(system));
!   }
! 
!   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));
!   }
  
!   tmp="Unknown benchmark '";
!   tmp+=benchmarkName;
!   tmp+="'";
!   UI->Fatal(tmp);
!   return(0);
  }
  
--- 11,26 ----
  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);
  }
  
***************
*** 132,197 ****
  void CBMBenchmarkSelector::displayList(void)
  {
!   CBMBenchmarkGZIP1                 gzip1(system);
!   CBMBenchmarkGZIP9                 gzip9(system);
! 
!   CBMBenchmarkBZIP21                bzip21(system);
!   CBMBenchmarkBZIP29                bzip29(system);
! 
!   CBMBenchmarkNBENCH_NUMSORT        nbench_numsort(system);
!   CBMBenchmarkNBENCH_STRINGSORT     nbench_stringsort(system);
!   CBMBenchmarkNBENCH_BITFIELD       nbench_bitfield(system);
!   CBMBenchmarkNBENCH_EMF            nbench_emf(system);
!   CBMBenchmarkNBENCH_FOURIER        nbench_fourier(system);
!   CBMBenchmarkNBENCH_ASSIGN         nbench_assign(system);
!   CBMBenchmarkNBENCH_HUFFMAN        nbench_huffman(system);
!   CBMBenchmarkNBENCH_IDEA           nbench_idea(system);
!   CBMBenchmarkNBENCH_NNET           nbench_nnet(system);
!   CBMBenchmarkNBENCH_LU             nbench_lu(system);
! 
!   CBMBenchmarkSCIMARK2_FOURIER      scimark2_fourier(system);
!   CBMBenchmarkSCIMARK2_SOR          scimark2_sor(system);
!   CBMBenchmarkSCIMARK2_MC           scimark2_mc(system);
!   CBMBenchmarkSCIMARK2_SMM          scimark2_smm(system);
!   CBMBenchmarkSCIMARK2_LU           scimark2_lu(system);
! 
!   CBMBenchmarkBENCHPP_DHRYSTONE     benchpp_dry(system);
!   CBMBenchmarkBENCHPP_WHETSTONE     benchpp_wet(system);
!   CBMBenchmarkBENCHPP_STEPANOV_AL12 benchpp_ste_al12(system);
!   CBMBenchmarkLINPACKC_SP_UNROLL    linpackc_sp_unroll(system);
!   CBMBenchmarkLINPACKC_SP_ROLL      linpackc_sp_roll(system);
!   CBMBenchmarkLINPACKC_DP_UNROLL    linpackc_dp_unroll(system);
!   CBMBenchmarkLINPACKC_DP_ROLL      linpackc_dp_roll(system);
! 
!   gzip1.display();
!   gzip9.display();
! 
!   bzip21.display();
!   bzip29.display();
! 
!   nbench_numsort.display();
!   nbench_stringsort.display();
!   nbench_bitfield.display();
!   nbench_emf.display();
!   nbench_fourier.display();
!   nbench_assign.display();
!   nbench_huffman.display();
!   nbench_idea.display();
!   nbench_nnet.display();
!   nbench_lu.display();
! 
!   scimark2_fourier.display();
!   scimark2_sor.display();
!   scimark2_mc.display();
!   scimark2_smm.display();
!   scimark2_lu.display();
! 
!   benchpp_dry.display();
!   benchpp_wet.display();
!   benchpp_ste_al12.display();
! 
!   linpackc_sp_unroll.display();
!   linpackc_sp_roll.display();
!   linpackc_dp_unroll.display();
!   linpackc_dp_roll.display();
  }
  
--- 28,33 ----
  void CBMBenchmarkSelector::displayList(void)
  {
!   CBMBenchmark *B;
!   #include "Benchmark/Benchmark-Selector.liblist.h"
  }
  

Index: Benchmark-BENCHPP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPP.h	28 Sep 2006 17:52:45 -0000	1.3
--- Benchmark-BENCHPP.h	1 Nov 2006 12:59:56 -0000	1.4
***************
*** 46,51 ****
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    virtual int make(void);
--- 46,51 ----
    virtual int extract(int _force = 0);
    virtual int preConfigure(int _force);
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
    virtual int make(void);
***************
*** 120,122 ****
--- 120,124 ----
  };
  
+ lib_declare();
+ 
  #endif

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-SCIMARK2.cpp	25 Sep 2006 15:38:51 -0000	1.4
--- Benchmark-SCIMARK2.cpp	1 Nov 2006 12:59:56 -0000	1.5
***************
*** 4,7 ****
--- 4,9 ----
  #include <config.h>
  
+ #include "Benchmark/Benchmark-SCIMARK2.libwrapper.h"
+ 
  CBMBenchmarkSCIMARK2::CBMBenchmarkSCIMARK2(CBMSystem *_system)
    : CBMBenchmark(_system)
***************
*** 124,129 ****
  }
  
! int CBMBenchmarkSCIMARK2::configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				  CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    return(1);
--- 126,131 ----
  }
  
! int CBMBenchmarkSCIMARK2::configure(CBMCompiler        *_currentCompiler,
! 				    CBMCompilerOptions *_currentOptions)
  {
    return(1);

Index: Benchmark-LINPACKC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-LINPACKC.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-LINPACKC.cpp	1 Oct 2006 19:19:19 -0000	1.1
--- Benchmark-LINPACKC.cpp	1 Nov 2006 12:59:56 -0000	1.2
***************
*** 4,7 ****
--- 4,9 ----
  #include <config.h>
  
+ #include "Benchmark/Benchmark-LINPACKC.libwrapper.h"
+ 
  CBMBenchmarkLINPACKC::CBMBenchmarkLINPACKC(CBMSystem *_system)
    : CBMBenchmark(_system)
***************
*** 43,48 ****
  }
  
! int CBMBenchmarkLINPACKC::ContextMatches(CBMBenchmarkContextCompiler        *_currentCompiler,
! 					 CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    std::string localFlags;
--- 45,50 ----
  }
  
! int CBMBenchmarkLINPACKC::ContextMatches(CBMCompiler        *_currentCompiler,
! 					 CBMCompilerOptions *_currentOptions)
  {
    std::string localFlags;
***************
*** 155,160 ****
  }
  
! int CBMBenchmarkLINPACKC::configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 				  CBMBenchmarkContextCompilerOptions *_currentOptions)
  {
    return(1);
--- 157,162 ----
  }
  
! int CBMBenchmarkLINPACKC::configure(CBMCompiler        *_currentCompiler,
! 				    CBMCompilerOptions *_currentOptions)
  {
    return(1);

Index: Benchmark-BZIP2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BZIP2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BZIP2.h	3 Oct 2006 15:48:36 -0000	1.3
--- Benchmark-BZIP2.h	1 Nov 2006 12:59:56 -0000	1.4
***************
*** 26,31 ****
        \return Always 1 (ok).
    */
!   virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
! 			CBMBenchmarkContextCompilerOptions *_currentOptions);
  
    virtual int make(void);
--- 26,31 ----
        \return Always 1 (ok).
    */
!   virtual int configure(CBMCompiler        *_currentCompiler,
! 			CBMCompilerOptions *_currentOptions);
  
    virtual int make(void);
***************
*** 76,78 ****
--- 76,80 ----
  };
  
+ lib_declare();
+ 
  #endif