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

Merge branch 'coloquinte2' of gitlab.lip6.fr:vlsi-eda/coriolis into coloquinte2

This commit is contained in:
Jean-Paul Chaput 2023-06-22 17:09:39 +02:00
parent 04410f1cc2 0dc33538a7
commit 56da5ebe32
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitmodules vendored
View File

@ -1,3 +1,4 @@
[submodule "coloquinte"] [submodule "coloquinte"]
path = coloquinte path = coloquinte
url = git@github.com:Coloquinte/PlaceRoute.git url = git@github.com:Coloquinte/PlaceRoute.git
branch = coriolis-submodule

8
etesian/src/EtesianEngine.cpp
View File

@ -763,10 +763,11 @@ namespace Etesian {
if (instance->getPlacementStatus() == Instance::PlacementStatus::FIXED) { if (instance->getPlacementStatus() == Instance::PlacementStatus::FIXED) {
++fixedNb; ++fixedNb;
totalLength -= length; totalLength -= length;
} else if (instance->getPlacementStatus() == Instance::PlacementStatus::PLACED) {
cerr << "PLACED " << instance << endl;
} else { } else {
usedLength += length; usedLength += length;
if (instance->getPlacementStatus() == Instance::PlacementStatus::PLACED) {
cerr << "PLACED " << instance << endl;
}
} }
} }
if (instancesNb <= fixedNb) { if (instancesNb <= fixedNb) {
@ -842,7 +843,8 @@ namespace Etesian {
} }
} }
double spaceMargin = getSpaceMargin(); // Compute the space margin from the row length computed earlier
double spaceMargin = (double) (totalLength - usedLength) / usedLength;
double densityVariation = getDensityVariation(); double densityVariation = getDensityVariation();
double bloatFactor = 1.0 + std::max(spaceMargin - densityVariation, 0.0); double bloatFactor = 1.0 + std::max(spaceMargin - densityVariation, 0.0);
if (bloatFactor != 1.0) { if (bloatFactor != 1.0) {