compbench-devel Mailing List for CompBenchmarks (Page 43)

Brought to you by: xfred

compbench-devel

You can subscribe to this list here.

2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (48)	_Oct (51)	_Nov (66)	_Dec (83)
2007	_Jan (242)	_Feb (56)	_Mar (95)	_Apr (120)	_May (127)	_Jun (32)	_Jul (10)	_Aug (55)	_Sep (114)	_Oct (3)	_Nov	_Dec

Flat | Threaded

<< < 1 .. 41 42 43 44 45 > >> (Page 43 of 45)

[Compbench-devel] CompBenchmarks++ ChangeLog,1.8,1.9

From: Frederic T. <xf...@us...> - 2006-10-01 19:36:41

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

Modified Files:
	ChangeLog 
Log Message:
bzip2 package added.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	1 Oct 2006 19:19:45 -0000	1.8
--- ChangeLog	1 Oct 2006 19:36:38 -0000	1.9
***************
*** 3,6 ****
--- 3,7 ----
  	   C++ abstraction overhead.
  	*  linpackc package support (4 benchmarks).
+ 	*  bzip2 package support (2 benchmarks).
  	
  0.3.0

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BZIP2.cpp, NONE, 1.1 Benchmark-BZIP2.h, NONE, 1.1 Benchmark-Selector.cpp, 1.3, 1.4 Makefile.am, 1.5, 1.6 Makefile.in, 1.6, 1.7

From: Frederic T. <xf...@us...> - 2006-10-01 19:36:17

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

Modified Files:
	Benchmark-Selector.cpp Makefile.am Makefile.in 
Added Files:
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h 
Log Message:
bzip2 package added.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	1 Oct 2006 19:19:19 -0000	1.6
--- Makefile.in	1 Oct 2006 19:36:11 -0000	1.7
***************
*** 108,112 ****
  SUBDIRS = Compiler
  
! sources = Benchmark.cpp 					Benchmark-Selector.cpp 					Benchmark-Autotools.cpp 					Benchmark-xZIP.cpp 					Benchmark-GZIP.cpp 					Benchmark-NBENCH.cpp 					Benchmark-SCIMARK2.cpp 					Benchmark-BENCHPP.cpp 					Benchmark-LINPACKC.cpp
  
  
--- 108,112 ----
  SUBDIRS = Compiler
  
! sources = Benchmark.cpp 					Benchmark-Selector.cpp 					Benchmark-Autotools.cpp 					Benchmark-xZIP.cpp 					Benchmark-GZIP.cpp 					Benchmark-BZIP2.cpp 					Benchmark-NBENCH.cpp 					Benchmark-SCIMARK2.cpp 					Benchmark-BENCHPP.cpp 					Benchmark-LINPACKC.cpp
  
  
***************
*** 132,137 ****
  libBenchmark_la_OBJECTS =  Benchmark.lo Benchmark-Selector.lo \
  Benchmark-Autotools.lo Benchmark-xZIP.lo Benchmark-GZIP.lo \
! Benchmark-NBENCH.lo Benchmark-SCIMARK2.lo Benchmark-BENCHPP.lo \
! Benchmark-LINPACKC.lo
  CXXFLAGS = @CXXFLAGS@
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 132,137 ----
  libBenchmark_la_OBJECTS =  Benchmark.lo Benchmark-Selector.lo \
  Benchmark-Autotools.lo Benchmark-xZIP.lo Benchmark-GZIP.lo \
! Benchmark-BZIP2.lo Benchmark-NBENCH.lo Benchmark-SCIMARK2.lo \
! Benchmark-BENCHPP.lo Benchmark-LINPACKC.lo
  CXXFLAGS = @CXXFLAGS@
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 149,155 ****
  GZIP_ENV = --best
  DEP_FILES =  .deps/Benchmark-Autotools.P .deps/Benchmark-BENCHPP.P \
! .deps/Benchmark-GZIP.P .deps/Benchmark-LINPACKC.P \
! .deps/Benchmark-NBENCH.P .deps/Benchmark-SCIMARK2.P \
! .deps/Benchmark-Selector.P .deps/Benchmark-xZIP.P .deps/Benchmark.P
  SOURCES = $(libBenchmark_la_SOURCES)
  OBJECTS = $(libBenchmark_la_OBJECTS)
--- 149,156 ----
  GZIP_ENV = --best
  DEP_FILES =  .deps/Benchmark-Autotools.P .deps/Benchmark-BENCHPP.P \
! .deps/Benchmark-BZIP2.P .deps/Benchmark-GZIP.P \
! .deps/Benchmark-LINPACKC.P .deps/Benchmark-NBENCH.P \
! .deps/Benchmark-SCIMARK2.P .deps/Benchmark-Selector.P \
! .deps/Benchmark-xZIP.P .deps/Benchmark.P
  SOURCES = $(libBenchmark_la_SOURCES)
  OBJECTS = $(libBenchmark_la_OBJECTS)

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-Selector.cpp	1 Oct 2006 19:19:19 -0000	1.3
--- Benchmark-Selector.cpp	1 Oct 2006 19:36:11 -0000	1.4
***************
*** 3,6 ****
--- 3,7 ----
  
  #include <Benchmark/Benchmark-GZIP.h>
+ #include <Benchmark/Benchmark-BZIP2.h>
  #include <Benchmark/Benchmark-NBENCH.h>
  #include <Benchmark/Benchmark-SCIMARK2.h>
***************
*** 25,28 ****
--- 26,37 ----
    }
  
+   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));
***************
*** 126,129 ****
--- 135,141 ----
    CBMBenchmarkGZIP9                 gzip9(system);
  
+   CBMBenchmarkBZIP21                bzip21(system);
+   CBMBenchmarkBZIP29                bzip29(system);
+ 
    CBMBenchmarkNBENCH_NUMSORT        nbench_numsort(system);
    CBMBenchmarkNBENCH_STRINGSORT     nbench_stringsort(system);
***************
*** 154,157 ****
--- 166,172 ----
    gzip9.display();
  
+   bzip21.display();
+   bzip29.display();
+ 
    nbench_numsort.display();
    nbench_stringsort.display();

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	1 Oct 2006 19:19:19 -0000	1.5
--- Makefile.am	1 Oct 2006 19:36:11 -0000	1.6
***************
*** 7,10 ****
--- 7,11 ----
  					Benchmark-xZIP.cpp \
  					Benchmark-GZIP.cpp \
+ 					Benchmark-BZIP2.cpp \
  					Benchmark-NBENCH.cpp \
  					Benchmark-SCIMARK2.cpp \

--- NEW FILE: Benchmark-BZIP2.h ---
#ifndef H_CBMBENCHMARKBZIP2
#define H_CBMBENCHMARKBZIP2

#include <Benchmark/Benchmark-xZIP.h>

class CBMBenchmarkBZIP2 : public CBMBenchmarkxZIP
{
 private:


  virtual std::string downloadURL(void);
  virtual std::string expectedMD5(void);

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

 /** Configure package. Don't do anything.
      \return Always 1 (ok).
  */
  virtual int configure(CBMBenchmarkContextCompiler        *_currentCompiler,
			CBMBenchmarkContextCompilerOptions *_currentOptions);

  virtual int make(void);

 protected:
 public:
  CBMBenchmarkBZIP2(class CBMSystem *_system);

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

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

class CBMBenchmarkBZIP21 : public CBMBenchmarkBZIP2
{
 protected:
  virtual char*       compressionLevel(void);
  virtual std::string benchmarkComments(void);

 public:
  CBMBenchmarkBZIP21(class CBMSystem *_system);
  virtual std::string benchmarkName(void);
  virtual ~CBMBenchmarkBZIP21();
};


class CBMBenchmarkBZIP29 : public CBMBenchmarkBZIP2
{
 protected:
  virtual char*       compressionLevel(void);
  virtual std::string benchmarkComments(void);
 public:

  CBMBenchmarkBZIP29(class CBMSystem *_system);

