From f1050e641ca5275eb69f5cceda1c60aeb28a6d62 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Fri, 17 Nov 2023 17:43:39 -0700 Subject: [PATCH] ssta compile Signed-off-by: James Cherry --- include/sta/SearchClass.hh | 2 +- liberty/Liberty.cc | 2 +- search/MakeTimingModel.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sta/SearchClass.hh b/include/sta/SearchClass.hh index 52b27f77..17d67618 100644 --- a/include/sta/SearchClass.hh +++ b/include/sta/SearchClass.hh @@ -116,7 +116,7 @@ typedef Vector PathVertexSeq; typedef Vector SlackSeq; typedef Delay Crpr; typedef Vector PathRefSeq; -typedef MinMaxValues ClkDelays[RiseFall::index_count][RiseFall::index_count]; +typedef MinMaxValues ClkDelays[RiseFall::index_count][RiseFall::index_count]; enum class ReportPathFormat { full, full_clock, diff --git a/liberty/Liberty.cc b/liberty/Liberty.cc index aedcb5b6..5d5e3535 100644 --- a/liberty/Liberty.cc +++ b/liberty/Liberty.cc @@ -2586,7 +2586,7 @@ LibertyPort::clockTreePathDelays() const MinMax *min_max = (role == TimingRole::clockTreePathMin()) ? MinMax::min() : MinMax::max(); - delays.setValue(rf, min_max, delay); + delays.setValue(rf, min_max, delayAsFloat(delay)); } } } diff --git a/search/MakeTimingModel.cc b/search/MakeTimingModel.cc index 6c9d6895..37128435 100644 --- a/search/MakeTimingModel.cc +++ b/search/MakeTimingModel.cc @@ -536,11 +536,11 @@ MakeTimingModel::findClkInsertionDelays() int clk_rf_index = clk_rf->index(); float delay = min_max->initValue(); for (const int end_rf_index : RiseFall::rangeIndex()) { - float delay1; + Delay delay1; bool exists; delays[clk_rf_index][end_rf_index].value(min_max, delay1, exists); if (exists) - delay = min_max->minMax(delay, delay1); + delay = min_max->minMax(delay, delayAsFloat(delay1)); } TimingModel *model = makeGateModelScalar(delay, clk_rf); if (attrs == nullptr)