compbench-devel Mailing List for CompBenchmarks (Page 33)
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-11 20:35:07
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25824 Modified Files: System.cpp Log Message: Timeout used on wget. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** System.cpp 10 Jan 2007 18:04:59 -0000 1.17 --- System.cpp 11 Jan 2007 20:34:56 -0000 1.18 *************** *** 88,92 **** */ std::string cmd = CBM_PROG_WGET; ! cmd+=" -t1 -q "; cmd+=url; cmd+=" -O "; --- 88,92 ---- */ std::string cmd = CBM_PROG_WGET; ! cmd+=" --timeout=60 -t1 -q "; cmd+=url; cmd+=" -O "; |
|
From: Frederic T. <xf...@us...> - 2007-01-11 20:33:34
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25361 Modified Files: Benchmark-LINPACKC.cpp Log Message: English correctness. Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Benchmark-LINPACKC.cpp 11 Jan 2007 20:19:16 -0000 1.5 --- Benchmark-LINPACKC.cpp 11 Jan 2007 20:33:29 -0000 1.6 *************** *** 39,43 **** std::string CBMPackageLINPACKC::packageComments(void) { ! return("Official linpackc benchmark translated to C by Bonnie Toy, modified to suit compbenchmarks requierements."); } --- 39,43 ---- std::string CBMPackageLINPACKC::packageComments(void) { ! return("The former linpackc benchmark translated to C by Bonnie Toy has modified to suit compbenchmarks requirements."); } |
|
From: Frederic T. <xf...@us...> - 2007-01-11 20:19:30
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20055 Modified Files: Benchmark-LINPACKC.cpp Log Message: Package version fixed. Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-LINPACKC.cpp 11 Jan 2007 20:09:54 -0000 1.4 --- Benchmark-LINPACKC.cpp 11 Jan 2007 20:19:16 -0000 1.5 *************** *** 28,32 **** std::string CBMPackageLINPACKC::packageVersion(void) { ! return("0.1.0"); } --- 28,32 ---- std::string CBMPackageLINPACKC::packageVersion(void) { ! return("0.1.1"); } |
|
From: Frederic T. <xf...@us...> - 2007-01-11 20:14:09
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17876 Modified Files: Benchmark-LINPACKC.h Log Message: Obsolete methods removed. Index: Benchmark-LINPACKC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-LINPACKC.h 11 Jan 2007 19:59:35 -0000 1.4 --- Benchmark-LINPACKC.h 11 Jan 2007 20:14:06 -0000 1.5 *************** *** 56,61 **** CBMBenchmarkLINPACKC(CBMPackage *_package); virtual std::string benchmarkComments(void); - virtual std::string linpackPrecisionFlags(void) = 0; - virtual std::string linpackRollFlags(void) = 0; virtual std::string benchmarkLINPACKCComments(void) = 0; --- 56,59 ---- *************** *** 71,78 **** private: protected: - virtual std::string linpackPrecisionFlags(void); - virtual std::string linpackRollFlags(void); - - virtual std::string benchmarkLINPACKCComments(void); --- 69,72 ---- *************** *** 92,99 **** private: protected: - virtual std::string linpackPrecisionFlags(void); - virtual std::string linpackRollFlags(void); - - virtual std::string benchmarkLINPACKCComments(void); --- 86,89 ---- *************** *** 114,121 **** private: protected: - virtual std::string linpackPrecisionFlags(void); - virtual std::string linpackRollFlags(void); - - virtual std::string benchmarkLINPACKCComments(void); --- 104,107 ---- *************** *** 135,142 **** private: protected: - virtual std::string linpackPrecisionFlags(void); - virtual std::string linpackRollFlags(void); - - virtual std::string benchmarkLINPACKCComments(void); --- 121,124 ---- |
|
From: Frederic T. <xf...@us...> - 2007-01-11 20:13:10
|
Update of /cvsroot/compbench/CompBenchmarks++/share/patches In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17439 Modified Files: Makefile.am Removed Files: linpackc.patch.gz Log Message: New tarball referenced for linpackc package : related patch obsoleted. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/share/patches/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 12 Dec 2006 19:52:16 -0000 1.7 --- Makefile.am 11 Jan 2007 20:12:53 -0000 1.8 *************** *** 1,3 **** ! data_DATA = scimark2.patch.gz benchpp.patch.gz linpackc.patch.gz datarootdir=@datarootdir@/compbenchmarks/@VERSION@/patches --- 1,3 ---- ! data_DATA = scimark2.patch.gz benchpp.patch.gz datarootdir=@datarootdir@/compbenchmarks/@VERSION@/patches --- linpackc.patch.gz DELETED --- |
|
From: Frederic T. <xf...@us...> - 2007-01-11 20:11:47
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17039 Modified Files: Makefile.am Log Message: Obsolete definitions removed. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 11 Jan 2007 19:56:10 -0000 1.2 --- Makefile.am 11 Jan 2007 20:11:38 -0000 1.3 *************** *** 41,46 **** libcompbenchmarks_bm_linpackc_la_SOURCES = Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h - # libBenchmark_la_LIBADD = Compiler/libBenchmarkCompiler.la - INCLUDES = -I $(top_srcdir) --- 41,44 ---- |
|
From: Frederic T. <xf...@us...> - 2007-01-11 20:10:01
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16251 Modified Files: Benchmark-LINPACKC.cpp Log Message: Uses CBMPackageAutotools. New tarball referenced. Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-LINPACKC.cpp 3 Jan 2007 22:06:27 -0000 1.3 --- Benchmark-LINPACKC.cpp 11 Jan 2007 20:09:54 -0000 1.4 *************** *** 5,12 **** #include <SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h> - // !!! CBMPackageLINPACKC::CBMPackageLINPACKC(CBMSystem *_system) ! : CBMPackage(_system) { } --- 5,11 ---- #include <SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h> CBMPackageLINPACKC::CBMPackageLINPACKC(CBMSystem *_system) ! : CBMPackageAutotools(_system) { } *************** *** 14,23 **** std::string CBMPackageLINPACKC::downloadURL(void) { ! return("http://www.netlib.org/benchmark/linpackc"); } std::string CBMPackageLINPACKC::expectedMD5(void) { ! return("f6e06f98fdbf7e39f84aa9e6c04de131"); } --- 13,22 ---- std::string CBMPackageLINPACKC::downloadURL(void) { ! return("http://downloads.sourceforge.net/compbench/cbm-bm-linpackc-0.1.1.tar.gz"); } std::string CBMPackageLINPACKC::expectedMD5(void) { ! return("0fe702b78af01716a0ed1b3f5d05ac89"); } *************** *** 29,65 **** std::string CBMPackageLINPACKC::packageVersion(void) { ! return("02-25-1994"); } int CBMPackageLINPACKC::packageSize(void) { ! return(907); ! } ! ! int CBMPackageLINPACKC::ContextMatches(CBMCompiler *_currentCompiler, ! CBMCompilerOptions *_currentOptions) ! { ! std::string localFlags; ! std::string previousFlags; ! ! int r = CBMPackage::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); ! } } --- 28,37 ---- std::string CBMPackageLINPACKC::packageVersion(void) { ! return("0.1.0"); } int CBMPackageLINPACKC::packageSize(void) { ! return(75029); } *************** *** 67,76 **** std::string CBMPackageLINPACKC::packageComments(void) { ! return("Official linpackc benchmark translated to C by Bonnie Toy. A minor patch is applied."); } std::string CBMPackageLINPACKC::localPackageName(void) { ! return("linpackc.c"); } --- 39,48 ---- std::string CBMPackageLINPACKC::packageComments(void) { ! return("Official linpackc benchmark translated to C by Bonnie Toy, modified to suit compbenchmarks requierements."); } std::string CBMPackageLINPACKC::localPackageName(void) { ! return("cbm-bm-linpackc"); } *************** *** 82,86 **** char* CBMPackageLINPACKC::extractDirectory(void) { ! std::string dum = "linpackc-"; dum+=packageVersion(); --- 54,58 ---- char* CBMPackageLINPACKC::extractDirectory(void) { ! std::string dum = "cbm-bm-linpackc-"; dum+=packageVersion(); *************** *** 88,147 **** } - int CBMPackageLINPACKC::hasPatch(void) - { - return(1); - } - - int CBMPackageLINPACKC::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 CBMPackageLINPACKC::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 CBMPackageLINPACKC::preConfigure(int _force) { --- 60,63 ---- *************** *** 149,224 **** } - int CBMPackageLINPACKC::configure(CBMCompiler *_currentCompiler, - CBMCompilerOptions *_currentOptions) - { - return(1); - } - - int CBMPackageLINPACKC::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); - } - - int CBMPackageLINPACKC::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 CBMPackageLINPACKC::license(void) { --- 65,68 ---- *************** *** 256,261 **** std::string comment; ! comment="linpackc benchmark with specific compilation options :"; comment+=benchmarkLINPACKCComments(); return(comment); } --- 100,106 ---- std::string comment; ! comment="linpackc benchmark using "; comment+=benchmarkLINPACKCComments(); + comment+="."; return(comment); } *************** *** 269,273 **** cmd="cd "; cmd+=package->localPackageAbsoluteDirectory(); ! cmd+=" && echo $(./linpackc 2>&1 | "; cmd+=CBM_PROG_GREP; cmd+=" 'Kflops' | "; --- 114,121 ---- cmd="cd "; cmd+=package->localPackageAbsoluteDirectory(); ! cmd+=" && echo $("; ! cmd+="./"; ! cmd+=benchmarkName(); ! cmd+=" 2>&1 | "; cmd+=CBM_PROG_GREP; cmd+=" 'Kflops' | "; *************** *** 297,315 **** } - 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); } --- 145,151 ---- } std::string CBMBenchmarkLINPACKC_SP_UNROLL::benchmarkLINPACKCComments(void) { ! std::string dum = "single precision and unrolled version (which may ease compiler's optimisation)"; return(dum); } *************** *** 329,347 **** } - 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); } --- 165,171 ---- } std::string CBMBenchmarkLINPACKC_SP_ROLL::benchmarkLINPACKCComments(void) { ! std::string dum = "single precision and rolled version selected (matrix operations are given in a straightforward way, which may makes compiler's optimisation job more difficult)."; return(dum); } *************** *** 361,379 **** } - 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); } --- 185,191 ---- } std::string CBMBenchmarkLINPACKC_DP_UNROLL::benchmarkLINPACKCComments(void) { ! std::string dum = "double precision and unrolled version, which may ease compiler's optimisation"; return(dum); } *************** *** 392,411 **** } - - 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); } --- 204,210 ---- } std::string CBMBenchmarkLINPACKC_DP_ROLL::benchmarkLINPACKCComments(void) { ! std::string dum = "double precision and version (matrix operations are given in a straightforward way, which may makes compiler's optimisation job more difficult)."; return(dum); } |
|
From: Frederic T. <xf...@us...> - 2007-01-11 19:59:43
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12507 Modified Files: Benchmark-LINPACKC.h Log Message: Uses CBMPackageAutotools. Index: Benchmark-LINPACKC.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-LINPACKC.h 3 Jan 2007 22:06:27 -0000 1.3 --- Benchmark-LINPACKC.h 11 Jan 2007 19:59:35 -0000 1.4 *************** *** 10,19 **** #define H_CBMBENCHMARKLINPACKC ! #include <Benchmark/Benchmark.h> #include <Benchmark/Package.h> /** \brief Defines the linpackc package. */ ! class CBMPackageLINPACKC : public CBMPackage { public: --- 10,19 ---- #define H_CBMBENCHMARKLINPACKC ! #include <Benchmark/Benchmark-Autotools.h> #include <Benchmark/Package.h> /** \brief Defines the linpackc package. */ ! class CBMPackageLINPACKC : public CBMPackageAutotools { public: *************** *** 27,40 **** virtual int packageSize(void); /* in bytes */ - /** Compairs previous compilation context to current one. Local options - * are also taken in context. - * \return 1 if they match. - * \sa contextID() - * \sa storeContext() - * \sa Make() - */ - virtual int ContextMatches(CBMCompiler *_currentCompiler, - CBMCompilerOptions *_currentOptions); - virtual std::string packageComments(void); virtual std::string localPackageName(void); --- 27,30 ---- *************** *** 43,59 **** protected: virtual std::string language(void); - virtual char* extractDirectory(void); - virtual int hasPatch(void); - virtual int patch(int _force = 0); - - - virtual int extract(int _force = 0); virtual int preConfigure(int _force); - virtual int configure(CBMCompiler *_currentCompiler, - CBMCompilerOptions *_currentOptions); - - virtual int make(void); - virtual int release(void); public: --- 33,39 ---- protected: virtual std::string language(void); + virtual char *extractDirectory(void); virtual int preConfigure(int _force); public: |
|
From: Frederic T. <xf...@us...> - 2007-01-11 19:57:23
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11724 Modified Files: Benchmark-LINPACKC.libwrapper.h Log Message: Improvements and adapations for CBMPackage and new related API usage. Index: Benchmark-LINPACKC.libwrapper.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-LINPACKC.libwrapper.h 3 Jan 2007 22:06:27 -0000 1.2 --- Benchmark-LINPACKC.libwrapper.h 11 Jan 2007 19:57:14 -0000 1.3 *************** *** 1,3 **** --- 1,4 ---- #include <Benchmark/Benchmark-DLLoader.h> + #include <UI/UI.h> BenchmarkVector& CBMPackageLINPACKC::Benchmarks(void) { *************** *** 10,13 **** --- 11,31 ---- } + CBMBenchmark *CBMPackageLINPACKC::Benchmark(std::string bid) { + if (bid == "linpackc-sp-unroll") { + return(new CBMBenchmarkLINPACKC_SP_UNROLL(this)); + } + if (bid == "linpackc-dp-roll") { + return(new CBMBenchmarkLINPACKC_DP_ROLL(this)); + } + if (bid == "linpackc-dp-unroll") { + return(new CBMBenchmarkLINPACKC_DP_UNROLL(this)); + } + if (bid == "linpackc-sp-roll") { + return(new CBMBenchmarkLINPACKC_SP_ROLL(this)); + } + UI->Fatal("Unknown benchmark"); + return(0); + } + CBMPackage *package_LINPACKC = 0; CBMPackage *cbmlib_getPackage(void) { |
|
From: Frederic T. <xf...@us...> - 2007-01-11 19:56:18
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11344 Modified Files: Makefile.am Log Message: Benchmark/package wrapper script rewritten in Perl. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 Dec 2006 17:41:05 -0000 1.1 --- Makefile.am 11 Jan 2007 19:56:10 -0000 1.2 *************** *** 45,52 **** INCLUDES = -I $(top_srcdir) ! CBM_GENLIBWRAPPER = $(top_srcdir)/SupportedBenchmarks/benchmarks-genlibwrapper.sh ! EXTRA_DIST = benchmarks-genlibwrapper.sh benchmarks.list %.libwraXpper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER) --- 45,52 ---- INCLUDES = -I $(top_srcdir) ! CBM_GENLIBWRAPPER = $(top_srcdir)/SupportedBenchmarks/benchmarks-genlibwrapper.pl ! EXTRA_DIST = benchmarks-genlibwrapper.pl benchmarks.list %.libwraXpper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER) |
|
From: Frederic T. <xf...@us...> - 2007-01-11 19:55:18
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10956 Modified Files: benchmarks.list Log Message: Comments changed. Index: benchmarks.list =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/benchmarks.list,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** benchmarks.list 28 Dec 2006 17:41:04 -0000 1.1 --- benchmarks.list 11 Jan 2007 19:55:13 -0000 1.2 *************** *** 1,9 **** # $Id$ # Format : ! # internalName:includePostfix:objectPostfix ! gzip-1c:GZIP:GZIP1 ! gzip-9c:GZIP:GZIP9 bzip2-1c:BZIP2:BZIP21 bzip2-9c:BZIP2:BZIP29 nbench-numsort:NBENCH:NBENCH_NUMSORT nbench-stringsort:NBENCH:NBENCH_STRINGSORT --- 1,9 ---- # $Id$ # Format : ! # internalName:packagePostfix:benchmarkPostfix bzip2-1c:BZIP2:BZIP21 bzip2-9c:BZIP2:BZIP29 + gzip-1c:GZIP:GZIP1 + gzip-9c:GZIP:GZIP9 nbench-numsort:NBENCH:NBENCH_NUMSORT nbench-stringsort:NBENCH:NBENCH_STRINGSORT |
|
From: Frederic T. <xf...@us...> - 2007-01-11 18:07:38
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2427 Modified Files: Makefile.am Log Message: Fixes for make dist and make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/reference/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 Dec 2006 18:10:52 -0000 1.1 --- Makefile.am 11 Jan 2007 18:07:29 -0000 1.2 *************** *** 1 **** ! data_DATA = CBMSystem-copy.data compiler-fake-g++-4.1.1-13 compiler-fake-gcc-4.1.1-13 compiler-fake-tcc-0.9.23 \ 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 \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-01-11 18:07:27
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2411 Modified Files: Makefile.am Log Message: Fixes for make dist and make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 28 Dec 2006 18:51:42 -0000 1.1 --- Makefile.am 11 Jan 2007 18:07:15 -0000 1.2 *************** *** 1 **** ! data_DATA = libtest.pl \ No newline at end of file --- 1 ---- ! dist_noinst_DATA = libtest.pl \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-01-11 17:34:35
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22084 Modified Files: Makefile.am Log Message: Fixes for make dist and make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 4 Jan 2007 19:46:10 -0000 1.5 --- Makefile.am 11 Jan 2007 17:34:27 -0000 1.6 *************** *** 12,16 **** $(top_srcdir)/CBM-PI/t/03-CBMCompilerSelector-public.pl ! data_DATA = $(prog_tests) test: --- 12,16 ---- $(top_srcdir)/CBM-PI/t/03-CBMCompilerSelector-public.pl ! dist_noinst_DATA = $(prog_tests) test: |
|
From: Frederic T. <xf...@us...> - 2007-01-11 17:34:19
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22046 Modified Files: Makefile.am Log Message: Fixes for make dist and make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 28 Dec 2006 18:38:13 -0000 1.3 --- Makefile.am 11 Jan 2007 17:34:15 -0000 1.4 *************** *** 3,7 **** # LDFLAGS = -L../testing/.libs -lcompbenchmarks PERL = @CBM_PROG_PERL@ ! data_DATA = $(top_srcdir)/CBM-PI/CBM.pm Glue.o: $(top_srcdir)/CBM-PI/Glue.cpp --- 3,13 ---- # LDFLAGS = -L../testing/.libs -lcompbenchmarks PERL = @CBM_PROG_PERL@ ! # data_DATA = $(top_srcdir)/CBM-PI/CBM.pm ! ! EXTRA_DIST = CBM.pm ! ! inst_pkgdata_DATA = CBM.so $(top_srcdir)/CBM-PI/CBM.pm ! ! inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl Glue.o: $(top_srcdir)/CBM-PI/Glue.cpp |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:32:37
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28030 Modified Files: libcompbenchmarks.cpp libcompbenchmarks.h Log Message: UI_fatal introduced. Index: libcompbenchmarks.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libcompbenchmarks.h 28 Dec 2006 13:22:15 -0000 1.2 --- libcompbenchmarks.h 10 Jan 2007 20:32:31 -0000 1.3 *************** *** 42,45 **** --- 42,49 ---- extern int UO_verbose; + /** Enable exits on fatal error. + * Set to 1 in Perl wrapper; defaults to 0. */ + extern int UO_fatal; + #endif Index: libcompbenchmarks.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libcompbenchmarks.cpp 28 Dec 2006 13:22:15 -0000 1.2 --- libcompbenchmarks.cpp 10 Jan 2007 20:32:31 -0000 1.3 *************** *** 6,10 **** int UO_force = 0; int UO_verbose = 1; ! void setVerbosity(int v) --- 6,10 ---- int UO_force = 0; int UO_verbose = 1; ! int UO_fatal = 1; void setVerbosity(int v) |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:31:50
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27658 Modified Files: cloptions.cpp Log Message: Improvements and adapations for CBMPackage and new related API usage. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cloptions.cpp 23 Nov 2006 16:40:49 -0000 1.11 --- cloptions.cpp 10 Jan 2007 20:31:44 -0000 1.12 *************** *** 1,4 **** #include <cloptions.h> ! #include <Benchmark/Benchmark-Selector.h> #include <Compiler/Compiler.h> #include <System/System.h> --- 1,6 ---- #include <cloptions.h> ! #include <Benchmark/Package.h> ! #include <Benchmark/Benchmark.h> ! // #include <Benchmark/Benchmark-Selector.h> #include <Compiler/Compiler.h> #include <System/System.h> *************** *** 16,19 **** --- 18,48 ---- int parseExitValue = -1; + void cbmOptionsDisplayBenchmarks(CBMPackage *P) + { + CBMBenchmark *B; + int i; + int n = P->benchmarkNumber(); + + for(i=0; i<n; i++) { + B=P->Benchmark(i); + B->display(); + } + } + + void cbmOptionsDisplayAllBenchmarks(void) + { + CBMPackage *P; + int i; + int n = cbmSystem->packageNumber(); + + printf("n=%d\n", n); + for(i=0; i<n; i++) { + P=cbmSystem->Package(i); + printf("%d => %x\n", i, P); + P->display(); + cbmOptionsDisplayBenchmarks(P); + } + } + void cbmOptionsHelp(void) { *************** *** 55,61 **** } CBMBenchmark *cbmOptionsExpectBenchmark(char *optarg) { - CBMBenchmarkSelector SB(cbmSystem); CBMBenchmark *B = 0; std::string bench; --- 84,94 ---- } + void cbmUnknownPackage(char *pack) + { + std::cerr << "Unknow package '" << pack << "'" << std::endl; + } + CBMBenchmark *cbmOptionsExpectBenchmark(char *optarg) { CBMBenchmark *B = 0; std::string bench; *************** *** 68,72 **** bench=optarg; ! B=SB.select((char*) bench.c_str()); if (!B) { cbmUnknownBenchmark((char*) bench.c_str()); --- 101,105 ---- bench=optarg; ! B=cbmSystem->Benchmark(bench); if (!B) { cbmUnknownBenchmark((char*) bench.c_str()); *************** *** 77,87 **** } int cbmOptionsParse(int argc, char *argv[]) { int c; int context; ! CBMBenchmark::Status status; ! CBMBenchmarkSelector SB(cbmSystem); CBMBenchmark *B = 0; --- 110,142 ---- } + + CBMPackage *cbmOptionsExpectPackage(char *optarg) + { + CBMPackage *P = 0; + std::string pack; + + if (!optarg) { + std::cerr << "package missing in argument line" << std::endl; + parseExitValue=1; + return(0); + } + + pack=optarg; + P=cbmSystem->Package(pack); + if (!P) { + cbmUnknownPackage((char*) pack.c_str()); + parseExitValue=1; + return(0); + } + return(P); + } + int cbmOptionsParse(int argc, char *argv[]) { int c; int context; ! CBMPackage::Status status; ! CBMPackage *P = 0; CBMBenchmark *B = 0; *************** *** 140,154 **** break; case 'i': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) ! parseExitValue=B->Install(UO_force); break; case 'u': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) ! parseExitValue=B->Uninstall(); break; case 'L': ! SB.displayList(); parseExitValue=0; break; --- 195,209 ---- break; case 'i': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=P->Install(UO_force); break; case 'u': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=P->Uninstall(); break; case 'L': ! cbmOptionsDisplayAllBenchmarks(); parseExitValue=0; break; *************** *** 183,191 **** break; case 'f': ! B=cbmOptionsExpectBenchmark(optarg); ! if (!B) break; if (optind<=argc) { ! B->Fetch(argv[optind-1], UO_force); } else { std::cerr << "tarball missing in argument line" << std::endl; --- 238,246 ---- break; case 'f': ! P=cbmOptionsExpectPackage(optarg); ! if (!P) break; if (optind<=argc) { ! P->Fetch(argv[optind-1], UO_force); } else { std::cerr << "tarball missing in argument line" << std::endl; *************** *** 195,202 **** break; case 'D': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) { ! if (B->downloadURL()!="") { ! parseExitValue=!B->Download(); } else { UI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); --- 250,257 ---- break; case 'D': ! P=cbmOptionsExpectPackage(optarg); ! if (P) { ! if (P->downloadURL()!="") { ! parseExitValue=!P->Download(); } else { UI->Fatal("Package is not known to be hosted anymore on the Internet. Use --fetch option"); *************** *** 205,236 **** break; case 'E': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) ! parseExitValue=!B->Extract(UO_force); break; case 'p': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) ! parseExitValue=!B->Patch(UO_force); break; case 'g': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) ! parseExitValue=!B->PreConfigure(UO_force); break; case 't': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) { if (!UO_enableTestSuite) { UI->Fatal("Incompatible options : --test and --disable-testsuite"); } } ! if (B) ! parseExitValue=!B->Test(UO_force); break; case 'r': ! B=cbmOptionsExpectBenchmark(optarg); ! if (B) ! parseExitValue=!B->Release(); break; case 'B': --- 260,291 ---- break; case 'E': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=!P->Extract(UO_force); break; case 'p': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=!P->Patch(UO_force); break; case 'g': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=!P->PreConfigure(UO_force); break; case 't': ! P=cbmOptionsExpectPackage(optarg); ! if (P) { if (!UO_enableTestSuite) { UI->Fatal("Incompatible options : --test and --disable-testsuite"); } } ! if (P) ! parseExitValue=!P->Test(UO_force); break; case 'r': ! P=cbmOptionsExpectPackage(optarg); ! if (P) ! parseExitValue=!P->Release(); break; case 'B': *************** *** 261,281 **** O=new CBMCompilerOptions(C, (char*) options.c_str()); ! ! if (B->getStatus()<CBMBenchmark::Preconfigured) { ! std::cerr << "Benchmark not properly installed" << std::endl; parseExitValue=1; break; } ! context=B->ContextMatches(C, O); ! status=B->getStatus(); ! if ((status>=CBMBenchmark::Configured) && (!context)) { ! B->Release(); } if (!context) { ! B->Configure(C, O); ! B->Make(UO_force); ! B->Test(UO_force); } B->Bench(); --- 316,336 ---- O=new CBMCompilerOptions(C, (char*) options.c_str()); ! P=B->Package(); ! if (P->getStatus()<CBMPackage::Preconfigured) { ! std::cerr << "Package not properly installed" << std::endl; parseExitValue=1; break; } ! context=P->ContextMatches(C, O); ! status=P->getStatus(); ! if ((status>=CBMPackage::Configured) && (!context)) { ! P->Release(); } if (!context) { ! P->Configure(C, O); ! P->Make(UO_force); ! P->Test(UO_force); } B->Bench(); |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:31:00
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27241 Modified Files: Benchmark-BENCHPPLINUX.cpp Log Message: Minor changes in comments; License fixed. Index: Benchmark-BENCHPPLINUX.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPPLINUX.cpp 3 Jan 2007 22:06:26 -0000 1.4 --- Benchmark-BENCHPPLINUX.cpp 10 Jan 2007 20:30:57 -0000 1.5 *************** *** 50,54 **** std::string CBMPackageBENCHPPLINUX::packageComments(void) { ! return("Bench++ for Linux was initially a port of Bench++ (based on" \ "ADA PIWG suite) to Linux."); } --- 50,54 ---- std::string CBMPackageBENCHPPLINUX::packageComments(void) { ! return("Bench++ for Linux was initially a port of Bench++ (based on " \ "ADA PIWG suite) to Linux."); } *************** *** 155,159 **** std::string CBMPackageBENCHPPLINUX::license(void) { ! return("Public domain"); } --- 155,159 ---- std::string CBMPackageBENCHPPLINUX::license(void) { ! return("GPL v2"); } |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:28:54
|
Update of /cvsroot/compbench/CompBenchmarks++/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26437 Modified Files: UI.cpp Log Message: UO_fatal evaluated before throwing exit(); Index: UI.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/UI/UI.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UI.cpp 28 Dec 2006 13:15:48 -0000 1.5 --- UI.cpp 10 Jan 2007 20:28:48 -0000 1.6 *************** *** 17,22 **** { std::cerr << "FATAL ERROR: " << msg << std::endl; ! cbmSystem->done(); ! exit(1); return(1); } --- 17,24 ---- { std::cerr << "FATAL ERROR: " << msg << std::endl; ! if (UO_fatal) { ! cbmSystem->done(); ! exit(1); ! } return(1); } |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:28:04
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26078 Modified Files: Glue.cpp Log Message: UO_fatal set to 0. Index: Glue.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Glue.cpp 4 Jan 2007 19:37:29 -0000 1.3 --- Glue.cpp 10 Jan 2007 20:27:58 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- sys = new CBM_SYSTEM; UO_verbose=0; + UO_fatal=0; sys->init(); return(sys); |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:27:10
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25704 Modified Files: CBM.pm CBM_wrap.cxx Log Message: Many changes in API. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CBM.pm 4 Jan 2007 19:47:11 -0000 1.4 --- CBM.pm 10 Jan 2007 20:27:00 -0000 1.5 *************** *** 201,204 **** --- 201,205 ---- *Tested = *CBMc::CBMPackage_Tested; *Benchmarked = *CBMc::CBMPackage_Benchmarked; + *resetContext = *CBMc::CBMPackage_resetContext; *display = *CBMc::CBMPackage_display; *System = *CBMc::CBMPackage_System; *************** *** 425,428 **** --- 426,430 ---- *UO_force = *CBMc::UO_force; *UO_verbose = *CBMc::UO_verbose; + *UO_fatal = *CBMc::UO_fatal; my %__cbmSystem_hash; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CBM_wrap.cxx 4 Jan 2007 19:47:11 -0000 1.4 --- CBM_wrap.cxx 10 Jan 2007 20:27:00 -0000 1.5 *************** *** 1907,1910 **** --- 1907,1932 ---- + SWIGCLASS_STATIC int _wrap_UO_fatal_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + { + int val; + int res = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(sv, &val); + if (!SWIG_IsOK(res)) { + SWIG_exception_fail(SWIG_ArgError(res), "in variable '""UO_fatal""' of type '""int""'"); + } + UO_fatal = static_cast<int >(val); + } + fail: + return 1; + } + + + SWIGCLASS_STATIC int _wrap_UO_fatal_get(pTHX_ SV *sv, MAGIC *SWIGUNUSEDPARM(mg)) { + MAGIC_PPERL + sv_setsv(sv,SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(UO_fatal))) ; + return 1; + } + + SWIGCLASS_STATIC int _wrap_cbmSystem_set(pTHX_ SV* sv, MAGIC * SWIGUNUSEDPARM(mg)) { MAGIC_PPERL *************** *** 3711,3714 **** --- 3733,3765 ---- + XS(_wrap_CBMPackage_resetContext) { + { + CBMPackage *arg1 = (CBMPackage *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: CBMPackage_resetContext(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBMPackage, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CBMPackage_resetContext" "', argument " "1"" of type '" "CBMPackage *""'"); + } + arg1 = reinterpret_cast<CBMPackage * >(argp1); + result = (int)(arg1)->resetContext(); + + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_CBMPackage_display) { { *************** *** 6470,6473 **** --- 6521,6525 ---- { "CBMc::UO_force", MAGIC_CLASS _wrap_UO_force_set, MAGIC_CLASS _wrap_UO_force_get,0 }, { "CBMc::UO_verbose", MAGIC_CLASS _wrap_UO_verbose_set, MAGIC_CLASS _wrap_UO_verbose_get,0 }, + { "CBMc::UO_fatal", MAGIC_CLASS _wrap_UO_fatal_set, MAGIC_CLASS _wrap_UO_fatal_get,0 }, { "CBMc::cbmSystem", MAGIC_CLASS _wrap_cbmSystem_set, MAGIC_CLASS _wrap_cbmSystem_get,&SWIGTYPE_p_CBMSystem }, {0,0,0,0} *************** *** 6516,6519 **** --- 6568,6572 ---- {"CBMc::CBMSystemLinux_processor_number", _wrap_CBMSystemLinux_processor_number}, {"CBMc::delete_CBMSystemLinux", _wrap_delete_CBMSystemLinux}, + {"CBMc::CBMPackage_resetContext", _wrap_CBMPackage_resetContext}, {"CBMc::CBMPackage_display", _wrap_CBMPackage_display}, {"CBMc::CBMPackage_System", _wrap_CBMPackage_System}, |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:26:37
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25691 Modified Files: Package.cpp Log Message: benchmarkSize() is not pure anymore. Index: Package.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Package.cpp 4 Jan 2007 19:39:52 -0000 1.3 --- Package.cpp 10 Jan 2007 20:26:34 -0000 1.4 *************** *** 132,135 **** --- 132,140 ---- } + int CBMPackage::benchmarkSize(void) + { + return(0); + } + int CBMPackage::hasTest(void) { |
|
From: Frederic T. <xf...@us...> - 2007-01-10 20:26:18
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25587 Modified Files: Package.h Log Message: For Perl API useability : removeContext() is now public benchmarkSize() is not pure anymore. Index: Package.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Package.h 4 Jan 2007 19:39:52 -0000 1.3 --- Package.h 10 Jan 2007 20:26:06 -0000 1.4 *************** *** 70,78 **** virtual int readStatus(void); - /** Remove context. - * \sa storeContext() - */ - virtual int resetContext(void); - protected: /** \sa Benchmarks() */ --- 70,73 ---- *************** *** 169,172 **** --- 164,172 ---- CBMCompilerOptions *_currentOptions); public: + /** Remove context. + * \sa storeContext() + */ + virtual int resetContext(void); + /** Display informations about package */ virtual void display(void); *************** *** 273,277 **** * \sa preConfigure() * \sa packageSize() */ ! virtual int benchmarkSize(void) = 0; /** Compairs previous compilation context to current one --- 273,277 ---- * \sa preConfigure() * \sa packageSize() */ ! virtual int benchmarkSize(void); /** Compairs previous compilation context to current one |
|
From: Frederic T. <xf...@us...> - 2007-01-10 18:05:03
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4723 Modified Files: System.cpp Log Message: Fixes on patch directory checking. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** System.cpp 4 Jan 2007 18:53:05 -0000 1.16 --- System.cpp 10 Jan 2007 18:04:59 -0000 1.17 *************** *** 38,41 **** --- 38,53 ---- } + int CBMSystem::verifyPatchDirectory(std::string dir) + { + std::string fn; + + if (!checkDirectory(dir)) { + return(0); + } + fn+="/scimark2.patch.gz"; + + return(fileExists(fn)); + } + int CBMSystem::CheckDirectory(Temp where) { *************** *** 412,418 **** result+="/"; result+="patches"; ! if (!checkDirectory(result)) { result=getenv("PWD"); result+="/share/patches"; } break; --- 424,434 ---- result+="/"; result+="patches"; ! if (!verifyPatchDirectory(result)) { result=getenv("PWD"); result+="/share/patches"; + if (!verifyPatchDirectory(result)) { + result=getenv("PWD"); + result+="/../share/patches"; + } } break; |
|
From: Frederic T. <xf...@us...> - 2007-01-10 18:04:39
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4706 Modified Files: System.h Log Message: New verifyPatchDirectory() private method. Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** System.h 4 Jan 2007 18:53:05 -0000 1.16 --- System.h 10 Jan 2007 18:04:30 -0000 1.17 *************** *** 43,46 **** --- 43,54 ---- }; + private: + /** Check if the given directory holds patches. + * Check if given arguments holds patches needed by libcompbenchmarks. + * \param dir directory to check + * \return non-null if ok. + */ + virtual int verifyPatchDirectory(std::string dir); + protected: /** \sa Packages() */ |