  virtual std::string benchmarkName(void);
  virtual ~CBMBenchmarkBZIP29();
};

#endif

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

#include <config.h>

#include <fstream>

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(CBMBenchmarkContextCompiler        *_currentCompiler,
				 CBMBenchmarkContextCompilerOptions *_currentOptions)
{
  return(1);
}

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

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

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

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

[Compbench-devel] CompBenchmarks++ ChangeLog,1.7,1.8

From: Frederic T. <xf...@us...> - 2006-10-01 19:19:50

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

Modified Files:
	ChangeLog 
Log Message:
LINPACKC package added.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	28 Sep 2006 17:52:28 -0000	1.7
--- ChangeLog	1 Oct 2006 19:19:45 -0000	1.8
***************
*** 2,5 ****
--- 2,7 ----
  	*  Stepanov benchmark (from Bench++) supported; measures
  	   C++ abstraction overhead.
+ 	*  linpackc package support (4 benchmarks).
+ 	
  0.3.0
  	*  Few bug and compilation fixes.

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-LINPACKC.cpp, NONE, 1.1 Benchmark-LINPACKC.h, NONE, 1.1 Benchmark-Selector.cpp, 1.2, 1.3 Makefile.am, 1.4, 1.5 Makefile.in, 1.5, 1.6

From: Frederic T. <xf...@us...> - 2006-10-01 19:19:26

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

Modified Files:
	Benchmark-Selector.cpp Makefile.am Makefile.in 
Added Files:
	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h 
Log Message:
LINPACKC package added.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in	20 Sep 2006 10:47:56 -0000	1.5
--- Makefile.in	1 Oct 2006 19:19:19 -0000	1.6
***************
*** 108,112 ****
  SUBDIRS = Compiler
  
! sources = Benchmark.cpp 					Benchmark-Selector.cpp 					Benchmark-Autotools.cpp 					Benchmark-xZIP.cpp 					Benchmark-GZIP.cpp 					Benchmark-NBENCH.cpp 					Benchmark-SCIMARK2.cpp 					Benchmark-BENCHPP.cpp
  
  
--- 108,112 ----
  SUBDIRS = Compiler
  
! sources = Benchmark.cpp 					Benchmark-Selector.cpp 					Benchmark-Autotools.cpp 					Benchmark-xZIP.cpp 					Benchmark-GZIP.cpp 					Benchmark-NBENCH.cpp 					Benchmark-SCIMARK2.cpp 					Benchmark-BENCHPP.cpp 					Benchmark-LINPACKC.cpp
  
  
***************
*** 132,136 ****
  libBenchmark_la_OBJECTS =  Benchmark.lo Benchmark-Selector.lo \
  Benchmark-Autotools.lo Benchmark-xZIP.lo Benchmark-GZIP.lo \
! Benchmark-NBENCH.lo Benchmark-SCIMARK2.lo Benchmark-BENCHPP.lo
  CXXFLAGS = @CXXFLAGS@
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 132,137 ----
  libBenchmark_la_OBJECTS =  Benchmark.lo Benchmark-Selector.lo \
  Benchmark-Autotools.lo Benchmark-xZIP.lo Benchmark-GZIP.lo \
! Benchmark-NBENCH.lo Benchmark-SCIMARK2.lo Benchmark-BENCHPP.lo \
! Benchmark-LINPACKC.lo
  CXXFLAGS = @CXXFLAGS@
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 148,154 ****
  GZIP_ENV = --best
  DEP_FILES =  .deps/Benchmark-Autotools.P .deps/Benchmark-BENCHPP.P \
! .deps/Benchmark-GZIP.P .deps/Benchmark-NBENCH.P \
! .deps/Benchmark-SCIMARK2.P .deps/Benchmark-Selector.P \
! .deps/Benchmark-xZIP.P .deps/Benchmark.P
  SOURCES = $(libBenchmark_la_SOURCES)
  OBJECTS = $(libBenchmark_la_OBJECTS)
--- 149,155 ----
  GZIP_ENV = --best
  DEP_FILES =  .deps/Benchmark-Autotools.P .deps/Benchmark-BENCHPP.P \
! .deps/Benchmark-GZIP.P .deps/Benchmark-LINPACKC.P \
! .deps/Benchmark-NBENCH.P .deps/Benchmark-SCIMARK2.P \
! .deps/Benchmark-Selector.P .deps/Benchmark-xZIP.P .deps/Benchmark.P
  SOURCES = $(libBenchmark_la_SOURCES)
  OBJECTS = $(libBenchmark_la_OBJECTS)

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-Selector.cpp	28 Sep 2006 17:52:45 -0000	1.2
--- Benchmark-Selector.cpp	1 Oct 2006 19:19:19 -0000	1.3
***************
*** 6,9 ****
--- 6,10 ----
  #include <Benchmark/Benchmark-SCIMARK2.h>
  #include <Benchmark/Benchmark-BENCHPP.h>
+ #include <Benchmark/Benchmark-LINPACKC.h>
  
  CBMBenchmarkSelector::CBMBenchmarkSelector(CBMSystem *_system)
***************
*** 96,99 ****
--- 97,116 ----
    }
  
+   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;
***************
*** 129,132 ****
--- 146,153 ----
    CBMBenchmarkBENCHPP_WHETSTONE     benchpp_wet(system);
    CBMBenchmarkBENCHPP_STEPANOV_AL12 benchpp_ste_al12(system);
+   CBMBenchmarkLINPACKC_SP_UNROLL    linpackc_sp_unroll(system);
+   CBMBenchmarkLINPACKC_SP_UNROLL    linpackc_sp_roll(system);
+   CBMBenchmarkLINPACKC_SP_UNROLL    linpackc_dp_unroll(system);
+   CBMBenchmarkLINPACKC_SP_UNROLL    linpackc_dp_roll(system);
  
    gzip1.display();
***************
*** 153,156 ****
--- 174,182 ----
    benchpp_wet.display();
    benchpp_ste_al12.display();
+ 
+   linpackc_sp_unroll.display();
+   linpackc_sp_roll.display();
+   linpackc_dp_unroll.display();
+   linpackc_dp_roll.display();
  }
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	19 Sep 2006 15:39:34 -0000	1.4
--- Makefile.am	1 Oct 2006 19:19:19 -0000	1.5
***************
*** 9,13 ****
  					Benchmark-NBENCH.cpp \
  					Benchmark-SCIMARK2.cpp \
! 					Benchmark-BENCHPP.cpp
  
  
--- 9,14 ----
  					Benchmark-NBENCH.cpp \
  					Benchmark-SCIMARK2.cpp \
! 					Benchmark-BENCHPP.cpp \
! 					Benchmark-LINPACKC.cpp
  
  

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

#include <config.h>

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

std::string CBMBenchmarkLINPACKC::downloadURL(void)
{
  return("http://www.netlib.org/benchmark/linpackc");
}

std::string CBMBenchmarkLINPACKC::expectedMD5(void)
{
  return("f6e06f98fdbf7e39f84aa9e6c04de131");
}

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

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

  comment="linpackc benchmark with specific compilation options :";
  comment+=benchmarkLINPACKCComments();
  return(comment);
}

std::string CBMBenchmarkLINPACKC::packageVersion(void)
{
  return("02-25-1994");
}

int CBMBenchmarkLINPACKC::packageSize(void)
{
  return(907);
}

int CBMBenchmarkLINPACKC::ContextMatches(CBMBenchmarkContextCompiler        *_currentCompiler,
					 CBMBenchmarkContextCompilerOptions *_currentOptions)
{
  std::string localFlags;
  std::string previousFlags;

  int r = CBMBenchmark::ContextMatches(_currentCompiler,
				       _currentOptions);

  if (!r) {
    return(0);
  }

  localFlags=linpackPrecisionFlags();
  localFlags+=" ";
  localFlags+=linpackRollFlags();

  previousFlags=system->read("linpackc-localflags");

  if ((previousFlags==localFlags) &&
      (getStatus()>=Made)) {
    return(1);
  } else {
    return(0);
  }
}


std::string CBMBenchmarkLINPACKC::packageComments(void)
{
  return("Official linpackc benchmark translated to C by Bonnie Toy. A minor patch is applied.");
}

std::string CBMBenchmarkLINPACKC::localPackageName(void)
{
  return("linpackc.c");
}

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

char* CBMBenchmarkLINPACKC::extractDirectory(void)
{
  std::string dum = "linpackc-";

  dum+=packageVersion();
  return((char*) dum.c_str());
}

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

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

  patch+=system->temporaryDirectory(CBMSystem::Patches);
  patch+="/linpackc.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 linpackc.c";
  r=system->exec(cmd, sstdout);
  return(!r);
}

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

  cmd+="cd ";
  cmd+=system->temporaryDirectory(CBMSystem::Extract);
  cmd+=" && ";
  cmd+=CBM_PROG_MKDIR;
  cmd+=" -p ";
  cmd+=extractDirectory();
  cmd+=" && cd ";
  cmd+=extractDirectory();
  cmd+=" && ";
  cmd+=CBM_PROG_CP;
  cmd+=" ";
  cmd+=system->temporaryDirectory(CBMSystem::Download);
  cmd+="/";
  cmd+=localPackageName();
  cmd+=" .";

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

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

int CBMBenchmarkLINPACKC::configure(CBMBenchmarkContextCompiler        *_currentCompiler,
				  CBMBenchmarkContextCompilerOptions *_currentOptions)
{
  return(1);
}

