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

Fixes for release 2 5 5 #91

Merged
merged 8 commits into from
Nov 23, 2023
Merged

Fixes for release 2 5 5 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52546d6
Rename tabs.css into custom_tabs.css to avoid doxygen overwrite.
jpc-lip6 Nov 21, 2023
c6c94d7
Install Oroshi doc in the right place.
jpc-lip6 Nov 21, 2023
9c849d4
One less level in the left menu (was too wide).
jpc-lip6 Nov 21, 2023
151291a
New rule "install_docs" to build the documentation.
jpc-lip6 Nov 21, 2023
e95db5b
Fix the loading of initHook.py, use Python loading mechanism directly.
jpc-lip6 Nov 21, 2023
66ac9f0
Don't connect with M2 on M3 RoutingPads.
jpc-lip6 Nov 22, 2023
b4e07a1
Do not protect with TrackMarkers M2 RoutingPads.
jpc-lip6 Nov 22, 2023
0b61146
Duplicated ".spi" targets in pnrcheck designflow.
jpc-lip6 Nov 22, 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
14 changes: 12 additions & 2 deletions Makefile.LIP6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm: $(HOME)/.local/bin/pdm
@$(localpath) pdm install --no-self -d --plugins


install: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm
configure:
@$(localpath) pdm run meson setup ${BUILDDIR} --prefix=$(PREFIX) -Dpython.install_env=prefix
@$(localpath) pdm run ninja -C $(BUILDDIR) install


install: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm configure
@$(localpath) pdm run meson install -C $(BUILDDIR)
@echo ""; \
echo "============================================================================"; \
echo "Coriolis has been successfully built"; \
Expand All @@ -75,6 +78,13 @@ install: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm
echo "============================================================================";


install_docs: check_dir $(CORIOLIS_SRC)/.pdm-plugins/bin/pdm configure
@$(localpath) pdm run meson configure ${BUILDDIR} --prefix=$(PREFIX) \
-Donly-docs=true \
-Ddocs=true
@$(localpath) pdm run meson install -C $(BUILDDIR)


