compbench-devel Mailing List for CompBenchmarks (Page 41)
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...> - 2006-11-01 10:31:21
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18559 Modified Files: System-Cygwin.cpp Log Message: Split() moved into CBMSystem. Chomp() used. Index: System-Cygwin.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Cygwin.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** System-Cygwin.cpp 26 Sep 2006 16:03:14 -0000 1.2 --- System-Cygwin.cpp 1 Nov 2006 10:31:17 -0000 1.3 *************** *** 19,62 **** } - std::string CBMSystemCygwin::Split(const std::string& str, const std::string& delim, int wantedIndex) - { - unsigned int offset = 0; - unsigned int delimIndex = 0; - unsigned int nowIndex = 0; - - delimIndex = str.find(delim, offset); - - while (delimIndex != std::string::npos) - { - if (wantedIndex==nowIndex) - return(str.substr(offset, delimIndex - offset)); - offset += delimIndex - offset + delim.length(); - delimIndex = str.find(delim, offset); - nowIndex++; - } - if (wantedIndex==nowIndex) - return(str.substr(offset)); - else - return(""); - } - std::string CBMSystemCygwin::processor_name(void) { ! return(Split(cache, "\n", 2)); } std::string CBMSystemCygwin::processor_mhz(void) { ! return(Split(cache, "\n", 0)); } std::string CBMSystemCygwin::processor_cache(void) { ! return(Split(cache, "\n", 1)); } std::string CBMSystemCygwin::processor_number(void) { ! return(Split(cache, "\n", 3)); } --- 19,52 ---- } std::string CBMSystemCygwin::processor_name(void) { ! std::string r = Split(cache, "\n", 2); ! ! Chomp(r); ! return(r); } std::string CBMSystemCygwin::processor_mhz(void) { ! std::string r = Split(cache, "\n", 0); ! ! Chomp(r); ! return(r); } std::string CBMSystemCygwin::processor_cache(void) { ! std::string r = Split(cache, "\n", 1); ! ! Chomp(r); ! return(r); } std::string CBMSystemCygwin::processor_number(void) { ! std::string r = Split(cache, "\n", 3); ! ! Chomp(r); ! return(r); } |
|
From: Frederic T. <xf...@us...> - 2006-11-01 10:30:57
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18150 Modified Files: System-Cygwin.h Log Message: Split() moved into CBMSystem. Index: System-Cygwin.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Cygwin.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** System-Cygwin.h 25 Sep 2006 15:26:39 -0000 1.1 --- System-Cygwin.h 1 Nov 2006 10:30:53 -0000 1.2 *************** *** 21,28 **** private: std::string cache; - - virtual std::string Split(const std::string& str, - const std::string& delim, - int wantedIndex); protected: public: --- 21,24 ---- |
|
From: Frederic T. <xf...@us...> - 2006-11-01 10:29:45
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17750 Modified Files: System.cpp System.h Log Message: New string manipulation methods. Split has been taken from the System-Cygwin object. Chomp() added. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** System.cpp 25 Sep 2006 15:54:25 -0000 1.6 --- System.cpp 1 Nov 2006 10:29:40 -0000 1.7 *************** *** 1,4 **** --- 1,5 ---- #include <System/System.h> #include <System/md5.h> + #include <Benchmark/Benchmark-DLLoader.h> #include <UI/UI.h> *************** *** 103,117 **** } void CBMSystem::display(void) { ! std::cout << "host::arch=" << arch() ! << "host::hostid=" << hostid() ! << "host::hostname=" << hostname() ! << "host::os=" << os() ! << "host::os_version=" << os_version() ! << "host::processor_name=" << processor_name() ! << "host::processor_mhz=" << processor_mhz() ! << "host::processor_cache=" << processor_cache() ! << "host::processor_number=" << processor_number(); } --- 104,159 ---- } + + + std::string CBMSystem::Split(const std::string& str, const std::string& delim, int wantedIndex) + { + unsigned int offset = 0; + unsigned int delimIndex = 0; + unsigned int nowIndex = 0; + + delimIndex = str.find(delim, offset); + + while (delimIndex != std::string::npos) + { + if (wantedIndex==nowIndex) + return(str.substr(offset, delimIndex - offset)); + offset += delimIndex - offset + delim.length(); + delimIndex = str.find(delim, offset); + nowIndex++; + } + if (wantedIndex==nowIndex) + return(str.substr(offset)); + else + return(""); + } + + void CBMSystem::Chomp(std::string& str) + { + int l = str.length(); + + if (l) { + if (str[l-1]=='\n') { + str.resize(l-1); + l--; + } + if (l) + if (str[l-1]=='\r') { + str.resize(l-1); + l--; + } + } + } + void CBMSystem::display(void) { ! std::cout << "host::arch=" << arch() << std::endl ! << "host::hostid=" << hostid() << std::endl ! << "host::hostname=" << hostname() << std::endl ! << "host::os=" << os() << std::endl ! << "host::os_version=" << os_version() << std::endl ! << "host::processor_name=" << processor_name() << std::endl ! << "host::processor_mhz=" << processor_mhz() << std::endl ! << "host::processor_cache=" << processor_cache() << std::endl ! << "host::processor_number=" << processor_number() << std::endl; } *************** *** 222,226 **** host=hostname(); - host.erase(host.length()-1); switch(where) { --- 264,267 ---- *************** *** 363,366 **** --- 404,409 ---- std::string fn; + cbmlib_done(); + fn=temporaryDirectory(CBMSystem::Status); fn+="/"; Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** System.h 25 Sep 2006 15:54:25 -0000 1.9 --- System.h 1 Nov 2006 10:29:40 -0000 1.10 *************** *** 106,109 **** --- 106,122 ---- virtual int init(void); + /** Split a std::string. + * Split given string as sub-strings, according to an arbitrary delimiter. + * \param str string to split + * \param delim delimiter + * \param wantedIndex sub-string index */ + virtual std::string Split(const std::string& str, + const std::string& delim, + int wantedIndex); + + /** Remove trailing line-feed (and carriage return) from specified string. + * \param str the string */ + virtual void Chomp(std::string& str); + /** Describe host. * Displays informations about processors, OS, and so on. |
|
From: Frederic T. <xf...@us...> - 2006-10-12 16:07:34
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4149 Modified Files: Benchmark-BENCHPP.cpp Log Message: Fix : 'none' is passed, as expected, if no option has been set. Index: Benchmark-BENCHPP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark-BENCHPP.cpp 28 Sep 2006 17:52:45 -0000 1.4 --- Benchmark-BENCHPP.cpp 12 Oct 2006 16:07:23 -0000 1.5 *************** *** 147,152 **** cmd+=_currentCompiler->Binary(); cmd+="\n"; ! cmd+=_currentOptions->Options(); ! cmd+=" -DHAS_BOOL"; cmd+="\n\n\n\""; cmd+=" | ./Configure"; --- 147,155 ---- cmd+=_currentCompiler->Binary(); cmd+="\n"; ! if (_currentOptions->Options() != "") { ! cmd+=_currentOptions->Options(); ! } else { ! cmd+="none"; ! } cmd+="\n\n\n\""; cmd+=" | ./Configure"; |
|
From: Frederic T. <xf...@us...> - 2006-10-12 16:07:00
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3785 Modified Files: compbenchmarks-config.1 Log Message: Date changed. Index: compbenchmarks-config.1 =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config.1,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** compbenchmarks-config.1 10 Oct 2006 17:34:47 -0000 1.6 --- compbenchmarks-config.1 12 Oct 2006 16:06:56 -0000 1.7 *************** *** 130,134 **** .\" .IX Title "COMPBENCHMARKS-CONFIG 1" ! .TH COMPBENCHMARKS-CONFIG 1 "2006-10-10" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" compbenchmarks\-config 0.3.2 \- compilers' benchmarking environment --- 130,134 ---- .\" .IX Title "COMPBENCHMARKS-CONFIG 1" ! .TH COMPBENCHMARKS-CONFIG 1 "2006-10-12" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" compbenchmarks\-config 0.3.2 \- compilers' benchmarking environment |
|
From: Frederic T. <xf...@us...> - 2006-10-12 16:06:10
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3416 Modified Files: ChangeLog Log Message: Few updates. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ChangeLog 11 Oct 2006 16:33:09 -0000 1.13 --- ChangeLog 12 Oct 2006 16:06:02 -0000 1.14 *************** *** 1,4 **** 0.3.2 ! * Fixes in linpackc and benchpp-stepanov benchmarks definition. * Fixes status evaluation when re-benchmarking a package having a testsuite. --- 1,4 ---- 0.3.2 ! * Fixes in linpackc and benchpp benchmarks definition. * Fixes status evaluation when re-benchmarking a package having a testsuite. |
|
From: Frederic T. <xf...@us...> - 2006-10-11 16:34:15
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6372 Modified Files: Benchmark.cpp Log Message: If testsuite has been executed on a similar context, the Bench() now works properly. Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Benchmark.cpp 10 Oct 2006 16:49:41 -0000 1.12 --- Benchmark.cpp 11 Oct 2006 16:34:11 -0000 1.13 *************** *** 480,484 **** ! if (((getStatus()!=Tested) && (hasTest())) && (UO_enableTestSuite)) { info=benchmarkName(); --- 480,484 ---- ! if (((getStatus()<Tested) && (hasTest())) && (UO_enableTestSuite)) { info=benchmarkName(); |
|
From: Frederic T. <xf...@us...> - 2006-10-11 16:33:14
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6007 Modified Files: ChangeLog Log Message: New bug fix on 0.3.2. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ChangeLog 10 Oct 2006 17:31:30 -0000 1.12 --- ChangeLog 11 Oct 2006 16:33:09 -0000 1.13 *************** *** 1,4 **** --- 1,6 ---- 0.3.2 * Fixes in linpackc and benchpp-stepanov benchmarks definition. + * Fixes status evaluation when re-benchmarking a package having a + testsuite. * More arguments recognized by compbenchmarks; checking package's embedded testsuite is now optional. Force option added. |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:34:50
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20980 Modified Files: compbenchmarks-config compbenchmarks-config.1 Log Message: 0.3.2 Update. Index: compbenchmarks-config.1 =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config.1,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** compbenchmarks-config.1 10 Oct 2006 17:31:07 -0000 1.5 --- compbenchmarks-config.1 10 Oct 2006 17:34:47 -0000 1.6 *************** *** 132,136 **** .TH COMPBENCHMARKS-CONFIG 1 "2006-10-10" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" ! compbenchmarks\-config 0.3.1 \- compilers' benchmarking environment .SH "SYNOPSIS" .IX Header "SYNOPSIS" --- 132,136 ---- .TH COMPBENCHMARKS-CONFIG 1 "2006-10-10" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" ! compbenchmarks\-config 0.3.2 \- compilers' benchmarking environment .SH "SYNOPSIS" .IX Header "SYNOPSIS" Index: compbenchmarks-config =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** compbenchmarks-config 10 Oct 2006 17:30:43 -0000 1.24 --- compbenchmarks-config 10 Oct 2006 17:34:47 -0000 1.25 *************** *** 564,568 **** $w=60; } ! my $cmd = "echo 'EOF' | $CBM_PROGRAMS{'DIALOG'} --backtitle 'compbenchmarks 0.3.1' --gauge '$title' $h $w $percent"; system("$cmd"); --- 564,568 ---- $w=60; } ! my $cmd = "echo 'EOF' | $CBM_PROGRAMS{'DIALOG'} --backtitle 'compbenchmarks 0.3.2' --gauge '$title' $h $w $percent"; system("$cmd"); *************** *** 575,579 **** $args=~s/\n/\\n/g; ! my $cmd = "$CBM_PROGRAMS{'DIALOG'} --backtitle 'compbenchmarks 0.3.1' $args --stdout > $DIALOG_TMPFILE"; system("$cmd"); --- 575,579 ---- $args=~s/\n/\\n/g; ! my $cmd = "$CBM_PROGRAMS{'DIALOG'} --backtitle 'compbenchmarks 0.3.2' $args --stdout > $DIALOG_TMPFILE"; system("$cmd"); *************** *** 1122,1126 **** =head1 NAME ! compbenchmarks-config 0.3.1 - compilers' benchmarking environment =head1 SYNOPSIS --- 1122,1126 ---- =head1 NAME ! compbenchmarks-config 0.3.2 - compilers' benchmarking environment =head1 SYNOPSIS |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:31:33
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19893 Modified Files: ChangeLog configure.in Doxyfile Log Message: 0.3.2 Update. Index: Doxyfile =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Doxyfile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Doxyfile 1 Oct 2006 19:57:25 -0000 1.4 --- Doxyfile 10 Oct 2006 17:31:30 -0000 1.5 *************** *** 5,9 **** #--------------------------------------------------------------------------- PROJECT_NAME = CompBenchmarks ! PROJECT_NUMBER = 0.3.1 OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO --- 5,9 ---- #--------------------------------------------------------------------------- PROJECT_NAME = CompBenchmarks ! PROJECT_NUMBER = 0.3.2 OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ChangeLog 4 Oct 2006 16:15:18 -0000 1.11 --- ChangeLog 10 Oct 2006 17:31:30 -0000 1.12 *************** *** 1,2 **** --- 1,7 ---- + 0.3.2 + * Fixes in linpackc and benchpp-stepanov benchmarks definition. + * More arguments recognized by compbenchmarks; checking package's + embedded testsuite is now optional. Force option added. + 0.3.1 * Stepanov benchmark (from Bench++) supported; measures Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** configure.in 1 Oct 2006 19:57:25 -0000 1.10 --- configure.in 10 Oct 2006 17:31:30 -0000 1.11 *************** *** 7,11 **** AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.3.1) AM_CONFIG_HEADER(config.h) --- 7,11 ---- AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.3.2) AM_CONFIG_HEADER(config.h) |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:31:16
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19828 Modified Files: compbenchmarks.1 compbenchmarks-config.1 Log Message: 0.3.2 Update. Index: compbenchmarks.1 =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks.1,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** compbenchmarks.1 27 Sep 2006 16:53:28 -0000 1.3 --- compbenchmarks.1 10 Oct 2006 17:31:07 -0000 1.4 *************** *** 130,136 **** .\" .IX Title "COMPBENCHMARKS 1" ! .TH COMPBENCHMARKS 1 "2006-09-26" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" ! compbenchmarks 0.3.0 \- Compilers' benchmarking environment .SH "SYNOPSIS" .IX Header "SYNOPSIS" --- 130,136 ---- .\" .IX Title "COMPBENCHMARKS 1" ! .TH COMPBENCHMARKS 1 "2006-10-10" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" ! compbenchmarks 0.3.2 \- Compilers' benchmarking environment .SH "SYNOPSIS" .IX Header "SYNOPSIS" *************** *** 161,165 **** .PP compbenchmarks \-\-program\-infos ! Show informations about all used external programs .PP compbenchmarks \-\-compiler\-infos <c\-bin> --- 161,165 ---- .PP compbenchmarks \-\-program\-infos ! Show informations about all used external programs. .PP compbenchmarks \-\-compiler\-infos <c\-bin> *************** *** 176,179 **** --- 176,208 ---- (if given), and returns performance (higher is better). + .PP + Here are some more fine-grained operations : + .PP + compbenchmarks \-\-download <b\-id> + Download benchmark, and verify checksum. + .PP + compbenchmarks \-\-extract <b\-id> + Extract given benchmark (from a downloaded + archive). + .PP + compbenchmarks \-\-patch <b\-id> + Patch benchmark (not always needed). + .PP + compbenchmarks \-\-preconfigure <b\-id> + Preconfigure a benchmark (not always needed). + .PP + compbenchmarks \-\-test <b\-id> + Test if a benchmark runs as expected (require + package's internal test suite). + .PP + compbenchmarks \-\-release <b\-id> + Clean built object for a benchmark. + .PP + compbenchmarks \-\-force \-\-test <b\-id> + Force the test suite execution (even if it has already been executed). + force may be applied to other options. + .PP + compbenchmarks \-\-disable\-testsuite \-\-bench <b\-id> <c\-bin> [c\-options] + Disable benchmark's embedded test suite. .SH "DESCRIPTION" .IX Header "DESCRIPTION" Index: compbenchmarks-config.1 =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config.1,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** compbenchmarks-config.1 4 Oct 2006 16:41:05 -0000 1.4 --- compbenchmarks-config.1 10 Oct 2006 17:31:07 -0000 1.5 *************** *** 130,134 **** .\" .IX Title "COMPBENCHMARKS-CONFIG 1" ! .TH COMPBENCHMARKS-CONFIG 1 "2006-10-04" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" compbenchmarks\-config 0.3.1 \- compilers' benchmarking environment --- 130,134 ---- .\" .IX Title "COMPBENCHMARKS-CONFIG 1" ! .TH COMPBENCHMARKS-CONFIG 1 "2006-10-10" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" compbenchmarks\-config 0.3.1 \- compilers' benchmarking environment |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:30:54
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19487 Modified Files: compbenchmarks-config Log Message: Fix. \n is appended after each result record, when needed (parser exepects \n). Index: compbenchmarks-config =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** compbenchmarks-config 4 Oct 2006 16:41:04 -0000 1.23 --- compbenchmarks-config 10 Oct 2006 17:30:43 -0000 1.24 *************** *** 900,903 **** --- 900,906 ---- open(FD, ">>$F"); # file must exists for archiving if (($r ne '') && (($r =~ /^\d*$/) || ($r =~ /^\d*\.\d*$/)) && ($r>0)) { + if (!($r =~ /\n$/)) { + $r.="\n"; + } print FD "result::benchmark=$r_b\nresult::compiler=$r_c\nresult::options=$r_o\nresult::value=$r\n"; } |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:28:42
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18745 Modified Files: compbenchmarks.pod Log Message: Updated with new options/arguments. Index: compbenchmarks.pod =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks.pod,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** compbenchmarks.pod 26 Sep 2006 19:23:41 -0000 1.3 --- compbenchmarks.pod 10 Oct 2006 17:28:39 -0000 1.4 *************** *** 1,5 **** =head1 NAME ! compbenchmarks 0.3.0 - Compilers' benchmarking environment =head1 SYNOPSIS --- 1,5 ---- =head1 NAME ! compbenchmarks 0.3.2 - Compilers' benchmarking environment =head1 SYNOPSIS *************** *** 31,35 **** compbenchmarks --program-infos ! Show informations about all used external programs compbenchmarks --compiler-infos <c-bin> --- 31,35 ---- compbenchmarks --program-infos ! Show informations about all used external programs. compbenchmarks --compiler-infos <c-bin> *************** *** 47,50 **** --- 47,79 ---- better). + Here are some more fine-grained operations : + + compbenchmarks --download <b-id> + Download benchmark, and verify checksum. + + compbenchmarks --extract <b-id> + Extract given benchmark (from a downloaded + archive). + + compbenchmarks --patch <b-id> + Patch benchmark (not always needed). + + compbenchmarks --preconfigure <b-id> + Preconfigure a benchmark (not always needed). + + compbenchmarks --test <b-id> + Test if a benchmark runs as expected (require + package's internal test suite). + + compbenchmarks --release <b-id> + Clean built object for a benchmark. + + compbenchmarks --force --test <b-id> + Force the test suite execution (even if it has already been executed). + force may be applied to other options. + + compbenchmarks --disable-testsuite --bench <b-id> <c-bin> [c-options] + Disable benchmark's embedded test suite. + =head1 DESCRIPTION |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:27:04
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18028 Removed Files: aclocal.m4 configure stamp-h.in Log Message: Useless in CVS. --- aclocal.m4 DELETED --- --- stamp-h.in DELETED --- --- configure DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:25:52
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17645 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:25:43
|
Update of /cvsroot/compbench/CompBenchmarks++/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17630 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:25:26
|
Update of /cvsroot/compbench/CompBenchmarks++/share In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17594 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:25:13
|
Update of /cvsroot/compbench/CompBenchmarks++/share/patches In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17573 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:25:01
|
Update of /cvsroot/compbench/CompBenchmarks++/share/system In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17225 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:24:51
|
Update of /cvsroot/compbench/CompBenchmarks++/share/system/cygwin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17211 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:24:35
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17198 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:24:24
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17185 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 17:23:43
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16822 Removed Files: Makefile.in Log Message: Useless in CVS. --- Makefile.in DELETED --- |
|
From: Frederic T. <xf...@us...> - 2006-10-10 16:53:40
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5833 Modified Files: cloptions.cpp Log Message: Many new arguments; New variables for user options. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cloptions.cpp 3 Oct 2006 15:43:02 -0000 1.7 --- cloptions.cpp 10 Oct 2006 16:53:36 -0000 1.8 *************** *** 2,7 **** #include <Benchmark/Benchmark-Selector.h> #include <Benchmark/Compiler/BenchmarkContext-Compiler.h> - #include <System/System.h> #include <config.h> --- 2,7 ---- #include <Benchmark/Benchmark-Selector.h> #include <Benchmark/Compiler/BenchmarkContext-Compiler.h> #include <System/System.h> + #include <UI/UI.h> #include <config.h> *************** *** 14,17 **** --- 14,22 ---- extern int optind, opterr, optopt; + int parseExitValue = -1; + + int UO_enableTestSuite = 1; + int UO_force = 0; + void cbmOptionsHelp(void) { *************** *** 33,36 **** --- 38,53 ---- << " use specified compiler and options (if provided)" << std::endl << " to run benchmark b-id" << std::endl + << std::endl + << "Fine grained operations gives more specs :" << std::endl + << " --download <b-id> : download a benchmark" << std::endl + << " --extract <b-id> : extract a benchmark" << std::endl + << " --patch <b-id> : patch a benchmark" << std::endl + << " --preconfigure <b-id> : preconfigure a benchmark" << std::endl + << " --test <b-id> : test a benchmark" << std::endl + << " --release <b-id> : release a benchmark" << std::endl + << std::endl + << "Other options affecting behaviour :" << std::endl + << " --disable-testsuite : disable package's test suite" << std::endl + << " --force : force operation" << std::endl << std::endl; } *************** *** 41,48 **** } int cbmOptionsParse(int argc, char *argv[]) { int c; - int x = -1; int context; CBMBenchmark::Status status; --- 58,86 ---- } + CBMBenchmark *cbmOptionsExpectBenchmark(char *optarg) + { + CBMBenchmarkSelector SB(cbmSystem); + CBMBenchmark *B = 0; + std::string bench; + + if (!optarg) { + std::cerr << "benchmark missing in argument line" << std::endl; + parseExitValue=1; + return(0); + } + + bench=optarg; + B=SB.select((char*) bench.c_str()); + if (!B) { + cbmUnknownBenchmark((char*) bench.c_str()); + parseExitValue=1; + return(0); + } + return(B); + } + int cbmOptionsParse(int argc, char *argv[]) { int c; int context; CBMBenchmark::Status status; *************** *** 50,54 **** CBMBenchmarkSelector SB(cbmSystem); CBMBenchmark *B = 0; ! CBMBenchmarkContextCompilerSelector SC(cbmSystem); CBMBenchmarkContextCompiler *C = 0; --- 88,92 ---- CBMBenchmarkSelector SB(cbmSystem); CBMBenchmark *B = 0; ! CBMBenchmarkContextCompilerSelector SC(cbmSystem); CBMBenchmarkContextCompiler *C = 0; *************** *** 62,66 **** {"version", 0, 0, 'v'}, {"install", 1, 0, 'i' }, ! {"fetch", 1, 0, 'F'}, {"uninstall", 1, 0, 'u' }, {"list-benchmarks", 0, 0, 'L'}, --- 100,104 ---- {"version", 0, 0, 'v'}, {"install", 1, 0, 'i' }, ! {"fetch", 1, 0, 'f'}, {"uninstall", 1, 0, 'u' }, {"list-benchmarks", 0, 0, 'L'}, *************** *** 70,73 **** --- 108,120 ---- {"benchmark-infos", 1, 0, 'I' }, {"bench", 1, 0, 'B'}, + + {"download", 1, 0, 'D' }, + {"extract", 1, 0, 'E' }, + {"patch", 1, 0, 'p' }, + {"preconfigure", 1, 0, 'g' }, + {"test", 1, 0, 't' }, + {"release", 1, 0, 'r' }, + {"disable-testsuite", 0, 0, 'T' }, + {"force", 0, 0, 'F' }, { 0, 0, 0, 0} }; *************** *** 76,80 **** int option_index = 0; ! if (x!=-1) break; --- 123,127 ---- int option_index = 0; ! if (parseExitValue!=-1) break; *************** *** 88,122 **** case 'v': std::cout << VERSION << std::endl; ! x=0; break; case 'h': cbmOptionsHelp(); ! x=0; break; case 'i': ! B=SB.select((char*) optarg); if (B) ! x=B->Install(); ! else ! cbmUnknownBenchmark(optarg); break; case 'u': ! B=SB.select((char*) optarg); if (B) ! x=B->Uninstall(); ! else ! cbmUnknownBenchmark(optarg); break; case 'L': SB.displayList(); ! x=0; break; case 'H': cbmSystem->display(); ! x=0; break; case 'P': cbmSystem->displayPrograms(); ! x=0; break; case 'C': --- 135,171 ---- case 'v': std::cout << VERSION << std::endl; ! parseExitValue=0; break; case 'h': cbmOptionsHelp(); ! parseExitValue=0; 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; ! case 'T': ! UO_enableTestSuite=0; ! break; ! case 'F': ! UO_force=1; break; case 'H': cbmSystem->display(); ! parseExitValue=0; break; case 'P': cbmSystem->displayPrograms(); ! parseExitValue=0; break; case 'C': *************** *** 124,169 **** if (C) { C->display(); ! x=0; } else ! x=1; break; case 'I': ! B=SB.select((char*) optarg); if (B) { B->display(); ! x=0; ! } else ! x=1; ! break; ! case 'F': ! if (!optarg) { ! std::cerr << "benchmark missing in argument line" << std::endl; ! x=1; ! break; } ! bench=optarg; ! B=SB.select((char*) bench.c_str()); ! if (!B) { ! cbmUnknownBenchmark((char*) bench.c_str()); ! x=1; break; - } - optind++; if (optind<=argc) { ! B->Fetch(argv[optind-1]); } else { std::cerr << "tarball missing in argument line" << std::endl; ! x=1; break; } break; case 'B': ! bench=optarg; ! B=SB.select((char*) bench.c_str()); ! if (!B) { ! cbmUnknownBenchmark((char*) bench.c_str()); ! x=1; break; - } optind++; if (optind<=argc) { --- 173,238 ---- if (C) { C->display(); ! parseExitValue=0; } else ! parseExitValue=1; break; case 'I': ! B=cbmOptionsExpectBenchmark(optarg); if (B) { B->display(); ! parseExitValue=0; } ! 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; ! parseExitValue=1; break; } break; + case 'D': + B=cbmOptionsExpectBenchmark(optarg); + if (B) + parseExitValue=!B->Download(); + 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': ! B=cbmOptionsExpectBenchmark(optarg); ! if (!B) break; optind++; if (optind<=argc) { *************** *** 171,175 **** } else { std::cerr << "compiler missing in argument line" << std::endl; ! x=1; break; } --- 240,244 ---- } else { std::cerr << "compiler missing in argument line" << std::endl; ! parseExitValue=1; break; } *************** *** 177,181 **** if (!C) { std::cerr << "Compiler " << compiler.c_str() << " not found." << std::endl; ! x=1; break; } --- 246,250 ---- if (!C) { std::cerr << "Compiler " << compiler.c_str() << " not found." << std::endl; ! parseExitValue=1; break; } *************** *** 192,196 **** if (B->getStatus()<CBMBenchmark::Preconfigured) { std::cerr << "Benchmark not properly installed" << std::endl; ! x=1; break; } --- 261,265 ---- if (B->getStatus()<CBMBenchmark::Preconfigured) { std::cerr << "Benchmark not properly installed" << std::endl; ! parseExitValue=1; break; } *************** *** 204,217 **** if (!context) { B->Configure(C, O); ! B->Make(); ! B->Test(); } B->Bench(); ! x=0; break; } } cbmSystem->done(); ! exit(x); } --- 273,286 ---- if (!context) { B->Configure(C, O); ! B->Make(UO_force); ! B->Test(UO_force); } B->Bench(); ! parseExitValue=0; break; } } cbmSystem->done(); ! exit(parseExitValue); } |
|
From: Frederic T. <xf...@us...> - 2006-10-10 16:52:54
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5466 Modified Files: cloptions.h Log Message: New variables for user options. Index: cloptions.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cloptions.h 19 Sep 2006 17:12:06 -0000 1.2 --- cloptions.h 10 Oct 2006 16:52:51 -0000 1.3 *************** *** 10,13 **** --- 10,19 ---- #define H_CBMOPTIONS + /** User option defining if package's test suite has to be run */ + extern int UO_enableTestSuite; + + /** User option defining 'force' mode */ + extern int UO_force; + /** Parse command line arguments. High-level function to parse arguments through getopt.h. */ |
