From 3d9e86303e05a0efef8caeb67b41248a49d01654 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 21 Feb 2023 17:04:38 +0100 Subject: [PATCH] Final deprecation of Katabatic, Knick & Kite. --- bootstrap/build.conf | 6 ++-- cumulus/src/designflow/pnr.py | 2 -- unicorn/CMakeLists.txt | 6 ++-- unicorn/src/CgtMain.cpp | 53 ++++++++++++++++------------------- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/bootstrap/build.conf b/bootstrap/build.conf index 86143759..6f3aa465 100644 --- a/bootstrap/build.conf +++ b/bootstrap/build.conf @@ -21,9 +21,9 @@ projects = [ , "etesian" , "anabatic" , "katana" - , "knik" - , "katabatic" - , "kite" + #, "knik" + #, "katabatic" + #, "kite" , "equinox" , "solstice" , "oroshi" diff --git a/cumulus/src/designflow/pnr.py b/cumulus/src/designflow/pnr.py index 39063f30..7aaa9379 100644 --- a/cumulus/src/designflow/pnr.py +++ b/cumulus/src/designflow/pnr.py @@ -67,8 +67,6 @@ class PnR ( FlowTask ): import Etesian import Anabatic import Katana - import Katabatic - import Kite import Bora import Tutorial import Viewer diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index 5ca53885..b9a1885a 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -35,9 +35,9 @@ find_package(KATANA REQUIRED) #find_package(BORA REQUIRED) # FIXME: make FindBORA.cmake find_package(ETESIAN REQUIRED) - find_package(KNIK REQUIRED) - find_package(KATABATIC REQUIRED) - find_package(KITE REQUIRED) + #find_package(KNIK REQUIRED) + #find_package(KATABATIC REQUIRED) + #find_package(KITE REQUIRED) find_package(EQUINOX REQUIRED) find_package(SOLSTICE REQUIRED) #find_package(TUTORIAL REQUIRED) # FIXME: make FindTUTORIAL.cmake diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp index e57343d7..b9249dbe 100644 --- a/unicorn/src/CgtMain.cpp +++ b/unicorn/src/CgtMain.cpp @@ -57,8 +57,7 @@ using namespace CRL; #include "katana/GraphicKatanaEngine.h" #include "etesian/GraphicEtesianEngine.h" -#include "knik/GraphicKnikEngine.h" -#include "kite/GraphicKiteEngine.h" +#include "katana/GraphicKatanaEngine.h" #include "equinox/GraphicEquinoxEngine.h" #include "solstice/GraphicSolsticeEngine.h" #include "unicorn/UnicornGui.h" @@ -70,8 +69,8 @@ using namespace Unicorn; int main ( int argc, char *argv[] ) { - int returnCode = 0; - bool kiteSuccess = true; + int returnCode = 0; + bool katanaSuccess = true; try { bool destroyDatabase; @@ -102,7 +101,7 @@ int main ( int argc, char *argv[] ) ( "info,i" , bopts::bool_switch() , "Lots of informational messages.") ( "show-conf" , bopts::bool_switch() - , "Print Kite configuration settings.") + , "Print Katana configuration settings.") ( "conf" , bopts::value() , "An XML configuration file." ) ( "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" "allowed to perform." ) ( "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 statistical measurements on the disk.") ( "cell,c" , bopts::value() @@ -238,10 +237,10 @@ int main ( int argc, char *argv[] ) Cfg::getParamInt("metis.numberOfInstancesStopCriterion")->setInt ( partitionSizeStop ); if ( arguments.count("edge") ) - Cfg::getParamPercentage("kite.edgeCapacity")->setPercentage ( edgeCapacity ); + Cfg::getParamPercentage("katana.edgeCapacity")->setPercentage ( edgeCapacity ); if ( arguments.count("events-limit") ) - Cfg::getParamInt("kite.eventsLimit")->setInt ( eventsLimit ); + Cfg::getParamInt("katana.eventsLimit")->setInt ( eventsLimit ); UnicornGui::getBanner().setName ( "cgt" ); UnicornGui::getBanner().setPurpose ( "Coriolis Graphical Tool" ); @@ -250,8 +249,7 @@ int main ( int argc, char *argv[] ) cmess1 << " Tool Credits" << endl; cmess1 << " Hurricane .................... Remy Escassut & Christian Masson" << endl; cmess1 << " Etesian - Placer .............................. Gabriel Gouvine" << endl; - cmess1 << " Knik - Global Router ............................ Damien Dupuis" << endl; - cmess1 << " Kite - Detailed Router ....................... Jean-Paul Chaput" << endl; + cmess1 << " Katana - Detailed Router ...................... Jean-Paul Chaput" << endl; cmess1 << " " << endl; cmess1 << " Contributors" << endl; @@ -310,11 +308,8 @@ int main ( int argc, char *argv[] ) dbo_ptr unicorn ( UnicornGui::create() ); unicorn->setApplicationName ( QObject::tr("cgt") ); - //unicorn->registerTool ( Mauka::GraphicMaukaEngine::grab() ); unicorn->registerTool ( Katana::GraphicKatanaEngine::grab() ); unicorn->registerTool ( Etesian::GraphicEtesianEngine::grab() ); - //unicorn->registerTool ( Knik::GraphicKnikEngine::grab() ); - unicorn->registerTool ( Kite::GraphicKiteEngine::grab() ); //unicorn->setEnableRedrawInterrupt ( true ); //unicorn->registerTool ( Equinox::GraphicEquinoxEngine::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; - bool runKiteTool = loadGlobal or globalRoute or detailedRoute; + bool runKatanaTool = loadGlobal or globalRoute or detailedRoute; - if ( runKiteTool ) { + if ( runKatanaTool ) { //cell->flattenNets ( not arguments.count("global") ); - unsigned int globalFlags = (loadGlobal) ? Kite::KtLoadGlobalRouting - : Kite::KtBuildGlobalRouting; + // unsigned int globalFlags = (loadGlobal) ? Katana::LoadGlobalRouting + // : Katana::BuildGlobalRouting; - Kite::KiteEngine* kite = Kite::KiteEngine::create ( cell ); - if ( showConf ) kite->printConfiguration (); + Katana::KatanaEngine* katana = Katana::KatanaEngine::create ( cell ); + if ( showConf ) katana->printConfiguration (); - kite->runGlobalRouter ( globalFlags ); - if ( saveGlobal ) kite->saveGlobalSolution (); + katana->runGlobalRouter ( Katana::Flags::NoFlags ); + // if ( saveGlobal ) katana->saveGlobalSolution (); if ( detailedRoute ) { - kite->loadGlobalRouting ( Katabatic::EngineLoadGrByNet ); - kite->layerAssign ( Katabatic::EngineNoNetLayerAssign ); - kite->runNegociate (); - kiteSuccess = kite->getToolSuccess (); - kite->finalizeLayout (); + katana->loadGlobalRouting ( Anabatic::EngineLoadGrByNet ); + katana->layerAssign ( Anabatic::EngineNoNetLayerAssign ); + katana->runNegociate (); + katanaSuccess = katana->isDetailedRoutingSuccess (); + katana->finalizeLayout (); if ( dumpMeasures ) - kite->dumpMeasures (); - kite->destroy (); + katana->dumpMeasures (); + katana->destroy (); if ( arguments.count("save-design") ) { cell->setName ( arguments["save-design"].as().c_str() ); @@ -405,7 +400,7 @@ int main ( int argc, char *argv[] ) } } - returnCode = (kiteSuccess) ? 0 : 1; + returnCode = (katanaSuccess) ? 0 : 1; } }