jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the DATATYPE for LAYER record in GdsStream. 

* Change: In GdsStream::_gdsLayerTable, use a map<> instead of a vector<>,
    use a combined value of the layer index and the datatype as index.
        (index = (layer<<16) + datatype.
    This allow for layers that are represented by a pair of (layer,datatype)
    with same layer and different datatypes.
* Change: In GdsStream::gdsToLayer(), now have two parameters, the layer
    and the datatype.
This commit is contained in:
Jean-Paul Chaput 2021-06-16 16:24:01 +02:00
parent 6c68055199
commit 15e7abf667
1 changed files with 113 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
crlcore/src/ccore/gds/GdsParser.cpp
View File

@ -203,6 +203,7 @@ namespace {
void readString (); void readString ();
void readUnits (); void readUnits ();
void readLayer (); void readLayer ();
void readDatatype ();
void readWidth (); void readWidth ();
void readBgnextn (); void readBgnextn ();
void readEndextn (); void readEndextn ();
@ -352,7 +353,7 @@ namespace {
case AREF: readDummy( false ); break; case AREF: readDummy( false ); break;
case TEXT: readDummy( false ); break; case TEXT: readDummy( false ); break;
case LAYER: readLayer(); break; case LAYER: readLayer(); break;
case DATATYPE: readDummy( false ); break; case DATATYPE: readDatatype(); break;
case WIDTH: readWidth(); break; case WIDTH: readWidth(); break;
case XY: readXy(); break; case XY: readXy(); break;
case ENDEL: readDummy( false ); break; case ENDEL: readDummy( false ); break;
@ -542,6 +543,10 @@ namespace {
{ _int16s.push_back( _readInt<uint16_t>() ); } { _int16s.push_back( _readInt<uint16_t>() ); }
void GdsRecord::readDatatype ()
{ _int16s.push_back( _readInt<uint16_t>() ); }
void GdsRecord::readWidth () void GdsRecord::readWidth ()
{ _int32s.push_back( _readInt<uint32_t>() ); } { _int32s.push_back( _readInt<uint32_t>() ); }
@ -640,7 +645,7 @@ namespace {
class GdsStream { class GdsStream {
public: public:
static const Layer* gdsToLayer ( uint16_t ); static const Layer* gdsToLayer ( uint16_t gdsLayer, uint16_t datatype );
public: public:
static void _staticInit (); static void _staticInit ();
GdsStream ( string gdsPath ); GdsStream ( string gdsPath );
@ -650,6 +655,7 @@ namespace {
bool read ( Library* ); bool read ( Library* );
bool readFormatType (); bool readFormatType ();
bool readStructure (); bool readStructure ();
const Layer* readLayerAndDatatype ();
bool readBoundary (); bool readBoundary ();
bool readPath (); bool readPath ();
bool readSref (); bool readSref ();
@ -685,7 +691,7 @@ namespace {
Point _position; Point _position;
}; };
private: private:
static vector<const Layer*> _gdsLayerTable; static map<uint32_t,const Layer*> _gdsLayerTable;
vector<DelayedInstance> _delayedInstances; vector<DelayedInstance> _delayedInstances;
string _gdsPath; string _gdsPath;
ifstream _stream; ifstream _stream;
@ -718,15 +724,14 @@ namespace {
{ } { }
vector<const Layer*> GdsStream::_gdsLayerTable; map<uint32_t,const Layer*> GdsStream::_gdsLayerTable;
void GdsStream::_staticInit () void GdsStream::_staticInit ()
{ {
_gdsLayerTable = vector<const Layer*>( 1024, NULL );
for ( const BasicLayer* layer : DataBase::getDB()->getTechnology()->getBasicLayers() ) { for ( const BasicLayer* layer : DataBase::getDB()->getTechnology()->getBasicLayers() ) {
uint16_t gdsNumber = layer->getGds2Layer(); uint32_t gdsNumber = (layer->getGds2Layer() << 16) + layer->getGds2Datatype();
if (gdsNumber < 1024) _gdsLayerTable[gdsNumber] = layer; _gdsLayerTable[gdsNumber] = layer;
} }
} }
@ -734,8 +739,14 @@ namespace {
inline void GdsStream::resetStrans () { _angle = 0.0; _xReflection = false; } inline void GdsStream::resetStrans () { _angle = 0.0; _xReflection = false; }
const Layer* GdsStream::gdsToLayer ( uint16_t gdsLayer ) const Layer* GdsStream::gdsToLayer ( uint16_t gdsLayer, uint16_t datatype )
{ return (gdsLayer < _gdsLayerTable.size()) ? _gdsLayerTable[gdsLayer] : NULL; } {
uint32_t gdsIndex = (gdsLayer << 16) + datatype;
auto ilayer = _gdsLayerTable.find( gdsIndex );
if (ilayer == _gdsLayerTable.end())
return NULL;
return (*ilayer).second;
}
inline bool GdsStream::isValidSyntax () const { return _validSyntax; } inline bool GdsStream::isValidSyntax () const { return _validSyntax; }
@ -930,6 +941,45 @@ namespace {
} }
const Layer* GdsStream::readLayerAndDatatype ()
{
uint16_t gdsLayer = 0;
uint16_t gdsDatatype = 0;
if (_record.isLAYER()) {
gdsLayer = (uint16_t)_record.getInt16s()[0];
_stream >> _record;
} else {
cerr << Error( "GdsStream::readLayerAndDatatype(): Expecting LAYER record, got %s."
, GdsRecord::toStrType(_record.getType()).c_str()
) << endl;
_validSyntax = false;
return NULL;;
}
if (_record.isDATATYPE()) {
gdsDatatype = (uint16_t)_record.getInt16s()[0];
_stream >> _record;
} else {
cerr << Error( "GdsStream::readLayerAndDatatype(): Expecting DATATYPE record, got %s."
, GdsRecord::toStrType(_record.getType()).c_str()
) << endl;
_validSyntax = false;
return NULL;;
}
const Layer* layer = gdsToLayer( gdsLayer, gdsDatatype );
cdebug_log(101,0) << "Layer id+datatype:" << gdsLayer << "+" << gdsDatatype << " " << layer << endl;
if (not layer) {
cerr << Error( "GdsStream::readLayerAndDatatype(): No BasicLayer id:%d+%d in GDS conversion table (skipped)."
, gdsLayer, gdsDatatype
) << endl;
}
return layer;
}
bool GdsStream::readText () bool GdsStream::readText ()
{ {
const Layer* layer = NULL; const Layer* layer = NULL;
@ -938,7 +988,7 @@ namespace {
if (_record.isELFLAGS()) { _stream >> _record; } if (_record.isELFLAGS()) { _stream >> _record; }
if (_record.isPLEX ()) { _stream >> _record; } if (_record.isPLEX ()) { _stream >> _record; }
if (_record.isLAYER ()) { if (_record.isLAYER ()) {
layer = gdsToLayer( (uint16_t)_record.getInt16s()[0] ); layer = gdsToLayer( (uint16_t)_record.getInt16s()[0], 0 );
if (not layer) { if (not layer) {
cerr << Error( "GdsStream::readText(): No BasicLayer id:%d in GDS conversion table (skipped)." cerr << Error( "GdsStream::readText(): No BasicLayer id:%d in GDS conversion table (skipped)."
, _record.getInt16s()[0] , _record.getInt16s()[0]
@ -1045,29 +1095,11 @@ namespace {
{ {
cdebug_log(101,1) << "GdsStream::readBoundary()" << endl; cdebug_log(101,1) << "GdsStream::readBoundary()" << endl;
const Layer* layer = NULL;
if (_record.isELFLAGS()) { _stream >> _record; } if (_record.isELFLAGS()) { _stream >> _record; }
if (_record.isPLEX ()) { _stream >> _record; } if (_record.isPLEX ()) { _stream >> _record; }
if (_record.isLAYER()) { const Layer* layer = readLayerAndDatatype();
layer = gdsToLayer( (uint16_t)_record.getInt16s()[0] ); if (not _validSyntax) {
cdebug_log(101,0) << "Layer id:" << ((uint32_t)_record.getInt16s()[0]) << " " << layer << endl;
if (not layer) {
cerr << Error( "GdsStream::readBoundary(): No BasicLayer id:%d in GDS conversion table (skipped)."
, _record.getInt16s()[0]
) << endl;
}
_stream >> _record;
} else {
_validSyntax = false;
cdebug_tabw(101,-1);
return _validSyntax;
}
if (_record.isDATATYPE()) { _stream >> _record; }
else {
_validSyntax = false;
cdebug_tabw(101,-1); cdebug_tabw(101,-1);
return _validSyntax; return _validSyntax;
} }
@ -1090,7 +1122,6 @@ namespace {
{ {
cdebug_log(101,1) << "GdsStream::readPath()" << endl; cdebug_log(101,1) << "GdsStream::readPath()" << endl;
const Layer* layer = NULL;
DbU::Unit width = 0; DbU::Unit width = 0;
uint16_t pathtype = 0; uint16_t pathtype = 0;
DbU::Unit bgnextn = 0; DbU::Unit bgnextn = 0;
@ -1099,27 +1130,8 @@ namespace {
if (_record.isELFLAGS()) { _stream >> _record; } if (_record.isELFLAGS()) { _stream >> _record; }
if (_record.isPLEX ()) { _stream >> _record; } if (_record.isPLEX ()) { _stream >> _record; }
if (_record.isLAYER()) { const Layer* layer = readLayerAndDatatype();
layer = gdsToLayer( (uint16_t)_record.getInt16s()[0] );
if (not layer) { if (not layer) {
cerr << Error( "GdsStream::readPath(): No BasicLayer id \"%d\" in GDS conversion table (skipped)."
, _record.getInt16s()[0]
) << endl;
}
_stream >> _record;
cdebug_log(101,0) << layer << endl;
} else {
_validSyntax = false;
cdebug_tabw(101,-1);
return _validSyntax;
}
if (_record.isDATATYPE()) { _stream >> _record; }
else {
cerr << Error( "GdsStream::readPath(): Expecting DATATYPE record, got %s."
, GdsRecord::toStrType(_record.getType()).c_str()
) << endl;
_validSyntax = false;
cdebug_tabw(101,-1); cdebug_tabw(101,-1);
return _validSyntax; return _validSyntax;
} }
@ -1287,7 +1299,7 @@ namespace {
if (_record.isPLEX ()) { _stream >> _record; } if (_record.isPLEX ()) { _stream >> _record; }
if (_record.isLAYER ()) { if (_record.isLAYER ()) {
layer = gdsToLayer( (uint16_t)_record.getInt16s()[0] ); layer = gdsToLayer( (uint16_t)_record.getInt16s()[0], 0 );
if (not layer) { if (not layer) {
cerr << Error( "GdsStream::readNode(): No BasicLayer id \"%d\" in GDS conversion table (skipped)." cerr << Error( "GdsStream::readNode(): No BasicLayer id \"%d\" in GDS conversion table (skipped)."
, _record.getInt16s()[0] , _record.getInt16s()[0]
@ -1326,7 +1338,7 @@ namespace {
if (_record.isPLEX ()) { _stream >> _record; } if (_record.isPLEX ()) { _stream >> _record; }
if (_record.isLAYER ()) { if (_record.isLAYER ()) {
layer = gdsToLayer( (uint16_t)_record.getInt16s()[0] ); layer = gdsToLayer( (uint16_t)_record.getInt16s()[0], 0 );
if (not layer) { if (not layer) {
cerr << Error( "GdsStream::readNode(): No BasicLayer id \"%d\" in GDS conversion table (skipped)." cerr << Error( "GdsStream::readNode(): No BasicLayer id \"%d\" in GDS conversion table (skipped)."
, _record.getInt16s()[0] , _record.getInt16s()[0]