int CBMBenchmarkLINPACKC::make(void)
{
  std::string cmd;
  std::string sstdout;
  std::string localFlags;
  int         r;

  localFlags=linpackPrecisionFlags();
  localFlags+=" ";
  localFlags+=linpackRollFlags();

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

  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+=" ";
  cmd+=" -lm ";
  cmd+=localFlags;
  cmd+="'";

  r=system->exec(cmd, sstdout);

  if (!r) {
    system->store("linpackc-localflags",
		  localFlags);
  }

  return(!r);
}

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

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && echo $(./linpackc 2>&1 | ";
  cmd+=CBM_PROG_GREP;
  cmd+=" 'Kflops' | ";
  cmd+=CBM_PROG_CUT;
  cmd+=" -f5 -d' ')";

  if (system->exec(cmd, result)==0) {
    return(result);
  } else {
    return("0");
  }

}

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

  cmd="cd ";
  cmd+=localPackageAbsoluteDirectory();
  cmd+=" && rm -f linpackc linpackc.exe 2> /dev/null";

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

std::string CBMBenchmarkLINPACKC::license(void)
{
  return("Not specified");
}

std::string CBMBenchmarkLINPACKC::homePage(void)
{
  return("http://math.nist.gov/scimark/");
}

std::string CBMBenchmarkLINPACKC::author(void)
{
  return("Roldan Pozo & Bruce R Miller");
}

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

CBMBenchmarkLINPACKC::~CBMBenchmarkLINPACKC()
{
}

CBMBenchmarkLINPACKC_SP_UNROLL::CBMBenchmarkLINPACKC_SP_UNROLL(CBMSystem *_system)
  : CBMBenchmarkLINPACKC(_system)
{
}

std::string CBMBenchmarkLINPACKC_SP_UNROLL::benchmarkName(void)
{
  return("linpackc-sp-unroll");
}

