2023-03-18 12:17:23 -05:00
|
|
|
// -*- C++ -*-
|
|
|
|
//
|
|
|
|
// This file is part of the Coriolis Software.
|
|
|
|
// Copyright (c) Sorbonne Université 2007-2023, All Rights Reserved
|
|
|
|
//
|
|
|
|
// +-----------------------------------------------------------------+
|
|
|
|
// | C O R I O L I S |
|
|
|
|
// | T r a m o n t a n a - Extractor & LVX |
|
|
|
|
// | |
|
|
|
|
// | Algorithm : Christian MASSON |
|
|
|
|
// | First impl. : Yifei WU |
|
|
|
|
// | Second impl. : Jean-Paul CHAPUT |
|
|
|
|
// | E-mail : Jean-Paul.Chaput@lip6.fr |
|
|
|
|
// | =============================================================== |
|
|
|
|
// | C++ Module : "./SweepLine.cpp" |
|
|
|
|
// +-----------------------------------------------------------------+
|
|
|
|
|
|
|
|
|
|
|
|
#include <iomanip>
|
|
|
|
#include "hurricane/utilities/Path.h"
|
|
|
|
#include "hurricane/DebugSession.h"
|
|
|
|
#include "hurricane/UpdateSession.h"
|
|
|
|
#include "hurricane/Bug.h"
|
|
|
|
#include "hurricane/Error.h"
|
|
|
|
#include "hurricane/Warning.h"
|
|
|
|
#include "hurricane/Breakpoint.h"
|
|
|
|
#include "hurricane/Timer.h"
|
|
|
|
#include "hurricane/DataBase.h"
|
|
|
|
#include "hurricane/Technology.h"
|
|
|
|
#include "hurricane/Layer.h"
|
|
|
|
#include "hurricane/Net.h"
|
|
|
|
#include "hurricane/Pad.h"
|
|
|
|
#include "hurricane/Plug.h"
|
|
|
|
#include "hurricane/Cell.h"
|
|
|
|
#include "hurricane/Instance.h"
|
|
|
|
#include "hurricane/Vertical.h"
|
|
|
|
#include "hurricane/Horizontal.h"
|
|
|
|
#include "hurricane/RoutingPad.h"
|
|
|
|
#include "crlcore/Utilities.h"
|
|
|
|
#include "tramontana/SweepLine.h"
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
#include "tramontana/QueryTiles.h"
|
2023-03-18 12:17:23 -05:00
|
|
|
|
|
|
|
|
|
|
|
namespace Tramontana {
|
|
|
|
|
|
|
|
using std::cout;
|
|
|
|
using std::cerr;
|
|
|
|
using std::endl;
|
|
|
|
using std::dec;
|
|
|
|
using std::setw;
|
|
|
|
using std::setfill;
|
|
|
|
using std::left;
|
|
|
|
using std::right;
|
|
|
|
using std::string;
|
|
|
|
using std::ostream;
|
|
|
|
using std::ofstream;
|
|
|
|
using std::ostringstream;
|
|
|
|
using std::setprecision;
|
|
|
|
using std::vector;
|
|
|
|
using std::make_pair;
|
|
|
|
using Hurricane::dbo_ptr;
|
|
|
|
using Hurricane::UpdateSession;
|
|
|
|
using Hurricane::DebugSession;
|
|
|
|
using Hurricane::tab;
|
|
|
|
using Hurricane::Bug;
|
|
|
|
using Hurricane::Error;
|
|
|
|
using Hurricane::Warning;
|
|
|
|
using Hurricane::Breakpoint;
|
|
|
|
using Hurricane::Interval;
|
|
|
|
using Hurricane::Box;
|
|
|
|
using Hurricane::DataBase;
|
|
|
|
using Hurricane::Technology;
|
|
|
|
using Hurricane::Layer;
|
|
|
|
using Hurricane::Entity;
|
|
|
|
using Hurricane::Horizontal;
|
|
|
|
using Hurricane::Vertical;
|
|
|
|
using Hurricane::RoutingPad;
|
|
|
|
using Hurricane::Cell;
|
|
|
|
using Hurricane::Instance;
|
|
|
|
|
|
|
|
|
|
|
|
// -------------------------------------------------------------------
|
|
|
|
// Class : "Tramontana::SweepLine".
|
|
|
|
|
|
|
|
|
|
|
|
SweepLine::SweepLine ( TramontanaEngine* tramontana )
|
2023-03-28 08:13:02 -05:00
|
|
|
: _tramontana (tramontana)
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
, _extracteds ()
|
2023-03-28 08:13:02 -05:00
|
|
|
, _tiles ()
|
|
|
|
, _intervalTrees()
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
{
|
|
|
|
for ( const BasicLayer* bl : DataBase::getDB()->getTechnology()->getBasicLayers() ) {
|
|
|
|
// HARDCODED. Should read the gauge.
|
|
|
|
if (getString(bl->getName()).substr(0,6) == "gmetal") continue;
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
if ( (bl->getMaterial() == BasicLayer::Material::metal)
|
|
|
|
or (bl->getMaterial() == BasicLayer::Material::poly))
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
_extracteds.push_back( bl );
|
|
|
|
}
|
|
|
|
|
|
|
|
// _extracteds.push_back( DataBase::getDB()->getTechnology()->getBasicLayer( "metal5" ));
|
|
|
|
// _extracteds.push_back( DataBase::getDB()->getTechnology()->getBasicLayer( "metal4" ));
|
|
|
|
// _extracteds.push_back( DataBase::getDB()->getTechnology()->getBasicLayer( "metal3" ));
|
|
|
|
// _extracteds.push_back( DataBase::getDB()->getTechnology()->getBasicLayer( "metal2" ));
|
|
|
|
// _extracteds.push_back( DataBase::getDB()->getTechnology()->getBasicLayer( "metal1" ));
|
|
|
|
// _extracteds.push_back( DataBase::getDB()->getTechnology()->getBasicLayer( "poly" ));
|
|
|
|
}
|
2023-03-18 12:17:23 -05:00
|
|
|
|
|
|
|
|
|
|
|
SweepLine::~SweepLine ()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
|
|
|
|
void SweepLine::run ()
|
|
|
|
{
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
//DebugSession::open( 160, 169 );
|
|
|
|
cdebug_log(160,1) << "SweepLine::run()" << endl;
|
2023-03-28 08:13:02 -05:00
|
|
|
loadTiles();
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
//bool debugOn = false;
|
|
|
|
bool written = false;
|
2023-03-18 12:17:23 -05:00
|
|
|
for ( Element& element : _tiles ) {
|
|
|
|
Tile* tile = element.getTile();
|
|
|
|
TileIntv tileIntv ( tile, tile->getYMin(), tile->getYMax() );
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
// if (getString(tile->getNet()->getName()) == "a(13)") {
|
|
|
|
// cerr << tile << endl;
|
|
|
|
// }
|
|
|
|
// if (not debugOn and (element.getX() == DbU::fromLambda(1724.0))) {
|
|
|
|
// debugOn = true;
|
|
|
|
// DebugSession::open( 0, 169 );
|
|
|
|
// }
|
|
|
|
// if (debugOn and (element.getX() > DbU::fromLambda(1726.0))) {
|
|
|
|
// debugOn = false;
|
|
|
|
// DebugSession::close();
|
|
|
|
// }
|
|
|
|
cdebug_log(160,1) << "X@ + " << DbU::getValueString(element.getX()) << " " << tile << endl;
|
2023-03-28 08:13:02 -05:00
|
|
|
auto intvTree = _intervalTrees.find( element.getMask() );
|
|
|
|
if (intvTree == _intervalTrees.end()) {
|
|
|
|
cerr << Error( "SweepLine::run(): Missing interval tree for layer(mask) %s."
|
|
|
|
" (for tile: %s)"
|
|
|
|
, getString(element.getMask()).c_str()
|
|
|
|
, getString(element.getTile()).c_str()
|
|
|
|
) << endl;
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
cdebug_tabw(160,-1);
|
2023-03-28 08:13:02 -05:00
|
|
|
continue;
|
|
|
|
}
|
2023-03-18 12:17:23 -05:00
|
|
|
if (element.isLeftEdge()) {
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
// if (tile->getId() == 46055) {
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
// DebugSession::open( 0, 169 );
|
|
|
|
// if (not written) intvTree->second.write( "tree-before.gv" );
|
|
|
|
// cdebug_log(160,0) << " Interval tree *before* insertion." << endl;
|
|
|
|
// for ( auto elt : intvTree->second.getElements() ) {
|
|
|
|
// cdebug_log(160,0) << " | in tree:" << elt << endl;
|
|
|
|
// if (elt.getData()->getBoundingBox().getXMax() < tile->getLeftEdge())
|
|
|
|
// cdebug_log(160,0) << " * Should have been removed !" << endl;
|
|
|
|
// }
|
|
|
|
// }
|
2023-03-28 08:13:02 -05:00
|
|
|
for ( const TileIntv& overlap : intvTree->second.getOverlaps(
|
2023-03-18 12:17:23 -05:00
|
|
|
Interval(tile->getYMin(), tile->getYMax() ))) {
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
cdebug_log(160,0) << " | intersect " << overlap.getData() << endl;
|
2023-03-18 12:17:23 -05:00
|
|
|
tile->merge( overlap.getData() );
|
|
|
|
}
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
cdebug_log(160,0) << " | insert tile" << endl;
|
|
|
|
// if (tile->getId() == 60117) {
|
|
|
|
// cerr << " | insert in " << element.getMask() << endl;
|
|
|
|
// cerr << " | " << tile << endl;
|
|
|
|
// }
|
|
|
|
// if (tile->getId() == 46373) {
|
|
|
|
// cerr << " | insert " << tile << endl;
|
|
|
|
// }
|
2023-03-28 08:13:02 -05:00
|
|
|
intvTree->second.insert( tileIntv );
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
// if (tile->getId() == 46055) {
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
// if (not written) intvTree->second.write( "tree-after.gv" );
|
|
|
|
// written = true;
|
|
|
|
// DebugSession::close();
|
|
|
|
// }
|
2023-03-18 12:17:23 -05:00
|
|
|
} else {
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
// if (tile->getId() == 289) {
|
|
|
|
// DebugSession::open( 0, 169 );
|
|
|
|
// }
|
|
|
|
// cdebug_log(160,0) << " | remove tile from " << element.getMask() << endl;
|
|
|
|
// cdebug_log(160,0) << " | " << tile << endl;
|
|
|
|
// if ((tile->getId() == 289) and not written) {
|
|
|
|
// cerr << "(before) written is " << written << endl;
|
|
|
|
// DebugSession::open( 0, 169 );
|
|
|
|
// intvTree->second.write( "tree-before.gv" );
|
|
|
|
// //DebugSession::close();
|
|
|
|
// for ( auto elt : intvTree->second.getElements() ) {
|
|
|
|
// cerr << " | in tree:" << elt << endl;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
cdebug_log(160,0) << " | remove tile" << endl;
|
2023-03-28 08:13:02 -05:00
|
|
|
intvTree->second.remove( tileIntv );
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
// DebugSession::open( 0, 169 );
|
|
|
|
// intvTree->second.checkVMax();
|
|
|
|
// DebugSession::close();
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
// if ((tile->getId() == 289) and not written) {
|
|
|
|
// //DebugSession::open( 0, 169 );
|
|
|
|
// written = true;
|
|
|
|
// cerr << "(after) written is " << written << endl;
|
|
|
|
// intvTree->second.write( "tree-after.gv" );
|
|
|
|
// DebugSession::close();
|
|
|
|
// }
|
|
|
|
// if (intvTree->second.find( tileIntv ) != intvTree->second.end()) {
|
|
|
|
// cerr << "NOT Removed " << tileIntv << endl;
|
|
|
|
// }
|
|
|
|
// if (tile->getId() == 289) {
|
|
|
|
// cerr << " | removed " << tile << endl;
|
|
|
|
// intvTree->second.write( "tree.gv" );
|
|
|
|
// for ( auto elt : intvTree->second.getElements() ) {
|
|
|
|
// cerr << " | in tree:" << elt << endl;
|
|
|
|
// }
|
|
|
|
// DebugSession::close();
|
|
|
|
// }
|
2023-03-28 08:13:02 -05:00
|
|
|
// if (tile->getId() == 46055) {
|
|
|
|
// intvTree->second.write( "we_at_remove.gv" );
|
|
|
|
// for ( auto tile : intvTree->second.getElements() ) {
|
|
|
|
// cerr << "| in tree:" << tile << endl;
|
|
|
|
// }
|
|
|
|
// }
|
2023-03-18 12:17:23 -05:00
|
|
|
}
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
//intvTree->second.checkVMax();
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
cdebug_tabw(160,-1);
|
2023-03-18 12:17:23 -05:00
|
|
|
}
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
//if (debugOn) DebugSession::close();
|
|
|
|
cdebug_tabw(160,-1);
|
2023-03-28 08:13:02 -05:00
|
|
|
//DebugSession::close();
|
2023-03-18 12:17:23 -05:00
|
|
|
mergeEquipotentials();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-03-28 08:13:02 -05:00
|
|
|
void SweepLine::loadTiles ()
|
2023-03-18 12:17:23 -05:00
|
|
|
{
|
2023-03-28 08:13:02 -05:00
|
|
|
//cerr << "SweepLine::loadTiles()" << endl;
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
|
|
|
|
for ( const BasicLayer* layer : _extracteds ) {
|
2023-03-28 08:13:02 -05:00
|
|
|
_intervalTrees.insert( make_pair( layer->getMask(), TileIntvTree() ));
|
|
|
|
}
|
|
|
|
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
QueryTiles query ( this );
|
|
|
|
for ( const BasicLayer* layer : _extracteds ) {
|
|
|
|
query.setBasicLayer( layer );
|
|
|
|
query.doQuery();
|
2023-03-18 12:17:23 -05:00
|
|
|
}
|
Transhierarchical/flat extraction work, no netlist rebuild yet.
* Bug: In Interval::intersect(), bad condition check in strict mode.
* Change: In Occurrence::operator<(), change the sorting criterions
so that the ones with no paths are "lower", then the one with
no entities, then compare entities Id then Path hashes.
* Change: In Occurrence::getCompactString(), to be more readable,
suppress leading and ending "<>".
* Change: In IntervalTree, now use an IntervalDataCompare to control
the ordering of the nodes inside the tree. This may be needed
when IntervalData is build upon a pointer, we don't want to
sort on pointer values (non deterministic) .
* Bug: In IntervalTree::postRemove(), there was an incorrect computation
of the updated childsVMax.
* Bug: In IntervalTree::beginOverlaps(), miscalculated leftmost
interval overlapping.
* Bug: In RbTree::remove(), when exchanging the removed node for a
leaf, fully swap the nodes contents, was incompletly copied before.
* New: In CellWidget, add new slots selectSet(OccurrenceSet&) and
unselectSet(OccurrenceSet&), to be able to select/unselected sets
of Occurrence (for use by TabEquipotentials).
* Change: In EtesianEngine, no more need to remove leading/ending "<>".
* New: In Tramontana, use a Query to find all the Occurrence under
an area. Previously we were using Cell::getOccurrencesUnder()
which *do not* return the components in instances, so we would
have been unable to find trans-hierarchical shorts circuits.
* New: In tramontana, now use a Relation to tag all the components
belonging to an Equipotential.
* Change: In Equipotential, store everything under the form of
Occurrence, instead of Components. Due to the way the Occurrences
are sorted, the one holding Components should be firts.
2023-04-02 16:02:46 -05:00
|
|
|
cmess2 << " - Loaded " << query.getGoMatchCount() << " tiles." << endl;
|
|
|
|
|
|
|
|
// for ( Occurrence occurrence : getCell()->getOccurrencesUnder( getCell()->getBoundingBox() ) ) {
|
|
|
|
// vector<Tile*> tiles;
|
|
|
|
// Component* component = dynamic_cast<Component*>( occurrence.getEntity() );
|
|
|
|
// if (occurrence.getPath().getInstances().getSize() > 0) {
|
|
|
|
// cerr << occurrence << endl;
|
|
|
|
// }
|
|
|
|
// if (not component) continue;
|
|
|
|
// for ( const BasicLayer* layer : extracteds ) {
|
|
|
|
// if (not component->getLayer()->getMask().intersect(layer->getMask())) continue;
|
|
|
|
// tiles.push_back( Tile::create( occurrence, layer ));
|
|
|
|
// _tiles.push_back( Element( tiles.back(), Tile::LeftEdge ) );
|
|
|
|
// _tiles.push_back( Element( tiles.back(), Tile::RightEdge ) );
|
|
|
|
// if (tiles.size() > 1)
|
|
|
|
// tiles.back()->setParent( tiles[0] );
|
|
|
|
// }
|
|
|
|
// tiles.clear();
|
|
|
|
// }
|
2023-03-18 12:17:23 -05:00
|
|
|
sort( _tiles.begin(), _tiles.end() );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SweepLine::mergeEquipotentials ()
|
|
|
|
{
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
//DebugSession::open( 160, 169 );
|
|
|
|
cdebug_log(160,1) << "SweepLine::mergeEquipotentials()" << endl;
|
2023-03-28 08:13:02 -05:00
|
|
|
//cerr << "SweepLine::mergeEquipotentials()" << endl;
|
2023-03-18 12:17:23 -05:00
|
|
|
Tile::timeTick();
|
|
|
|
for ( Tile* tile : Tile::getAllTiles() ) {
|
|
|
|
tile->getRoot( Tile::MergeEqui );
|
|
|
|
}
|
Full transhierarchical implementation done.
* New: Equipotential elements includes now:
1. Components at the top level (the cell owning the Equi).
2. Nets at the top level. If an equi include all the components
of a Net, own the Net, not all it's individual components.
3. Other equipotentials from the Instances immediatey below.
Thoses equis should be equivalents to the Plug of the Net.
They are stored in the form of Occurrences <Instance,Equi>,
the relation is stored on that Occurrence.
* New: Equipotential::getFlatComponents(), a collection to recursively
get all the *component* occurrences of the equi. Transhierarchically.
Go through components, nets components, and recursively through
the child equis.
* New: EquipotentialRelation, the master of this relation is the
Equipotential and the slaves, all its elements.
* Change: In Tile, in case the tile is build on a deep component,
we trace up the Equipotential it belongs to in the Instance
level immediately belonging to the Cell under extraction.
They must exists as we extract from bottom to top all the
master cells. So we have, for that tile an Occurrence
<Instance,Equi> that we can store in the current Equi level.
* Change/Bug: In Tile, add an Id to be reliably sort the tiles
in the IntervalTree. As we replaced the tile component occurrence
by a <Instance,Equi> we were having multiple tiles with the same
equi. This was causing havoc again in the IntervalTree.
Should add a check in the RbTree for elements with the
exact same key, but that would imply passing a new template
parameter for the "equal" function.
2023-04-13 07:00:50 -05:00
|
|
|
cdebug_tabw(160,-1);
|
|
|
|
//DebugSession::close();
|
2023-03-18 12:17:23 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
string SweepLine::_getTypeName () const
|
|
|
|
{ return "Tramontana::SweepLine"; }
|
|
|
|
|
|
|
|
|
|
|
|
string SweepLine::_getString () const
|
|
|
|
{
|
|
|
|
ostringstream os;
|
|
|
|
os << "<SweepLine \"" << _tramontana->getCell()->getName() << "\">";
|
|
|
|
return os.str();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Record* SweepLine::_getRecord () const
|
|
|
|
{
|
|
|
|
Record* record = new Record ( _getString() );
|
|
|
|
if (record) {
|
|
|
|
record->add( getSlot( "_tramontana" , &_tramontana ) );
|
|
|
|
record->add( getSlot( "_tiles" , &_tiles ) );
|
|
|
|
}
|
|
|
|
return record;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} // Tramontana namespace.
|