diff --git a/common/arch_pybindings_shared.h b/common/arch_pybindings_shared.h index c2fe3e24..46f1f9be 100644 --- a/common/arch_pybindings_shared.h +++ b/common/arch_pybindings_shared.h @@ -9,6 +9,8 @@ readonly_wrapper, conv_from_str>::def_wrap(ctx_cls, "top_module"); +readonly_wrapper>::def_wrap(ctx_cls, "timing_result"); fn_wrapper_0a>::def_wrap( ctx_cls, "getNameDelimiter"); diff --git a/common/basectx.h b/common/basectx.h index dbfdf5ee..507f29cd 100644 --- a/common/basectx.h +++ b/common/basectx.h @@ -84,6 +84,9 @@ struct BaseCtx // Context meta data dict attrs; + // Fmax data post timing analysis + TimingResult timing_result; + Context *as_ctx = nullptr; // Has the frontend loaded a design? diff --git a/common/nextpnr_types.h b/common/nextpnr_types.h index bbf61934..1cae3dbe 100644 --- a/common/nextpnr_types.h +++ b/common/nextpnr_types.h @@ -217,6 +217,18 @@ struct ClockConstraint DelayPair period; }; +struct ClockFmax +{ + float achieved; + float constraint; +}; + +struct TimingResult +{ + // Achieved and target Fmax for all clock domains + dict clock_fmax; +}; + // Represents the contents of a non-leaf cell in a design // with hierarchy diff --git a/common/pybindings.cc b/common/pybindings.cc index bdd4f92a..2f672a41 100644 --- a/common/pybindings.cc +++ b/common/pybindings.cc @@ -285,8 +285,16 @@ PYBIND11_EMBEDDED_MODULE(MODULE_NAME, m) WRAP_MAP(m, WireMap, wrap_context, "WireMap"); WRAP_MAP_UPTR(m, RegionMap, "RegionMap"); - WRAP_VECTOR(m, PortRefVector, wrap_context); + typedef dict ClockFmaxMap; + WRAP_MAP(m, ClockFmaxMap, pass_through, "ClockFmaxMap"); + auto clk_fmax_cls = py::class_(m, "ClockFmax") + .def_readonly("achieved", &ClockFmax::achieved) + .def_readonly("constraint", &ClockFmax::constraint); + + auto tmg_result_cls = py::class_>(m, "TimingResult"); + readonly_wrapper>::def_wrap(tmg_result_cls, "clock_fmax"); arch_wrap_python(m); } diff --git a/common/timing.cc b/common/timing.cc index d110498c..0cdb5be2 100644 --- a/common/timing.cc +++ b/common/timing.cc @@ -1315,6 +1315,8 @@ void timing_analysis(Context *ctx, bool print_histogram, bool print_fmax, bool p if (print_fmax) { log_break(); unsigned max_width = 0; + auto &result = ctx->timing_result; + result.clock_fmax.clear(); for (auto &clock : clock_reports) max_width = std::max(max_width, clock.first.str(ctx).size()); for (auto &clock : clock_reports) { @@ -1324,6 +1326,9 @@ void timing_analysis(Context *ctx, bool print_histogram, bool print_fmax, bool p if (ctx->nets.at(clock.first)->clkconstr) target = 1000 / ctx->getDelayNS(ctx->nets.at(clock.first)->clkconstr->period.minDelay()); + result.clock_fmax[clock.first].achieved = clock_fmax[clock.first]; + result.clock_fmax[clock.first].constraint = target; + bool passed = target < clock_fmax[clock.first]; if (!warn_on_failure || passed) log_info("Max frequency for clock %*s'%s': %.02f MHz (%s at %.02f MHz)\n", width, "",