std::string CBMBenchmarkLINPACKC_SP_UNROLL::linpackPrecisionFlags(void)
{
  std::string dum = "-DSP";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_SP_UNROLL::linpackRollFlags(void)
{
  std::string dum = "-DUNROLL";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_SP_UNROLL::benchmarkLINPACKCComments(void)
{
  std::string dum = "single precision used. Unrolled version selected, which may ease compiler's work and optimisation.";
  return(dum);
}

CBMBenchmarkLINPACKC_SP_UNROLL::~CBMBenchmarkLINPACKC_SP_UNROLL()
{
}

CBMBenchmarkLINPACKC_SP_ROLL::CBMBenchmarkLINPACKC_SP_ROLL(CBMSystem *_system)
  : CBMBenchmarkLINPACKC(_system)
{
}

std::string CBMBenchmarkLINPACKC_SP_ROLL::benchmarkName(void)
{
  return("linpackc-sp-roll");
}

std::string CBMBenchmarkLINPACKC_SP_ROLL::linpackPrecisionFlags(void)
{
  std::string dum = "-DSP";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_SP_ROLL::linpackRollFlags(void)
{
  std::string dum = "-DROLL";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_SP_ROLL::benchmarkLINPACKCComments(void)
{
  std::string dum = "single precision used. Rolled version selected (matrix operations are given in a straightforward way, which may makes compiler's optimisation job more difficult).";
  return(dum);
}

CBMBenchmarkLINPACKC_SP_ROLL::~CBMBenchmarkLINPACKC_SP_ROLL()
{
}

CBMBenchmarkLINPACKC_DP_UNROLL::CBMBenchmarkLINPACKC_DP_UNROLL(CBMSystem *_system)
  : CBMBenchmarkLINPACKC(_system)
{
}

std::string CBMBenchmarkLINPACKC_DP_UNROLL::benchmarkName(void)
{
  return("linpackc-dp-unroll");
}

std::string CBMBenchmarkLINPACKC_DP_UNROLL::linpackPrecisionFlags(void)
{
  std::string dum = "-DDP";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_DP_UNROLL::linpackRollFlags(void)
{
  std::string dum = "-DUNROLL";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_DP_UNROLL::benchmarkLINPACKCComments(void)
{
  std::string dum = "double precision used. Unrolled version selected, which may ease compiler's work and optimisation.";
  return(dum);
}

CBMBenchmarkLINPACKC_DP_UNROLL::~CBMBenchmarkLINPACKC_DP_UNROLL()
{
}

CBMBenchmarkLINPACKC_DP_ROLL::CBMBenchmarkLINPACKC_DP_ROLL(CBMSystem *_system)
  : CBMBenchmarkLINPACKC(_system)
{
}
std::string CBMBenchmarkLINPACKC_DP_ROLL::benchmarkName(void)
{
  return("linpackc-dp-roll");
}


std::string CBMBenchmarkLINPACKC_DP_ROLL::linpackPrecisionFlags(void)
{
  std::string dum = "-DDP";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_DP_ROLL::linpackRollFlags(void)
{
  std::string dum = "-DROLL";
  return(dum);
}

std::string CBMBenchmarkLINPACKC_DP_ROLL::benchmarkLINPACKCComments(void)
{
  std::string dum = "double precision used. Rolled version selected (matrix operations are given in a straightforward way, which may makes compiler's optimisation job more difficult).";
  return(dum);
}

CBMBenchmarkLINPACKC_DP_ROLL::~CBMBenchmarkLINPACKC_DP_ROLL()
{
}

--- NEW FILE: Benchmark-LINPACKC.h ---
/* ----------------------------------------------------------------------------
   $Id: Benchmark-LINPACKC.h,v 1.1 2006/10/01 19:19:19 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(CBMBenchmarkContextCompiler        *_currentCompiler,
				     CBMBenchmarkContextCompilerOptions *_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(CBMBenchmarkContextCompiler        *_currentCompiler,
			CBMBenchmarkContextCompilerOptions *_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();
		
};




#endif

[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BENCHPP.cpp, 1.3, 1.4 Benchmark-BENCHPP.h, 1.2, 1.3 Benchmark-Selector.cpp, 1.1, 1.2

From: Frederic T. <xf...@us...> - 2006-09-28 17:52:49

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

Modified Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-Selector.cpp 
Log Message:
Stepanov AL12 support.

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-BENCHPP.cpp	25 Sep 2006 15:38:48 -0000	1.3
--- Benchmark-BENCHPP.cpp	28 Sep 2006 17:52:45 -0000	1.4
***************
*** 148,151 ****
--- 148,152 ----
    cmd+="\n";
    cmd+=_currentOptions->Options();
+   cmd+=" -DHAS_BOOL";
    cmd+="\n\n\n\"";
    cmd+=" | ./Configure";
***************
*** 163,167 ****
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
!   cmd+=" a000091 a000092 ";
  
    if (language()=="C") {
--- 164,168 ----
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
!   cmd+=" a000091 a000092 s000005a s000005m ";
  
    if (language()=="C") {
***************
*** 179,183 ****
    } else {
      if (language()=="C++") {
!       cmd+="CXXFLAGS=";
      } else {
        /* !!! */
--- 180,184 ----
    } else {
      if (language()=="C++") {
!       cmd+=" CXXFLAGS=";
      } else {
        /* !!! */
***************
*** 207,211 ****
    cmd+=" -f2 -d':')";
    
- 
    if (system->exec(cmd, result)==0) {
      return(result);
--- 208,211 ----
***************
*** 301,302 ****
--- 301,358 ----
  {
  }
+ 
+ 
+ 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()
+ {
+ }

Index: Benchmark-Selector.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Selector.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-Selector.cpp	19 Sep 2006 15:38:46 -0000	1.1
--- Benchmark-Selector.cpp	28 Sep 2006 17:52:45 -0000	1.2
***************
*** 92,95 ****
--- 92,99 ----
    }
  
+   if (tmp=="benchpp-stefanov-al12") {
+     return(new CBMBenchmarkBENCHPP_STEPANOV_AL12(system));
+   }
+ 
    tmp="Unknown benchmark '";
    tmp+=benchmarkName;
***************
*** 99,126 ****
  }
  
  void CBMBenchmarkSelector::displayList(void)
  {
!   CBMBenchmarkGZIP1             gzip1(system);
!   CBMBenchmarkGZIP9             gzip9(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);
  
    gzip1.display();
--- 103,132 ----
  }
  
+ 
  void CBMBenchmarkSelector::displayList(void)
  {
!   CBMBenchmarkGZIP1                 gzip1(system);
!   CBMBenchmarkGZIP9                 gzip9(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);
  
    gzip1.display();
***************
*** 146,149 ****
--- 152,156 ----
    benchpp_dry.display();
    benchpp_wet.display();
+   benchpp_ste_al12.display();
  }
  

Index: Benchmark-BENCHPP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BENCHPP.h	19 Sep 2006 17:09:35 -0000	1.2
--- Benchmark-BENCHPP.h	28 Sep 2006 17:52:45 -0000	1.3
***************
*** 95,97 ****
--- 95,122 ----
  };
  
+ /** \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();
+ };
+ 
  #endif

[Compbench-devel] CompBenchmarks++ ChangeLog,1.6,1.7

From: Frederic T. <xf...@us...> - 2006-09-28 17:52:39

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

Modified Files:
	ChangeLog 
Log Message:
Stepanov AL12 support.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog	27 Sep 2006 16:25:48 -0000	1.6
--- ChangeLog	28 Sep 2006 17:52:28 -0000	1.7
***************
*** 1,29 ****
  0.3.0
! 	Few bug and compilation fixes.
! 	Internet connection is no longer needed (local
! 	packages can be used as input).
! 	Man page for compbenchmarks-config.
! 	Cygwin & FreeBSD support.
  	
  0.3.0-BETA1
! 	Complete rewrite of the core in C++.
! 	A new GUI has been developped in Perl with dialog.
  	
  0.2.1
! 	{No public release}
  	
  0.2.0-BETA
! 	C compilers support
! 	More benchmarks (gzip, bzip2)
! 	Bug fixes
  	
  0.1.2-BETA
! 	Much improved usability
! 	Ineffiscient compilation process fixed
! 	Updated documentation
! 	Sanity checks
! 	Null or negative results are ignored
  	
  0.1.0-BETA
  
! 	First public version
\ No newline at end of file
--- 1,32 ----
+ 0.3.1
+ 	*  Stepanov benchmark (from Bench++) supported; measures
+ 	   C++ abstraction overhead.
  0.3.0
! 	*  Few bug and compilation fixes.
! 	*  Internet connection is no longer needed (local
! 	*  packages can be used as input).
! 	*  Man page for compbenchmarks-config.
! 	*  Cygwin & FreeBSD support.
  	
  0.3.0-BETA1
! 	*  Complete rewrite of the core in C++.
! 	*  A new GUI has been developped in Perl with dialog.
  	
  0.2.1
! 	*  {No public release}
  	
  0.2.0-BETA
! 	*  C compilers support
! 	*  More benchmarks (gzip, bzip2)
! 	*  Bug fixes
  	
  0.1.2-BETA
! 	*  Much improved usability
! 	*  Ineffiscient compilation process fixed
! 	*  Updated documentation
! 	*  Sanity checks
! 	*  Null or negative results are ignored
  	
  0.1.0-BETA
  
! 	*  First public version
\ No newline at end of file

[Compbench-devel] CompBenchmarks++ Doxyfile,1.2,1.3

From: Frederic T. <xf...@us...> - 2006-09-27 16:57:16

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

Modified Files:
	Doxyfile 
Log Message:
0.3.0

Index: Doxyfile
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Doxyfile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Doxyfile	20 Sep 2006 12:10:47 -0000	1.2
--- Doxyfile	27 Sep 2006 16:57:13 -0000	1.3
***************
*** 5,9 ****
  #---------------------------------------------------------------------------
  PROJECT_NAME           = CompBenchmarks
! PROJECT_NUMBER         = 0.3.0-BETA1
  OUTPUT_DIRECTORY       = doc
  CREATE_SUBDIRS         = NO
--- 5,9 ----
  #---------------------------------------------------------------------------
  PROJECT_NAME           = CompBenchmarks
! PROJECT_NUMBER         = 0.3.0
  OUTPUT_DIRECTORY       = doc
  CREATE_SUBDIRS         = NO

[Compbench-devel] CompBenchmarks++ compbenchmarks.1, 1.2, 1.3 compbenchmarks-config.1, 1.1, 1.2

From: Frederic T. <xf...@us...> - 2006-09-27 16:53:31

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

Modified Files:
	compbenchmarks.1 compbenchmarks-config.1 
Log Message:
Minor updates.

Index: compbenchmarks.1
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** compbenchmarks.1	25 Sep 2006 16:09:06 -0000	1.2
--- compbenchmarks.1	27 Sep 2006 16:53:28 -0000	1.3
***************
*** 130,134 ****
  .\"
  .IX Title "COMPBENCHMARKS 1"
! .TH COMPBENCHMARKS 1 "2006-09-25" "perl v5.8.8" "User Contributed Perl Documentation"
  .SH "NAME"
  compbenchmarks 0.3.0 \- Compilers' benchmarking environment
--- 130,134 ----
  .\"
  .IX Title "COMPBENCHMARKS 1"
! .TH COMPBENCHMARKS 1 "2006-09-26" "perl v5.8.8" "User Contributed Perl Documentation"
  .SH "NAME"
  compbenchmarks 0.3.0 \- Compilers' benchmarking environment
***************
*** 155,159 ****
  .PP
  compbenchmarks \-\-list\-benchmarks
!   List all recognized benchmarks/package.
  .PP
  compbenchmarks \-\-host\-infos
--- 155,159 ----
  .PP
  compbenchmarks \-\-list\-benchmarks
!   List all recognized benchmarks/packages.
  .PP
  compbenchmarks \-\-host\-infos
***************
*** 164,169 ****
  .PP
  compbenchmarks \-\-compiler\-infos <c\-bin>
!   Show informations about specified binary (compiler). <c\-bin> may be either
!   a relative compiler (like gcc\-3.3) or a full path to the compiler binary
    (/opt/lt/bin/g++).
  .PP
--- 164,170 ----
  .PP
  compbenchmarks \-\-compiler\-infos <c\-bin>
!   Show informations about specified binary (compiler).
!   <c\-bin> may be either a relative compiler
!   (like gcc\-3.3) or a full path to the compiler binary
    (/opt/lt/bin/g++).
  .PP
***************
*** 172,182 ****
  .PP
  compbenchmarks \-\-bench <b\-id> <c\-bin> [c\-options]
!   Make benchmark with specified compiler and options (if given), and returns
!   performance (higher is better).
  .SH "DESCRIPTION"
  .IX Header "DESCRIPTION"
! This tool provides a command line interface to compile and
! evaluate C/\*(C+ benchmarks more conveniently, according to customizable
! parameters.
  .PP
  Normally used by compbenchmarks-config program.
--- 173,184 ----
  .PP
  compbenchmarks \-\-bench <b\-id> <c\-bin> [c\-options]
!   Make benchmark with specified compiler and options
!   (if given), and returns performance (higher is
!   better).
  .SH "DESCRIPTION"
  .IX Header "DESCRIPTION"
! This tool provides a command line interface to
! compile and evaluate C/\*(C+ benchmarks more conveniently,
! according to customizable parameters.
  .PP
  Normally used by compbenchmarks-config program.

Index: compbenchmarks-config.1
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** compbenchmarks-config.1	25 Sep 2006 16:07:32 -0000	1.1
--- compbenchmarks-config.1	27 Sep 2006 16:53:28 -0000	1.2
***************
*** 130,134 ****
  .\"
  .IX Title "COMPBENCHMARKS-CONFIG 1"
! .TH COMPBENCHMARKS-CONFIG 1 "2006-09-25" "perl v5.8.8" "User Contributed Perl Documentation"
  .SH "NAME"
  compbenchmarks\-config 0.3.0 \- compilers' benchmarking environment
--- 130,134 ----
  .\"
  .IX Title "COMPBENCHMARKS-CONFIG 1"
! .TH COMPBENCHMARKS-CONFIG 1 "2006-09-27" "perl v5.8.8" "User Contributed Perl Documentation"
  .SH "NAME"
  compbenchmarks\-config 0.3.0 \- compilers' benchmarking environment

[Compbench-devel] CompBenchmarks++ ChangeLog,1.5,1.6

From: Frederic T. <xf...@us...> - 2006-09-27 16:25:51

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

Modified Files:
	ChangeLog 
Log Message:
0.3.0.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog	25 Sep 2006 18:36:57 -0000	1.5
--- ChangeLog	27 Sep 2006 16:25:48 -0000	1.6
***************
*** 1,3 ****
! 0.3.0-BETA2
  	Few bug and compilation fixes.
  	Internet connection is no longer needed (local
--- 1,3 ----
! 0.3.0
  	Few bug and compilation fixes.
  	Internet connection is no longer needed (local

[Compbench-devel] CompBenchmarks++ compbenchmarks-config, 1.18, 1.19

From: Frederic T. <xf...@us...> - 2006-09-27 16:23:29

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

Modified Files:
	compbenchmarks-config 
Log Message:
Fix : Warn if no benchmark selected.

Index: compbenchmarks-config
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** compbenchmarks-config	26 Sep 2006 19:32:59 -0000	1.18
--- compbenchmarks-config	27 Sep 2006 16:23:24 -0000	1.19
***************
*** 742,746 ****
    my $bn = $ENV{"HOME"} . "/.compbenchmarks/$hostname/Configuration/benchmarks";
  
!   if (-f $bn) {
      $nobench=1;
    } else {
--- 742,746 ----
    my $bn = $ENV{"HOME"} . "/.compbenchmarks/$hostname/Configuration/benchmarks";
  
!   if (! -f $bn) {
      $nobench=1;
    } else {

[Compbench-devel] CompBenchmarks++ compbenchmarks-config, 1.17, 1.18

From: Frederic T. <xf...@us...> - 2006-09-26 19:33:02

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

Modified Files:
	compbenchmarks-config 
Log Message:
Fix : each compiler's version string is now correctly used to see if a same version hasn't been selected twice.

Index: compbenchmarks-config
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** compbenchmarks-config	26 Sep 2006 19:13:25 -0000	1.17
--- compbenchmarks-config	26 Sep 2006 19:32:59 -0000	1.18
***************
*** 181,186 ****
  
    foreach $c (@compilers) {
!     if (!defined($unique{"$c->{id}-$c->{name}-$c->{version}"})) {
!       $unique{"$c->{id}-$c->{name}-$c->{version}"}=$c;
      }
    }
--- 181,186 ----
  
    foreach $c (@compilers) {
!     if (!defined($unique{"$c->{id}-$c->{version}"})) {
!       $unique{"$c->{id}-$c->{version}"}=$c;
      }
    }

[Compbench-devel] CompBenchmarks++ compbenchmarks.pod,1.2,1.3

From: Frederic T. <xf...@us...> - 2006-09-26 19:23:51

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

Modified Files:
	compbenchmarks.pod 
Log Message:
Cosmetic changes.


Index: compbenchmarks.pod
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks.pod,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** compbenchmarks.pod	25 Sep 2006 16:09:06 -0000	1.2
--- compbenchmarks.pod	26 Sep 2006 19:23:41 -0000	1.3
***************
*** 25,29 ****
  
  compbenchmarks --list-benchmarks
!   List all recognized benchmarks/package.
  
  compbenchmarks --host-infos
--- 25,29 ----
  
  compbenchmarks --list-benchmarks
!   List all recognized benchmarks/packages.
  
  compbenchmarks --host-infos
***************
*** 34,39 ****
  
  compbenchmarks --compiler-infos <c-bin>
!   Show informations about specified binary (compiler). <c-bin> may be either
!   a relative compiler (like gcc-3.3) or a full path to the compiler binary
    (/opt/lt/bin/g++).
  
--- 34,40 ----
  
  compbenchmarks --compiler-infos <c-bin>
!   Show informations about specified binary (compiler).
!   <c-bin> may be either a relative compiler
!   (like gcc-3.3) or a full path to the compiler binary
    (/opt/lt/bin/g++).
  
***************
*** 42,53 ****
  
  compbenchmarks --bench <b-id> <c-bin> [c-options]
!   Make benchmark with specified compiler and options (if given), and returns
!   performance (higher is better).
  
  =head1 DESCRIPTION
  
! This tool provides a command line interface to compile and
! evaluate C/C++ benchmarks more conveniently, according to customizable
! parameters.
  
  Normally used by compbenchmarks-config program.
--- 43,55 ----
  
  compbenchmarks --bench <b-id> <c-bin> [c-options]
!   Make benchmark with specified compiler and options
!   (if given), and returns performance (higher is
!   better).
  
  =head1 DESCRIPTION
  
! This tool provides a command line interface to
! compile and evaluate C/C++ benchmarks more conveniently,
! according to customizable parameters.
  
  Normally used by compbenchmarks-config program.

[Compbench-devel] CompBenchmarks++ compbenchmarks-config, 1.16, 1.17

From: Frederic T. <xf...@us...> - 2006-09-26 19:13:28

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

Modified Files:
	compbenchmarks-config 
Log Message:
slowdown.sh script used (private).

Index: compbenchmarks-config
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** compbenchmarks-config	26 Sep 2006 19:12:20 -0000	1.16
--- compbenchmarks-config	26 Sep 2006 19:13:25 -0000	1.17
***************
*** 871,875 ****
  		my $r = `$cmd`;
  		$SIG{INT} = 'DEFAULT';
- 		`./slowdown.sh`;
  		my $end = time();
  		$TOTAL_TIME+=($end-$beg);
--- 871,874 ----

[Compbench-devel] CompBenchmarks++ compbenchmarks-config, 1.15, 1.16

From: Frederic T. <xf...@us...> - 2006-09-26 19:12:25

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

Modified Files:
	compbenchmarks-config 
Log Message:
Warn if no benchmark selected.

Index: compbenchmarks-config
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** compbenchmarks-config	25 Sep 2006 15:49:38 -0000	1.15
--- compbenchmarks-config	26 Sep 2006 19:12:20 -0000	1.16
***************
*** 738,746 ****
    my $tot = 0;
    my @selected_benchs;
  
    my $bn = $ENV{"HOME"} . "/.compbenchmarks/$hostname/Configuration/benchmarks";
!   @selected_benchs = `$CBM_PROGRAMS{'CAT'} $bn`;
!   chomp(@selected_benchs);
!   
    foreach(@selected_benchs) {
      my $p = cbmc_package_get($_);
--- 738,761 ----
    my $tot = 0;
    my @selected_benchs;
+   my $nobench = 0;
  
    my $bn = $ENV{"HOME"} . "/.compbenchmarks/$hostname/Configuration/benchmarks";
! 
!   if (-f $bn) {
!     $nobench=1;
!   } else {
!     @selected_benchs = `$CBM_PROGRAMS{'CAT'} $bn`;
!     chomp(@selected_benchs);
! 
!     if (!(@selected_benchs+0)) {
!       $nobench=1;
!     }
!   }
! 
!   if ($nobench) {
!     cbmc_dialog_msg("No benchmark selected.\nSelect benchmarks using main menu.", 6, 40);
!     return;
!   }
! 
    foreach(@selected_benchs) {
      my $p = cbmc_package_get($_);
***************
*** 856,859 ****
--- 871,875 ----
  		my $r = `$cmd`;
  		$SIG{INT} = 'DEFAULT';
+ 		`./slowdown.sh`;
  		my $end = time();
  		$TOTAL_TIME+=($end-$beg);
***************
*** 1082,1086 ****
  =head1 NAME
  
! compbenchmarks 0.3.0 - compilers' benchmarking environment
  
  =head1 SYNOPSIS
--- 1098,1102 ----
  =head1 NAME
  
! compbenchmarks-config 0.3.0 - compilers' benchmarking environment
  
  =head1 SYNOPSIS
***************
*** 1102,1106 ****
  missing ones, basically according to your environment.
  
! compbenchmarks-config used compbenchmark program.
  
  =head1 DIRECTORIES
--- 1118,1122 ----
  missing ones, basically according to your environment.
  
! compbenchmarks-config uses compbenchmark program.
  
  =head1 DIRECTORIES
***************
*** 1140,1143 ****
--- 1156,1163 ----
  =back
  
+ =head1 SEE ALSO
+ 
+ Manpage of compbenchmarks
+ 
  =head1 AUTHOR

[Compbench-devel] CompBenchmarks++/Benchmark/Compiler BenchmarkContext-Compiler.cpp, 1.4, 1.5 BenchmarkContext-CompilerGCC.cpp, 1.6, 1.7

From: Frederic T. <xf...@us...> - 2006-09-26 16:03:31

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

Modified Files:
	BenchmarkContext-Compiler.cpp BenchmarkContext-CompilerGCC.cpp 
Log Message:
Banner added.

Index: BenchmarkContext-Compiler.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Compiler/BenchmarkContext-Compiler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BenchmarkContext-Compiler.cpp	26 Sep 2006 16:00:39 -0000	1.4
--- BenchmarkContext-Compiler.cpp	26 Sep 2006 16:03:27 -0000	1.5
***************
*** 1,2 ****
--- 1,10 ----
+ /* ----------------------------------------------------------------------------
+    $Id$
+ 
+    This is free software.
+    For details, see the GNU Public License in the COPYING file, or
+    Look http://www.fsf.org
+    ------------------------------------------------------------------------- */
+ 
  #include <Benchmark/Compiler/BenchmarkContext-Compiler.h>
  #include <Benchmark/Compiler/BenchmarkContext-CompilerGCC.h>

Index: BenchmarkContext-CompilerGCC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Compiler/BenchmarkContext-CompilerGCC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BenchmarkContext-CompilerGCC.cpp	26 Sep 2006 16:01:28 -0000	1.6
--- BenchmarkContext-CompilerGCC.cpp	26 Sep 2006 16:03:27 -0000	1.7
***************
*** 1,2 ****
--- 1,10 ----
+ /* ----------------------------------------------------------------------------
+    $Id$
+ 
+    This is free software.
+    For details, see the GNU Public License in the COPYING file, or
+    Look http://www.fsf.org
+    ------------------------------------------------------------------------- */
+ 
  #include <Benchmark/Compiler/BenchmarkContext-CompilerGCC.h>
  #include <System/System.h>

[Compbench-devel] CompBenchmarks++/System System-Cygwin.cpp, 1.1, 1.2 System-FreeBSD.cpp, 1.4, 1.5 System-Linux.cpp, 1.3, 1.4

From: Frederic T. <xf...@us...> - 2006-09-26 16:03:19

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

Modified Files:
	System-Cygwin.cpp System-FreeBSD.cpp System-Linux.cpp 
Log Message:
Banner added.

Index: System-FreeBSD.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-FreeBSD.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** System-FreeBSD.cpp	25 Sep 2006 18:36:23 -0000	1.4
--- System-FreeBSD.cpp	26 Sep 2006 16:03:14 -0000	1.5
***************
*** 1,2 ****
--- 1,10 ----
+ /* ----------------------------------------------------------------------------
+    $Id$
+ 
+    This is free software.
+    For details, see the GNU Public License in the COPYING file, or
+    Look http://www.fsf.org
+    ------------------------------------------------------------------------- */
+ 
  #include <System/System-FreeBSD.h>
  #include <string>

Index: System-Cygwin.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Cygwin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** System-Cygwin.cpp	25 Sep 2006 15:26:39 -0000	1.1
--- System-Cygwin.cpp	26 Sep 2006 16:03:14 -0000	1.2
***************
*** 1,2 ****
--- 1,10 ----
+ /* ----------------------------------------------------------------------------
+    $Id$
+ 
+    This is free software.
+    For details, see the GNU Public License in the COPYING file, or
+    Look http://www.fsf.org
+    ------------------------------------------------------------------------- */
+ 
  #include <System/System-Cygwin.h>
  #include <string>

Index: System-Linux.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Linux.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** System-Linux.cpp	14 Sep 2006 22:39:18 -0000	1.3
--- System-Linux.cpp	26 Sep 2006 16:03:15 -0000	1.4
***************
*** 1,2 ****
--- 1,10 ----
+ /* ----------------------------------------------------------------------------
+    $Id$
+ 
+    This is free software.
+    For details, see the GNU Public License in the COPYING file, or
+    Look http://www.fsf.org
+    ------------------------------------------------------------------------- */
+ 
  #include <System/System-Linux.h>
  #include <string>

[Compbench-devel] CompBenchmarks++/Benchmark/Compiler BenchmarkContext-CompilerGCC.cpp, 1.5, 1.6

From: Frederic T. <xf...@us...> - 2006-09-26 16:01:39

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

Modified Files:
	BenchmarkContext-CompilerGCC.cpp 
Log Message:
Prefix name by gcc/g++ when a vanilla GCC is used.

Index: BenchmarkContext-CompilerGCC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Compiler/BenchmarkContext-CompilerGCC.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BenchmarkContext-CompilerGCC.cpp	18 Sep 2006 18:57:39 -0000	1.5
--- BenchmarkContext-CompilerGCC.cpp	26 Sep 2006 16:01:28 -0000	1.6
***************
*** 21,24 ****
--- 21,25 ----
    std::string cmd = compilerBinary;
    std::string result;
+   std::string tmp;
  
    cmd+=" --version | ";
***************
*** 26,29 ****
--- 27,36 ----
    cmd+=" -1";
    system->exec(cmd, result); /* !!! */
+ 
+   if ((int) result.find("gcc")<0) {
+     tmp="gcc ";
+     tmp+=result;
+     result=tmp;
+   }
    return(result);
  }
***************
*** 76,79 ****
--- 83,87 ----
    std::string cmd = compilerBinary;
    std::string result;
+   std::string tmp;
  
    cmd+=" --version | ";
***************
*** 81,84 ****
--- 89,98 ----
    cmd+=" -1";
    system->exec(cmd, result); /* !!! */
+ 
+   if ((int) result.find("g++")<0) {
+     tmp="g++ ";
+     tmp+=result;
+     result=tmp;
+   }
    return(result);
  }

[Compbench-devel] CompBenchmarks++/Benchmark/Compiler BenchmarkContext-Compiler.cpp, 1.3, 1.4

From: Frederic T. <xf...@us...> - 2006-09-26 16:00:47

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

Modified Files:
	BenchmarkContext-Compiler.cpp 
Log Message:
Fix on compiler selection when a vanilla gcc/g++ is used.

Index: BenchmarkContext-Compiler.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Compiler/BenchmarkContext-Compiler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BenchmarkContext-Compiler.cpp	18 Sep 2006 18:57:39 -0000	1.3
--- BenchmarkContext-Compiler.cpp	26 Sep 2006 16:00:39 -0000	1.4
***************
*** 74,77 ****
--- 74,86 ----
  						  compilerBinary));
      }
+     raw=compilerBinary;
+     if (((int) raw.find("g++")>0) || (raw=="g++")) {
+       return(new CBMBenchmarkContextCompilerGCC_cpp(system,
+ 						    compilerBinary));
+     }
+     if (((int) raw.find("gcc")>0) || (raw=="gcc")) {
+       return(new CBMBenchmarkContextCompilerGCC(system,
+ 						compilerBinary));
+     }
    }

