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

* ./unicorn/src: 

- Change: In CgtMain and cgt, use the new router (Katabatic+Kite).
This commit is contained in:
Jean-Paul Chaput 2013-12-04 01:57:21 +00:00
parent 4a33fa12b3
commit 789c047e69
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unicorn/src/CgtMain.cpp
View File

@ -389,8 +389,8 @@ int main ( int argc, char *argv[] )
if ( runKiteTool ) { if ( runKiteTool ) {
//cell->flattenNets ( not arguments.count("global") ); //cell->flattenNets ( not arguments.count("global") );
unsigned int globalFlags = (loadGlobal) ? Kite::LoadGlobalSolution unsigned int globalFlags = (loadGlobal) ? Kite::KtLoadGlobalRouting
: Kite::BuildGlobalSolution; : Kite::KtBuildGlobalRouting;
static KatabaticEngine::NetSet routingNets; static KatabaticEngine::NetSet routingNets;
KiteEngine* kite = KiteEngine::create ( cell ); KiteEngine* kite = KiteEngine::create ( cell );
@ -400,8 +400,8 @@ int main ( int argc, char *argv[] )
if ( saveGlobal ) kite->saveGlobalSolution (); if ( saveGlobal ) kite->saveGlobalSolution ();
if ( detailedRoute ) { if ( detailedRoute ) {
kite->loadGlobalRouting ( Katabatic::LoadGrByNet, routingNets ); kite->loadGlobalRouting ( Katabatic::EngineLoadGrByNet, routingNets );
kite->layerAssign ( Katabatic::NoNetLayerAssign ); kite->layerAssign ( Katabatic::EngineNoNetLayerAssign );
kite->runNegociate (); kite->runNegociate ();
kiteSuccess = kite->getToolSuccess (); kiteSuccess = kite->getToolSuccess ();
kite->finalizeLayout (); kite->finalizeLayout ();

13
unicorn/src/cgt.py
View File

@ -89,6 +89,7 @@ if __name__ == '__main__':
parser.add_option( '-v', '--verbose' , action='store_true', dest='verbose' , help='First level of verbosity.') parser.add_option( '-v', '--verbose' , action='store_true', dest='verbose' , help='First level of verbosity.')
parser.add_option( '-V', '--very-verbose' , action='store_true', dest='veryVerbose' , help='Second level of verbosity.') parser.add_option( '-V', '--very-verbose' , action='store_true', dest='veryVerbose' , help='Second level of verbosity.')
parser.add_option( '-i', '--info' , action='store_true', dest='info' , help='Display lots of informational messages.') parser.add_option( '-i', '--info' , action='store_true', dest='info' , help='Display lots of informational messages.')
parser.add_option( '--paranoid' , action='store_true', dest='paranoid' , help='Display everything that *may be* suspicious...')
parser.add_option( '-b', '--bug' , action='store_true', dest='bug' , help='Display bug related messages.') parser.add_option( '-b', '--bug' , action='store_true', dest='bug' , help='Display bug related messages.')
parser.add_option( '--show-conf' , action='store_true', dest='showConf' , help='Display Kite configuration.') parser.add_option( '--show-conf' , action='store_true', dest='showConf' , help='Display Kite configuration.')
parser.add_option( '-D', '--core-dump' , action='store_true', dest='coreDump' , help='Enable core-dump when a crash occurs.') parser.add_option( '-D', '--core-dump' , action='store_true', dest='coreDump' , help='Enable core-dump when a crash occurs.')
@ -109,6 +110,7 @@ if __name__ == '__main__':
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
args.insert(0, 'cgt') args.insert(0, 'cgt')
af = CRL.AllianceFramework.get()
#Hurricane.trace(True) #Hurricane.trace(True)
Cfg.Configuration.pushDefaultPriority(Cfg.Parameter.Priority.CommandLine) Cfg.Configuration.pushDefaultPriority(Cfg.Parameter.Priority.CommandLine)
@ -117,6 +119,7 @@ if __name__ == '__main__':
if options.verbose: Cfg.getParamBool ('misc.verboseLevel1').setBool(True) if options.verbose: Cfg.getParamBool ('misc.verboseLevel1').setBool(True)
if options.veryVerbose: Cfg.getParamBool ('misc.verboseLevel2').setBool(True) if options.veryVerbose: Cfg.getParamBool ('misc.verboseLevel2').setBool(True)
if options.info: Cfg.getParamBool ('misc.info' ).setBool(True) if options.info: Cfg.getParamBool ('misc.info' ).setBool(True)
if options.paranoid: Cfg.getParamBool ('misc.paranoid' ).setBool(True)
if options.bug: Cfg.getParamBool ('misc.bug' ).setBool(True) if options.bug: Cfg.getParamBool ('misc.bug' ).setBool(True)
if options.logMode: Cfg.getParamBool ('misc.logMode' ).setBool(True) if options.logMode: Cfg.getParamBool ('misc.logMode' ).setBool(True)
if options.showConf: Cfg.getParamBool ('misc.showConf' ).setBool(True) if options.showConf: Cfg.getParamBool ('misc.showConf' ).setBool(True)
@ -134,8 +137,6 @@ if __name__ == '__main__':
Cfg.Configuration.popDefaultPriority() Cfg.Configuration.popDefaultPriority()
af = CRL.AllianceFramework.get()
cell = None cell = None
if options.acmSigdaName: if options.acmSigdaName:
cell = CRL.AcmSigda.load(options.acmSigdaName) cell = CRL.AcmSigda.load(options.acmSigdaName)
@ -208,8 +209,8 @@ if __name__ == '__main__':
runKiteTool = loadGlobal or globalRoute or detailRoute runKiteTool = loadGlobal or globalRoute or detailRoute
if runKiteTool: if runKiteTool:
if loadGlobal: globalFlags = Kite.LoadGlobalSolution if loadGlobal: globalFlags = Kite.KtLoadGlobalRouting
else: globalFlags = Kite.BuildGlobalSolution else: globalFlags = Kite.KtBuildGlobalRouting
routingNets = [] routingNets = []
kite = Kite.KiteEngine.create(cell) kite = Kite.KiteEngine.create(cell)
@ -219,8 +220,8 @@ if __name__ == '__main__':
if saveGlobal: kite.saveGlobalSolution() if saveGlobal: kite.saveGlobalSolution()
if detailRoute: if detailRoute:
kite.loadGlobalRouting( Katabatic.LoadGrByNet, routingNets ) kite.loadGlobalRouting( Katabatic.EngineLoadGrByNet, routingNets )
kite.layerAssign ( Katabatic.NoNetLayerAssign ) kite.layerAssign ( Katabatic.EngineNoNetLayerAssign )
kite.runNegociate () kite.runNegociate ()
kiteSuccess = kite.getToolSuccess() kiteSuccess = kite.getToolSuccess()
kite.finalizeLayout() kite.finalizeLayout()