Final deprecation of Katabatic, Knick & Kite.

This commit is contained in:
Jean-Paul Chaput 2023-02-21 17:04:38 +01:00
parent fabcabe31d
commit 3d9e86303e
4 changed files with 30 additions and 37 deletions

View File

@ -21,9 +21,9 @@ projects = [
, "etesian" , "etesian"
, "anabatic" , "anabatic"
, "katana" , "katana"
, "knik" #, "knik"
, "katabatic" #, "katabatic"
, "kite" #, "kite"
, "equinox" , "equinox"
, "solstice" , "solstice"
, "oroshi" , "oroshi"

View File

@ -67,8 +67,6 @@ class PnR ( FlowTask ):
import Etesian import Etesian
import Anabatic import Anabatic
import Katana import Katana
import Katabatic
import Kite
import Bora import Bora
import Tutorial import Tutorial
import Viewer import Viewer

View File

@ -35,9 +35,9 @@
find_package(KATANA REQUIRED) find_package(KATANA REQUIRED)
#find_package(BORA REQUIRED) # FIXME: make FindBORA.cmake #find_package(BORA REQUIRED) # FIXME: make FindBORA.cmake
find_package(ETESIAN REQUIRED) find_package(ETESIAN REQUIRED)
find_package(KNIK REQUIRED) #find_package(KNIK REQUIRED)
find_package(KATABATIC REQUIRED) #find_package(KATABATIC REQUIRED)
find_package(KITE REQUIRED) #find_package(KITE REQUIRED)
find_package(EQUINOX REQUIRED) find_package(EQUINOX REQUIRED)
find_package(SOLSTICE REQUIRED) find_package(SOLSTICE REQUIRED)
#find_package(TUTORIAL REQUIRED) # FIXME: make FindTUTORIAL.cmake #find_package(TUTORIAL REQUIRED) # FIXME: make FindTUTORIAL.cmake

View File

@ -57,8 +57,7 @@ using namespace CRL;
#include "katana/GraphicKatanaEngine.h" #include "katana/GraphicKatanaEngine.h"
#include "etesian/GraphicEtesianEngine.h" #include "etesian/GraphicEtesianEngine.h"
#include "knik/GraphicKnikEngine.h" #include "katana/GraphicKatanaEngine.h"
#include "kite/GraphicKiteEngine.h"
#include "equinox/GraphicEquinoxEngine.h" #include "equinox/GraphicEquinoxEngine.h"
#include "solstice/GraphicSolsticeEngine.h" #include "solstice/GraphicSolsticeEngine.h"
#include "unicorn/UnicornGui.h" #include "unicorn/UnicornGui.h"
@ -71,7 +70,7 @@ using namespace Unicorn;
int main ( int argc, char *argv[] ) int main ( int argc, char *argv[] )
{ {
int returnCode = 0; int returnCode = 0;
bool kiteSuccess = true; bool katanaSuccess = true;
try { try {
bool destroyDatabase; bool destroyDatabase;
@ -102,7 +101,7 @@ int main ( int argc, char *argv[] )
( "info,i" , bopts::bool_switch() ( "info,i" , bopts::bool_switch()
, "Lots of informational messages.") , "Lots of informational messages.")
( "show-conf" , bopts::bool_switch() ( "show-conf" , bopts::bool_switch()
, "Print Kite configuration settings.") , "Print Katana configuration settings.")
( "conf" , bopts::value<string>() ( "conf" , bopts::value<string>()
, "An XML configuration file." ) , "An XML configuration file." )
( "core-dump,D" , bopts::bool_switch() ( "core-dump,D" , bopts::bool_switch()
@ -133,7 +132,7 @@ int main ( int argc, char *argv[] )
, "The maximum number of iterations (events) that the router is" , "The maximum number of iterations (events) that the router is"
"allowed to perform." ) "allowed to perform." )
( "detailed-route,R" , bopts::bool_switch(&detailedRoute)->default_value(false) ( "detailed-route,R" , bopts::bool_switch(&detailedRoute)->default_value(false)
, "Run the detailed router (Kite).") , "Run the detailed router (Katana).")
( "dump-measures,M" , bopts::bool_switch(&dumpMeasures)->default_value(false) ( "dump-measures,M" , bopts::bool_switch(&dumpMeasures)->default_value(false)
, "Dump statistical measurements on the disk.") , "Dump statistical measurements on the disk.")
( "cell,c" , bopts::value<string>() ( "cell,c" , bopts::value<string>()
@ -238,10 +237,10 @@ int main ( int argc, char *argv[] )
Cfg::getParamInt("metis.numberOfInstancesStopCriterion")->setInt ( partitionSizeStop ); Cfg::getParamInt("metis.numberOfInstancesStopCriterion")->setInt ( partitionSizeStop );
if ( arguments.count("edge") ) if ( arguments.count("edge") )
Cfg::getParamPercentage("kite.edgeCapacity")->setPercentage ( edgeCapacity ); Cfg::getParamPercentage("katana.edgeCapacity")->setPercentage ( edgeCapacity );
if ( arguments.count("events-limit") ) if ( arguments.count("events-limit") )
Cfg::getParamInt("kite.eventsLimit")->setInt ( eventsLimit ); Cfg::getParamInt("katana.eventsLimit")->setInt ( eventsLimit );
UnicornGui::getBanner().setName ( "cgt" ); UnicornGui::getBanner().setName ( "cgt" );
UnicornGui::getBanner().setPurpose ( "Coriolis Graphical Tool" ); UnicornGui::getBanner().setPurpose ( "Coriolis Graphical Tool" );
@ -250,8 +249,7 @@ int main ( int argc, char *argv[] )
cmess1 << " Tool Credits" << endl; cmess1 << " Tool Credits" << endl;
cmess1 << " Hurricane .................... Remy Escassut & Christian Masson" << endl; cmess1 << " Hurricane .................... Remy Escassut & Christian Masson" << endl;
cmess1 << " Etesian - Placer .............................. Gabriel Gouvine" << endl; cmess1 << " Etesian - Placer .............................. Gabriel Gouvine" << endl;
cmess1 << " Knik - Global Router ............................ Damien Dupuis" << endl; cmess1 << " Katana - Detailed Router ...................... Jean-Paul Chaput" << endl;
cmess1 << " Kite - Detailed Router ....................... Jean-Paul Chaput" << endl;
cmess1 << " " << endl; cmess1 << " " << endl;
cmess1 << " Contributors" << endl; cmess1 << " Contributors" << endl;
@ -310,11 +308,8 @@ int main ( int argc, char *argv[] )
dbo_ptr<UnicornGui> unicorn ( UnicornGui::create() ); dbo_ptr<UnicornGui> unicorn ( UnicornGui::create() );
unicorn->setApplicationName ( QObject::tr("cgt") ); unicorn->setApplicationName ( QObject::tr("cgt") );
//unicorn->registerTool ( Mauka::GraphicMaukaEngine::grab() );
unicorn->registerTool ( Katana::GraphicKatanaEngine::grab() ); unicorn->registerTool ( Katana::GraphicKatanaEngine::grab() );
unicorn->registerTool ( Etesian::GraphicEtesianEngine::grab() ); unicorn->registerTool ( Etesian::GraphicEtesianEngine::grab() );
//unicorn->registerTool ( Knik::GraphicKnikEngine::grab() );
unicorn->registerTool ( Kite::GraphicKiteEngine::grab() );
//unicorn->setEnableRedrawInterrupt ( true ); //unicorn->setEnableRedrawInterrupt ( true );
//unicorn->registerTool ( Equinox::GraphicEquinoxEngine::grab() ); //unicorn->registerTool ( Equinox::GraphicEquinoxEngine::grab() );
//unicorn->registerTool ( Solstice::GraphicSolsticeEngine::grab() ); //unicorn->registerTool ( Solstice::GraphicSolsticeEngine::grab() );
@ -375,29 +370,29 @@ int main ( int argc, char *argv[] )
if ( detailedRoute and not (loadGlobal or globalRoute) ) globalRoute = true; if ( detailedRoute and not (loadGlobal or globalRoute) ) globalRoute = true;
bool runKiteTool = loadGlobal or globalRoute or detailedRoute; bool runKatanaTool = loadGlobal or globalRoute or detailedRoute;
if ( runKiteTool ) { if ( runKatanaTool ) {
//cell->flattenNets ( not arguments.count("global") ); //cell->flattenNets ( not arguments.count("global") );
unsigned int globalFlags = (loadGlobal) ? Kite::KtLoadGlobalRouting // unsigned int globalFlags = (loadGlobal) ? Katana::LoadGlobalRouting
: Kite::KtBuildGlobalRouting; // : Katana::BuildGlobalRouting;
Kite::KiteEngine* kite = Kite::KiteEngine::create ( cell ); Katana::KatanaEngine* katana = Katana::KatanaEngine::create ( cell );
if ( showConf ) kite->printConfiguration (); if ( showConf ) katana->printConfiguration ();
kite->runGlobalRouter ( globalFlags ); katana->runGlobalRouter ( Katana::Flags::NoFlags );
if ( saveGlobal ) kite->saveGlobalSolution (); // if ( saveGlobal ) katana->saveGlobalSolution ();
if ( detailedRoute ) { if ( detailedRoute ) {
kite->loadGlobalRouting ( Katabatic::EngineLoadGrByNet ); katana->loadGlobalRouting ( Anabatic::EngineLoadGrByNet );
kite->layerAssign ( Katabatic::EngineNoNetLayerAssign ); katana->layerAssign ( Anabatic::EngineNoNetLayerAssign );
kite->runNegociate (); katana->runNegociate ();
kiteSuccess = kite->getToolSuccess (); katanaSuccess = katana->isDetailedRoutingSuccess ();
kite->finalizeLayout (); katana->finalizeLayout ();
if ( dumpMeasures ) if ( dumpMeasures )
kite->dumpMeasures (); katana->dumpMeasures ();
kite->destroy (); katana->destroy ();
if ( arguments.count("save-design") ) { if ( arguments.count("save-design") ) {
cell->setName ( arguments["save-design"].as<string>().c_str() ); cell->setName ( arguments["save-design"].as<string>().c_str() );
@ -405,7 +400,7 @@ int main ( int argc, char *argv[] )
} }
} }
returnCode = (kiteSuccess) ? 0 : 1; returnCode = (katanaSuccess) ? 0 : 1;
} }
} }