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

New densityVariation option to replace uniformDensity

This commit is contained in:
Gabriel Gouvine 2023-06-10 14:35:55 +02:00
parent e395069025
commit 5c75a1ffb7
6 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crlcore/python/technos/common/etesian.py
View File

@ -20,7 +20,7 @@ param = Cfg.getParamDouble( 'etesian.aspectRatio' )
param.setDouble( 1.0 ) param.setDouble( 1.0 )
Cfg.getParamDouble ( 'etesian.spaceMargin' ).setPercentage( 0.05 ) Cfg.getParamDouble ( 'etesian.spaceMargin' ).setPercentage( 0.05 )
Cfg.getParamDouble ( 'etesian.spreadMargin' ).setPercentage( 0.05 ) Cfg.getParamDouble ( 'etesian.densityVariation' ).setPercentage( 0.05 )
Cfg.getParamBool ( 'etesian.uniformDensity' ).setBool ( False ) Cfg.getParamBool ( 'etesian.uniformDensity' ).setBool ( False )
Cfg.getParamBool ( 'etesian.routingDriven' ).setBool ( False ) Cfg.getParamBool ( 'etesian.routingDriven' ).setBool ( False )
Cfg.getParamString ( 'etesian.feedNames' ).setString ( 'tie_x0,rowend_x0' ) Cfg.getParamString ( 'etesian.feedNames' ).setString ( 'tie_x0,rowend_x0' )
@ -44,12 +44,11 @@ param.addValue( 'Show result only', 3 )
layout = Cfg.Configuration.get().getLayout() layout = Cfg.Configuration.get().getLayout()
layout.addTab ( 'Placer', 'etesian' ) layout.addTab ( 'Placer', 'etesian' )
layout.addTitle ( 'Placer', 'Placement area' ) layout.addTitle ( 'Placer', 'Placement area' )
layout.addParameter( 'Placer', 'etesian.aspectRatio' , 'Aspect Ratio, X/Y (%)', 0 ) layout.addParameter( 'Placer', 'etesian.aspectRatio' , 'Aspect Ratio, X/Y' , 0 )
layout.addParameter( 'Placer', 'etesian.spaceMargin' , 'Space Margin' , 1 ) layout.addParameter( 'Placer', 'etesian.spaceMargin' , 'Space Margin' , 1 )
layout.addParameter( 'Placer', 'etesian.spreadMargin' , 'Threshold before spreading', 1 )
layout.addRule ( 'Placer' ) layout.addRule ( 'Placer' )
layout.addTitle ( 'Placer', 'Etesian - Placer') layout.addTitle ( 'Placer', 'Etesian - Placer')
layout.addParameter( 'Placer', 'etesian.uniformDensity', 'Uniform density' , 0 ) layout.addParameter( 'Placer', 'etesian.densityVariation' , 'Density variation' , 0 )
layout.addParameter( 'Placer', 'etesian.routingDriven' , 'Routing driven' , 0 ) layout.addParameter( 'Placer', 'etesian.routingDriven' , 'Routing driven' , 0 )
layout.addParameter( 'Placer', 'etesian.effort' , 'Placement effort' , 1 ) layout.addParameter( 'Placer', 'etesian.effort' , 'Placement effort' , 1 )
layout.addParameter( 'Placer', 'etesian.graphics' , 'Placement view' , 1 ) layout.addParameter( 'Placer', 'etesian.graphics' , 'Placement view' , 1 )

10
etesian/src/Configuration.cpp
View File

