Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added layer map manupulation functions to LefImport #129

Merged
merged 1 commit into from
Feb 17, 2024
Merged

Added layer map manupulation functions to LefImport #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions crlcore/src/ccore/crlcore/LefImport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <hurricane/DbU.h>
namespace Hurricane {
class Library;
class Layer;
}


Expand All @@ -40,6 +41,9 @@ namespace CRL {
static void setMergeLibrary ( Hurricane::Library* );
static void setGdsForeignDirectory ( std::string path );
static void setPinFilter ( DbU::Unit xThreshold, DbU::Unit yThreshold, uint32_t flags );
static Hurricane::Layer* getLayer ( std::string name);
static void addLayer ( std::string name, Hurricane::Layer* layer );
static void clearLayer ( std::string name );
};


Expand Down
30 changes: 28 additions & 2 deletions crlcore/src/ccore/lefdef/LefImport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ namespace {
static DbU::Unit fromLefUnits ( int );
static Layer* getLayer ( string );
static void addLayer ( string, Layer* );
static void clearLayer ( string );
static void reset ();
static Library* parse ( string file );
LefParser ( string file, string libraryName );
Expand Down Expand Up @@ -305,7 +306,6 @@ namespace {
return NULL;
}


void LefParser::addLayer ( string layerName, Layer* layer )
{
if (getLayer(layerName)) {
Expand All @@ -316,6 +316,11 @@ namespace {
_layerLut[ layerName ] = layer;
}

void LefParser::clearLayer ( string layerName )
{
auto item = _layerLut.find( layerName );
if (item != _layerLut.end()) _layerLut.erase(item);
}

bool LefParser::isUnmatchedLayer ( string layerName )
{
Expand Down Expand Up @@ -815,7 +820,7 @@ namespace {
{
LefParser* parser = (LefParser*)ud;

//cerr << " @ _pinCbk: " << pin->name() << endl;
//cerr << " @ _pinCbk: " << pin->name() << endl;

bool created = false;
parser->earlyGetCell( created );
Expand Down Expand Up @@ -1384,5 +1389,26 @@ namespace CRL {
#endif
}

Layer* LefImport::getLayer ( string name )
{
#if defined(HAVE_LEFDEF)
return LefParser::getLayer( name );
#else
return 0;
#endif
}

void LefImport::addLayer ( string name, Layer* layer )
{
#if defined(HAVE_LEFDEF)
LefParser::addLayer( name, layer );
#endif
}

void LefImport::clearLayer ( string name )
{
#if defined(HAVE_LEFDEF)
LefParser::clearLayer( name );
#endif
}
} // CRL namespace.
63 changes: 63 additions & 0 deletions crlcore/src/pyCRL/PyLefImport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "crlcore/PyLefImport.h"
#include "hurricane/isobar/PyLibrary.h"
#include "hurricane/isobar/PyLayer.h"
#include <string>
#include <sstream>

Expand All @@ -33,6 +34,7 @@ namespace CRL {
using Hurricane::Error;
using Hurricane::Warning;
using Hurricane::Library;
using Hurricane::Layer;
using Isobar::ProxyProperty;
using Isobar::ProxyError;
using Isobar::ConstructorError;
Expand All @@ -46,6 +48,9 @@ namespace CRL {
using Isobar::PyLibrary_Link;
using Isobar::PyTypeLibrary;
using Isobar::PyLibrary;
using Isobar::PyLayer_Link;
using Isobar::PyTypeLayer;
using Isobar::PyLayer;


extern "C" {
Expand Down Expand Up @@ -143,6 +148,58 @@ extern "C" {
Py_RETURN_NONE;
}

static PyObject* PyLefImport_getLayer ( PyObject*, PyObject* args )
{
cdebug_log(30,0) << "PyLefImport_getLayer()" << endl;
Layer* layer = NULL;
HTRY
char* name = NULL;
if (PyArg_ParseTuple( args, "s:LefImport.getLayer", &name )) {
layer = LefImport::getLayer( name );
} else {
PyErr_SetString ( ConstructorError, "LefImport.getLayer(): Bad type or bad number of parameters." );
return NULL;
}
HCATCH
return (PyObject*)PyLayer_Link(layer);
}

static PyObject* PyLefImport_addLayer ( PyObject*, PyObject* args )
{
cdebug_log(30,0) << "PyLefImport_addLayer()" << endl;
HTRY
char* name = NULL;
PyObject* pyLayer = NULL;
if (PyArg_ParseTuple( args, "sO:LefImport.addLayer", &name, &pyLayer )) {
Layer* layer = PYLAYER_O(pyLayer);
if (layer == NULL) {
PyErr_SetString( ConstructorError
, "PyLefImport.addLayer(): Second parameter is not of Layer type" );
return NULL;
}
LefImport::addLayer( name, layer );
} else {
PyErr_SetString ( ConstructorError, "LefImport.addLayer(): Bad type or bad number of parameters." );
return NULL;
}
HCATCH
Py_RETURN_NONE;
}

static PyObject* PyLefImport_clearLayer ( PyObject*, PyObject* args )
{
cdebug_log(30,0) << "PyLefImport_clearLayer()" << endl;
HTRY
char* name = NULL;
if (PyArg_ParseTuple( args, "s:LefImport.clearLayer", &name )) {
LefImport::clearLayer( name );
} else {
PyErr_SetString ( ConstructorError, "LefImport.clearLayer(): Bad type or bad number of parameters." );
return NULL;
}
HCATCH
Py_RETURN_NONE;
}

// Standart Destroy (Attribute).

Expand All @@ -158,6 +215,12 @@ extern "C" {
, "Set the directory where to find FOREIGN GDS files." }
, { "setPinFilter" , (PyCFunction)PyLefImport_setPinFilter , METH_VARARGS|METH_STATIC
, "Select the way Rectilinear pins are converted to one rectangle." }
, { "getLayer" , (PyCFunction)PyLefImport_getLayer , METH_VARARGS|METH_STATIC
, "Get Layer from LefImport map." }
, { "addLayer" , (PyCFunction)PyLefImport_addLayer , METH_VARARGS|METH_STATIC
, "Add Layer to LefImport map." }
, { "clearLayer" , (PyCFunction)PyLefImport_clearLayer , METH_VARARGS|METH_STATIC
, "Remove Layer from LefImport map." }
//, { "destroy" , (PyCFunction)PyLefImport_destroy , METH_VARARGS
// , "Destroy the associated hurricane object. The python object remains." }
, {NULL, NULL, 0, NULL} /* sentinel */
Expand Down
Loading