install_alliance:
export ALLIANCE_TOP=$(PREFIX); \
export LD_LIBRARY_PATH=$(PREFIX)/lib:$(LD_LIBRARY_PATH); \
Expand Down
0 Seabreeze/doc/tabs.css → Seabreeze/doc/custom_tabs.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Seabreeze/doc/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Seabreeze - Routing Toolbox</h1>
<!--
Expand Down
11 changes: 9 additions & 2 deletions anabatic/src/NetBuilderHV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,23 @@ namespace Anabatic {

cdebug_log(145,0) << "flags: " << flags << endl;
if ((rpDepth == 0) or (rpDepth == 2)) {
const Layer* contactLayer = Session::getBuildContactLayer( 1 );
size_t wireDepth = RoutingGauge::nlayerdepth;
cdebug_log(145,0) << "case: METAL1 or METAL3 RoutingPad." << endl;
if (rpDepth == 2) {
cdebug_log(145,0) << "METAL3 override." << endl;
contactLayer = Session::getRoutingLayer( 2 );
wireDepth = 2;
}

if (flags & HAccess) {
cdebug_log(145,0) << "case: HAccess" << endl;

if ( ((flags & VSmall) and not ((flags & UseNonPref))) or (flags & Punctual) ) {
cdebug_log(145,0) << "case: VSmall and *not* UseNonPref" << endl;

AutoContact* subContact1 = AutoContactTurn::create( gcell, rp->getNet(), Session::getBuildContactLayer(1) );
AutoSegment::create( rpSourceContact, subContact1, Flags::Horizontal );
AutoContact* subContact1 = AutoContactTurn::create( gcell, rp->getNet(), contactLayer );
AutoSegment::create( rpSourceContact, subContact1, Flags::Horizontal, wireDepth );
rpSourceContact = subContact1;

flags &= ~UseNonPref;
Expand Down
Empty file added bora/python/__init__.py
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions bora/python/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'initHook.py',
subdir: 'coriolis/bora',
)
Expand Down
19 changes: 3 additions & 16 deletions bora/src/BoraEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,22 +110,9 @@ namespace Bora {

void BoraEngine::_runBoraInit ()
{
Utilities::Path pythonSitePackages = System::getPath("pythonSitePackages");
Utilities::Path confFile = "coriolis/bora/initHook.py";
Utilities::Path systemConfFile = pythonSitePackages / confFile;

if (systemConfFile.exists()) {
//Isobar::Script::addPath( systemConfDir.toString() );

dbo_ptr<Isobar::Script> script = Isobar::Script::create( confFile.toPyModPath() );
script->addKwArgument( "bora" , (PyObject*)PyBoraEngine_Link(this) );
script->runFunction ( "boraHook", getCell() );

//Isobar::Script::removePath( systemConfDir.toString() );
} else {
cerr << Warning( "Bora system configuration file:\n <%s> not found."
, systemConfFile.toString().c_str() ) << endl;
}
dbo_ptr<Isobar::Script> script = Isobar::Script::create( "coriolis.bora.initHook" );
script->addKwArgument( "bora" , (PyObject*)PyBoraEngine_Link(this) );
script->runFunction ( "boraHook", getCell() );
}


Expand Down
2 changes: 1 addition & 1 deletion crlcore/doc/crlcore/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ HTML_STYLESHEET = @DOCDIR@/SoC.css
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = @DOCDIR@/custom_tabs.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
0 crlcore/doc/crlcore/tabs.css → crlcore/doc/crlcore/custom_tabs.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion crlcore/doc/crlcore/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Coriolis Core (CRL) Documentation</h1>
<!--
Expand Down
3 changes: 1 addition & 2 deletions cumulus/src/designflow/pnrcheck.py
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Saved me from a lot of debugging :D

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debugging is our burden !

Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ def mkRuleSet ( callerGlobals, vlogDesignName, flags=0, extraRtlDepends=[], extr

if not (flags & NoSynthesis):
ruleYosys = Yosys .mkRule( 'yosys', vlogDesignName+'.v' )
ruleB2V = Blif2Vst.mkRule( 'b2v' , [ vhdlDesignName+'.vst'
, vlogDesignName+'.spi' ]
ruleB2V = Blif2Vst.mkRule( 'b2v' , [ vhdlDesignName+'.vst' ]
, [ruleYosys]
, flags=0 )
rtlDepends = [ ruleB2V ]
Expand Down
2 changes: 1 addition & 1 deletion documentation/content/pages/users-guide/UsersGuide_HTML.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Printable Version of this Document


.. contents::
:depth: 2
:depth: 1


.. include:: ../../../etc/definitions.rst
Expand Down
2 changes: 1 addition & 1 deletion hurricane/doc/analog/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ HTML_STYLESHEET = @DOCDIR@/SoC.css
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = @DOCDIR@/custom_tabs.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
0 hurricane/doc/analog/tabs.css → hurricane/doc/analog/custom_tabs.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hurricane/doc/analog/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Hurricane VLSI Database</h1>
<!--
Expand Down
2 changes: 1 addition & 1 deletion hurricane/doc/hurricane/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ HTML_STYLESHEET = "@DOCDIR@/SoC.css"
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = "@DOCDIR@/custom_tabs.css"

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
0 hurricane/doc/hurricane/tabs.css → hurricane/doc/hurricane/custom_tabs.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions hurricane/doc/hurricane/doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ HTML_FOOTER = footer.html
# obsolete.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_STYLESHEET = SoC.css
HTML_STYLESHEET =

# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
# cascading style sheets that are included after the standard style sheets
Expand All @@ -1488,7 +1488,7 @@ HTML_STYLESHEET = SoC.css
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = SoC.css,custom_tabs.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
2 changes: 1 addition & 1 deletion hurricane/doc/hurricane/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Hurricane VLSI Database</h1>
<!--
Expand Down
2 changes: 1 addition & 1 deletion hurricane/doc/viewer/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ HTML_STYLESHEET = "@DOCDIR@/SoC.css"
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = @DOCDIR@/custom_tabs.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
0 hurricane/doc/viewer/tabs.css → hurricane/doc/viewer/custom_tabs.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hurricane/doc/viewer/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Hurricane Design Viewer</h1>
<!--
Expand Down
Empty file added katana/python/__init__.py
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions katana/python/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'initHook.py',
subdir: 'coriolis/katana',
)
Expand Down
19 changes: 3 additions & 16 deletions katana/src/KatanaEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,22 +221,9 @@ namespace Katana {

void KatanaEngine::_runKatanaInit ()
{
Utilities::Path pythonSitePackages = System::getPath( "pythonSitePackages" );
Utilities::Path confFile = "coriolis/katana/initHook.py";
Utilities::Path systemConfFile = pythonSitePackages / confFile;

if (systemConfFile.exists()) {
//Isobar::Script::addPath( systemConfDir.toString() );

dbo_ptr<Isobar::Script> script = Isobar::Script::create( confFile.toPyModPath() );
script->addKwArgument( "katana" , (PyObject*)PyKatanaEngine_Link(this) );
script->runFunction ( "katanaHook", getCell() );

//Isobar::Script::removePath( systemConfDir.toString() );
} else {
cerr << Warning( "Katana system configuration file:\n <%s> not found."
, systemConfFile.toString().c_str() ) << endl;
}
dbo_ptr<Isobar::Script> script = Isobar::Script::create( "coriolis.katana.initHook" );
script->addKwArgument( "katana" , (PyObject*)PyKatanaEngine_Link(this) );
script->runFunction ( "katanaHook", getCell() );
}


Expand Down
2 changes: 1 addition & 1 deletion katana/src/NegociateWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ namespace {
//if (isVH) TrackMarker::create( rp, depth+2 );
}
if (rlDepth == 1) {
if (depth+1 < rg->getDepth())
if ((depth == 0) and (depth+1 < rg->getDepth()))
TrackMarker::create( rp, depth+1 );
}
}
Expand Down
2 changes: 1 addition & 1 deletion oroshi/doc/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,7 @@ HTML_STYLESHEET = "@DOCDIR@/SoC.css"
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = @DOCDIR@/custom_tabs.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
0 oroshi/doc/tabs.css → oroshi/doc/custom_tabs.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion oroshi/doc/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Oroshi - Analog Devices Layouts</h1>
<!--
Expand Down
4 changes: 2 additions & 2 deletions oroshi/doc/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cdata.set('VERSION', meson.project_version())

cdata.set('TOP_SRCDIR', meson.project_source_root())
cdata.set('DOCDIR', meson.current_source_dir())
cdata.set('DOCBUILDDIR', meson.current_build_dir() / 'oroshi')
cdata.set('DOCBUILDDIR', meson.current_build_dir() / 'doc')
cdata.set('TAGDIR', meson.project_build_root())

doxyfile = configure_file(
Expand All @@ -16,7 +16,7 @@ doxyfile = configure_file(
oroshi_docs = custom_target(
'oroshi-docs',
input: doxyfile,
output: 'oroshi',
output: 'doc',
command: [doxygen, doxyfile],
depends: [hurricane_docs, viewer_docs, crlcore_docs],
install: true,
Expand Down
2 changes: 1 addition & 1 deletion unicorn/doc/unicorn/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ HTML_STYLESHEET = @DOCDIR@/SoC.css
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = @DOCDIR@/custom_tabs.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down
0 unicorn/doc/unicorn/tabs.css → unicorn/doc/unicorn/custom_tabs.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion unicorn/doc/unicorn/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="SoC.css" rel="stylesheet" type="text/css">
<link href="tabs.css" rel="stylesheet" type="text/css">
<link href="custom_tabs.css" rel="stylesheet" type="text/css">
</head>
<h1 id="pagetop" class="header">Unicorn - Coriolis GUI</h1>
<!--
Expand Down
Empty file added unicorn/python/__init__.py
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions unicorn/python/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
py.install_sources(
'__init__.py',
'initHook.py',
subdir: 'coriolis/unicorn',
)
Expand Down
19 changes: 3 additions & 16 deletions unicorn/src/UnicornGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,9 @@ namespace Unicorn {

void UnicornGui::_runUnicornInit ()
{
Utilities::Path pythonSitePackages = System::getPath("pythonSitePackages");
Utilities::Path confFile = "coriolis/unicorn/initHook.py";
Utilities::Path systemConfFile = pythonSitePackages / confFile;

if (systemConfFile.exists()) {
//Isobar::Script::addPath( systemConfDir.toString() );

dbo_ptr<Isobar::Script> script = Isobar::Script::create( confFile.toPyModPath() );
script->addKwArgument( "editor" , (PyObject*)PyCellViewer_Link(this) );
script->runFunction ( "unicornConfigure", getCell() );

//Isobar::Script::removePath( systemConfDir.toString() );
} else {
cerr << Warning("Unicorn system configuration file:\n <%s> not found."
,systemConfFile.toString().c_str()) << endl;
}
dbo_ptr<Isobar::Script> script = Isobar::Script::create( "coriolis.unicorn.initHook" );
script->addKwArgument( "editor" , (PyObject*)PyCellViewer_Link(this) );
script->runFunction ( "unicornConfigure", getCell() );
}


Expand Down
Loading