@ -60,7 +60,7 @@ namespace Etesian {
, _spreadingConf ( Cfg::getParamBool ("etesian.uniformDensity" , false )->asBool()? ForceUniform : MaxDensity ) , _spreadingConf ( Cfg::getParamBool ("etesian.uniformDensity" , false )->asBool()? ForceUniform : MaxDensity )
, _routingDriven ( Cfg::getParamBool ("etesian.routingDriven" , false )->asBool()) , _routingDriven ( Cfg::getParamBool ("etesian.routingDriven" , false )->asBool())
, _spaceMargin ( Cfg::getParamPercentage("etesian.spaceMargin" , 5.0)->asDouble() ) , _spaceMargin ( Cfg::getParamPercentage("etesian.spaceMargin" , 5.0)->asDouble() )
, _spreadMargin ( Cfg::getParamPercentage("etesian.spreadMargin" , 5.0)->asDouble() ) , _densityVariation ( Cfg::getParamPercentage("etesian.densityVariation", 5.0)->asDouble() )
, _aspectRatio ( Cfg::getParamPercentage("etesian.aspectRatio" ,100.0)->asDouble() ) , _aspectRatio ( Cfg::getParamPercentage("etesian.aspectRatio" ,100.0)->asDouble() )
, _tieName ( Cfg::getParamString ("etesian.tieName" ,"tie_x0" )->asString() ) , _tieName ( Cfg::getParamString ("etesian.tieName" ,"tie_x0" )->asString() )
, _feedNames ( Cfg::getParamString ("etesian.feedNames" ,"tie_x0,rowend_x0")->asString() ) , _feedNames ( Cfg::getParamString ("etesian.feedNames" ,"tie_x0,rowend_x0")->asString() )
@ -108,7 +108,7 @@ namespace Etesian {
, _updateConf ( other._updateConf ) , _updateConf ( other._updateConf )
, _spreadingConf ( other._spreadingConf ) , _spreadingConf ( other._spreadingConf )
, _spaceMargin ( other._spaceMargin ) , _spaceMargin ( other._spaceMargin )
, _spreadMargin ( other._spreadMargin ) , _densityVariation ( other._densityVariation)
, _aspectRatio ( other._aspectRatio ) , _aspectRatio ( other._aspectRatio )
, _tieName ( other._tieName ) , _tieName ( other._tieName )
, _feedNames ( other._feedNames ) , _feedNames ( other._feedNames )
@ -117,7 +117,7 @@ namespace Etesian {
, _bloat ( other._bloat ) , _bloat ( other._bloat )
, _latchUpDistance ( other._latchUpDistance ) , _latchUpDistance ( other._latchUpDistance )
, _antennaGateMaxWL ( other._antennaGateMaxWL ) , _antennaGateMaxWL ( other._antennaGateMaxWL )
, _antennaDiodeMaxWL( other._antennaDiodeMaxWL ) , _antennaDiodeMaxWL( other._antennaDiodeMaxWL)
{ {
if (other._rg) _rg = other._rg->getClone(); if (other._rg) _rg = other._rg->getClone();
if (other._cg) _cg = other._cg->getClone(); if (other._cg) _cg = other._cg->getClone();
@ -143,7 +143,7 @@ namespace Etesian {
cmess1 << Dots::asInt (" - Spreading Conf" ,_spreadingConf ) << endl; cmess1 << Dots::asInt (" - Spreading Conf" ,_spreadingConf ) << endl;
cmess1 << Dots::asBool (" - Routing driven" ,_routingDriven ) << endl; cmess1 << Dots::asBool (" - Routing driven" ,_routingDriven ) << endl;
cmess1 << Dots::asPercentage(" - Space Margin" ,_spaceMargin ) << endl; cmess1 << Dots::asPercentage(" - Space Margin" ,_spaceMargin ) << endl;
cmess1 << Dots::asPercentage(" - Spread Margin" ,_spreadMargin ) << endl; cmess1 << Dots::asPercentage(" - Spread Margin" ,_densityVariation ) << endl;
cmess1 << Dots::asPercentage(" - Aspect Ratio" ,_aspectRatio ) << endl; cmess1 << Dots::asPercentage(" - Aspect Ratio" ,_aspectRatio ) << endl;
cmess1 << Dots::asString (" - Bloat model" ,_bloat ) << endl; cmess1 << Dots::asString (" - Bloat model" ,_bloat ) << endl;
cmess1 << Dots::asString (" - Antenna gate Max. WL" ,DbU::getValueString(_antennaGateMaxWL )) << endl; cmess1 << Dots::asString (" - Antenna gate Max. WL" ,DbU::getValueString(_antennaGateMaxWL )) << endl;
@ -175,7 +175,7 @@ namespace Etesian {
record->add ( getSlot( "_updateConf" , (int)_updateConf ) ); record->add ( getSlot( "_updateConf" , (int)_updateConf ) );
record->add ( getSlot( "_spreadingConf" , (int)_spreadingConf ) ); record->add ( getSlot( "_spreadingConf" , (int)_spreadingConf ) );
record->add ( getSlot( "_spaceMargin" , _spaceMargin ) ); record->add ( getSlot( "_spaceMargin" , _spaceMargin ) );
record->add ( getSlot( "_spreadMargin" , _spreadMargin ) ); record->add ( getSlot( "_densityVariation" , _densityVariation ) );
record->add ( getSlot( "_aspectRatio" , _aspectRatio ) ); record->add ( getSlot( "_aspectRatio" , _aspectRatio ) );
record->add ( getSlot( "_tieName" , _tieName ) ); record->add ( getSlot( "_tieName" , _tieName ) );
record->add ( getSlot( "_feedNames" , _feedNames ) ); record->add ( getSlot( "_feedNames" , _feedNames ) );

22
etesian/src/EtesianEngine.cpp
View File

@ -55,19 +55,6 @@ namespace {
using Etesian::EtesianEngine; using Etesian::EtesianEngine;
using coloquinte::CellOrientation; using coloquinte::CellOrientation;
// Options for both placers
unsigned const SteinerModel = 0x0001;
// Options for the global placer
unsigned const ForceUniformDensity = 0x0010;
unsigned const UpdateLB = 0x0020;
unsigned const UpdateUB = 0x0040;
// Options for the detailed placer
unsigned const UpdateDetailed = 0x0100;
//unsigned const NonConvexOpt = 0x0200;
Instance* extractInstance ( const RoutingPad* rp ) Instance* extractInstance ( const RoutingPad* rp )
{ {
return rp->getOccurrence().getPath().getTailInstance(); return rp->getOccurrence().getPath().getTailInstance();
@ -871,11 +858,9 @@ namespace Etesian {
} }
double spaceMargin = getSpaceMargin(); double spaceMargin = getSpaceMargin();
double spreadMargin = getSpreadMargin(); double densityVariation = getDensityVariation();
Density densityConf = getSpreadingConf(); double bloatFactor = 1.0 + std::max(spaceMargin - densityVariation, 0.0);
double bloatFactor = 1.0; if (bloatFactor != 1.0) {
if (densityConf == Density::ForceUniform) {
bloatFactor += std::max(spaceMargin - spreadMargin, 0.0);
cmess1 << " - Cells inflated by " << bloatFactor << endl; cmess1 << " - Cells inflated by " << bloatFactor << endl;
} }
@ -1052,7 +1037,6 @@ namespace Etesian {
if (_bloatCells.getSelected()->getName() != "disabled") if (_bloatCells.getSelected()->getName() != "disabled")
cmess2 << stdCellSizes.toString(1) << endl; cmess2 << stdCellSizes.toString(1) << endl;
//_densityLimits = new coloquinte::density_restrictions ();
_surface = new coloquinte::Rectangle( (int)(topAb.getXMin() / hpitch) _surface = new coloquinte::Rectangle( (int)(topAb.getXMin() / hpitch)
, (int)(topAb.getXMax() / hpitch) , (int)(topAb.getXMax() / hpitch)
, (int)(topAb.getYMin() / vpitch) , (int)(topAb.getYMin() / vpitch)

6
etesian/src/PyEtesianEngine.cpp
View File

@ -81,7 +81,7 @@ extern "C" {
DirectSetLongAttribute (PyEtesianEngine_setFixedAbHeight,setFixedAbHeight,PyEtesianEngine,EtesianEngine) DirectSetLongAttribute (PyEtesianEngine_setFixedAbHeight,setFixedAbHeight,PyEtesianEngine,EtesianEngine)
DirectSetLongAttribute (PyEtesianEngine_setFixedAbWidth ,setFixedAbWidth ,PyEtesianEngine,EtesianEngine) DirectSetLongAttribute (PyEtesianEngine_setFixedAbWidth ,setFixedAbWidth ,PyEtesianEngine,EtesianEngine)
DirectSetDoubleAttribute (PyEtesianEngine_setSpaceMargin ,setSpaceMargin ,PyEtesianEngine,EtesianEngine) DirectSetDoubleAttribute (PyEtesianEngine_setSpaceMargin ,setSpaceMargin ,PyEtesianEngine,EtesianEngine)
DirectSetDoubleAttribute (PyEtesianEngine_setSpreadMargin ,setSpreadMargin ,PyEtesianEngine,EtesianEngine) DirectSetDoubleAttribute (PyEtesianEngine_setDensityVariation,setDensityVariation ,PyEtesianEngine,EtesianEngine)
DirectSetDoubleAttribute (PyEtesianEngine_setAspectRatio ,setAspectRatio ,PyEtesianEngine,EtesianEngine) DirectSetDoubleAttribute (PyEtesianEngine_setAspectRatio ,setAspectRatio ,PyEtesianEngine,EtesianEngine)
DirectGetLongAttribute (PyEtesianEngine_getFixedAbHeight,getFixedAbHeight,PyEtesianEngine,EtesianEngine) DirectGetLongAttribute (PyEtesianEngine_getFixedAbHeight,getFixedAbHeight,PyEtesianEngine,EtesianEngine)
DirectGetLongAttribute (PyEtesianEngine_getFixedAbWidth ,getFixedAbWidth ,PyEtesianEngine,EtesianEngine) DirectGetLongAttribute (PyEtesianEngine_getFixedAbWidth ,getFixedAbWidth ,PyEtesianEngine,EtesianEngine)
@ -274,8 +274,8 @@ extern "C" {
, "Use this width when computing the size of the default abutment box (disable aspect ratio)." } , "Use this width when computing the size of the default abutment box (disable aspect ratio)." }
, { "setSpaceMargin" , (PyCFunction)PyEtesianEngine_setSpaceMargin , METH_VARARGS , { "setSpaceMargin" , (PyCFunction)PyEtesianEngine_setSpaceMargin , METH_VARARGS
, "Override the configuration space margin parameter value." } , "Override the configuration space margin parameter value." }
, { "setSpreadMargin" , (PyCFunction)PyEtesianEngine_setSpreadMargin , METH_VARARGS , { "setDensityVariation" , (PyCFunction)PyEtesianEngine_setDensityVariation, METH_VARARGS
, "Override the configuration spread margin parameter value." } , "Override the configuration density variation parameter value." }
, { "setAspectRatio" , (PyCFunction)PyEtesianEngine_setAspectRatio , METH_VARARGS , { "setAspectRatio" , (PyCFunction)PyEtesianEngine_setAspectRatio , METH_VARARGS
, "Override the configuration aspect ratio parameter value." } , "Override the configuration aspect ratio parameter value." }
, { "resetPlacement" , (PyCFunction)PyEtesianEngine_resetPlacement , METH_NOARGS , { "resetPlacement" , (PyCFunction)PyEtesianEngine_resetPlacement , METH_NOARGS

10
etesian/src/etesian/Configuration.h
View File

@ -66,7 +66,7 @@ namespace Etesian {
inline Density getSpreadingConf () const; inline Density getSpreadingConf () const;
inline bool getRoutingDriven () const; inline bool getRoutingDriven () const;
inline double getSpaceMargin () const; inline double getSpaceMargin () const;
inline double getSpreadMargin () const; inline double getDensityVariation () const;
inline double getAspectRatio () const; inline double getAspectRatio () const;
inline string getTieName () const; inline string getTieName () const;
inline string getFeedNames () const; inline string getFeedNames () const;
@ -77,7 +77,7 @@ namespace Etesian {
inline DbU::Unit getAntennaGateMaxWL () const; inline DbU::Unit getAntennaGateMaxWL () const;
inline DbU::Unit getAntennaDiodeMaxWL () const; inline DbU::Unit getAntennaDiodeMaxWL () const;
inline void setSpaceMargin ( double ); inline void setSpaceMargin ( double );
inline void setSpreadMargin ( double ); inline void setDensityVariation ( double );
inline void setAspectRatio ( double ); inline void setAspectRatio ( double );
void print ( Cell* ) const; void print ( Cell* ) const;
Record* _getRecord () const; Record* _getRecord () const;
@ -92,7 +92,7 @@ namespace Etesian {
Density _spreadingConf; Density _spreadingConf;
bool _routingDriven; bool _routingDriven;
double _spaceMargin; double _spaceMargin;
double _spreadMargin; double _densityVariation;
double _aspectRatio; double _aspectRatio;
string _tieName; string _tieName;
string _feedNames; string _feedNames;
@ -115,7 +115,7 @@ namespace Etesian {
inline Density Configuration::getSpreadingConf () const { return _spreadingConf; } inline Density Configuration::getSpreadingConf () const { return _spreadingConf; }
inline bool Configuration::getRoutingDriven () const { return _routingDriven; } inline bool Configuration::getRoutingDriven () const { return _routingDriven; }
inline double Configuration::getSpaceMargin () const { return _spaceMargin; } inline double Configuration::getSpaceMargin () const { return _spaceMargin; }
inline double Configuration::getSpreadMargin () const { return _spreadMargin; } inline double Configuration::getDensityVariation () const { return _densityVariation; }
inline double Configuration::getAspectRatio () const { return _aspectRatio; } inline double Configuration::getAspectRatio () const { return _aspectRatio; }
inline string Configuration::getTieName () const { return _tieName; } inline string Configuration::getTieName () const { return _tieName; }
inline string Configuration::getFeedNames () const { return _feedNames; } inline string Configuration::getFeedNames () const { return _feedNames; }
@ -126,7 +126,7 @@ namespace Etesian {
inline DbU::Unit Configuration::getAntennaGateMaxWL () const { return _antennaGateMaxWL; } inline DbU::Unit Configuration::getAntennaGateMaxWL () const { return _antennaGateMaxWL; }
inline DbU::Unit Configuration::getAntennaDiodeMaxWL () const { return _antennaDiodeMaxWL; } inline DbU::Unit Configuration::getAntennaDiodeMaxWL () const { return _antennaDiodeMaxWL; }
inline void Configuration::setSpaceMargin ( double margin ) { _spaceMargin = margin; } inline void Configuration::setSpaceMargin ( double margin ) { _spaceMargin = margin; }
inline void Configuration::setSpreadMargin ( double margin ) { _spreadMargin = margin; } inline void Configuration::setDensityVariation ( double margin ) { _densityVariation = margin; }
inline void Configuration::setAspectRatio ( double ratio ) { _aspectRatio = ratio; } inline void Configuration::setAspectRatio ( double ratio ) { _aspectRatio = ratio; }

8
etesian/src/etesian/EtesianEngine.h
View File

@ -92,7 +92,7 @@ namespace Etesian {
inline GraphicUpdate getUpdateConf () const; inline GraphicUpdate getUpdateConf () const;
inline Density getSpreadingConf () const; inline Density getSpreadingConf () const;
inline double getSpaceMargin () const; inline double getSpaceMargin () const;
inline double getSpreadMargin () const; inline double getDensityVariation () const;
inline double getAspectRatio () const; inline double getAspectRatio () const;
inline DbU::Unit getAntennaGateMaxWL () const; inline DbU::Unit getAntennaGateMaxWL () const;
inline DbU::Unit getAntennaDiodeMaxWL () const; inline DbU::Unit getAntennaDiodeMaxWL () const;
@ -113,7 +113,7 @@ namespace Etesian {
inline void setFixedAbHeight ( DbU::Unit ); inline void setFixedAbHeight ( DbU::Unit );
inline void setFixedAbWidth ( DbU::Unit ); inline void setFixedAbWidth ( DbU::Unit );
inline void setSpaceMargin ( double ); inline void setSpaceMargin ( double );
inline void setSpreadMargin ( double ); inline void setDensityVariation ( double );
inline void setAspectRatio ( double ); inline void setAspectRatio ( double );
void setDefaultAb (); void setDefaultAb ();
void adjustSliceHeight (); void adjustSliceHeight ();
@ -210,7 +210,7 @@ namespace Etesian {
inline GraphicUpdate EtesianEngine::getUpdateConf () const { return getConfiguration()->getUpdateConf(); } inline GraphicUpdate EtesianEngine::getUpdateConf () const { return getConfiguration()->getUpdateConf(); }
inline Density EtesianEngine::getSpreadingConf () const { return getConfiguration()->getSpreadingConf(); } inline Density EtesianEngine::getSpreadingConf () const { return getConfiguration()->getSpreadingConf(); }
inline double EtesianEngine::getSpaceMargin () const { return getConfiguration()->getSpaceMargin(); } inline double EtesianEngine::getSpaceMargin () const { return getConfiguration()->getSpaceMargin(); }
inline double EtesianEngine::getSpreadMargin () const { return getConfiguration()->getSpreadMargin(); } inline double EtesianEngine::getDensityVariation () const { return getConfiguration()->getDensityVariation(); }
inline double EtesianEngine::getAspectRatio () const { return getConfiguration()->getAspectRatio(); } inline double EtesianEngine::getAspectRatio () const { return getConfiguration()->getAspectRatio(); }
inline DbU::Unit EtesianEngine::getAntennaGateMaxWL () const { return getConfiguration()->getAntennaGateMaxWL(); } inline DbU::Unit EtesianEngine::getAntennaGateMaxWL () const { return getConfiguration()->getAntennaGateMaxWL(); }
inline DbU::Unit EtesianEngine::getAntennaDiodeMaxWL () const { return getConfiguration()->getAntennaDiodeMaxWL(); } inline DbU::Unit EtesianEngine::getAntennaDiodeMaxWL () const { return getConfiguration()->getAntennaDiodeMaxWL(); }
@ -226,7 +226,7 @@ namespace Etesian {
inline void EtesianEngine::setFixedAbHeight ( DbU::Unit abHeight ) { _fixedAbHeight = abHeight; } inline void EtesianEngine::setFixedAbHeight ( DbU::Unit abHeight ) { _fixedAbHeight = abHeight; }
inline void EtesianEngine::setFixedAbWidth ( DbU::Unit abWidth ) { _fixedAbWidth = abWidth; } inline void EtesianEngine::setFixedAbWidth ( DbU::Unit abWidth ) { _fixedAbWidth = abWidth; }
inline void EtesianEngine::setSpaceMargin ( double margin ) { getConfiguration()->setSpaceMargin(margin); } inline void EtesianEngine::setSpaceMargin ( double margin ) { getConfiguration()->setSpaceMargin(margin); }
inline void EtesianEngine::setSpreadMargin ( double margin ) { getConfiguration()->setSpreadMargin(margin); } inline void EtesianEngine::setDensityVariation ( double margin ) { getConfiguration()->setDensityVariation(margin); }
inline void EtesianEngine::setAspectRatio ( double ratio ) { getConfiguration()->setAspectRatio(ratio); } inline void EtesianEngine::setAspectRatio ( double ratio ) { getConfiguration()->setAspectRatio(ratio); }
inline DbU::Unit EtesianEngine::toDbU ( int64_t v ) const { return v*getSliceStep(); } inline DbU::Unit EtesianEngine::toDbU ( int64_t v ) const { return v*getSliceStep(); }
inline uint32_t EtesianEngine::_getNewDiodeId () { return _diodeCount++; } inline uint32_t EtesianEngine::_getNewDiodeId () { return _diodeCount++; }