jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./mauka: 

- New: In MaukaEngine::Construct(), do not try to initialize the slice height
        from a model with an empty AbutmentBox. Instead, signal an error (the model
        is likely to be missing, it has been initialized from the COMPONENT).
    - Change: In MaukaEngine::Construct(), clearer error message when there is duplicated
        instances. Show the full occurrence path of each conflicting instance.
This commit is contained in:
Jean-Paul Chaput 2013-02-10 11:53:07 +00:00
parent 9724cef332
commit 725cf8b2e6
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mauka/src/BBPlacer.cpp
View File

@ -265,7 +265,7 @@ void BBPlacer::Save()
instanceOccurrence.getPath().getTransformation().invert().applyOn(instanceTransformation);
instance->setTransformation(instanceTransformation);
instance->setPlacementStatus(Instance::PlacementStatus::PLACED);
//setPlacementStatusRecursivelyToPlaced(instance);
//setPlacementStatusRecursivelyToPlaced(instance);
}
}

31
mauka/src/MaukaEngine.cpp
View File

@ -184,9 +184,9 @@ void MaukaEngine::Construct()
// **************************
{
typedef map<Occurrence, unsigned> InstanceOccurrenceMap;
typedef set<Instance*> InstanceSet;
typedef map<Instance*,Occurrence> OccurrencesLUT;
typedef map<Net*, unsigned> NetMap;
InstanceSet instanceSet;
OccurrencesLUT occurencesLUT;
NetMap netMap;
unsigned instanceId = 0;
unsigned netId = 0;
@ -222,6 +222,14 @@ void MaukaEngine::Construct()
{
//cerr << "unplaced " << (*ioccurrence) << (*ioccurrence).getBoundingBox() << endl;
Cell* model = instance->getMasterCell();
if (model->getAbutmentBox().isEmpty()) {
throw Error("Unplaced terminal instance <%s> of <%s> with an empty model abutment box.\n"
"(hint: the vst model may be missing)"
,getString(instance->getName()).c_str()
,getString(model->getName()).c_str()
);
}
DbU::Unit insWidth = model->getAbutmentBox().getWidth();
DbU::Unit insHeight = model->getAbutmentBox().getHeight();
if (standardCellHeight == 0) {
@ -239,16 +247,21 @@ void MaukaEngine::Construct()
_instanceOccurrencesVector.push_back(*ioccurrence);
//VerifyPathCellBox(*ioccurrence);
_instanceWidths.push_back(insWidth);
InstanceSet::iterator isit = instanceSet.find(instance);
if (isit != instanceSet.end())
OccurrencesLUT::iterator duplicate = occurencesLUT.find(instance);
if (duplicate != occurencesLUT.end())
{
cerr << "Unplaced Instance : " << *isit << endl;
cerr << "Unplaced Occurrence : " << (*ioccurrence) << endl;
cerr << (*isit)->getPlacementStatus() << endl;
throw Error("Each unplaced instance must have one occurrence only");
//cerr << "Unplaced Instance : " << *duplicate << endl;
//cerr << "Unplaced Occurrence : " << (*ioccurrence) << endl;
//cerr << (*duplicate)->getPlacementStatus() << endl;
throw Error("Each unplaced instance must have one occurrence only.\n"
"Model <%s> is intanciated as:\n<b>. %s\n. %s</b>\n(at least)."
,getString(instance->getMasterCell()->getName()).c_str()
,(*ioccurrence).getCompactString().c_str()
,((*duplicate).second).getCompactString().c_str()
);
}
_instanceOccurrencesMap[*ioccurrence] = instanceId++;
instanceSet.insert(instance);
occurencesLUT.insert(make_pair(instance,*ioccurrence));
_instanceNets.push_back(UVector());
}
}

2
mauka/src/mauka/MaukaEngine.h
View File

@ -2,7 +2,7 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2006-2012, All Rights Reserved
// Copyright (c) UPMC/LIP6 2006-2013, All Rights Reserved
//
// x-----------------------------------------------------------------x
// | C O R I O L I S |