From d69327d9a90f88901424ff3013abde346d4e36e2 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 30 Jul 2019 13:13:57 +0200 Subject: [PATCH] Various typos correction (courtesy of G. Gouvine). --- README.rst | 13 ++++++------- .../src/ccore/toolbox/HyperNetPortOccurrences.cpp | 2 +- crlcore/src/pyCRL/PyAllianceFramework.cpp | 4 ++-- cumulus/src/tools/px2mpx.py | 2 +- etesian/src/EtesianEngine.cpp | 6 +++--- hurricane/src/hurricane/TransistorLayer.cpp | 3 ++- ispd/src/IspdMain.cpp | 2 +- katabatic/doc/Modifications.rst | 2 +- katabatic/src/LoadGrByNet.cpp | 2 +- katana/src/TrackElements.cpp | 2 +- kite/src/TrackElements.cpp | 2 +- knik/src/knik/KnikEngine.h | 2 +- lefdef/src/def/def/defiPath.cpp | 7 ++++--- tutorial/src/tutorial.py | 8 ++++---- unicorn/src/CgtMain.cpp | 6 +++--- unicorn/src/cgt.py | 8 ++++---- vlsisapd/src/bookshelf/src/Parser.cpp | 4 ++-- 17 files changed, 38 insertions(+), 37 deletions(-) diff --git a/README.rst b/README.rst index 9336ca1c..28e9132f 100644 --- a/README.rst +++ b/README.rst @@ -5,20 +5,19 @@ Coriolis README =============== - -Coriolis is a free database, placement tool and routing tool for VLSI designs. +Coriolis is a free database, placement tool and routing tool for VLSI design. Purpose ======= Coriolis provides several tools to perform the layout of VLSI circuits. Its -main components are the Hurricane database, the Etesian placer and the Kite +main components are the Hurricane database, the Etesian placer and the Katana router, but other tools can use the Hurricane database and the parsers provided. The user interface is the prefered way to use Coriolis, but all -Coriolis tools are Python modules and thus scriptables. +Coriolis tools are Python modules and thus scriptable. Documentation @@ -33,7 +32,7 @@ The documentation of the latest *stable* version is also available online. It may be quite outdated from the *devel* version. - https://soc-extras.lip6.fr/en/coriolis/coriolis2-users-guide/ + https://www-soc.lip6.fr/sesi-docs/coriolis2-docs/coriolis2/en/latex/users-guide/UsersGuide.pdf Building Coriolis @@ -85,8 +84,8 @@ The Coriolis main interface can be launched with the command: :: ego@home:~: ~/coriolis-2.x/./Release.Shared/install/bin/coriolis -The ``coriolis`` script is tasked to guess it's location and setup appropriatly -the UNIX environment, then lauch ``cgt`` (or *any* command, with the +The ``coriolis`` script detects its location and setups the UNIX +environment appropriately, then lauches ``cgt`` (or *any* command, with the ``--run=`` option). Conversely, you can setup the current shell environement for Coriolis by diff --git a/crlcore/src/ccore/toolbox/HyperNetPortOccurrences.cpp b/crlcore/src/ccore/toolbox/HyperNetPortOccurrences.cpp index 0b65bef4..105a0ed3 100644 --- a/crlcore/src/ccore/toolbox/HyperNetPortOccurrences.cpp +++ b/crlcore/src/ccore/toolbox/HyperNetPortOccurrences.cpp @@ -380,7 +380,7 @@ Occurrence CHyperNetDriverPortOccurrences::Locator::getElement() const { if (_pinLocator.isValid()) return _pinLocator.getElement(); - return _plugOccurrenceLocator.getElement(); + return _plugOccurrenceLocator.getElement(); } Locator* CHyperNetDriverPortOccurrences::Locator::getClone() const diff --git a/crlcore/src/pyCRL/PyAllianceFramework.cpp b/crlcore/src/pyCRL/PyAllianceFramework.cpp index 5831f1b1..eebf7f33 100644 --- a/crlcore/src/pyCRL/PyAllianceFramework.cpp +++ b/crlcore/src/pyCRL/PyAllianceFramework.cpp @@ -537,13 +537,13 @@ extern "C" { , { "addCellGauge" , (PyCFunction)PyAllianceFramework_addCellGauge , METH_VARARGS , "Add a new cell gauge." } , { "getCellGauge" , (PyCFunction)PyAllianceFramework_getCellGauge , METH_VARARGS - , "Get a cell gauge (whithout a name, return the default)." } + , "Get a cell gauge (without a name, return the default)." } , { "matchCellGauge" , (PyCFunction)PyAllianceFramework_matchCellGauge , METH_VARARGS , "Find the first CellGauge comptible with width and height." } , { "addRoutingGauge" , (PyCFunction)PyAllianceFramework_addRoutingGauge , METH_VARARGS , "Add a new routing gauge." } , { "getRoutingGauge" , (PyCFunction)PyAllianceFramework_getRoutingGauge , METH_VARARGS - , "Get a routing gauge (whithout a name, return the default)." } + , "Get a routing gauge (without a name, return the default)." } , { "setRoutingGauge" , (PyCFunction)PyAllianceFramework_setRoutingGauge , METH_VARARGS , "Select the default routing gauge." } //, { "destroy" , (PyCFunction)PyAllianceFramework_destroy , METH_NOARGS diff --git a/cumulus/src/tools/px2mpx.py b/cumulus/src/tools/px2mpx.py index 554d780b..29ad1385 100755 --- a/cumulus/src/tools/px2mpx.py +++ b/cumulus/src/tools/px2mpx.py @@ -335,7 +335,7 @@ def ScriptMain ( **kw ): if __name__ == '__main__': parser = optparse.OptionParser() - parser.add_option( '-c', '--cell', type='string', dest='cell' , help='The name of the chip to build, whithout extension.') + parser.add_option( '-c', '--cell', type='string', dest='cell' , help='The name of the chip to build, without extension.') parser.add_option( '-v', '--verbose' , action='store_true', dest='verbose' , help='First level of verbosity.') parser.add_option( '-V', '--very-verbose' , action='store_true', dest='veryVerbose', help='Second level of verbosity.') (options, args) = parser.parse_args() diff --git a/etesian/src/EtesianEngine.cpp b/etesian/src/EtesianEngine.cpp index 7e64703a..f06848bc 100644 --- a/etesian/src/EtesianEngine.cpp +++ b/etesian/src/EtesianEngine.cpp @@ -274,6 +274,7 @@ namespace Etesian { Super::_postCreate(); // Ugly: Name based detection of ISPD benchmarks. + // Maybe base it on whether the imported library is in Bookshelf format or not? if (getString(getCell()->getName()).substr(0,7) == "bigblue") { cmess2 << " o ISPD benchmark <" << getCell()->getName() << ">, no feed cells will be added." << endl; @@ -649,8 +650,6 @@ namespace Etesian { _placementLB.positions_ = positions; _placementLB.orientations_ = orientations; _placementUB = _placementLB; - //cerr << "Coloquinte cell height: " << _circuit.get_cell(0).size.y << endl; - } @@ -831,6 +830,7 @@ namespace Etesian { int_t sliceHeight = getSliceHeight() / getHorizontalPitch(); roughLegalize(sliceHeight, options); + // TODO: for uniform density distribution, add some margin to the cell sizes so we don't disrupt it during detailed placement for ( int i=0; i will be printed on ." ) ( "cell,c" , poptions::value() - , "The name of the cell to load, whithout extension." ) + , "The name of the cell to load, without extension." ) ( "knik,k" , poptions::bool_switch(&knikSimple)->default_value(false) , "Perform a simple routing pass.") ( "KNIK,K" , poptions::bool_switch(&knikOverflow)->default_value(false) diff --git a/katabatic/doc/Modifications.rst b/katabatic/doc/Modifications.rst index 764969fc..a24debb2 100644 --- a/katabatic/doc/Modifications.rst +++ b/katabatic/doc/Modifications.rst @@ -48,5 +48,5 @@ AutoHorizontal/AutoVertical * The local ``slacken()`` methods are, in fact AutoSegment::makeTopologyDogLeg(). -* We now must be able to create AutoHorizontal/AutoContact whithout suppling +* We now must be able to create AutoHorizontal/AutoContact without suppling the anchor AutoContacts. Allows more supple building constructions. diff --git a/katabatic/src/LoadGrByNet.cpp b/katabatic/src/LoadGrByNet.cpp index 6d20cebb..8acfb774 100644 --- a/katabatic/src/LoadGrByNet.cpp +++ b/katabatic/src/LoadGrByNet.cpp @@ -243,7 +243,7 @@ namespace { //! function: //!
    //!
  • One global: nonsensical because there also must be a terminal. -//!
  • Two aligned globals: in that case we do a straight wire whithout +//!
  • Two aligned globals: in that case we do a straight wire without //! any AutoContact (handled by the source/target of the wire). //!
