compbench-devel Mailing List for CompBenchmarks
Brought to you by:
xfred
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-10-02 17:32:45
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15766 Modified Files: 05-KB-Option-Logics.pl Log Message: Correct handling of implied-by statements when the implied option comes first. Index: 05-KB-Option-Logics.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-KB-Option-Logics.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 05-KB-Option-Logics.pl 18 Apr 2007 16:29:21 -0000 1.3 --- 05-KB-Option-Logics.pl 2 Oct 2007 17:32:42 -0000 1.4 *************** *** 117,121 **** my $ib; foreach $ib (@ib) { ! $implied_count{$ib}++; } } --- 117,121 ---- my $ib; foreach $ib (@ib) { ! $implied_count{$ib}+=2; } } *************** *** 251,258 **** my $r = $C->analyzeOptions($opt_string); ! my $x = "1\nOption $l1 is implied by $l0\n"; ! ok($r eq $x, "Analyzing $opt_string from '$i' '$ib' on " . $C->Name() . " : expects ($x) has ($r)\n"); } } --- 251,266 ---- my $r = $C->analyzeOptions($opt_string); ! my $x = "Option $l1 is implied by $l0"; ! $r=~s/\n/\!/g; ! ok($r =~ /$x/, "Analyzing $opt_string from '$i' '$ib' on " . $C->Name() . " : expects ($x) has ($r)\n"); + + my $r2 = $C->analyzeOptions("$l1 $l0"); + $r2=~s/\n/\!/g; + my $x2 = "Option $l1 is implied by $l0"; + + ok($r2 =~ /$x2/, "Analyzing $l1 $l0 from '$i' '$ib' on " . + $C->Name() . " : expects ($x2) in ($r2)\n"); } } |
From: Frederic T. <xf...@us...> - 2007-10-02 17:32:19
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15723 Modified Files: Compiler-Option-Description.cpp Compiler-Option-Description.h Log Message: Logic() and logicAppendImplied() methods added to handle implied-by statements when the implied option comes first. Index: Compiler-Option-Description.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Description.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Compiler-Option-Description.cpp 16 Apr 2007 20:38:13 -0000 1.8 --- Compiler-Option-Description.cpp 2 Oct 2007 17:32:08 -0000 1.9 *************** *** 106,109 **** --- 106,118 ---- } + CBM::CompilerOptionLogic *CompilerOptionDescription::Logic(void) + { + if (!logic) + logic=new CBM::CompilerOptionLogic(parent, + this, + 0); + return(logic); + } + std::string CompilerOptionDescription::Id(void) { *************** *** 152,158 **** std::string tmp; ! if (logic) ! return(logic->use()); ! else { tmp="Logic for option "; tmp+=Id(); --- 161,168 ---- std::string tmp; ! if (logic) { ! tmp=logic->use(); ! return(tmp); ! } else { tmp="Logic for option "; tmp+=Id(); *************** *** 269,272 **** --- 279,288 ---- } + void CompilerOptionDescriptions::logicAppendImplied(CompilerOptionDescription *D, + std::string ref) + { + D->Logic()->appendCommand(RevImplied, 1, "", "", ref); + } + CBM::Compiler *CompilerOptionDescriptions::Compiler(void) { Index: Compiler-Option-Description.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Description.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Compiler-Option-Description.h 4 Sep 2007 20:02:55 -0000 1.10 --- Compiler-Option-Description.h 2 Oct 2007 17:32:08 -0000 1.11 *************** *** 75,78 **** --- 75,84 ---- CBM_CODs *_parent); + /** Returns option logics. + * + * \return Give option logics + */ + virtual CBM_COL *Logic(void); + /** Get option's internal ID. * *************** *** 199,202 **** --- 205,220 ---- virtual CompilerOptionDescription *DescriptionLitteral(std::string _litt); + /** Inserts a new logic constraints for forwardly implied options. + * + * Using gcc, option string '-fcse-skip-blocks -O3' is valid, because + * 'implied' operand on CSE option is checked before -O3 (which implies + * said CSE option). Thus, we must signal in -fcse-skip-blocks that + * a further -O3 will 'clash'. + * + * \param D Description concerned. + * \param ref Further option (not known/Used() at this time) to watch for + */ + virtual void logicAppendImplied(CompilerOptionDescription *D, + std::string ref); /** Retrieve associated compiler. * |
From: Frederic T. <xf...@us...> - 2007-10-02 17:30:33
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14952 Modified Files: Compiler-Option-Logic.cpp Compiler-Option-Logic.h Log Message: removeAppended() and appendCommand() methods added to handle implied-by statements when the implied option comes first. Index: Compiler-Option-Logic.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Logic.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Compiler-Option-Logic.h 4 Sep 2007 17:33:35 -0000 1.3 --- Compiler-Option-Logic.h 2 Oct 2007 17:30:29 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- Exclusive, /*!< Bijective exclusion operator */ ImpliedBy, /*!< Left item is implied by right one */ + RevImplied, /*!< Left item used first, yet, implied by right one */ Requires /*!< Left item requieres right one */ }; *************** *** 28,31 **** --- 29,33 ---- std::string internalVarValue; /*!< variable (desired) value */ std::string optionReferred; /*!< option's name */ + int rt_appended; /*!< Added (on run-time) by CompilerOptionLogic::appendCommand() */ }; *************** *** 51,54 **** --- 53,61 ---- std::vector<CompilerOptionLogicCommand*> commands; + /** Removes auto-added variables. + * See RevImplied for an example of commands that may emerge on run-time; + * they should be removed after option line check. + */ + virtual void removeAppended(void); public: /** Constructor. *************** *** 71,74 **** --- 78,96 ---- virtual std::string use(void); + + /** Append a command (run-time) in logics. + * + * Used by RevImplied for instance. + * \param id Operator identifier + * \param testOption 1 for option, 0 for an internal variable + * \param internalVarName variable name + * \param internalVarValue variable (desired) value + * \param optionReferred option's name */ + virtual void appendCommand(CompilerOptionLogicCommandID _id, + int _testOption, + std::string _internalVarName, + std::string _internalVarValue, + std::string _optionReferred); + /** Desctructor */ virtual ~CompilerOptionLogic(); Index: Compiler-Option-Logic.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Logic.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Compiler-Option-Logic.cpp 16 Apr 2007 20:37:28 -0000 1.3 --- Compiler-Option-Logic.cpp 2 Oct 2007 17:30:29 -0000 1.4 *************** *** 17,21 **** { int i; ! int n = _from->nodeNumber(); CBM::XMLNode *N; CBM::XMLAttribute *A; --- 17,21 ---- { int i; ! int n; CBM::XMLNode *N; CBM::XMLAttribute *A; *************** *** 26,29 **** --- 26,32 ---- description=_description; + if (!_from) + return; + n=_from->nodeNumber(); for(i=0; i<n; i++) { N=_from->getNode(i); *************** *** 34,38 **** cmd=new CompilerOptionLogicCommand; cmd->id=Exclusive; ! cmd->internalVarName=A->Value(); A=N->getAttribute("value"); --- 37,41 ---- cmd=new CompilerOptionLogicCommand; cmd->id=Exclusive; ! cmd->rt_appended=0; cmd->internalVarName=A->Value(); A=N->getAttribute("value"); *************** *** 58,61 **** --- 61,65 ---- cmd->optionReferred=A->Value(); cmd->testOption=1; + cmd->rt_appended=0; commands.push_back(cmd); continue; *************** *** 67,70 **** --- 71,75 ---- continue; cmd=new CompilerOptionLogicCommand; + cmd->rt_appended=0; cmd->id=Requires; cmd->optionReferred=A->Value(); *************** *** 76,83 **** } std::string CompilerOptionLogic::use(void) { int i; ! int n = commands.size(); CBM::CompilerOptionLogicCommand *cmd; CBM::Compiler *C = context->Compiler(); --- 81,110 ---- } + void CompilerOptionLogic::removeAppended(void) + { + int i; + int n = commands.size(); + CompilerOptionLogicCommand *cmd; + std::vector<CompilerOptionLogicCommand*> ncommands; + int r = 0; + + for(i=0; i<n; i++) { + cmd=commands[i]; + if (!cmd->rt_appended) + ncommands.push_back(cmd); + else { + delete(cmd); + r=1; + } + } + + if (r) + commands=ncommands; + } + std::string CompilerOptionLogic::use(void) { int i; ! int n; CBM::CompilerOptionLogicCommand *cmd; CBM::Compiler *C = context->Compiler(); *************** *** 89,92 **** --- 116,120 ---- std::string varvalue; + n=commands.size(); for(i=0; i<n; i++) { cmd=commands[i]; *************** *** 117,120 **** --- 145,149 ---- tmp+=context->Description(var->lastWriter)->Option(); } + removeAppended(); return(tmp); } *************** *** 128,133 **** --- 157,173 ---- tmp+=context->Description(cmd->optionReferred)->Option(); return(tmp); + } else { + D=context->Description(cmd->optionReferred); + context->logicAppendImplied(D, description->Id()); } break; + case RevImplied: + tmp="Option "; + tmp+=context->Description(cmd->optionReferred)->Option(); + tmp+=" is implied by "; + tmp+=description->Option(); + removeAppended(); + return(tmp); + break; case Requires: if (!C->colOptionHas(cmd->optionReferred)) { *************** *** 136,143 **** --- 176,186 ---- tmp+=" requires "; tmp+=context->Description(cmd->optionReferred)->Option(); + removeAppended(); return(tmp); } break; default: + removeAppended(); + printf("Command ID %d ?\n", cmd->id); return("Unknown command in option analyzing"); break; *************** *** 147,150 **** --- 190,212 ---- } + void CompilerOptionLogic::appendCommand(CompilerOptionLogicCommandID _id, + int _testOption, + std::string _internalVarName, + std::string _internalVarValue, + std::string _optionReferred) + { + CompilerOptionLogicCommand *cmd; + + cmd=new CompilerOptionLogicCommand; + cmd->id=_id; + cmd->optionReferred=_optionReferred; + cmd->testOption=_testOption; + cmd->internalVarName=_internalVarName; + cmd->internalVarValue=_internalVarValue; + cmd->rt_appended=1; + commands.push_back(cmd); + } + + CompilerOptionLogic::~CompilerOptionLogic() { |
From: Frederic T. <xf...@us...> - 2007-09-27 17:21:53
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12203 Modified Files: main.cpp main.h Log Message: Compiler autodetection revisited (part of mechanism moved to libcompbenchmarks/). Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** main.cpp 26 Sep 2007 19:13:43 -0000 1.18 --- main.cpp 27 Sep 2007 17:21:49 -0000 1.19 *************** *** 52,109 **** } ! CompilerAutodetectThread::CompilerAutodetectThread(QObject *parent) ! : QThread(parent) { } ! void CompilerAutodetectThread::run() { ! static int known_compiler_number = 24; ! const char *known_compilers[] = {"/usr/bin/gcc", ! "/usr/bin/tcc", ! "gcc-2.95", ! "gcc-2.96", ! "gcc-3.1", ! "gcc-3.2", ! "gcc-3.3", ! "gcc-3.4", ! "gcc-4.0", ! "gcc-4.1", ! "gcc-4.2", ! "/usr/local/bin/gcc", ! "/usr/local/bin/tcc", ! "/usr/bin/g++", ! "g++-2.95", ! "g++-2.96", ! "g++-3.1", ! "g++-3.2", ! "g++-3.3", ! "g++-3.4", ! "g++-4.0", ! "g++-4.1", ! "g++-4.2", ! "/usr/local/bin/g++"}; ! CBM::CompilerSelector SC(CBM::cbmSystem); ! CBM::Compiler *C; ! CBM::UIMsg *msg; ! int i; ! msg=CBM::cbmUI->msgCompilerAutodetect(); ! ! for(i=0; i<known_compiler_number; i++) { ! C=SC.select(known_compilers[i]); ! if (C) { ! App->compilerRegister(C); ! } ! msg->setProgress((float) ((i*100.0)/known_compiler_number)); ! } ! CBM::cbmUI->outputOK(); ! if (parent()) ! parent()->deleteLater(); } ! CompilerAutodetectThread::~CompilerAutodetectThread() { } --- 52,83 ---- } ! QSystemCompilerAutodetectThreadManager::QSystemCompilerAutodetectThreadManager() ! : CBM::SystemThreadCompilerAutodetectManager() { } ! void QSystemCompilerAutodetectThreadManager::compilerRegister(CBM::Compiler *C) { ! if (C) ! App->compilerRegister(C); ! } ! QSystemCompilerAutodetectThreadManager::~QSystemCompilerAutodetectThreadManager() ! { ! } ! QCompilerAutodetectThread::QCompilerAutodetectThread() ! : QThread() ! { ! manager=new QSystemCompilerAutodetectThreadManager; ! T=new CBM::SystemThreadCompilerAutodetect(manager); ! } ! void QCompilerAutodetectThread::run(void) ! { ! T->Start(); } ! QCompilerAutodetectThread::~QCompilerAutodetectThread() { } *************** *** 392,398 **** void Application::doCompilerAutodetect(void) { ! CompilerAutodetectThread *T; ! T=new CompilerAutodetectThread(); T->start(); } --- 366,372 ---- void Application::doCompilerAutodetect(void) { ! QCompilerAutodetectThread *T; ! T=new QCompilerAutodetectThread(); T->start(); } Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** main.h 17 Sep 2007 19:38:47 -0000 1.12 --- main.h 27 Sep 2007 17:21:49 -0000 1.13 *************** *** 14,17 **** --- 14,18 ---- #include <Status/Status-Console.h> #include <Plan/Plan-Batch.h> + #include <System/System-Thread-CompilerAutodetect.h> namespace CQT { *************** *** 44,54 **** }; ! class CompilerAutodetectThread : public QThread { ! Q_OBJECT public: ! CompilerAutodetectThread(QObject *parent = 0); virtual void run(); ! virtual ~CompilerAutodetectThread(); }; --- 45,65 ---- }; ! class QSystemCompilerAutodetectThreadManager : public CBM::SystemThreadCompilerAutodetectManager { ! public: ! QSystemCompilerAutodetectThreadManager(); ! virtual void compilerRegister(CBM::Compiler *C); ! virtual ~QSystemCompilerAutodetectThreadManager(); ! }; ! ! class QCompilerAutodetectThread : public QThread { ! Q_OBJECT ! protected: ! QSystemCompilerAutodetectThreadManager *manager; ! CBM::SystemThreadCompilerAutodetect *T; public: ! QCompilerAutodetectThread(); virtual void run(); ! virtual ~QCompilerAutodetectThread(); }; |
From: Frederic T. <xf...@us...> - 2007-09-27 17:21:18
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12176 Modified Files: Makefile.am Log Message: System-Thread-CompilerAutodetect files added. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 16 May 2007 09:47:24 -0000 1.3 --- Makefile.am 27 Sep 2007 17:21:14 -0000 1.4 *************** *** 22,26 **** endif ! sources = System.cpp System-Unix.cpp System-Thread-Download.cpp libSystem_la_SOURCES = $(sources) $(source_sys) --- 22,26 ---- endif ! sources = System.cpp System-Unix.cpp System-Thread-Download.cpp System-Thread-CompilerAutodetect.cpp libSystem_la_SOURCES = $(sources) $(source_sys) |
From: Frederic T. <xf...@us...> - 2007-09-27 17:20:39
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11816 Added Files: System-Thread-CompilerAutodetect.cpp System-Thread-CompilerAutodetect.h Log Message: First import. --- NEW FILE: System-Thread-CompilerAutodetect.h --- /* ---------------------------------------------------------------------------- $Id: System-Thread-CompilerAutodetect.h,v 1.1 2007/09/27 17:20:34 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBMSYSTEM_COMPILER_AUTODETECT #define H_CBMSYSTEM_COMPILER_AUTODETECT 1 #include <Base/Thread.h> #include <Compiler/Compiler.h> #include <string> namespace CBM { class SystemThreadCompilerAutodetectManager { protected: SystemThreadCompilerAutodetectManager(); public: virtual void compilerRegister(CBM::Compiler *C) = 0; virtual ~SystemThreadCompilerAutodetectManager(); }; class SystemThreadCompilerAutodetect : public ThreadAction { private: int total; int current; SystemThreadCompilerAutodetectManager *manager; protected: virtual void routine(void); public: SystemThreadCompilerAutodetect(SystemThreadCompilerAutodetectManager *_manager); virtual float Progress(void); ~SystemThreadCompilerAutodetect(); }; } #endif --- NEW FILE: System-Thread-CompilerAutodetect.cpp --- /* ---------------------------------------------------------------------------- $Id: System-Thread-CompilerAutodetect.cpp,v 1.1 2007/09/27 17:20:34 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <System/System-Thread-CompilerAutodetect.h> #include <UI/UI-Msg.h> #include <UI/UI.h> #include <System/System.h> using namespace CBM; SystemThreadCompilerAutodetectManager::SystemThreadCompilerAutodetectManager() { } SystemThreadCompilerAutodetectManager::~SystemThreadCompilerAutodetectManager() { } SystemThreadCompilerAutodetect::SystemThreadCompilerAutodetect(SystemThreadCompilerAutodetectManager *_manager) { total=24; current=0; manager=_manager; } void SystemThreadCompilerAutodetect::routine(void) { const char *known_compilers[] = {"/usr/bin/gcc", "/usr/bin/tcc", "gcc-2.95", "gcc-2.96", "gcc-3.1", "gcc-3.2", "gcc-3.3", "gcc-3.4", "gcc-4.0", "gcc-4.1", "gcc-4.2", "/usr/local/bin/gcc", "/usr/local/bin/tcc", "/usr/bin/g++", "g++-2.95", "g++-2.96", "g++-3.1", "g++-3.2", "g++-3.3", "g++-3.4", "g++-4.0", "g++-4.1", "g++-4.2", "/usr/local/bin/g++"}; P(); current=0; R(); CBM::CompilerSelector SC(cbmSystem); CBM::Compiler *C; CBM::UIMsg *msg; int i; msg=cbmUI->msgCompilerAutodetect(); for(i=0; i<total; i++) { P(); current=i; R(); C=SC.select(known_compilers[i]); if (C) manager->compilerRegister(C); P(); msg->setProgress((float) ((current*100.0)/total)); R(); } cbmUI->outputOK(); } float SystemThreadCompilerAutodetect::Progress(void) { int i; P(); i=current; R(); return((i*100.0)/total); } SystemThreadCompilerAutodetect::~SystemThreadCompilerAutodetect() { delete(manager); } |
From: Frederic T. <xf...@us...> - 2007-09-26 19:14:00
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14635 Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Uninstalled benchmarks are removed from batch definitions. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** PlanDefineBatch.cpp 17 Sep 2007 19:38:47 -0000 1.20 --- PlanDefineBatch.cpp 26 Sep 2007 19:13:57 -0000 1.21 *************** *** 353,356 **** --- 353,359 ---- connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(itemEdited(QTreeWidgetItem*, int))); + + connect(this, SIGNAL(sigRefreshBenchmarks()), + this, SLOT(doRefreshBenchmarks())); headerItem()->setHidden(true); *************** *** 360,363 **** --- 363,392 ---- } + void PlanDefineBatchList::packageRemoved(CBM::Package *P) + { + PlanDefineBatchListItem *Ri = (PlanDefineBatchListItem*) invisibleRootItem(); + PlanDefineBatchListItem *Pi; + PlanDefineBatchListItem *PBs; + PlanDefineBatchListItem *B; + + int pi, pn = Ri->childCount(); + int bi, bn; + + for(pi=0; pi<pn; pi++) { + Pi=(PlanDefineBatchListItem*) Ri->child(pi); + if (Pi->type()==PIPlanBatch) { + PBs=Pi->Nearest(PIBenchmarks); + bn=PBs->childCount(); + for (bi=0; bi<bn; bi++) { + B=(PlanDefineBatchListItem*) PBs->child(bi); + if (B->Benchmark()->Package()==P) { + Pi->Batch()->remove(B->Benchmark()); + PBs->takeChild(bi); + } + } + } + } + } + PlanDefineBatchListItem *PlanDefineBatchList::Item(CBM::PlanBatch *_batch) { *************** *** 376,379 **** --- 405,422 ---- } + void PlanDefineBatchList::doRefreshBenchmarks(void) + { + int pn = CBM::cbmSystem->packageNumber(); + CBM::Package *P; + int pi; + + for (pi=0; pi<pn; pi++) { + P=CBM::cbmSystem->Package(pi); + if (P->getStatus()<CBM::Package::Preconfigured) { + packageRemoved(P); + } + } + } + PlanDefineBatchListItem *PlanDefineBatchList::Item(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options) *************** *** 832,835 **** --- 875,883 ---- } + void PlanDefineBatchList::refreshBenchmarks(void) + { + emit sigRefreshBenchmarks(); + } + PlanDefineBatchList::~PlanDefineBatchList() { Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PlanDefineBatch.h 17 Sep 2007 19:38:47 -0000 1.15 --- PlanDefineBatch.h 26 Sep 2007 19:13:57 -0000 1.16 *************** *** 88,91 **** --- 88,100 ---- private: CBM::Plan *plan; + + void packageRemoved(CBM::Package *P); + + protected slots: + virtual void doRefreshBenchmarks(void); + + signals: + virtual void sigRefreshBenchmarks(void); + protected: virtual PlanDefineBatchListItem *Item(CBM::PlanBatch *_batch); *************** *** 185,188 **** --- 194,199 ---- CBM::CompilerOptions *_options, QString _newname); + + virtual void refreshBenchmarks(void); virtual ~PlanDefineBatchList(); |
From: Frederic T. <xf...@us...> - 2007-09-26 19:13:52
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14614 Modified Files: main.cpp Log Message: Uninstalled benchmarks are removed from batch definitions. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** main.cpp 17 Sep 2007 19:38:47 -0000 1.17 --- main.cpp 26 Sep 2007 19:13:43 -0000 1.18 *************** *** 268,271 **** --- 268,272 ---- packageManager->packagesRefresh(); planManager->AvailableBenchmark()->refreshBenchmarks(); + planManager->Define()->Batch()->refreshBenchmarks(); } |
From: Frederic T. <xf...@us...> - 2007-09-25 17:10:41
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15414 Modified Files: ChangeLog Log Message: English correctness. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ChangeLog 20 Sep 2007 19:35:25 -0000 1.27 --- ChangeLog 25 Sep 2007 17:06:14 -0000 1.28 *************** *** 4,8 **** * compbenchmarks-plan supports --run-number. * Updated compbenchmark-core inline documentation. ! * Fixes SEGFAULT on inexistant compiler binary given in XML plan file. * Fixes possible SEGFAULT on compiler/package language(s) cross-checking. --- 4,8 ---- * compbenchmarks-plan supports --run-number. * Updated compbenchmark-core inline documentation. ! * Fixes SEGFAULT on inexistent compiler binary given in XML plan file. * Fixes possible SEGFAULT on compiler/package language(s) cross-checking. |
From: Frederic T. <xf...@us...> - 2007-09-24 15:10:09
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30943 Modified Files: README Log Message: Documentation updated. Index: README =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/README,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** README 23 Sep 2007 21:25:27 -0000 1.12 --- README 24 Sep 2007 15:10:05 -0000 1.13 *************** *** 1,5 **** $Id$ ! CompBenchmarks' suite 0.5.0 This package integrates some of the well-known benchmarks and applications, --- 1,5 ---- $Id$ ! CompBenchmarks 0.5.0 This package integrates some of the well-known benchmarks and applications, *************** *** 20,24 **** For now, CompilerBenchmarks' suite just supports tcc and GCC compilers on Linux, FreeBSD & Cygwin. Any help improving that is welcome. It has only been ! tested on i386/x86_64 and compatible systems. Installation : --- 20,25 ---- For now, CompilerBenchmarks' suite just supports tcc and GCC compilers on Linux, FreeBSD & Cygwin. Any help improving that is welcome. It has only been ! tested on i386/x86_64 and compatible systems (yet testsuite has also been validated on ! ARM/Linux). Installation : *************** *** 52,56 **** * See ./compbenchmark-plan/compbenchmarks-plan -h ! Web-site also summarizes and makes a digest of that. Interrested people are invited to visit home page at --- 53,59 ---- * See ./compbenchmark-plan/compbenchmarks-plan -h ! Web-site also summarizes that. ! It also presents an overview of up-coming Qt-4.x GUI. ! Interrested people are invited to visit home page at |
From: Frederic T. <xf...@us...> - 2007-09-23 21:25:30
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12861 Modified Files: README Log Message: Documentation updated. Index: README =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/README,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** README 28 Dec 2006 13:32:16 -0000 1.11 --- README 23 Sep 2007 21:25:27 -0000 1.12 *************** *** 9,15 **** Requierements : ! * A C++ Compiler or/and a C compiler (like g++ and gcc from GCC), make * Perl 5 or above, with Digest::MD5 module installed. ! * wget, dialog, and few UNIX commands (tar, gzip, unzip, zcat, grep, head, mkdir, patch, rm, tail and cat) * Internet connection (needed only to download packages) --- 9,16 ---- Requierements : ! * A supported operating system (Linux, Cygwin or FreeBSD), * Perl 5 or above, with Digest::MD5 module installed. ! * A C++ compiler (like g++, from GCC) and GNU Make ! * wget, and few UNIX commands (tar, gzip, unzip, zcat, grep, head, mkdir, patch, rm, tail and cat) * Internet connection (needed only to download packages) *************** *** 17,27 **** * For Cygwin, WMI is needed (embedded since W2K). ! For now, CompilerBenchmarks' suite just supports tcc and gcc compilers on Linux, FreeBSD & Cygwin. Any help improving that is welcome. It has only been ! tested on i686 and compatible systems. Installation : ! compbenchmarks is providen as a GNU gzipped-tarball package. Traditionnal installation process is used : * tar xzvf compbenchmarks-x.y.z.tar.gz --- 18,29 ---- * For Cygwin, WMI is needed (embedded since W2K). ! For now, CompilerBenchmarks' suite just supports tcc and GCC compilers on Linux, FreeBSD & Cygwin. Any help improving that is welcome. It has only been ! tested on i386/x86_64 and compatible systems. Installation : ! compbenchmarks is providen as a GNU gzipped-tarball package. Traditionnal installation ! process is used : * tar xzvf compbenchmarks-x.y.z.tar.gz *************** *** 42,70 **** Quick start : ! * ./compbenchmarks-ui-perl , it'll detect your C compilers and create ! basic configurations files ! * Quit the application Usage : ! * In ~/.compbenchmarks/$HOST/Configuration, edit default-C-compilers and ! default-C-compilers-options (for C, language. If you are interessted in ! C++ benchmarks, replace C by C++ in those filenames). ! ! * Run ./compbenchmarks-ui-perl ! ! * Insure that the system is idle (e.g. X server stopped) before starting ! benchmarks. ! ! * If you don't have an internet connection, look at the --fetch of ! compbenchmarks. It'll import a local archive as a known benchmark package. ! * Contact informations and ways to submit results described at ! Interrested people are invited to visit ! http://compbench.sourceforge.net/cgi-bin/index.cgi to get more informations about how to publish results, and see up-to-date list supported benchmarks ! and programs (./compbenchmarks-ui-perl gives this information for running ! version). Frederic Trouche --- 44,61 ---- Quick start : ! Beta-testers documentation give a straight-forward approach. See : ! http://sourceforge.net/project/showfiles.php?group_id=150828&package_id=244860 Usage : ! * See ./compbenchmark-core/compbenchmarks-core -h ! * See ./compbenchmark-plan/compbenchmarks-plan -h ! Web-site also summarizes and makes a digest of that. ! Interrested people are invited to visit home page at ! http://compbench.sourceforge.net/cgi-bin/index.cgi to get more information about how to publish results, and see up-to-date list supported benchmarks ! and programs. Frederic Trouche |
From: Frederic T. <xf...@us...> - 2007-09-23 20:39:52
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27737 Modified Files: config.guess config.sub Log Message: Internal changes. Index: config.guess =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/config.guess,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.guess 23 May 2007 15:37:13 -0000 1.2 --- config.guess 23 Sep 2007 20:39:47 -0000 1.3 *************** *** 5,9 **** # Inc. ! timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it --- 5,9 ---- # Inc. ! timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it *************** *** 331,335 **** echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; --- 331,335 ---- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; *************** *** 794,798 **** *:Interix*:[3456]*) case ${UNAME_MACHINE} in ! x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; --- 794,798 ---- *:Interix*:[3456]*) case ${UNAME_MACHINE} in ! x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; Index: config.sub =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/config.sub,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.sub 23 May 2007 15:37:13 -0000 1.2 --- config.sub 23 Sep 2007 20:39:47 -0000 1.3 *************** *** 5,9 **** # Inc. ! timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. --- 5,9 ---- # Inc. ! timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. *************** *** 476,481 **** os=-unicosmp ;; ! cr16c) ! basic_machine=cr16c-unknown os=-elf ;; --- 476,481 ---- os=-unicosmp ;; ! cr16) ! basic_machine=cr16-unknown os=-elf ;; *************** *** 684,687 **** --- 684,691 ---- os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent |
From: Frederic T. <xf...@us...> - 2007-09-23 18:13:14
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6258 Modified Files: configure.in Log Message: Python 2.4.3 required (instead of 2.4.4). Swig 1.3.28 required (instead of 1.3.29). Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** configure.in 20 Sep 2007 19:34:01 -0000 1.41 --- configure.in 23 Sep 2007 18:13:10 -0000 1.42 *************** *** 47,52 **** AC_PROG_CXX AC_PROG_LIBTOOL ! AM_PATH_PYTHON(2.4.4) ! AC_PROG_SWIG(1.3.29) SWIG_ENABLE_CXX SWIG_PYTHON --- 47,52 ---- AC_PROG_CXX AC_PROG_LIBTOOL ! AM_PATH_PYTHON(2.4.3) ! AC_PROG_SWIG(1.3.28) SWIG_ENABLE_CXX SWIG_PYTHON |
From: Frederic T. <xf...@us...> - 2007-09-20 20:29:07
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5590 Modified Files: Makefile.am Log Message: Fixed -version-info in LDFLAGS. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 20 Sep 2007 19:29:15 -0000 1.7 --- Makefile.am 20 Sep 2007 20:29:03 -0000 1.8 *************** *** 22,26 **** UI/libUI.la ! libcompbenchmarks_la_LDFLAGS = -release @VERSION@ AM_LDFLAGS = $(XML_LIBS) -lpthread --- 22,26 ---- UI/libUI.la ! libcompbenchmarks_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ AM_LDFLAGS = $(XML_LIBS) -lpthread |
From: Frederic T. <xf...@us...> - 2007-09-20 19:51:09
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23607 Modified Files: Doxyfile Log Message: Cosmetic changes in doc (relation graphs removed). Comments added. Index: Doxyfile =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Doxyfile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Doxyfile 23 May 2007 15:39:47 -0000 1.10 --- Doxyfile 20 Sep 2007 19:51:05 -0000 1.11 *************** *** 1,18 **** ! # Doxyfile 1.5.1 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = CompBenchmarks PROJECT_NUMBER = 0.5.0 OUTPUT_DIRECTORY = doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English [...1514 lines suppressed...] + # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will + # generate a legend page explaining the meaning of the various boxes and + # arrows in the dot generated graphs. + GENERATE_LEGEND = YES + + # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will + # remove the intermediate dot files that are used to generate + # the various graphs. + DOT_CLEANUP = YES + #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- + + # The SEARCHENGINE tag specifies whether or not a search engine should be + # used. If set to NO the values of all tags below this one will be ignored. + SEARCHENGINE = NO |
From: Frederic T. <xf...@us...> - 2007-09-20 19:37:28
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18389 Modified Files: Benchmark-LINPACKC.cpp Log Message: Version() now returns 0.1.2 - which does match used package's. Index: Benchmark-LINPACKC.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Benchmark-LINPACKC.cpp 10 Sep 2007 20:28:53 -0000 1.13 --- Benchmark-LINPACKC.cpp 20 Sep 2007 19:37:25 -0000 1.14 *************** *** 38,42 **** std::string PackageLINPACKC::Version(void) { ! return("0.1.1"); } --- 38,42 ---- std::string PackageLINPACKC::Version(void) { ! return("0.1.2"); } |
From: Frederic T. <xf...@us...> - 2007-09-20 19:35:31
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17623 Modified Files: ChangeLog Log Message: Updated 0.5.0 comments. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ChangeLog 9 Sep 2007 18:24:14 -0000 1.26 --- ChangeLog 20 Sep 2007 19:35:25 -0000 1.27 *************** *** 1,3 **** ! 0.5.0-BETA3 * Updated compbenchmark-core inline documentation. * Fixes SEGFAULT on inexistant compiler binary given in XML plan file. --- 1,6 ---- ! 0.5.0 ! * Changes in installation process (for better integration). ! * Plan now detects incompatible options given to compilers. ! * compbenchmarks-plan supports --run-number. * Updated compbenchmark-core inline documentation. * Fixes SEGFAULT on inexistant compiler binary given in XML plan file. |
From: Frederic T. <xf...@us...> - 2007-09-20 19:34:04
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16858 Modified Files: configure.in Log Message: Canonical host/target definitions disabled. CBM_LIB_VERSION added (for explicit versionning of libraries). Custom libxml2 variables replaced by defaut ones. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** configure.in 19 Sep 2007 16:29:38 -0000 1.40 --- configure.in 20 Sep 2007 19:34:01 -0000 1.41 *************** *** 12,19 **** AC_INIT(libcompbenchmarks/Benchmark/Benchmark.cpp) ! AC_CANONICAL_HOST ! AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0) AM_CONFIG_HEADER(libcompbenchmarks/config.h) --- 12,23 ---- AC_INIT(libcompbenchmarks/Benchmark/Benchmark.cpp) ! # AC_CANONICAL_HOST ! # AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0) + + MINOR_V=$(echo ${VERSION} | cut -f2 -d'.') + CBM_LIB_VERSION="${MINOR_V}:0:${MINOR_V}" + AM_CONFIG_HEADER(libcompbenchmarks/config.h) *************** *** 264,269 **** AC_SUBST(CBM_PROG_PERL) AC_SUBST(CXXFLAGS) ! AC_SUBST(XML_CPPFLAGS) ! AC_SUBST(XML_LIBS) AC_OUTPUT(libcompbenchmarks/share/Makefile --- 268,272 ---- AC_SUBST(CBM_PROG_PERL) AC_SUBST(CXXFLAGS) ! AC_SUBST(CBM_LIB_VERSION) AC_OUTPUT(libcompbenchmarks/share/Makefile *************** *** 308,313 **** echo "CXX : $CXX" echo "CXFLAGS : $CXXFLAGS" ! echo "XML_LIBS : $XML_LIBS" ! echo "XML_CPPFLAGS : $XML_CPPFLAGS" echo "" echo "System : $CBM_SYSTEM" --- 311,316 ---- echo "CXX : $CXX" echo "CXFLAGS : $CXXFLAGS" ! echo "XML_LIBS : ${XML_LIBS}" ! echo "XML_CPPFLAGS : ${XML_CPPFLAGS}" echo "" echo "System : $CBM_SYSTEM" |
From: Frederic T. <xf...@us...> - 2007-09-20 19:32:13
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16272 Modified Files: Makefile.am Log Message: Explicit references for linking to pthread and libxml2 disabled (should be normally retrieved from libcompbenchmarks.la). Removed man pages (old and unmaintained at this time) : user should use -h option from compbenchmarks-core. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 1 Aug 2007 19:43:54 -0000 1.2 --- Makefile.am 20 Sep 2007 19:32:04 -0000 1.3 *************** *** 14,28 **** libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_core_LDADD = ../libcompbenchmarks/libcompbenchmarks.la @XML_LIBS@ -lpthread compbenchmarks_core_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la noinst_HEADERS = $(compbenchmarks_core_SOURCES:.cpp=.h) ! EXTRA_DIST = compbenchmarks-core.pod compbenchmarks-core.1 INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) ! man_MANS = compbenchmarks-core.1 ! compbenchmarks-core.1: compbenchmarks-core.pod ! pod2man $< > $@ --- 14,28 ---- libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_core_LDADD = ../libcompbenchmarks/libcompbenchmarks.la # @XML_LIBS@ -lpthread compbenchmarks_core_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la noinst_HEADERS = $(compbenchmarks_core_SOURCES:.cpp=.h) ! # EXTRA_DIST = compbenchmarks-core.pod compbenchmarks-core.1 INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) ! # man_MANS = compbenchmarks-core.1 ! # compbenchmarks-core.1: compbenchmarks-core.pod ! # pod2man $< > $@ |
From: Frederic T. <xf...@us...> - 2007-09-20 19:30:39
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15706 Modified Files: Makefile.am Log Message: Explicit references for linking to pthread and libxml2 disabled (should be normally retrieved from sub .la libraries). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 1 Aug 2007 19:44:10 -0000 1.2 --- Makefile.am 20 Sep 2007 19:30:36 -0000 1.3 *************** *** 14,18 **** libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_plan_LDADD = ../libcompbenchmarks/libcompbenchmarks.la @XML_LIBS@ -lpthread compbenchmarks_plan_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la --- 14,18 ---- libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! compbenchmarks_plan_LDADD = ../libcompbenchmarks/libcompbenchmarks.la # @XML_LIBS@ -lpthread compbenchmarks_plan_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la |
From: Frederic T. <xf...@us...> - 2007-09-20 19:29:20
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15258 Modified Files: Makefile.am Log Message: Versions added to benchmark libraries (taken from configure.in). libxml2 providen variables used instead of custom ./configure variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 17 Apr 2007 18:04:06 -0000 1.6 --- Makefile.am 20 Sep 2007 19:29:15 -0000 1.7 *************** *** 21,24 **** --- 21,29 ---- Plan/libPlan.la \ UI/libUI.la + + libcompbenchmarks_la_LDFLAGS = -release @VERSION@ + + AM_LDFLAGS = $(XML_LIBS) -lpthread + # -lwwwcore -lwwwapp -lwwwinit # !!! |
From: Frederic T. <xf...@us...> - 2007-09-20 19:28:26
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14890 Modified Files: Compiler-Options.cpp Log Message: Fixes a bug when adding an option in a option group without a batch (only used by compbenchmark-core -B at this time). Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Compiler-Options.cpp 17 Sep 2007 19:14:32 -0000 1.11 --- Compiler-Options.cpp 20 Sep 2007 19:28:23 -0000 1.12 *************** *** 65,69 **** int ok = 0; ! if (!_batch->compilerNumber()) { return("Please, add compilers in batch before adding options."); } --- 65,69 ---- int ok = 0; ! if ((_batch) && (!_batch->compilerNumber())) { return("Please, add compilers in batch before adding options."); } |
From: Frederic T. <xf...@us...> - 2007-09-20 19:27:19
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14493 Modified Files: Makefile.am Log Message: libxml2 providen variables used instead of custom ./configure variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 6 Jun 2007 21:42:13 -0000 1.3 --- Makefile.am 20 Sep 2007 19:27:12 -0000 1.4 *************** *** 17,21 **** libPlanincludedir = $(includedir)/compbenchmarks/Plan ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks @XML_CPPFLAGS@ ! libPlan_la_LIBADD = @XML_LIBS@ \ No newline at end of file --- 17,22 ---- libPlanincludedir = $(includedir)/compbenchmarks/Plan ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks ! AM_CPPFLAGS = $(XML_CPPFLAGS) ! libPlan_la_LIBADD = $(XML_LIBS) \ No newline at end of file |
From: Frederic T. <xf...@us...> - 2007-09-20 19:26:51
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14132 Modified Files: Makefile.am Log Message: libxml2 providen variables used instead of custom ./configure variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 16 May 2007 09:44:49 -0000 1.8 --- Makefile.am 20 Sep 2007 19:26:46 -0000 1.9 *************** *** 17,22 **** libBaseincludedir = $(includedir)/compbenchmarks/Base ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks @XML_CPPFLAGS@ -DDATAROOTDIR=\"@datarootdir@\" ! libBase_la_LIBADD = @XML_LIBS@ -lpthread --- 17,23 ---- libBaseincludedir = $(includedir)/compbenchmarks/Base ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks -DDATAROOTDIR=\"@datarootdir@\" ! AM_CPPFLAGS = $(XML_CPPFLAGS) ! libBase_la_LIBADD = $(XML_LIBS) -lpthread |
From: Frederic T. <xf...@us...> - 2007-09-20 19:25:03
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13380 Modified Files: Makefile.am Log Message: Versions added to benchmark libraries (taken from configure.in). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 6 Sep 2007 17:38:10 -0000 1.6 --- Makefile.am 20 Sep 2007 19:24:59 -0000 1.7 *************** *** 24,27 **** --- 24,36 ---- libcompbenchmarks_bm_linpackc_la_LIBADD = ../libcompbenchmarks/libcompbenchmarks.la + libcompbenchmarks_bm_gzip_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + libcompbenchmarks_bm_bzip2_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + libcompbenchmarks_bm_nbench_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + libcompbenchmarks_bm_scimark2_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + libcompbenchmarks_bm_benchpp_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + libcompbenchmarks_bm_benchpplinux_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + libcompbenchmarks_bm_linpackc_la_LDFLAGS = -version-info @CBM_LIB_VERSION@ + + Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.inc libcompbenchmarks_bm_gzip_la_SOURCES = Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.inc |