compbench-devel Mailing List for CompBenchmarks (Page 26)
Brought to you by:
xfred
Menu
▾
▴
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
|
|
From: Frederic T. <xf...@us...> - 2007-01-26 13:09:16
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5199 Modified Files: configure.in Log Message: Removed CPPFLAGS overloading; DATAROOTDIR is defined in Makefiles. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** configure.in 26 Jan 2007 01:26:04 -0000 1.24 --- configure.in 26 Jan 2007 13:09:12 -0000 1.25 *************** *** 37,41 **** # AC_DEFINE_DIR([CBM_DATADIR], [$datadir], [Data directory]) ! CPPFLAGS=-DDATAROOTDIR='"$(datarootdir)"' $CPPFLAGS AC_PATH_PROG(CBM_PROG_DIALOG, dialog, [], --- 37,41 ---- # AC_DEFINE_DIR([CBM_DATADIR], [$datadir], [Data directory]) ! # CPPFLAGS=-DDATAROOTDIR='"$(datarootdir)"' $CPPFLAGS AC_PATH_PROG(CBM_PROG_DIALOG, dialog, [], |
|
From: Frederic T. <xf...@us...> - 2007-01-26 13:07:57
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4290 Modified Files: CBM.i Log Message: Minor changes. Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CBM.i 25 Jan 2007 20:39:25 -0000 1.9 --- CBM.i 26 Jan 2007 13:07:51 -0000 1.10 *************** *** 6,11 **** #include "Glue.h" #include "System/System.h" - #include "Benchmark/Package.h" #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" #include "Base/XML.h" --- 6,11 ---- #include "Glue.h" #include "System/System.h" #include "Benchmark/Benchmark.h" + #include "Benchmark/Package.h" #include "Compiler/Compiler.h" #include "Base/XML.h" *************** *** 25,27 **** %include "Compiler/Compiler.h" %include "Plan/Plan.h" ! %include "Glue.h" \ No newline at end of file --- 25,27 ---- %include "Compiler/Compiler.h" %include "Plan/Plan.h" ! %include "Glue.h" |
|
From: Frederic T. <xf...@us...> - 2007-01-26 13:03:23
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1704 Modified Files: Makefile.am Log Message: libxml2 flags now defined by configure.in -shadow option added for swig. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 25 Jan 2007 20:39:25 -0000 1.12 --- Makefile.am 26 Jan 2007 13:03:04 -0000 1.13 *************** *** 39,46 **** $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H) ! swig -c++ $(INCLUDES) -Wall -proxy -perl $< $(top_srcdir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H) ! swig -c++ $(INCLUDES) -Wall -proxy -perl $< AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` --- 39,46 ---- $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H) ! swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $< $(top_srcdir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H) ! swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $< AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` *************** *** 48,54 **** libCBM_la_LIBADD = ../libcompbenchmarks/libcompbenchmarks.la ! INCLUDES = -I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir) -I/usr/include/libxml2 # !!! $(xml2-config --cflags) ! ! # libBase_la_LIBADD = -L/usr/lib -lxml2 # !!! `xml2-config --libs` test: --- 48,52 ---- libCBM_la_LIBADD = ../libcompbenchmarks/libcompbenchmarks.la ! INCLUDES = -I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir) @XML_CPPFLAGS@ test: |
|
From: Frederic T. <xf...@us...> - 2007-01-26 13:02:04
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1117 Modified Files: Makefile.am Log Message: libxml2 flags now defined by configure.in Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 25 Jan 2007 15:39:57 -0000 1.5 --- Makefile.am 26 Jan 2007 13:01:56 -0000 1.6 *************** *** 17,23 **** libBaseincludedir = $(includedir)/compbenchmarks/Base ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I/usr/include/libxml2 -DDATAROOTDIR=\"@datarootdir@\" # !!! $(xml2-config --cflags) ! libBase_la_LIBADD = -L/usr/lib -lxml2 # !!! `xml2-config --libs` - # -I /usr/include/w3c-libwww # !!! --- 17,22 ---- libBaseincludedir = $(includedir)/compbenchmarks/Base ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks @XML_CPPFLAGS@ -DDATAROOTDIR=\"@datarootdir@\" ! libBase_la_LIBADD = @XML_LIBS@ |
|
From: Frederic T. <xf...@us...> - 2007-01-26 13:00:26
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv581 Modified Files: Package.cpp Log Message: Minor changes. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Package.cpp 26 Jan 2007 01:42:45 -0000 1.4 --- Package.cpp 26 Jan 2007 13:00:23 -0000 1.5 *************** *** 37,41 **** } ! Benchmark *Package::Benchmark(int i) { Benchmarks(); --- 37,41 ---- } ! CBM::Benchmark *Package::Benchmark(int i) { Benchmarks(); *************** *** 43,47 **** } ! Benchmark *Package::Benchmark(std::string bid) { std::cerr << "virtual Package::Benchmark() called" << std::endl; --- 43,47 ---- } ! CBM::Benchmark *Package::Benchmark(std::string bid) { std::cerr << "virtual Package::Benchmark() called" << std::endl; |
|
From: Frederic T. <xf...@us...> - 2007-01-26 12:59:37
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32551 Modified Files: Benchmark.cpp Benchmark.h Log Message: Name() is not purely virtual anymore. Index: Benchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark.h 23 Jan 2007 16:51:26 -0000 1.2 --- Benchmark.h 26 Jan 2007 12:59:31 -0000 1.3 *************** *** 60,64 **** \return a std::string representing current benchmark's identification (e.g. gzip-1c) */ ! virtual std::string Name(void) = 0; /** Benchmark comments --- 60,64 ---- \return a std::string representing current benchmark's identification (e.g. gzip-1c) */ ! virtual std::string Name(void); /** Benchmark comments Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark.cpp 23 Jan 2007 16:51:26 -0000 1.2 --- Benchmark.cpp 26 Jan 2007 12:59:31 -0000 1.3 *************** *** 24,27 **** --- 24,33 ---- } + std::string Benchmark::Name(void) + { + std::cerr << "pure virtual method Benchmark::Name() called." << std::endl; + return(""); + } + Package *Benchmark::Package(void) { |
|
From: Frederic T. <xf...@us...> - 2007-01-26 12:58:36
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32089 Modified Files: Package.h Log Message: SWIG directives. Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Package.h 22 Jan 2007 18:21:47 -0000 1.1 --- Package.h 26 Jan 2007 12:58:32 -0000 1.2 *************** *** 15,18 **** --- 15,33 ---- #include <vector> + #ifdef SWIG + + /* !!! If in SWIG parser, we need to define CBM::Benchmark so that all methods get + * correctly wrapped. Hope there's a better solution... */ + %module CBM + %{ + #include <Benchmark/Benchmark.h> + %} + #include <Benchmark/Benchmark.h> + #define CBM_BM CBM::Benchmark + + #else + # define CBM_BM class Benchmark + #endif + namespace CBM { class System; *************** *** 195,203 **** \sa Benchmarks() \return A pointer to the benchmark instance */ ! virtual class Benchmark *Benchmark(int i); /** Get a benchmark according to its identifier. \return References to a Benchmark object */ ! virtual class Benchmark *Benchmark(std::string bid); /** Stores benchmark status --- 210,218 ---- \sa Benchmarks() \return A pointer to the benchmark instance */ ! virtual CBM_BM *Benchmark(int i); /** Get a benchmark according to its identifier. \return References to a Benchmark object */ ! virtual CBM_BM *Benchmark(std::string bid); /** Stores benchmark status |
|
From: Frederic T. <xf...@us...> - 2007-01-26 01:48:10
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17996 Modified Files: libcompbenchmarks.cpp libcompbenchmarks.h Log Message: UO_verbose_dl introduced. Index: libcompbenchmarks.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/libcompbenchmarks.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libcompbenchmarks.h 22 Jan 2007 17:42:42 -0000 1.1 --- libcompbenchmarks.h 26 Jan 2007 01:48:07 -0000 1.2 *************** *** 38,45 **** extern int UO_force; - /** Verbose mode. * If set to 0, disable verbose mode (UI messages disabled). */ extern int UO_verbose; /** Enable exits on fatal error. --- 38,46 ---- extern int UO_force; /** Verbose mode. * If set to 0, disable verbose mode (UI messages disabled). */ extern int UO_verbose; + + extern int UO_verbose_dl; /** Enable exits on fatal error. Index: libcompbenchmarks.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/libcompbenchmarks.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libcompbenchmarks.cpp 22 Jan 2007 17:42:42 -0000 1.1 --- libcompbenchmarks.cpp 26 Jan 2007 01:48:07 -0000 1.2 *************** *** 6,9 **** --- 6,10 ---- int CBM::UO_force = 0; int CBM::UO_verbose = 1; + int CBM::UO_verbose_dl = 0; int CBM::UO_fatal = 1; |
|
From: Frederic T. <xf...@us...> - 2007-01-26 01:47:52
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17836 Modified Files: Benchmark-DLLoader.cpp Log Message: UO_verbose_dl introduced. Index: Benchmark-DLLoader.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark-DLLoader.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-DLLoader.cpp 22 Jan 2007 18:21:47 -0000 1.1 --- Benchmark-DLLoader.cpp 26 Jan 2007 01:47:45 -0000 1.2 *************** *** 35,44 **** cbmlib_internal *r; ! if (UO_verbose) std::cout << "Loading " << lib << "... "; r=cbmlib_check_previousload(package_id); if (r) { ! if (UO_verbose) std::cout << "found (cached)." << std::endl; return(r); --- 35,44 ---- cbmlib_internal *r; ! if (UO_verbose_dl) std::cout << "Loading " << lib << "... "; r=cbmlib_check_previousload(package_id); if (r) { ! if (UO_verbose_dl) std::cout << "found (cached)." << std::endl; return(r); *************** *** 47,65 **** library=dlopen(lib, RTLD_NOW); if (library) { ! if (UO_verbose) std::cout << "found." << std::endl; r=new cbmlib_internal; r->library=library; ! if (UO_verbose) std::cout << " Checking cbmlib_getPackage... "; r->PackageGet=(cbmlib_internal_getPackage_t) (dlsym(r->library, "cbmlib_getPackage")); if (!r->PackageGet) { dlclose(library); ! if (UO_verbose) std::cout << "Invalid" << std::endl; delete(r); return(0); } else { ! if (UO_verbose) std::cout << "found." << std::endl; } --- 47,65 ---- library=dlopen(lib, RTLD_NOW); if (library) { ! if (UO_verbose_dl) std::cout << "found." << std::endl; r=new cbmlib_internal; r->library=library; ! if (UO_verbose_dl) std::cout << " Checking cbmlib_getPackage... "; r->PackageGet=(cbmlib_internal_getPackage_t) (dlsym(r->library, "cbmlib_getPackage")); if (!r->PackageGet) { dlclose(library); ! if (UO_verbose_dl) std::cout << "Invalid" << std::endl; delete(r); return(0); } else { ! if (UO_verbose_dl) std::cout << "found." << std::endl; } *************** *** 68,72 **** return(r); } else { ! if (UO_verbose) std::cout << "N.A. (" << dlerror() << ")" << std::endl; } --- 68,72 ---- return(r); } else { ! if (UO_verbose_dl) std::cout << "N.A. (" << dlerror() << ")" << std::endl; } |
|
From: Frederic T. <xf...@us...> - 2007-01-26 01:42:49
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15624 Modified Files: Package.cpp Log Message: English correctness. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Package.cpp 25 Jan 2007 17:39:59 -0000 1.3 --- Package.cpp 26 Jan 2007 01:42:45 -0000 1.4 *************** *** 369,373 **** info+=" is a "; info+=_currentCompiler->language(); ! info+=" compiler, while benchmark is written is "; info+=language(); info+="."; --- 369,373 ---- info+=" is a "; info+=_currentCompiler->language(); ! info+=" compiler, while benchmark is in "; info+=language(); info+="."; |
|
From: Frederic T. <xf...@us...> - 2007-01-26 01:42:08
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15104 Modified Files: Benchmark-BENCHPP.libwrapper.h Benchmark-BENCHPPLINUX.libwrapper.h Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.libwrapper.h Benchmark-LINPACKC.libwrapper.h Benchmark-NBENCH.libwrapper.h Benchmark-SCIMARK2.libwrapper.h benchmarks-genlibwrapper.pl Log Message: UI->Fatal() is not called anymore if a benchmark cannot be found. Index: Benchmark-NBENCH.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-NBENCH.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 --- Benchmark-NBENCH.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 *************** *** 54,58 **** return(new CBM::BenchmarkNBENCH_IDEA(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 54,57 ---- Index: Benchmark-GZIP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-GZIP.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 --- Benchmark-GZIP.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 *************** *** 22,26 **** return(new CBM::BenchmarkGZIP1(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 22,25 ---- Index: benchmarks-genlibwrapper.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/benchmarks-genlibwrapper.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** benchmarks-genlibwrapper.pl 18 Jan 2007 18:44:36 -0000 1.3 --- benchmarks-genlibwrapper.pl 26 Jan 2007 01:41:57 -0000 1.4 *************** *** 53,57 **** print " }\n"; } - print " CBM::cbmUI->Fatal(\"Unknown benchmark\");\n"; print " return(0);\n"; print "}\n\n"; --- 53,56 ---- Index: Benchmark-BZIP2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BZIP2.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 --- Benchmark-BZIP2.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 *************** *** 22,26 **** return(new CBM::BenchmarkBZIP29(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 22,25 ---- Index: Benchmark-BENCHPP.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPP.libwrapper.h 21 Jan 2007 20:46:46 -0000 1.4 --- Benchmark-BENCHPP.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 *************** *** 26,30 **** return(new CBM::BenchmarkBENCHPP_DHRYSTONE(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 26,29 ---- Index: Benchmark-LINPACKC.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-LINPACKC.libwrapper.h 21 Jan 2007 20:46:47 -0000 1.5 --- Benchmark-LINPACKC.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.6 *************** *** 30,34 **** return(new CBM::BenchmarkLINPACKC_SP_ROLL(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 30,33 ---- Index: Benchmark-BENCHPPLINUX.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPPLINUX.libwrapper.h 21 Jan 2007 20:46:47 -0000 1.4 --- Benchmark-BENCHPPLINUX.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 *************** *** 154,158 **** return(new CBM::BenchmarkBENCHPPLINUX_LOOPJAMMING(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 154,157 ---- Index: Benchmark-SCIMARK2.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-SCIMARK2.libwrapper.h 18 Jan 2007 18:44:36 -0000 1.4 --- Benchmark-SCIMARK2.libwrapper.h 26 Jan 2007 01:41:57 -0000 1.5 *************** *** 34,38 **** return(new CBM::BenchmarkSCIMARK2_SOR(this)); } - CBM::cbmUI->Fatal("Unknown benchmark"); return(0); } --- 34,37 ---- |
|
From: Frederic T. <xf...@us...> - 2007-01-26 01:41:11
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14660 Modified Files: Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp Benchmark-GZIP.h Log Message: benchmarkSize() is now totalSize(); Index: Benchmark-GZIP.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Benchmark-GZIP.h 21 Jan 2007 21:27:37 -0000 1.6 --- Benchmark-GZIP.h 26 Jan 2007 01:40:56 -0000 1.7 *************** *** 44,48 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageGZIP(); --- 44,48 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageGZIP(); Index: Benchmark-GZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark-GZIP.cpp 21 Jan 2007 21:27:37 -0000 1.7 --- Benchmark-GZIP.cpp 26 Jan 2007 01:40:56 -0000 1.8 *************** *** 96,100 **** } ! int PackageGZIP::benchmarkSize(void) { return(76546048); --- 96,100 ---- } ! int PackageGZIP::totalSize(void) { return(76546048); Index: Benchmark-BZIP2.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark-BZIP2.h 21 Jan 2007 21:27:37 -0000 1.7 --- Benchmark-BZIP2.h 26 Jan 2007 01:40:56 -0000 1.8 *************** *** 51,55 **** virtual std::string author(void); ! virtual int benchmarkSize(void); virtual ~PackageBZIP2(); --- 51,55 ---- virtual std::string author(void); ! virtual int totalSize(void); virtual ~PackageBZIP2(); Index: Benchmark-BZIP2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark-BZIP2.cpp 21 Jan 2007 21:27:37 -0000 1.7 --- Benchmark-BZIP2.cpp 26 Jan 2007 01:40:55 -0000 1.8 *************** *** 138,142 **** } ! int PackageBZIP2::benchmarkSize(void) { return(76546048); --- 138,142 ---- } ! int PackageBZIP2::totalSize(void) { return(76546048); |
|
From: Frederic T. <xf...@us...> - 2007-01-26 01:26:09
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6985 Modified Files: configure.in Log Message: libxml2 and Gtk2 Perl module checked. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** configure.in 25 Jan 2007 20:40:15 -0000 1.23 --- configure.in 26 Jan 2007 01:26:04 -0000 1.24 *************** *** 37,41 **** # AC_DEFINE_DIR([CBM_DATADIR], [$datadir], [Data directory]) ! CPPFLAGS = -DDATAROOTDIR='"$(datarootdir)"' @CPPFLAGS@ AC_PATH_PROG(CBM_PROG_DIALOG, dialog, [], --- 37,41 ---- # AC_DEFINE_DIR([CBM_DATADIR], [$datadir], [Data directory]) ! CPPFLAGS=-DDATAROOTDIR='"$(datarootdir)"' $CPPFLAGS AC_PATH_PROG(CBM_PROG_DIALOG, dialog, [], *************** *** 203,211 **** fi CXXFLAGS="-Wall -pedantic -O2 -g" # Checks for libraries. AC_CHECK_LIB(dl, dlopen) ! # Checks for header files. AC_HEADER_STDC --- 203,224 ---- fi + AC_MSG_CHECKING([Perl's Gtk2 module]) + `$CBM_PROG_PERL -e 'use Gtk2' 2> /dev/null` + if test $? = 0; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(CBM_GTK2, test "1" = "1") + CBM_GTK2="enabled" + else + AC_MSG_RESULT([no, gtk interface disabled.]) + AC_DEFINE_UNQUOTED(CBM_GTK2, 0, [Gtk2]) + AM_CONDITIONAL(CBM_GTK2, test "0" = "1") + CBM_GTK2="disabled" + fi + CXXFLAGS="-Wall -pedantic -O2 -g" # Checks for libraries. AC_CHECK_LIB(dl, dlopen) ! AM_PATH_XML2(2.6.16,,exit 1) # Checks for header files. AC_HEADER_STDC *************** *** 254,257 **** --- 267,272 ---- AC_SUBST(CBM_PROG_PERL) AC_SUBST(CXXFLAGS) + AC_SUBST(XML_CPPFLAGS) + AC_SUBST(XML_LIBS) AC_OUTPUT(libcompbenchmarks/share/Makefile *************** *** 279,282 **** --- 294,301 ---- echo "CXX : $CXX" echo "CXFLAGS : $CXXFLAGS" + echo "XML_LIBS : $XML_LIBS" + echo "XML_CPPFLAGS : $XML_CPPFLAGS" + echo "" echo "System : $CBM_SYSTEM" + echo "Gtk2 frontend : $CBM_GTK2" echo "" |
|
From: Frederic T. <xf...@us...> - 2007-01-25 22:16:07
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23710 Modified Files: Config.cpp Config.h Log Message: Access to the CBM::Plan XML node. Index: Config.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Config.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Config.h 25 Jan 2007 20:37:55 -0000 1.5 --- Config.h 25 Jan 2007 22:15:59 -0000 1.6 *************** *** 42,45 **** --- 42,46 ---- Config(std::string _filename); + virtual XMLNode *planNode(void); virtual CBM::Package::Status getStatus(std::string _bid); Index: Config.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Config.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Config.cpp 25 Jan 2007 20:37:55 -0000 1.8 --- Config.cpp 25 Jan 2007 22:15:59 -0000 1.9 *************** *** 10,14 **** #include <Base/XMLReader.h> - #include <Plan/Plan.h> #include <UI/UI.h> --- 10,13 ---- *************** *** 64,67 **** --- 63,71 ---- } + CBM::XMLNode *Config::planNode(void) + { + return(plan); + } + int Config::verifyPatchDirectory(std::string dir) { *************** *** 358,361 **** --- 362,367 ---- { delete(plan); + changes=1; + plan=_plan; root->add(_plan); } |
|
From: Frederic T. <xf...@us...> - 2007-01-25 22:09:48
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21456 Modified Files: 05-Plan.pl Log Message: Tests added for restore*() methods. Index: 05-Plan.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-Plan.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 05-Plan.pl 25 Jan 2007 21:32:50 -0000 1.3 --- 05-Plan.pl 25 Jan 2007 22:09:39 -0000 1.4 *************** *** 6,10 **** require "libtest.pl"; ! use Test::Simple tests => 130; my $sys; --- 6,10 ---- require "libtest.pl"; ! use Test::Simple tests => 136; my $sys; *************** *** 99,102 **** --- 99,122 ---- chomp($x); ok($P->XML()->str() eq $x, "$top_srcdir/reference/plan.xml matches"); + ok($P->totalIterations() == 12, "total iterations is correct"); + } + + sub test_restore { + my $R = CBM::XMLReader->new(); + my $X; + + $P->reset(); + + ok($P->compilerNumber() == 0, "compiler number is correct"); + ok($P->compilerOptionNumber() == 0, "options' number is correct"); + ok($P->benchmarkNumber() == 0, "benchmark number is correct"); + ok($P->nextIteration(0) == 0); + + $X=$R->read("$top_srcdir/reference/plan.xml"); + $P->restore($X); + + my $x = `cat $top_srcdir/reference/plan.xml`; + chomp($x); + ok($P->XML()->str() eq $x, "$top_srcdir/reference/plan.xml matches"); } *************** *** 105,108 **** --- 125,129 ---- test_plan(); + test_restore(); $sys->done(); |
|
From: Frederic T. <xf...@us...> - 2007-01-25 22:08:50
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21077 Modified Files: Plan.cpp Plan.h Log Message: methods to restore all parameters according to an XML node (hierarchy). Index: Plan.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Plan.h 25 Jan 2007 21:33:48 -0000 1.3 --- Plan.h 25 Jan 2007 22:08:46 -0000 1.4 *************** *** 13,22 **** namespace CBM { class Plan { protected: ! std::vector<class Compiler *> compilers; ! std::vector<std::string> compilerOptions; ! std::vector<class Benchmark *> benchmarks; int iteration; --- 13,29 ---- namespace CBM { + /** \brief Configure and run benchmarks within specified contexts. + * This class manage sets of benchmarks, compiler options and compilers + * to evaluate performances in a convenient way. */ class Plan { protected: ! std::vector<class Compiler *> compilers; /*!< Compilers */ ! std::vector<std::string> compilerOptions; /*!< Compilers' optimisations */ ! std::vector<class Benchmark *> benchmarks; /*!< Benchmarks */ + /** Current iteration. + * This value represents the index of the current benchmarking evaluation + * !!! + */ int iteration; *************** *** 24,27 **** --- 31,39 ---- virtual int isUnique(std::string _options); virtual int isUnique(class Benchmark *_benchmark); + + virtual void restoreBenchmarks(class XMLNode *_benchmarksNode); + virtual void restoreCompilers(class XMLNode *_compilersNode); + virtual void restoreOptions(class XMLNode *_optionsNode); + public: Plan(); *************** *** 53,58 **** --- 65,75 ---- virtual int nextIteration(int simule = 0); + virtual void stop(void); + class XMLNode *XML(void); + + virtual void reset(void); virtual int store(void); + virtual int restore(XMLNode *_planRootNode); virtual ~Plan(); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Plan.cpp 25 Jan 2007 21:33:48 -0000 1.3 --- Plan.cpp 25 Jan 2007 22:08:46 -0000 1.4 *************** *** 66,69 **** --- 66,130 ---- } + void Plan::restoreBenchmarks(CBM::XMLNode *_benchmarksNode) + { + int i; + int n = _benchmarksNode->nodeNumber(); + CBM::XMLNode *N; + CBM::XMLAttribute *A; + + for(i=0; i<n; i++) { + N=_benchmarksNode->getNode(i); + if (N->Name() != "benchmark") + continue; + A=N->getAttribute("id"); + if (!A) + continue; + add(cbmSystem->Benchmark(A->Value())); + } + } + + void Plan::restoreCompilers(CBM::XMLNode *_compilersNode) + { + int i; + int n = _compilersNode->nodeNumber(); + CBM::XMLNode *N; + CBM::XMLAttribute *A; + CBM::CompilerSelector *SC; + CBM::Compiler *C; + + SC=new CBM::CompilerSelector(cbmSystem); + + for(i=0; i<n; i++) { + N=_compilersNode->getNode(i); + if (N->Name() != "compiler") + continue; + A=N->getAttribute("id"); + if (!A) + continue; + C=SC->select((char*) A->Value().c_str()); + add(C); + } + delete(SC); + } + + void Plan::restoreOptions(CBM::XMLNode *_optionsNode) + { + int i; + int n = _optionsNode->nodeNumber(); + CBM::XMLNode *N; + CBM::XMLAttribute *A; + + for(i=0; i<n; i++) { + N=_optionsNode->getNode(i); + if (N->Name() != "option") + continue; + A=N->getAttribute("value"); + if (!A) + continue; + add(A->Value()); + } + } + + int Plan::add(CBM::Compiler *_compiler) { *************** *** 73,76 **** --- 134,138 ---- compilers.push_back(_compiler); + stop(); return(1); } *************** *** 83,86 **** --- 145,149 ---- compilerOptions.push_back(_compilerOptions); + stop(); return(1); } *************** *** 93,96 **** --- 156,160 ---- benchmarks.push_back(_benchmark); + stop(); return(1); } *************** *** 109,113 **** } compilers=ncompilers; ! return(1); } --- 173,177 ---- } compilers=ncompilers; ! stop(); return(1); } *************** *** 126,130 **** } compilerOptions=noptions; ! return(1); } --- 190,194 ---- } compilerOptions=noptions; ! stop(); return(1); } *************** *** 142,146 **** nbenchmarks.push_back(B); } ! benchmarks=nbenchmarks; return(1); --- 206,210 ---- nbenchmarks.push_back(B); } ! stop(); benchmarks=nbenchmarks; return(1); *************** *** 165,179 **** CBM::Compiler *Plan::getCompiler(int _index) { ! return(compilers[_index]); } std::string Plan::getCompilerOptions(int _index) { ! return(compilerOptions[_index]); } CBM::Benchmark *Plan::getBenchmark(int _index) { ! return(benchmarks[_index]); } --- 229,252 ---- CBM::Compiler *Plan::getCompiler(int _index) { ! if (_index<compilerNumber()) ! return(compilers[_index]); ! else ! return(0); } std::string Plan::getCompilerOptions(int _index) { ! if (_index<compilerOptionNumber()) ! return(compilerOptions[_index]); ! else ! return(""); } CBM::Benchmark *Plan::getBenchmark(int _index) { ! if (_index<benchmarkNumber()) ! return(benchmarks[_index]); ! else ! return(0); } *************** *** 296,299 **** --- 369,398 ---- } + void Plan::stop(void) + { + iteration=0; + } + + void Plan::reset(void) + { + CBM::Compiler *C; + CBM::Benchmark *B; + std::string O; + + while ( (C=getCompiler(0)) != 0 ) { + remove(C); + delete(C); + } + + while ( (B=getBenchmark(0)) != 0 ) { + remove(B); + delete(B); + } + + while ( (O=getCompilerOptions(0)) != "") { + remove(O); + } + } + int Plan::store(void) { *************** *** 304,307 **** --- 403,454 ---- } + int Plan::restore(XMLNode *_planRootNode) + { + XMLNode *S; + XMLNode *R; + XMLNode *BM; + XMLNode *CO; + XMLNode *OP; + XMLNode *CI; + XMLAttribute *A; + + reset(); + + S=_planRootNode->getNode("selection"); + if (!S) + return(0); + + R=_planRootNode->getNode("run"); + if (!R) + return(0); + + BM=S->getNode("benchmarks"); + if (!BM) + return(0); + restoreBenchmarks(BM); + + CO=S->getNode("compilers"); + if (!CO) + return(0); + restoreCompilers(CO); + + OP=S->getNode("options"); + if (!OP) + return(0); + restoreOptions(OP); + + CI=R->getNode("current-iteration"); + if (!CI) + return(0); + + A=CI->getAttribute("index"); + + if (!A) + return(0); + + iteration=atoi(A->Value().c_str()); + return(1); + } + Plan::~Plan() { |
|
From: Frederic T. <xf...@us...> - 2007-01-25 21:33:51
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7951 Modified Files: Plan.cpp Plan.h Log Message: A same element (compiler, benchmark, options) can't be added more than once. Index: Plan.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Plan.h 25 Jan 2007 20:57:02 -0000 1.2 --- Plan.h 25 Jan 2007 21:33:48 -0000 1.3 *************** *** 21,24 **** --- 21,27 ---- int iteration; + virtual int isUnique(class Compiler *_compiler); + virtual int isUnique(std::string _options); + virtual int isUnique(class Benchmark *_benchmark); public: Plan(); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Plan.cpp 25 Jan 2007 20:57:02 -0000 1.2 --- Plan.cpp 25 Jan 2007 21:33:48 -0000 1.3 *************** *** 22,27 **** --- 22,75 ---- } + int Plan::isUnique(CBM::Compiler *_compiler) + { + int i; + int n = compilerNumber(); + CBM::Compiler *C; + + for(i=0; i<n; i++) { + C=getCompiler(i); + if (C->compilerName() == _compiler->compilerName()) { + return(0); + } + } + return(1); + } + + int Plan::isUnique(std::string _options) + { + int i; + int n = compilerOptionNumber(); + std::string O; + + for(i=0; i<n; i++) { + O=getCompilerOptions(i); + if (O == _options) + return(0); + } + return(1); + } + + int Plan::isUnique(CBM::Benchmark *_benchmark) + { + int i; + int n = benchmarkNumber(); + CBM::Benchmark *B; + + for(i=0; i<n; i++) { + B=getBenchmark(i); + if (B->Name() == _benchmark->Name()) + return(0); + } + + return(1); + } + int Plan::add(CBM::Compiler *_compiler) { + if (!isUnique(_compiler)) { + return(0); + } + compilers.push_back(_compiler); return(1); *************** *** 30,33 **** --- 78,85 ---- int Plan::add(std::string _compilerOptions) { + if (!isUnique(_compilerOptions)) { + return(0); + } + compilerOptions.push_back(_compilerOptions); return(1); *************** *** 36,39 **** --- 88,95 ---- int Plan::add(CBM::Benchmark *_benchmark) { + if (!isUnique(_benchmark)) { + return(0); + } + benchmarks.push_back(_benchmark); return(1); |
|
From: Frederic T. <xf...@us...> - 2007-01-25 21:32:55
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7585 Modified Files: 05-Plan.pl Log Message: More tests. Index: 05-Plan.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-Plan.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 05-Plan.pl 25 Jan 2007 20:57:31 -0000 1.2 --- 05-Plan.pl 25 Jan 2007 21:32:50 -0000 1.3 *************** *** 6,10 **** require "libtest.pl"; ! use Test::Simple tests => 123; my $sys; --- 6,10 ---- require "libtest.pl"; ! use Test::Simple tests => 130; my $sys; *************** *** 37,40 **** --- 37,41 ---- ok($P->compilerOptionNumber() == 0, "options' number is correct"); ok($P->benchmarkNumber() == 0, "benchmark number is correct"); + ok($P->add($oc) == 0, "unique compiler"); $it++; } *************** *** 47,50 **** --- 48,52 ---- ok($P->compilerOptionNumber() == $it, "options' number is correct"); ok($P->benchmarkNumber() == 0, "benchmark number is correct"); + ok($P->add($o) == 0, "unique option"); $it++; } *************** *** 60,63 **** --- 62,66 ---- "options' number is correct"); ok($P->benchmarkNumber() == $it, "benchmark number is correct"); + ok($P->add($ob) == 0, "unique benchmark"); $it++; } |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:58:32
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27350 Modified Files: Makefile.am Added Files: plan.xml Log Message: plan.xml added. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 25 Jan 2007 15:42:16 -0000 1.5 --- Makefile.am 25 Jan 2007 20:58:23 -0000 1.6 *************** *** 1 **** ! dist_noinst_DATA = CBMSystem-copy.data compiler-fake-g++-4.1.1-13 compiler-fake-gcc-4.1.1-13 compiler-fake-tcc-0.9.23 compbenchmarks-0.xml compbenchmarks-1.xml compbenchmarks-2.xml compbenchmarks-config-0.xml \ No newline at end of file --- 1 ---- ! dist_noinst_DATA = CBMSystem-copy.data compiler-fake-g++-4.1.1-13 compiler-fake-gcc-4.1.1-13 compiler-fake-tcc-0.9.23 compbenchmarks-0.xml compbenchmarks-1.xml compbenchmarks-2.xml compbenchmarks-config-0.xml plan.xml \ No newline at end of file --- NEW FILE: plan.xml --- <plan> <selection> <benchmarks> <benchmark id="gzip-1c"/> <benchmark id="gzip-9c"/> </benchmarks> <compilers> <compiler id="gcc"/> <compiler id="g++"/> </compilers> <options> <option value="-O2"/> <option value="-O3"/> <option value="-O0"/> </options> </selection> <run> <current-iteration index="12"/> </run> </plan> |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:57:40
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26973 Modified Files: 05-Plan.pl Log Message: More tests. Index: 05-Plan.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-Plan.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 05-Plan.pl 25 Jan 2007 20:34:53 -0000 1.1 --- 05-Plan.pl 25 Jan 2007 20:57:31 -0000 1.2 *************** *** 6,10 **** require "libtest.pl"; ! use Test::Simple tests => 109; my $sys; --- 6,10 ---- require "libtest.pl"; ! use Test::Simple tests => 123; my $sys; *************** *** 87,93 **** --- 87,99 ---- ok($P->nextIteration(1) == ($last!=($it+1)), "nextIteration() is correct"); $it++; + ok($P->currentIteration() == $it, "currentIteration() is correct"); } } } + ok($P->nextIteration(0) == 0); + + my $x = `cat $top_srcdir/reference/plan.xml`; + chomp($x); + ok($P->XML()->str() eq $x, "$top_srcdir/reference/plan.xml matches"); } |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:57:11
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26609 Modified Files: Plan.cpp Plan.h Log Message: XML() method added. Index: Plan.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Plan.h 25 Jan 2007 20:36:50 -0000 1.1 --- Plan.h 25 Jan 2007 20:57:02 -0000 1.2 *************** *** 50,53 **** --- 50,54 ---- virtual int nextIteration(int simule = 0); + class XMLNode *XML(void); virtual int store(void); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Plan.cpp 25 Jan 2007 20:36:50 -0000 1.1 --- Plan.cpp 25 Jan 2007 20:57:02 -0000 1.2 *************** *** 186,190 **** } ! int Plan::store(void) { XMLNode *root = new CBM::XMLNode("plan"); --- 186,190 ---- } ! CBM::XMLNode *Plan::XML(void) { XMLNode *root = new CBM::XMLNode("plan"); *************** *** 233,239 **** --- 233,246 ---- } + R->add(I); sprintf(c, "%d", currentIteration()); str=c; I->addAttribute("index", str); + return(root); + } + + int Plan::store(void) + { + XMLNode *root = XML(); cbmSystem->Config()->setPlan(root); |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:40:23
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20339 Modified Files: configure.in Log Message: libcompbenchmark/Plan/ added. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** configure.in 22 Jan 2007 18:18:39 -0000 1.22 --- configure.in 25 Jan 2007 20:40:15 -0000 1.23 *************** *** 264,267 **** --- 264,268 ---- libcompbenchmarks/Compiler/Compiler-GCC/Makefile libcompbenchmarks/Compiler/Makefile + libcompbenchmarks/Plan/Makefile libcompbenchmarks/Makefile libcompbenchmarks/Benchmark/Makefile |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:39:32
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20175 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Makefile.am Log Message: Interface to CBM::Plan added. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CBM.pm 25 Jan 2007 15:42:55 -0000 1.15 --- CBM.pm 25 Jan 2007 20:39:25 -0000 1.16 *************** *** 187,190 **** --- 187,191 ---- *setValue = *CBMc::XMLAttribute_setValue; *append = *CBMc::XMLAttribute_append; + *setParent = *CBMc::XMLAttribute_setParent; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 224,233 **** } *Name = *CBMc::XMLNode_Name; *Value = *CBMc::XMLNode_Value; *setValue = *CBMc::XMLNode_setValue; *append = *CBMc::XMLNode_append; ! *childNumber = *CBMc::XMLNode_childNumber; ! *getChild = *CBMc::XMLNode_getChild; *attributeNumber = *CBMc::XMLNode_attributeNumber; *getAttribute = *CBMc::XMLNode_getAttribute; --- 225,235 ---- } + *unreference = *CBMc::XMLNode_unreference; *Name = *CBMc::XMLNode_Name; *Value = *CBMc::XMLNode_Value; *setValue = *CBMc::XMLNode_setValue; *append = *CBMc::XMLNode_append; ! *nodeNumber = *CBMc::XMLNode_nodeNumber; ! *getNode = *CBMc::XMLNode_getNode; *attributeNumber = *CBMc::XMLNode_attributeNumber; *getAttribute = *CBMc::XMLNode_getAttribute; *************** *** 320,324 **** --- 322,328 ---- *Path = *CBMc::Config_Path; *str = *CBMc::Config_str; + *setPlan = *CBMc::Config_setPlan; *Changes = *CBMc::Config_Changes; + *ignoreChanges = *CBMc::Config_ignoreChanges; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 483,486 **** --- 487,542 ---- + ############# Class : CBM::Plan ############## + + package CBM::Plan; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_Plan(@_); + bless $self, $pkg if defined($self); + } + + *add = *CBMc::Plan_add; + *remove = *CBMc::Plan_remove; + *compilerNumber = *CBMc::Plan_compilerNumber; + *compilerOptionNumber = *CBMc::Plan_compilerOptionNumber; + *benchmarkNumber = *CBMc::Plan_benchmarkNumber; + *getCompiler = *CBMc::Plan_getCompiler; + *getCompilerOptions = *CBMc::Plan_getCompilerOptions; + *getBenchmark = *CBMc::Plan_getBenchmark; + *totalIterations = *CBMc::Plan_totalIterations; + *currentIteration = *CBMc::Plan_currentIteration; + *currentCompiler = *CBMc::Plan_currentCompiler; + *currentCompilerOptions = *CBMc::Plan_currentCompilerOptions; + *currentBenchmark = *CBMc::Plan_currentBenchmark; + *nextIteration = *CBMc::Plan_nextIteration; + *store = *CBMc::Plan_store; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_Plan($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + # ------- VARIABLE STUBS -------- *************** *** 500,502 **** --- 556,559 ---- $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::System; + *CBM_PLAN = *CBMc::CBM_PLAN; 1; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CBM_wrap.cxx 25 Jan 2007 15:42:55 -0000 1.15 --- CBM_wrap.cxx 25 Jan 2007 20:39:25 -0000 1.16 *************** *** 1433,1448 **** #define SWIGTYPE_p_CBM__Config swig_types[4] #define SWIGTYPE_p_CBM__Package swig_types[5] ! #define SWIGTYPE_p_CBM__System swig_types[6] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[7] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[8] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[9] ! #define SWIGTYPE_p_Compiler swig_types[10] ! #define SWIGTYPE_p_CompilerOptions swig_types[11] ! #define SWIGTYPE_p_char swig_types[12] ! #define SWIGTYPE_p_std__string swig_types[13] [...1515 lines suppressed...] + {"CBMc::Plan_currentCompilerOptions", _wrap_Plan_currentCompilerOptions}, + {"CBMc::Plan_currentBenchmark", _wrap_Plan_currentBenchmark}, + {"CBMc::Plan_nextIteration", _wrap_Plan_nextIteration}, + {"CBMc::Plan_store", _wrap_Plan_store}, + {"CBMc::delete_Plan", _wrap_delete_Plan}, {"CBMc::Init", _wrap_Init}, {"CBMc::stringref", _wrap_stringref}, *************** *** 9241,9244 **** --- 10415,10424 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__Compiler, (void*) "CBM::Compiler"); SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerSelector, (void*) "CBM::CompilerSelector"); + /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "CBM_PLAN", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__Plan, (void*) "CBM::Plan"); ST(0) = &PL_sv_yes; XSRETURN(1); Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 24 Jan 2007 20:29:18 -0000 1.11 --- Makefile.am 25 Jan 2007 20:39:25 -0000 1.12 *************** *** 22,25 **** --- 22,26 ---- $(top_srcdir)/libcompbenchmarks/Base/XMLReader.h \ $(top_srcdir)/libcompbenchmarks/Base/Config.h \ + $(top_srcdir)/libcompbenchmarks/Plan/Plan.h \ $(top_srcdir)/CBM-PI/Glue.h Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CBM.i 24 Jan 2007 19:33:41 -0000 1.8 --- CBM.i 25 Jan 2007 20:39:25 -0000 1.9 *************** *** 12,15 **** --- 12,16 ---- #include "Base/XMLReader.h" #include "Base/Config.h" + #include "Plan/Plan.h" using namespace CBM; %} *************** *** 23,25 **** --- 24,27 ---- %include "System/System.h" %include "Compiler/Compiler.h" + %include "Plan/Plan.h" %include "Glue.h" \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:38:20
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19786 Modified Files: Compiler-Options.cpp Compiler-Options.h Log Message: Interface and behaviour changed. Index: Compiler-Options.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler-Options.h 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler-Options.h 25 Jan 2007 20:38:15 -0000 1.2 *************** *** 13,18 **** namespace CBM { - class CBMCompiler; - /** \brief Abstraction layer for handling compilers' options. * --- 13,16 ---- *************** *** 30,51 **** std::string options; - /** Stores compiler using options. Initialised by constructor. - * \sa Compiler() - */ - class Compiler *compiler; - protected: public: /** Constructor - \param _compiler Compiler object related to given options \param _options Options to manage in current object. */ ! CompilerOptions(class Compiler *_compiler, ! char *_options); ! ! /** Retrives compiler ! \return Compiler instance declared in constructor */ ! virtual class Compiler *Compiler(void); /** Retrives options --- 28,38 ---- std::string options; protected: public: /** Constructor \param _options Options to manage in current object. */ ! CompilerOptions(std::string _options); /** Retrives options Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Compiler-Options.cpp 22 Jan 2007 18:24:21 -0000 1.1 --- Compiler-Options.cpp 25 Jan 2007 20:38:15 -0000 1.2 *************** *** 8,27 **** #include <Compiler/Compiler-Options.h> - #include <Compiler/Compiler.h> using namespace CBM; ! CompilerOptions::CompilerOptions(CBM::Compiler *_compiler, ! char *_options) { - compiler=_compiler; options=_options; } - Compiler *CompilerOptions::Compiler(void) - { - return(compiler); - } - std::string CompilerOptions::Options(void) { --- 8,19 ---- #include <Compiler/Compiler-Options.h> using namespace CBM; ! CompilerOptions::CompilerOptions(std::string _options) { options=_options; } std::string CompilerOptions::Options(void) { |
|
From: Frederic T. <xf...@us...> - 2007-01-25 20:37:58
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19431 Modified Files: Config.cpp Config.h Log Message: setPlan() interface and behaviour changed. Index: Config.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Config.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.h 25 Jan 2007 17:04:40 -0000 1.4 --- Config.h 25 Jan 2007 20:37:55 -0000 1.5 *************** *** 64,68 **** virtual std::string str(void); ! virtual void setPlan(class Plan *plan); virtual int Changes(void); --- 64,68 ---- virtual std::string str(void); ! virtual void setPlan(XMLNode *_plan); virtual int Changes(void); Index: Config.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Config.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Config.cpp 25 Jan 2007 17:38:46 -0000 1.7 --- Config.cpp 25 Jan 2007 20:37:55 -0000 1.8 *************** *** 355,360 **** } ! void Config::setPlan(CBM::Plan *plan) { } --- 355,362 ---- } ! void Config::setPlan(CBM::XMLNode *_plan) { + delete(plan); + root->add(_plan); } |
