diff options
| author | gatecat <gatecat@ds0.me> | 2021-02-19 10:39:57 +0000 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-02-19 11:31:33 +0000 |
| commit | 7922b3bfc4ef93b8f67194c05e1a236b4c83c3da (patch) | |
| tree | b2b21259e030edd0adc7cc944322e3e9186d3a71 /gui | |
| parent | 8376db94a7519406444988be3628a4dadfb8d742 (diff) | |
| download | nextpnr-7922b3bfc4ef93b8f67194c05e1a236b4c83c3da.tar.gz nextpnr-7922b3bfc4ef93b8f67194c05e1a236b4c83c3da.tar.bz2 nextpnr-7922b3bfc4ef93b8f67194c05e1a236b4c83c3da.zip | |
Replace DelayInfo with DelayPair/DelayQuad
This replaces the arch-specific DelayInfo structure with new DelayPair
(min/max only) and DelayQuad (min/max for both rise and fall) structures
that form part of common code.
This further reduces the amount of arch-specific code; and also provides
useful data structures for timing analysis which will need to delay
with pairs/quads of delays as it is improved.
While there may be a small performance cost to arches that didn't
separate the rise/fall cases (arches that aren't currently separating
the min/max cases just need to be fixed...) in DelayInfo, my expectation
is that inlining will mean this doesn't make much difference.
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/designwidget.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/designwidget.cc b/gui/designwidget.cc index 5e6098a5..53958c3a 100644 --- a/gui/designwidget.cc +++ b/gui/designwidget.cc @@ -652,11 +652,11 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt addProperty(attrsItem, QVariant::String, item.first.c_str(ctx), item.second.c_str());
}
- DelayInfo delay = ctx->getWireDelay(wire);
+ DelayQuad delay = ctx->getWireDelay(wire);
QtProperty *delayItem = addSubGroup(topItem, "Delay");
- addProperty(delayItem, QVariant::Double, "Min Raise", delay.minRaiseDelay());
- addProperty(delayItem, QVariant::Double, "Max Raise", delay.maxRaiseDelay());
+ addProperty(delayItem, QVariant::Double, "Min Raise", delay.minRiseDelay());
+ addProperty(delayItem, QVariant::Double, "Max Raise", delay.maxRiseDelay());
addProperty(delayItem, QVariant::Double, "Min Fall", delay.minFallDelay());
addProperty(delayItem, QVariant::Double, "Max Fall", delay.maxFallDelay());
@@ -721,11 +721,11 @@ void DesignWidget::onSelectionChanged(int num, const QItemSelection &, const QIt addProperty(attrsItem, QVariant::String, item.first.c_str(ctx), item.second.c_str());
}
- DelayInfo delay = ctx->getPipDelay(pip);
+ DelayQuad delay = ctx->getPipDelay(pip);
QtProperty *delayItem = addSubGroup(topItem, "Delay");
- addProperty(delayItem, QVariant::Double, "Min Raise", delay.minRaiseDelay());
- addProperty(delayItem, QVariant::Double, "Max Raise", delay.maxRaiseDelay());
+ addProperty(delayItem, QVariant::Double, "Min Raise", delay.minRiseDelay());
+ addProperty(delayItem, QVariant::Double, "Max Raise", delay.maxRiseDelay());
addProperty(delayItem, QVariant::Double, "Min Fall", delay.minFallDelay());
addProperty(delayItem, QVariant::Double, "Max Fall", delay.maxFallDelay());
} else if (type == ElementType::NET) {
|