riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

* ./mauka: 

- Change: In GraphicMaukaEngine, simplificate the normal menu, put
        everything else in the "step by step" sub-menu.
This commit is contained in:
Jean-Paul Chaput 2010-08-26 15:17:46 +00:00
parent 6e91d50324
commit 41e93e7c65
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mauka/src/GraphicMaukaEngine.cpp
View File

@ -191,7 +191,7 @@ namespace Mauka {
} }
void GraphicMaukaEngine::run () void GraphicMaukaEngine::doSimulatedAnnealing ()
{ {
MaukaEngine* mauka = createEngine (); MaukaEngine* mauka = createEngine ();
if ( mauka == NULL ) { if ( mauka == NULL ) {
@ -208,6 +208,19 @@ namespace Mauka {
} }
void GraphicMaukaEngine::place ()
{
if ( not MetisEngine::isHMetisCapable() ) doQuadriPart ();
else {
cerr << Warning("Mauka has not been compiled againts hMETIS.\n"
" Quadri-partition step is disabled, simulated annealing may be *very* long." ) << endl;
}
doSimulatedAnnealing ();
save ();
}
void GraphicMaukaEngine::save () void GraphicMaukaEngine::save ()
{ {
MaukaEngine* mauka = createEngine (); MaukaEngine* mauka = createEngine ();
@ -246,24 +259,31 @@ namespace Mauka {
prMenu->addSeparator (); prMenu->addSeparator ();
} }
QAction* placeAction = _viewer->findChild<QAction*>("viewer.menuBar.placeAndRoute.maukaPlace"); QAction* placeAction = _viewer->findChild<QAction*>("viewer.menuBar.placeAndRoute.place");
if ( placeAction != NULL ) if ( placeAction != NULL )
cerr << Warning("GraphicMaukaEngine::addToMenu() - Mauka placer already hooked in.") << endl; cerr << Warning("GraphicMaukaEngine::addToMenu() - Mauka placer already hooked in.") << endl;
else { else {
QAction* quadriPartAction = new QAction ( tr("Mauka - &QuadriPartition"), _viewer ); QAction* quadriPartAction = new QAction ( tr("Mauka - &QuadriPartition"), _viewer );
quadriPartAction->setObjectName ( "viewer.menuBar.quadriPartAndRoute.maukaQuadriPartition" ); quadriPartAction->setObjectName ( "viewer.menuBar.placeAndRoute.quadriPartition" );
quadriPartAction->setStatusTip ( tr("Run the <b>hMETIS</b> quadri-partitioner") ); quadriPartAction->setStatusTip ( tr("Run the <b>hMETIS</b> quadri-partitioner") );
quadriPartAction->setVisible ( true ); quadriPartAction->setVisible ( true );
prMenu->addAction ( quadriPartAction ); stepMenu->addAction ( quadriPartAction );
QAction* annealingAction = new QAction ( tr("Mauka - &Place"), _viewer );
annealingAction->setObjectName ( "viewer.menuBar.placeAndRoute.maukaPlace" );
annealingAction->setStatusTip ( tr("Run the <b>Mauka</b> placer") );
annealingAction->setVisible ( true );
stepMenu->addAction ( annealingAction );
QAction* placeAction = new QAction ( tr("Mauka - &Place"), _viewer ); QAction* placeAction = new QAction ( tr("Mauka - &Place"), _viewer );
placeAction->setObjectName ( "viewer.menuBar.placeAndRoute.maukaPlace" ); placeAction->setObjectName ( "viewer.menuBar.placeAndRoute.place" );
placeAction->setStatusTip ( tr("Run the <b>Mauka</b> placer") ); placeAction->setStatusTip ( tr("Run the <b>Mauka</b> placer") );
placeAction->setVisible ( true ); placeAction->setVisible ( true );
prMenu->addAction ( placeAction ); prMenu->addAction ( placeAction );
connect ( placeAction , SIGNAL(triggered()), this, SLOT(run()) );
connect ( quadriPartAction, SIGNAL(triggered()), this, SLOT(doQuadriPart()) ); connect ( quadriPartAction, SIGNAL(triggered()), this, SLOT(doQuadriPart()) );
connect ( annealingAction , SIGNAL(triggered()), this, SLOT(doSimulatedAnnealing()) );
connect ( placeAction , SIGNAL(triggered()), this, SLOT(place()) );
} }
connect ( this, SIGNAL(cellPreModificated ()), _viewer->getCellWidget(), SLOT(cellPreModificate ()) ); connect ( this, SIGNAL(cellPreModificated ()), _viewer->getCellWidget(), SLOT(cellPreModificate ()) );

39
mauka/src/mauka/GraphicMaukaEngine.h
View File

@ -61,25 +61,26 @@ namespace Mauka {
Q_OBJECT; Q_OBJECT;
public: public:
MaukaEngine* createEngine (); MaukaEngine* createEngine ();
MaukaEngine* getForFramework (); MaukaEngine* getForFramework ();
static void initMaukaContainer ( CellWidget* ); static void initMaukaContainer ( CellWidget* );
static void drawMaukaContainer ( CellWidget* static void drawMaukaContainer ( CellWidget*
, const Go* , const Go*
, const BasicLayer* , const BasicLayer*
, const Box& , const Box&
, const Transformation& , const Transformation&
); );
static GraphicMaukaEngine* grab (); static GraphicMaukaEngine* grab ();
virtual const Name& getName () const; virtual const Name& getName () const;
Cell* getCell (); Cell* getCell ();
virtual size_t release (); virtual size_t release ();
virtual void addToMenu ( CellViewer* ); virtual void addToMenu ( CellViewer* );
void refreshViewer (); void refreshViewer ();
public slots: public slots:
void doQuadriPart (); void doQuadriPart ();
void run (); void doSimulatedAnnealing ();
void save (); void place ();
void save ();
protected: protected:
static size_t _references; static size_t _references;