//! diff --git a/katana/src/TrackElements.cpp b/katana/src/TrackElements.cpp index 3bdb5247..0cb497cc 100644 --- a/katana/src/TrackElements.cpp +++ b/katana/src/TrackElements.cpp @@ -68,7 +68,7 @@ namespace Katana { if ( _locator.isValid() ) { _element = Session::lookup( _locator.getElement()->getCanonical(bounds)->base() ); if ( !_element ) { - cerr << Bug("Canonical segment whithout TrackElement.") << endl; + cerr << Bug("Canonical segment without TrackElement.") << endl; continue; } diff --git a/kite/src/TrackElements.cpp b/kite/src/TrackElements.cpp index 079694fc..af69dd07 100644 --- a/kite/src/TrackElements.cpp +++ b/kite/src/TrackElements.cpp @@ -68,7 +68,7 @@ namespace Kite { if ( _locator.isValid() ) { _element = Session::lookup( _locator.getElement()->getCanonical(bounds)->base() ); if ( !_element ) { - cerr << Bug("Canonical segment whithout TrackElement.") << endl; + cerr << Bug("Canonical segment without TrackElement.") << endl; continue; } diff --git a/knik/src/knik/KnikEngine.h b/knik/src/knik/KnikEngine.h index d5330577..e8460c5a 100644 --- a/knik/src/knik/KnikEngine.h +++ b/knik/src/knik/KnikEngine.h @@ -97,7 +97,7 @@ struct SegRecord { struct NetSurfacesComp : public binary_function { public: bool operator() ( const NetRecord &record1, const NetRecord &record2 ) const { if (record1._exArea < record2._exArea) return true; - if (record1._exArea == record1._exArea) { + if (record1._exArea == record2._exArea) { if (getString(record1._net->getName()) < getString(record2._net->getName())) return true; if (record1._net == record2._net) assert ( false ); } diff --git a/lefdef/src/def/def/defiPath.cpp b/lefdef/src/def/def/defiPath.cpp index 586c40e7..6adef117 100644 --- a/lefdef/src/def/def/defiPath.cpp +++ b/lefdef/src/def/def/defiPath.cpp @@ -106,9 +106,10 @@ void defiPath::clear() { void defiPath::Destroy() { - if (keys_) - free((char*)(keys_)); - keys_ = NULL; + if (keys_) { + free((char*)(keys_)); + keys_ = NULL; + } if (data_) { clear(); free((char*)(data_)); diff --git a/tutorial/src/tutorial.py b/tutorial/src/tutorial.py index 92b8a4ce..24cb924d 100755 --- a/tutorial/src/tutorial.py +++ b/tutorial/src/tutorial.py @@ -52,10 +52,10 @@ if __name__ == '__main__': parser = optparse.OptionParser(usage) parser.add_option( '--no-init' , action='store_true', dest='noInit' , help='Do not load any initialization.') - parser.add_option( '-c', '--cell' , type='string' , dest='cell' , help='The name of the cell to load, whithout extension.') - parser.add_option( '--acm-sigda-89' , type='string' , dest='acmSigdaName' , help='An ACM/SIGDA 89 bench name to load, whithout extension.') - parser.add_option( '--blif' , type='string' , dest='blifName' , help='A Blif (Yosys) design name to load, whithout extension.') - parser.add_option( '--ispd-05' , type='string' , dest='ispd05name' , help='An ISPD 05 bench (placement) name to load, whithout extension.') + parser.add_option( '-c', '--cell' , type='string' , dest='cell' , help='The name of the cell to load, without extension.') + parser.add_option( '--acm-sigda-89' , type='string' , dest='acmSigdaName' , help='An ACM/SIGDA 89 bench name to load, without extension.') + parser.add_option( '--blif' , type='string' , dest='blifName' , help='A Blif (Yosys) design name to load, without extension.') + parser.add_option( '--ispd-05' , type='string' , dest='ispd05name' , help='An ISPD 05 bench (placement) name to load, without extension.') parser.add_option( '-v', '--verbose' , action='store_true', dest='verbose' , help='First level of verbosity.') parser.add_option( '-V', '--very-verbose' , action='store_true', dest='veryVerbose' , help='Second level of verbosity.') parser.add_option( '-i', '--info' , action='store_true', dest='info' , help='Display lots of informational messages.') diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp index a76ea3ec..b9bcc528 100644 --- a/unicorn/src/CgtMain.cpp +++ b/unicorn/src/CgtMain.cpp @@ -137,7 +137,7 @@ int main ( int argc, char *argv[] ) ( "dump-measures,M" , bopts::bool_switch(&dumpMeasures)->default_value(false) , "Dump statistical measurements on the disk.") ( "cell,c" , bopts::value() - , "The name of the cell to load, whithout extension." ) + , "The name of the cell to load, without extension." ) ( "save-design,s" , bopts::value() , "Save the routed design.") ( "export-def" , bopts::bool_switch(&exportDef)->default_value(false) @@ -145,9 +145,9 @@ int main ( int argc, char *argv[] ) ( "import-def" , bopts::value() , "Import the design in DEF format.") ( "importk-ispd04-bk" , bopts::value() - , "The name of the ISPD04 benchmark to import (Bookshelf .aux), whithout extension." ) + , "The name of the ISPD04 benchmark to import (Bookshelf .aux), without extension." ) ( "import-iccad04-def" , bopts::value() - , "The name of the ICCAD04 benchmark to import (LEF/DEF), whithout extension." ) + , "The name of the ICCAD04 benchmark to import (LEF/DEF), without extension." ) ( "save-import" , bopts::bool_switch(&saveImport)->default_value(false) , "Save of the imported design immediatly after loading."); diff --git a/unicorn/src/cgt.py b/unicorn/src/cgt.py index faa0faaf..e2b1f57b 100755 --- a/unicorn/src/cgt.py +++ b/unicorn/src/cgt.py @@ -102,10 +102,10 @@ if __name__ == '__main__': parser = optparse.OptionParser(usage) parser.add_option( '--no-init' , action='store_true', dest='noInit' , help='Do not load any initialization.') - parser.add_option( '-c', '--cell' , type='string' , dest='cell' , help='The name of the cell to load, whithout extension.') - parser.add_option( '--acm-sigda-89' , type='string' , dest='acmSigdaName' , help='An ACM/SIGDA 89 bench name to load, whithout extension.') - parser.add_option( '--blif' , type='string' , dest='blifName' , help='A Blif (Yosys) design name to load, whithout extension.') - parser.add_option( '--ispd-05' , type='string' , dest='ispd05name' , help='An ISPD 05 bench (placement) name to load, whithout extension.') + parser.add_option( '-c', '--cell' , type='string' , dest='cell' , help='The name of the cell to load, without extension.') + parser.add_option( '--acm-sigda-89' , type='string' , dest='acmSigdaName' , help='An ACM/SIGDA 89 bench name to load, without extension.') + parser.add_option( '--blif' , type='string' , dest='blifName' , help='A Blif (Yosys) design name to load, without extension.') + parser.add_option( '--ispd-05' , type='string' , dest='ispd05name' , help='An ISPD 05 bench (placement) name to load, without extension.') parser.add_option( '--script' , type='string' , dest='script' , help='Run a Python or Stratus script.') parser.add_option( '-v', '--verbose' , action='store_true', dest='verbose' , help='First level of verbosity.') parser.add_option( '-V', '--very-verbose' , action='store_true', dest='veryVerbose' , help='Second level of verbosity.') diff --git a/vlsisapd/src/bookshelf/src/Parser.cpp b/vlsisapd/src/bookshelf/src/Parser.cpp index e317fec6..d2be284c 100644 --- a/vlsisapd/src/bookshelf/src/Parser.cpp +++ b/vlsisapd/src/bookshelf/src/Parser.cpp @@ -659,10 +659,10 @@ namespace Bookshelf { } if ( ordereds[0].empty() ) - throw Exception("Bookshelf::Parser(): .aux file do not contains <.nodes>."); + throw Exception("Bookshelf::Parser(): .aux file does not contains <.nodes>."); if ( ordereds[1].empty() ) - throw Exception("Bookshelf::Parser(): .aux file do not contains <.nets>."); + throw Exception("Bookshelf::Parser(): .aux file does not contains <.nets>."); for ( size_t iext=0 ; iext<5 ; ++iext ) { if ( ordereds[iext].empty() ) continue;