[Compbench-devel] CompBenchmarks++ README,1.8,1.9

From: Frederic T. <xf...@us...> - 2006-09-25 19:20:38

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

Modified Files:
	README 
Log Message:
Added FreeBSD support.

Index: README
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** README	25 Sep 2006 15:47:02 -0000	1.8
--- README	25 Sep 2006 19:20:29 -0000	1.9
***************
*** 17,21 ****
      * For Cygwin, WMI is needed (embedded since W2K).
  
! For now, CompilerBenchmarks' suite just supports tcc and gcc compilers on Linux and Cygwin. Any help improving that is welcome. It has only been tested on i686 and compatible systems. 
  
  Installation :
--- 17,23 ----
      * For Cygwin, WMI is needed (embedded since W2K).
  
! For now, CompilerBenchmarks' suite just supports tcc and gcc compilers on
! Linux, FreeBSD & Cygwin. Any help improving that is welcome. It has only been
! tested on i686 and compatible systems. 
  
  Installation :

[Compbench-devel] CompBenchmarks++ ChangeLog,1.4,1.5

From: Frederic T. <xf...@us...> - 2006-09-25 18:37:00

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

Modified Files:
	ChangeLog 
Log Message:
Added FreeBSD support.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	25 Sep 2006 15:42:37 -0000	1.4
--- ChangeLog	25 Sep 2006 18:36:57 -0000	1.5
***************
*** 4,8 ****
  	packages can be used as input).
  	Man page for compbenchmarks-config.
