compbench-devel

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

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

Modified Files:
	Benchmark-BENCHPP.libwrapper.h 
	Benchmark-BENCHPPLINUX.libwrapper.h 
	Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.libwrapper.h 
	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.libwrapper.h 
	Benchmark-NBENCH.libwrapper.h Benchmark-SCIMARK2.libwrapper.h 
	benchmarks-genlibwrapper.pl 
Log Message:
Fixes for CBMPackage and new related API usage.

Index: Benchmark-NBENCH.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-NBENCH.libwrapper.h	3 Jan 2007 22:06:27 -0000	1.2
--- Benchmark-NBENCH.libwrapper.h	15 Jan 2007 20:07:21 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageNBENCH::benchmarkNumber(void) {
+   return(10);
+ }
+ 
  BenchmarkVector& CBMPackageNBENCH::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);

Index: Benchmark-GZIP.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-GZIP.libwrapper.h	3 Jan 2007 22:06:27 -0000	1.2
--- Benchmark-GZIP.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageGZIP::benchmarkNumber(void) {
+   return(2);
+ }
+ 
  BenchmarkVector& CBMPackageGZIP::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);

Index: benchmarks-genlibwrapper.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/benchmarks-genlibwrapper.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** benchmarks-genlibwrapper.pl	3 Jan 2007 22:04:18 -0000	1.1
--- benchmarks-genlibwrapper.pl	15 Jan 2007 20:07:21 -0000	1.2
***************
*** 32,35 ****
--- 32,41 ----
    print "#include <UI/UI.h>\n\n";
  
+   my $n = (keys %{$DATA{$PACKAGE}})+0;
+ 
+   
+   print "int CBMPackage$PACKAGE\::benchmarkNumber(void) {\n";
+   print "  return($n);\n}\n\n";
+ 
    print "BenchmarkVector& CBMPackage$PACKAGE\::Benchmarks(void) {\n";
    print "  if (benchmarks.size()) return(benchmarks);\n";

Index: Benchmark-BZIP2.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BZIP2.libwrapper.h	3 Jan 2007 22:06:26 -0000	1.2
--- Benchmark-BZIP2.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageBZIP2::benchmarkNumber(void) {
+   return(2);
+ }
+ 
  BenchmarkVector& CBMPackageBZIP2::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);

Index: Benchmark-BENCHPP.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BENCHPP.libwrapper.h	3 Jan 2007 22:06:26 -0000	1.2
--- Benchmark-BENCHPP.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageBENCHPP::benchmarkNumber(void) {
+   return(3);
+ }
+ 
  BenchmarkVector& CBMPackageBENCHPP::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);

Index: Benchmark-LINPACKC.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-LINPACKC.libwrapper.h	11 Jan 2007 19:57:14 -0000	1.3
--- Benchmark-LINPACKC.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.4
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageLINPACKC::benchmarkNumber(void) {
+   return(4);
+ }
+ 
  BenchmarkVector& CBMPackageLINPACKC::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);

Index: Benchmark-BENCHPPLINUX.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BENCHPPLINUX.libwrapper.h	3 Jan 2007 22:06:26 -0000	1.2
--- Benchmark-BENCHPPLINUX.libwrapper.h	15 Jan 2007 20:07:20 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageBENCHPPLINUX::benchmarkNumber(void) {
+   return(35);
+ }
+ 
  BenchmarkVector& CBMPackageBENCHPPLINUX::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);

Index: Benchmark-LINPACKC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark-LINPACKC.cpp	11 Jan 2007 20:33:29 -0000	1.6
--- Benchmark-LINPACKC.cpp	15 Jan 2007 20:07:20 -0000	1.7
***************
*** 39,43 ****
  std::string CBMPackageLINPACKC::packageComments(void)
  {
!   return("The former linpackc benchmark translated to C by Bonnie Toy has modified to suit compbenchmarks requirements.");
  }
  
--- 39,43 ----
  std::string CBMPackageLINPACKC::packageComments(void)
  {
!   return("This is the former linpackc benchmark translated to C by Bonnie Toy, which has been modified to suit compbenchmarks requirements.");
  }
  

Index: Benchmark-SCIMARK2.libwrapper.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-SCIMARK2.libwrapper.h	3 Jan 2007 22:06:27 -0000	1.2
--- Benchmark-SCIMARK2.libwrapper.h	15 Jan 2007 20:07:21 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  #include <UI/UI.h>
  
+ int CBMPackageSCIMARK2::benchmarkNumber(void) {
+   return(5);
+ }
+ 
  BenchmarkVector& CBMPackageSCIMARK2::Benchmarks(void) {
    if (benchmarks.size()) return(benchmarks);