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

* ./crlcore: 

- New: In Utilities, automatic setting of STRATUS_MAPPING_NAME. It's put
        back into the environment from the configuration. This suppress the
        need for the last environment variable under cgt.
This commit is contained in:
Jean-Paul Chaput 2010-07-18 10:00:38 +00:00
parent 72e63309e7
commit 6d4e94616d
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crlcore/etc/tools.configuration.xml
View File

@ -81,6 +81,8 @@
<parameter id="kite.globalRipupLimit" type="int" value="5" min="1"/> <parameter id="kite.globalRipupLimit" type="int" value="5" min="1"/>
<parameter id="kite.longGlobalRipupLimit" type="int" value="5" min="1"/> <parameter id="kite.longGlobalRipupLimit" type="int" value="5" min="1"/>
<parameter id="kite.eventsLimit" type="int" value="4000000" min="1"/> <parameter id="kite.eventsLimit" type="int" value="4000000" min="1"/>
<!-- Stratus1 -->
<parameter id="stratus1.mappingName" type="string" value="./stratus2sxlib.xml"/>
<layout> <layout>
<!-- Miscellaneous --> <!-- Miscellaneous -->
<tab name="Misc."> <tab name="Misc.">
@ -140,5 +142,9 @@
<widget id="kite.longGlobalRipupLimit" label="Long Globals" column="1" spinbox="true"/> <widget id="kite.longGlobalRipupLimit" label="Long Globals" column="1" spinbox="true"/>
<widget type="rule"/> <widget type="rule"/>
</tab> </tab>
<tab name="Stratus1">
<widget type="title" label="Stratus1 - Netlist &amp; Layout Capture"/>
<widget id="stratus1.mappingName" label="Virtual Library Translation" column="0"/>
</tab>
</layout> </layout>
</configuration> </configuration>

38
crlcore/src/ccore/Utilities.cpp
View File

@ -86,9 +86,20 @@ namespace {
} }
void stratus1MappingNameChanged ( Cfg::Parameter* p )
{
bfs::path stratusMappingName = p->asString();
if ( not stratusMappingName.has_root_directory() ) {
stratusMappingName = System::getPath("etc") / stratusMappingName;
}
setenv ( "STRATUS_MAPPING_NAME", stratusMappingName.string().c_str(), 1 );
}
std::string environmentMapper ( std::string environmentName ) std::string environmentMapper ( std::string environmentName )
{ {
if ( environmentName == "CORIOLIS_TOP" ) return "coriolis_top"; if ( environmentName == "CORIOLIS_TOP" ) return "coriolis_top";
else if ( environmentName == "STRATUS_MAPPING_NAME" ) return "stratus_mapping_name";
return ""; return "";
} }
@ -224,8 +235,10 @@ namespace CRL {
// Environment variables reading. // Environment variables reading.
boptions::options_description options ("Environment Variables"); boptions::options_description options ("Environment Variables");
options.add_options() options.add_options()
( "coriolis_top", boptions::value<string>()->default_value(CORIOLIS_TOP) ( "coriolis_top" , boptions::value<string>()->default_value(CORIOLIS_TOP)
, "The root directory of the Coriolis installation tree." ); , "The root directory of the Coriolis installation tree." )
( "stratus_mapping_name", boptions::value<string>()
, "Stratus virtual cells mapping." );
boptions::variables_map arguments; boptions::variables_map arguments;
boptions::store ( boptions::parse_environment(options,environmentMapper), arguments ); boptions::store ( boptions::parse_environment(options,environmentMapper), arguments );
@ -266,12 +279,13 @@ namespace CRL {
// Default configuration loading. // Default configuration loading.
Cfg::Configuration* conf = Cfg::Configuration::get (); Cfg::Configuration* conf = Cfg::Configuration::get ();
Cfg::getParamBool("misc.catchCore" ,true )->registerCb ( catchCoreChanged ); Cfg::getParamBool ("misc.catchCore" ,true )->registerCb ( catchCoreChanged );
Cfg::getParamBool("misc.verboseLevel1",true )->registerCb ( verboseLevel1Changed ); Cfg::getParamBool ("misc.verboseLevel1" ,true )->registerCb ( verboseLevel1Changed );
Cfg::getParamBool("misc.verboseLevel2",true )->registerCb ( verboseLevel2Changed ); Cfg::getParamBool ("misc.verboseLevel2" ,true )->registerCb ( verboseLevel2Changed );
Cfg::getParamBool("misc.info" ,false)->registerCb ( infoChanged ); Cfg::getParamBool ("misc.info" ,false)->registerCb ( infoChanged );
Cfg::getParamBool("misc.logMode" ,true )->registerCb ( logModeChanged ); Cfg::getParamBool ("misc.logMode" ,true )->registerCb ( logModeChanged );
Cfg::getParamInt ("misc.traceLevel" ,1000 )->registerCb ( traceLevelChanged ); Cfg::getParamInt ("misc.traceLevel" ,1000 )->registerCb ( traceLevelChanged );
Cfg::getParamString("stratus1.mappingName","./stratus2sxlib.xml")->registerCb ( stratus1MappingNameChanged );
// Immediate update from the configuration. // Immediate update from the configuration.
catchCoreChanged ( Cfg::getParamBool("misc.catchCore" ) ); catchCoreChanged ( Cfg::getParamBool("misc.catchCore" ) );
@ -281,6 +295,11 @@ namespace CRL {
logModeChanged ( Cfg::getParamBool("misc.logMode" ) ); logModeChanged ( Cfg::getParamBool("misc.logMode" ) );
traceLevelChanged ( Cfg::getParamInt ("misc.traceLevel" ) ); traceLevelChanged ( Cfg::getParamInt ("misc.traceLevel" ) );
bfs::path stratusMappingName;
if ( arguments.count("stratus_mapping_name") ) {
Cfg::getParamString( "stratus1.mappingName")->setString ( arguments["stratus_mapping_name"].as<string>() );
}
bool systemConfFound = false; bool systemConfFound = false;
bfs::path systemConfFile = sysConfDir / "tools.configuration.xml"; bfs::path systemConfFile = sysConfDir / "tools.configuration.xml";
if ( bfs::exists(systemConfFile) ) { if ( bfs::exists(systemConfFile) ) {
@ -387,14 +406,9 @@ namespace CRL {
{ {
static bfs::path nullPath ("no_path"); static bfs::path nullPath ("no_path");
cerr << "Looking up: " << key << endl;
map<const string,bfs::path>::const_iterator ipath = _pathes.find ( key ); map<const string,bfs::path>::const_iterator ipath = _pathes.find ( key );
if ( ipath == _pathes.end() ) return nullPath; if ( ipath == _pathes.end() ) return nullPath;
cerr << "Successfull lookup: "; cerr.flush();
cerr << (*ipath).second.string() << endl;
return (*ipath).second; return (*ipath).second;
} }