! 	Cygwin support.
  	
  0.3.0-BETA1
--- 4,8 ----
  	packages can be used as input).
  	Man page for compbenchmarks-config.
! 	Cygwin & FreeBSD support.
  	
  0.3.0-BETA1

[Compbench-devel] CompBenchmarks++/System System-FreeBSD.cpp, 1.3, 1.4

From: Frederic T. <xf...@us...> - 2006-09-25 18:36:29

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

Modified Files:
	System-FreeBSD.cpp 
Log Message:
-a option removed for sysctl.

Index: System-FreeBSD.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-FreeBSD.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** System-FreeBSD.cpp	25 Sep 2006 18:05:47 -0000	1.3
--- System-FreeBSD.cpp	25 Sep 2006 18:36:23 -0000	1.4
***************
*** 11,30 ****
  std::string CBMSystemFreeBSD::processor_name(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.model | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_mhz(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.cpuspeed | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_cache(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.l2cachesize 2> /dev/null | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_number(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.ncpu | head -1 | cut -f2 -d'=')"));
  }
  
--- 11,30 ----
  std::string CBMSystemFreeBSD::processor_name(void)
  {
!   return(exec0("echo $(/sbin/sysctl hw.model | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_mhz(void)
  {
!   return(exec0("echo $(/sbin/sysctl hw.cpuspeed | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_cache(void)
  {
!   return(exec0("echo $(/sbin/sysctl hw.l2cachesize 2> /dev/null | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_number(void)
  {
!   return(exec0("echo $(/sbin/sysctl hw.ncpu | head -1 | cut -f2 -d'=')"));
  }

[Compbench-devel] CompBenchmarks++/System System-FreeBSD.cpp, 1.2, 1.3

From: Frederic T. <xf...@us...> - 2006-09-25 18:05:51

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

Modified Files:
	System-FreeBSD.cpp 
Log Message:
L2 Cache detected (may not work all all system).

Index: System-FreeBSD.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-FreeBSD.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** System-FreeBSD.cpp	25 Sep 2006 17:42:35 -0000	1.2
--- System-FreeBSD.cpp	25 Sep 2006 18:05:47 -0000	1.3
***************
*** 11,30 ****
  std::string CBMSystemFreeBSD::processor_name(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.model | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_mhz(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.cpuspeed | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_cache(void)
  {
!   return("0");
  }
  
  std::string CBMSystemFreeBSD::processor_number(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.ncpu | cut -f2 -d'=')"));
  }
  
--- 11,30 ----
  std::string CBMSystemFreeBSD::processor_name(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.model | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_mhz(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.cpuspeed | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_cache(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.l2cachesize 2> /dev/null | head -1 | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_number(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.ncpu | head -1 | cut -f2 -d'=')"));
  }

[Compbench-devel] CompBenchmarks++/System System-FreeBSD.cpp, 1.1, 1.2 System-FreeBSD.h, 1.1, 1.2

From: Frederic T. <xf...@us...> - 2006-09-25 17:42:39

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

Modified Files:
	System-FreeBSD.cpp System-FreeBSD.h 
Log Message:
/sbin/sysctl program used.

Index: System-FreeBSD.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-FreeBSD.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** System-FreeBSD.cpp	25 Sep 2006 17:28:57 -0000	1.1
--- System-FreeBSD.cpp	25 Sep 2006 17:42:35 -0000	1.2
***************
*** 11,20 ****
  std::string CBMSystemFreeBSD::processor_name(void)
  {
!   return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | head -1 | cut -f2 -d':' | perl -pe 's/(.+) \d+ MHz/$1/g')"));
  }
  
  std::string CBMSystemFreeBSD::processor_mhz(void)
  {
!   return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | head -1 | cut -f2 -d':' | perl -pe 's/.+ (\d+) MHz/$1/g')"));
  }
  
--- 11,20 ----
  std::string CBMSystemFreeBSD::processor_name(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.model | cut -f2 -d'=')"));
  }
  
  std::string CBMSystemFreeBSD::processor_mhz(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.cpuspeed | cut -f2 -d'=')"));
  }
  
***************
*** 26,30 ****
  std::string CBMSystemFreeBSD::processor_number(void)
  {
!   return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | grep MHz | wc -l"));
  }
  
--- 26,30 ----
  std::string CBMSystemFreeBSD::processor_number(void)
  {
!   return(exec0("echo $(/sbin/sysctl -a hw.ncpu | cut -f2 -d'=')"));
  }
  

Index: System-FreeBSD.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-FreeBSD.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** System-FreeBSD.h	25 Sep 2006 17:28:57 -0000	1.1
--- System-FreeBSD.h	25 Sep 2006 17:42:35 -0000	1.2
***************
*** 25,29 ****
    
    /** Returns processor name
!    *  Uses dmesg.boot to get the name of the first installed processor.
     *  \return Processor name, as clear text
     *  \sa processor_number() */
--- 25,29 ----
    
    /** Returns processor name
!    *  Uses /sbin/sysctl to get the name of the first installed processor.
     *  \return Processor name, as clear text
     *  \sa processor_number() */
***************
*** 31,35 ****
  
    /** Returns processor speed
!    *  Uses dmesg.boot to get the speed, in MHz, of the first installed processor.
     *  \return Processor speed in MHz, as clear text (integer returned)
     *  \sa processor_number() */
--- 31,35 ----
  
    /** Returns processor speed
!    *  Uses /sbin/sysctl to get the speed, in MHz, of the first installed processor.
     *  \return Processor speed in MHz, as clear text (integer returned)
     *  \sa processor_number() */
***************
*** 37,46 ****
  
    /** Returns processor cache
!    *  Uses dmesg.boot to get processor second level cache in Kb. Integer expected.
     *  \return std::string coding (first) processor second level cache in Kb. */
    virtual std::string processor_cache(void);
  
    /** Returns processors' number
!    *  Uses dmesg.boot to get information.
     *  \return std::string coding the number of processors (physical and logical) on host */
    virtual std::string processor_number(void);
--- 37,46 ----
  
    /** Returns processor cache
!    *  Uses /sbin/sysctl to get processor second level cache in Kb. Integer expected.
     *  \return std::string coding (first) processor second level cache in Kb. */
    virtual std::string processor_cache(void);
  
    /** Returns processors' number
!    *  Uses /sbin/sysctl to get information.
     *  \return std::string coding the number of processors (physical and logical) on host */
    virtual std::string processor_number(void);

[Compbench-devel] CompBenchmarks++ config.h.in, 1.6, 1.7 configure, 1.8, 1.9 configure.in, 1.8, 1.9 main.cpp, 1.4, 1.5

From: Frederic T. <xf...@us...> - 2006-09-25 17:29:37

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

Modified Files:
	config.h.in configure configure.in main.cpp 
Log Message:
Added FreeBSD support.

Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.cpp	25 Sep 2006 15:41:24 -0000	1.4
--- main.cpp	25 Sep 2006 17:29:32 -0000	1.5
***************
*** 9,12 ****
--- 9,16 ----
  #endif
  
+ #ifdef CBM_SYSTEM_FREEBSD
+ # include <System/System-FreeBSD.h>
+ #endif
+ 
  #include <cloptions.h>
  

Index: config.h.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.h.in	25 Sep 2006 15:39:33 -0000	1.6
--- config.h.in	25 Sep 2006 17:29:32 -0000	1.7
***************
*** 64,67 ****
--- 64,70 ----
  #undef CBM_SYSTEM_CYGWIN
  
+ /* FreeBSD */
+ #undef CBM_SYSTEM_FREEBSD
+ 
  /* Linux */
  #undef CBM_SYSTEM_LINUX

Index: configure
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure	25 Sep 2006 15:40:47 -0000	1.8
--- configure	25 Sep 2006 17:29:32 -0000	1.9
***************
*** 859,862 ****
--- 859,864 ----
  CBM_SYSTEM_CYGWIN_TRUE
  CBM_SYSTEM_CYGWIN_FALSE
+ CBM_SYSTEM_FREEBSD_TRUE
+ CBM_SYSTEM_FREEBSD_FALSE
  LIBOBJS
  LTLIBOBJS'
***************
*** 2347,2350 ****
--- 2349,2356 ----
  		CBM_SYSTEM_CYGWIN=1
  		;;
+ 	FreeBSD)
+ 		CBM_SYSTEM=CBMSystemFreeBSD
+ 		CBM_SYSTEM_FREEBSD=1
+ 		;;
  	*)
  		echo "$sys not supported yet." >&2
***************
*** 4529,4533 ****
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 4531 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
--- 4535,4539 ----
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 4537 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
***************
*** 6947,6955 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:6949: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:6953: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
--- 6953,6961 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:6955: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:6959: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
***************
*** 7215,7223 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:7217: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:7221: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
--- 7221,7229 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:7223: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:7227: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
***************
*** 7319,7327 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:7321: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:7325: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
--- 7325,7333 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:7327: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:7331: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
***************
*** 9760,9764 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 9762 "configure"
  #include "confdefs.h"
  
--- 9766,9770 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 9768 "configure"
  #include "confdefs.h"
  
***************
*** 9860,9864 ****
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 9862 "configure"
  #include "confdefs.h"
  
--- 9866,9870 ----
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 9868 "configure"
  #include "confdefs.h"
  
***************
*** 12228,12236 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:12230: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:12234: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
--- 12234,12242 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:12236: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:12240: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
***************
*** 12332,12340 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:12334: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:12338: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
--- 12338,12346 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:12340: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:12344: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
***************
*** 13893,13901 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:13895: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:13899: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
--- 13899,13907 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:13901: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:13905: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
***************
*** 13997,14005 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:13999: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:14003: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
--- 14003,14011 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:14005: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:14009: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
***************
*** 16216,16224 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:16218: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:16222: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
--- 16222,16230 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:16224: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:16228: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
***************
*** 16484,16492 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:16486: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:16490: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
--- 16490,16498 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:16492: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
!    echo "$as_me:16496: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
***************
*** 16588,16596 ****
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:16590: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:16594: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
--- 16594,16602 ----
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
!    (eval echo "\"\$as_me:16596: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
!    echo "$as_me:16600: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
***************
*** 20685,20688 ****
--- 20691,20714 ----
  fi
  
+ if test "$CBM_SYSTEM_FREEBSD"x = "1x"; then
+ 	sys_freebsd_def=1
+ else
+ 	sys_freebsd_def=0
+ fi
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CBM_SYSTEM_FREEBSD $sys_freebsd_def
+ _ACEOF
+ 
+ 
+ 
+ if test "$CBM_SYSTEM_FREEBSD" = "1x"; then
+   CBM_SYSTEM_FREEBSD_TRUE=
+   CBM_SYSTEM_FREEBSD_FALSE='#'
+ else
+   CBM_SYSTEM_FREEBSD_TRUE='#'
+   CBM_SYSTEM_FREEBSD_FALSE=
+ fi
+ 
  top_srcdir=`cd $srcdir; pwd`;
  
***************
*** 21459,21467 ****
  CBM_SYSTEM_CYGWIN_TRUE!$CBM_SYSTEM_CYGWIN_TRUE$ac_delim
  CBM_SYSTEM_CYGWIN_FALSE!$CBM_SYSTEM_CYGWIN_FALSE$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
      break
    elif $ac_last_try; then
--- 21485,21495 ----
  CBM_SYSTEM_CYGWIN_TRUE!$CBM_SYSTEM_CYGWIN_TRUE$ac_delim
  CBM_SYSTEM_CYGWIN_FALSE!$CBM_SYSTEM_CYGWIN_FALSE$ac_delim
+ CBM_SYSTEM_FREEBSD_TRUE!$CBM_SYSTEM_FREEBSD_TRUE$ac_delim
+ CBM_SYSTEM_FREEBSD_FALSE!$CBM_SYSTEM_FREEBSD_FALSE$ac_delim
  LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
      break
    elif $ac_last_try; then

Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.in	25 Sep 2006 15:40:47 -0000	1.8
--- configure.in	25 Sep 2006 17:29:32 -0000	1.9
***************
*** 20,23 ****
--- 20,27 ----
  		CBM_SYSTEM_CYGWIN=1
  		;;
+ 	FreeBSD)
+ 		CBM_SYSTEM=CBMSystemFreeBSD
+ 		CBM_SYSTEM_FREEBSD=1
+ 		;;
  	*)
  		echo "$sys not supported yet." >&2
***************
*** 235,238 ****
--- 239,250 ----
  AM_CONDITIONAL(CBM_SYSTEM_CYGWIN, test "$CBM_SYSTEM_CYGWIN" = "1x")
  
+ if test "$CBM_SYSTEM_FREEBSD"x = "1x"; then
+ 	sys_freebsd_def=1
+ else
+ 	sys_freebsd_def=0
+ fi
+ AC_DEFINE_UNQUOTED(CBM_SYSTEM_FREEBSD, $sys_freebsd_def, [FreeBSD])
+ AM_CONDITIONAL(CBM_SYSTEM_FREEBSD, test "$CBM_SYSTEM_FREEBSD" = "1x")
+ 
  top_srcdir=`cd $srcdir; pwd`;

[Compbench-devel] CompBenchmarks++/System System-FreeBSD.cpp, NONE, 1.1 System-FreeBSD.h, NONE, 1.1 Makefile.am, 1.4, 1.5 Makefile.in, 1.6, 1.7

From: Frederic T. <xf...@us...> - 2006-09-25 17:29:01

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

Modified Files:
	Makefile.am Makefile.in 
Added Files:
	System-FreeBSD.cpp System-FreeBSD.h 
Log Message:
Added FreeBSD support.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	25 Sep 2006 15:38:15 -0000	1.6
--- Makefile.in	25 Sep 2006 17:28:57 -0000	1.7
***************
*** 108,111 ****
--- 108,112 ----
  @CBM_SYSTEM_LINUX_TRUE@source_sys = System-Linux.cpp
  @CBM_SYSTEM_LINUX_FALSE@@CBM_SYSTEM_CYGWIN_TRUE@source_sys = System-Cygwin.cpp
+ @CBM_SYSTEM_LINUX_FALSE@@CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@source_sys = System-FreeBSD.cpp
  
  sources = System.cpp System-Unix.cpp 				md5.cpp
***************
*** 114,118 ****
  libSystem_la_SOURCES = $(sources) $(source_sys)
  
! extra_DIST = System-Linux.cpp
  
  noinst_HEADERS = $(sources:.cpp=.h) $(extra_DIST:.cpp=.h)
--- 115,119 ----
  libSystem_la_SOURCES = $(sources) $(source_sys)
  
! extra_DIST = System-Linux.cpp System-Cygwin.cpp System-FreeBSD.cpp
  
  noinst_HEADERS = $(sources:.cpp=.h) $(extra_DIST:.cpp=.h)
***************
*** 132,149 ****
  libSystem_la_LDFLAGS = 
  libSystem_la_LIBADD = 
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... md5.lo
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... md5.lo \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... System-Unix.lo \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@md... System-Linux.lo
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... md5.lo \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy...
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 133,175 ----
  libSystem_la_LDFLAGS = 
  libSystem_la_LIBADD = 
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md...
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_TRUE@@CBM...@Sy...
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS =  \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@md... \
! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_FREEBSD_FALSE@@CBM...@Sy...
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 159,164 ****
  TAR = tar
  GZIP_ENV = --best
! DEP_FILES =  .deps/System-Cygwin.P .deps/System-Linux.P \
! .deps/System-Unix.P .deps/System.P .deps/md5.P
  SOURCES = $(libSystem_la_SOURCES)
  OBJECTS = $(libSystem_la_OBJECTS)
--- 185,190 ----
  TAR = tar
  GZIP_ENV = --best
! DEP_FILES =  .deps/System-Cygwin.P .deps/System-FreeBSD.P \
! .deps/System-Linux.P .deps/System-Unix.P .deps/System.P .deps/md5.P
  SOURCES = $(libSystem_la_SOURCES)
  OBJECTS = $(libSystem_la_OBJECTS)

--- NEW FILE: System-FreeBSD.cpp ---
#include <System/System-FreeBSD.h>
#include <string>

#include <config.h> /* !!! */

CBMSystemFreeBSD::CBMSystemFreeBSD()
  : CBMSystemUnix()
{
}

std::string CBMSystemFreeBSD::processor_name(void)
{
  return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | head -1 | cut -f2 -d':' | perl -pe 's/(.+) \d+ MHz/$1/g')"));
}

std::string CBMSystemFreeBSD::processor_mhz(void)
{
  return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | head -1 | cut -f2 -d':' | perl -pe 's/.+ (\d+) MHz/$1/g')"));
}

std::string CBMSystemFreeBSD::processor_cache(void)
{
  return("0");
}

std::string CBMSystemFreeBSD::processor_number(void)
{
  return(exec0("echo $(grep -i cpu /var/run/dmesg.boot | grep MHz | wc -l"));
}

CBMSystemFreeBSD::~CBMSystemFreeBSD()
{
}

--- NEW FILE: System-FreeBSD.h ---
/* ----------------------------------------------------------------------------
   $Id: System-FreeBSD.h,v 1.1 2006/09/25 17:28:57 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_CBMSYSTEMFREEBSD
#define H_CBMSYSTEMFREEBSD

#include <System/System-Unix.h>

/** \brief FreeBSD operating system support class.
 *
 *  Implements a few methods not defined by CBMSystemUnix to handle properly
 *  FreeBSD systems in CompBenchmarks.
 */
class CBMSystemFreeBSD : public CBMSystemUnix
{
 protected:
 public:
  /** Constructor */
  CBMSystemFreeBSD();
  
  /** Returns processor name
   *  Uses dmesg.boot to get the name of the first installed processor.
   *  \return Processor name, as clear text
   *  \sa processor_number() */
  virtual std::string processor_name(void);

  /** Returns processor speed
   *  Uses dmesg.boot to get the speed, in MHz, of the first installed processor.
   *  \return Processor speed in MHz, as clear text (integer returned)
   *  \sa processor_number() */
  virtual std::string processor_mhz(void);

  /** Returns processor cache
   *  Uses dmesg.boot to get processor second level cache in Kb. Integer expected.
   *  \return std::string coding (first) processor second level cache in Kb. */
  virtual std::string processor_cache(void);

  /** Returns processors' number
   *  Uses dmesg.boot to get information.
   *  \return std::string coding the number of processors (physical and logical) on host */
  virtual std::string processor_number(void);

  /** Virtual destructor */
  virtual ~CBMSystemFreeBSD();
};

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	25 Sep 2006 15:26:39 -0000	1.4
--- Makefile.am	25 Sep 2006 17:28:57 -0000	1.5
***************
*** 6,9 ****
--- 6,13 ----
  if CBM_SYSTEM_CYGWIN
  source_sys		=	System-Cygwin.cpp
+ else
+ if CBM_SYSTEM_FREEBSD
+ source_sys		=	System-FreeBSD.cpp
+ endif
  endif
  endif
***************
*** 14,18 ****
  libSystem_la_SOURCES 	=	$(sources) $(source_sys)
  
! extra_DIST		=	System-Linux.cpp
  
  noinst_HEADERS		=	$(sources:.cpp=.h) $(extra_DIST:.cpp=.h)
--- 18,22 ----
  libSystem_la_SOURCES 	=	$(sources) $(source_sys)
  
! extra_DIST		=	System-Linux.cpp System-Cygwin.cpp System-FreeBSD.cpp
  
  noinst_HEADERS		=	$(sources:.cpp=.h) $(extra_DIST:.cpp=.h)

Flat | Threaded

<< < 1 .. 41 42 43 44 45 > >> (Page 43 of 45)

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (48)	Oct (51)	Nov (66)	Dec (83)
2007	Jan (242)	Feb (56)	Mar (95)	Apr (120)	May (127)	Jun (32)	Jul (10)	Aug (55)	Sep (114)	Oct (3)	Nov	Dec