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

Wip gf180mcu 2 #48

Merged
merged 7 commits into from
Oct 20, 2023
Merged

Wip gf180mcu 2 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af8ef61
The upper routing layer in gf180mcu is Metal5, not MetalTop (power).
jpc-lip6 Sep 28, 2023
e8e8938
Protect Python accessor wrapper from C++ thrown exceptions.
jpc-lip6 Sep 28, 2023
18dd31b
Add a prefix to GDS sub-cell isolated in a "per cell" library.
jpc-lip6 Sep 28, 2023
b85254c
In designflow.blif2vst, add the ".spi" file to the target list (for c…
jpc-lip6 Sep 30, 2023
438afa8
In designflow.technos.setupCMOS(), more relaxed clock name pattern.
jpc-lip6 Sep 30, 2023
9c79b38
In BlockConf.useHTree(), must set the useClockTree flag (for chip mode).
jpc-lip6 Sep 30, 2023
aeafa0d
Update the doc for gitlab & github.
jpc-lip6 Oct 5, 2023
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
2 changes: 1 addition & 1 deletion crlcore/python/technos/node180/gf180mcu_c4m/StdCell3V3Lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def _routing():
cfg.anabatic.globalLengthThreshold = 1450
cfg.anabatic.saturateRatio = 0.90
cfg.anabatic.saturateRp = 10
cfg.anabatic.topRoutingLayer = 'MetalTop'
cfg.anabatic.topRoutingLayer = 'Metal5'
cfg.anabatic.edgeLength = 48
cfg.anabatic.edgeWidth = 8
cfg.anabatic.edgeCostH = 9.0
Expand Down
1 change: 0 additions & 1 deletion crlcore/python/technos/node180/gf180mcu_c4m/iolib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def _loadIoLib ( pdkDir ):
io.vprint( 1, ' o Setup GF180MCU I/O library in {}.'.format( ioLib.getName() ))
cellsDir = pdkDir / 'libraries' / 'gf180mcu_fd_io' / 'latest' / 'cells'
for lefFile in cellsDir.glob( '*/*_5lm.lef' ):
print( lefFile )
gdsFile = lefFile.with_suffix( '.gds' )
if gdsFile.is_file():
Gds.setTopCellName( gdsFile.stem[:-4] )
Expand Down
2 changes: 2 additions & 0 deletions crlcore/src/ccore/gds/GdsParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,8 @@ namespace {
if (cell) return cell;

if (not Gds::getTopCellName().empty() and (cellName != Gds::getTopCellName())) {
cellName.insert( 0, "." );
cellName.insert( 0, Gds::getTopCellName() );
workLibrary = _library->getLibrary( Gds::getTopCellName() );
if (workLibrary) {
cell = workLibrary->getCell( cellName );
Expand Down
3 changes: 2 additions & 1 deletion cumulus/src/designflow/blif2vst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ def mkRule ( rule, targets, depends=[], flags=0 ):

def __init__ ( self, rule, targets, depends, flags ):
super().__init__( rule, targets, depends )
self.flags = flags
self.flags = flags
if not self.targets[0].suffix == '.vst':
raise TargetNotVst( 'Blif2Vst.__init__(): First target *must* "{}" be a vst file.' \
.format( self.targets[0] ))
self.targets.append( Path(self.file_depend(0).stem + '.spi') )
self.addClean( self.targets )

def __repr__ ( self ):
Expand Down
2 changes: 1 addition & 1 deletion cumulus/src/designflow/technos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def setupCMOS ( checkToolkit=None ):
Viewer.Graphics.setStyle( 'Alliance.Classic [black]' )
af = CRL.AllianceFramework.get()
env = af.getEnvironment()
env.setCLOCK( '^ck$|m_clock|^clk$' )
env.setCLOCK( '^ck$|m_clock|^clk' )
env.addSYSTEM_LIBRARY( library=(Where.checkToolkit / 'cells' / 'niolib').as_posix()
, mode =CRL.Environment.Append )

Expand Down
5 changes: 4 additions & 1 deletion cumulus/src/plugins/block/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,10 @@ def useHTree ( self, netName, flags=0 ):
.format(netName)) )
return
self.hTreeDatas.append( [ netName, flags ] );
self.useClockTree = True
net = self.cell.getNet( netName )
trace( 550,'\tBlockConf.useHTree() on "{}" -> {}\n'.format( netName, net ))
if net and net.isClock():
self.useClockTree = True

def addTrackAvoid ( self, trackAvoid ):
if self.cfg.anabatic.netBuilderStyle == 'VH,2RL':
Expand Down
28 changes: 28 additions & 0 deletions documentation/content/pages/github.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.. -*- Mode: rst -*-


===================
Gitlab Repositories
===================


:slug: github
:date: 2023-10-05 16:00
:author: Jean-Paul Chaput
:Contact: <[email protected]>
:Version: October 5, 2023 (jpc)
:status: hidden


.. include:: ../../etc/definitions.rst


The |git| repositories of all the components of the project:

================================ =======================================================
Component Repository
================================ =======================================================
|Alliance| https://github.com/lip6/alliance.git
|Coriolis| https://github.com/lip6/coriolis.git
:cb:`Alliance Check Toolkit` https://github.com/lip6/alliance-check-toolkit.git
================================ =======================================================
9 changes: 4 additions & 5 deletions documentation/pelicanconf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,11 @@
#SOCIAL = (('Pelican' , 'http://getpelican.com/' ),
# ('Python.org', 'http://python.org/' ),
# ('Jinja2' , 'http://jinja.pocoo.org/'),)
SOCIAL = None
SOCIAL = (('Matrix', 'element://vector/webapp/#/room/%23coriolis%3Amatrix.org?via=matrix.or'),)

# Social widget
LINKS = (('Alliance/Coriolis' , 'https://coriolis.lip6.fr/'),
('CIAN Team Website' , 'https://www-soc.lip6.fr/' ),
('Free Silicon Foundation', 'https://f-si.org' ),)
('CIAN Team Website' , 'https://largo.lip6.fr/' ),)

DEFAULT_PAGINATION = 10

Expand Down Expand Up @@ -138,8 +137,8 @@
NEST_HEADER_IMAGES = 'common/layout-motif-faded-4.png'
NEST_LINKS_COLUMN_TITLE = u'Links'
NEST_SOCIAL_COLUMN_TITLE = u'Social'
NEST_SITEMAP_COLUMN_TITLE = u'Social'
NEST_SITEMAP_COLUMN_TITLE = u'Map'
NEST_COPYRIGHT = u'Copyright © 2020-2020 Sorbonne Universite'

MENUITEMS = [ ('Git' , '/pages/gitlab.html' )
MENUITEMS = [ ('Git' , '/pages/github.html' )
, ('Documentation', '/pages/documentation.html' ) ]
34 changes: 28 additions & 6 deletions hurricane/src/isobar/hurricane/isobar/PyHurricane.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,10 @@ extern "C" {
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self, PyObject* args ) \
{ \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#FUNC_NAME"()") \
HTRY \
if (cobject->FUNC_NAME()) \
Py_RETURN_TRUE; \
HCATCH \
Py_RETURN_FALSE; \
}

Expand Down Expand Up @@ -383,7 +385,11 @@ extern "C" {
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self, PyObject* args ) \
{ \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#FUNC_NAME"()") \
return Py_BuildValue ("I",cobject->FUNC_NAME()); \
PyObject* rvalue = NULL; \
HTRY \
rvalue = Py_BuildValue ("I",cobject->FUNC_NAME()); \
HCATCH \
return rvalue; \
}


Expand All @@ -394,7 +400,11 @@ extern "C" {
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self, PyObject* args ) \
{ \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#FUNC_NAME"()") \
return Isobar::PyDbU_FromLong(cobject->FUNC_NAME()); \
PyObject* rvalue = NULL; \
HTRY \
rvalue = Isobar::PyDbU_FromLong(cobject->FUNC_NAME()); \
HCATCH \
return rvalue; \
}


Expand All @@ -405,7 +415,11 @@ extern "C" {
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self, PyObject* args ) \
{ \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#FUNC_NAME"()") \
return Py_BuildValue ("d",cobject->FUNC_NAME()); \
PyObject* rvalue = NULL; \
HTRY \
rvalue = Py_BuildValue ("d",cobject->FUNC_NAME()); \
HCATCH \
return rvalue; \
}


Expand All @@ -416,7 +430,11 @@ extern "C" {
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self ) \
{ \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#FUNC_NAME"()") \
return Py_BuildValue ("s",cobject->FUNC_NAME().c_str()); \
PyObject* rvalue = NULL; \
HTRY \
rvalue = Py_BuildValue ("s",cobject->FUNC_NAME().c_str()); \
HCATCH \
return rvalue; \
}


Expand All @@ -427,14 +445,18 @@ extern "C" {
static PyObject* PY_FUNC_NAME ( PY_SELF_TYPE *self ) \
{ \
GENERIC_METHOD_HEAD(SELF_TYPE,cobject,#FUNC_NAME"()") \
return Py_BuildValue ("s",getString(cobject->FUNC_NAME()).c_str()); \
PyObject* rvalue = NULL; \
HTRY \
rvalue = Py_BuildValue ("s",getString(cobject->FUNC_NAME()).c_str()); \
HCATCH \
return rvalue; \
}


# define accessorLayerFromVoid(FUNC_NAME,PY_SELF_TYPE,SELF_TYPE) \
static PyObject* PY_SELF_TYPE##_##FUNC_NAME ( PY_SELF_TYPE* self ) \
{ \
cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
cdebug_log(20,0) << #PY_SELF_TYPE "_" #FUNC_NAME "()" << endl; \
\
Layer* rlayer = NULL; \
\
Expand Down