Merge branch 'parallaxsw:master' into main

Silimate · Nov 15, 2024 · 75ffc39 · 75ffc39
2 parents 229d4d4 + 0bf9883
commit 75ffc39
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/search/PathEnd.cc b/search/PathEnd.cc
@@ -1945,7 +1945,9 @@ PathEndPathDelay::requiredTime(const StaState *sta) const
 {
   float delay = path_delay_->delay();
   if (path_delay_->ignoreClkLatency()) {
-    float src_offset = path_.isClock(sta) ? path_.clkEdge(sta)->time() : src_clk_arrival_;
+    Required src_offset = path_.isClock(sta)
+      ? path_.clkEdge(sta)->time()
+      : src_clk_arrival_;
     return src_offset + delay
       + ((minMax(sta) == MinMax::max()) ? -margin(sta) : margin(sta));
   }

diff --git a/search/ReportPath.cc b/search/ReportPath.cc
@@ -1102,8 +1102,8 @@ ReportPath::reportJson(const PathEnd *end,
     reportJson(end->targetClkPath(), "target_clock_path", 2, true, result);
 
   if (end->checkRole(this)) {
-    stringAppend(result, "  \"data_arrival_time\": %.3e,\n",
-                 end->dataArrivalTimeOffset(this));
+    stringAppend(result, "  \"data_arrival_time\": %s,\n",
+                 delayAsString(end->dataArrivalTimeOffset(this), this, 3));
 
     const MultiCyclePath *mcp = end->multiCyclePath();
     if (mcp)
@@ -1115,11 +1115,14 @@ ReportPath::reportJson(const PathEnd *end,
       stringAppend(result, "  \"path_delay\": %.3e,\n",
                    path_delay->delay());
 
-    stringAppend(result, "  \"crpr\": %.3e,\n", end->checkCrpr(this));
-    stringAppend(result, "  \"margin\": %.3e,\n", end->margin(this));
-    stringAppend(result, "  \"required_time\": %.3e,\n",
-                 end->requiredTimeOffset(this));
-    stringAppend(result, "  \"slack\": %.3e\n", end->slack(this));
+    stringAppend(result, "  \"crpr\": %s,\n",
+                 delayAsString(end->checkCrpr(this), this, 3));
+    stringAppend(result, "  \"margin\": %s,\n",
+                 delayAsString(end->margin(this), this, 3));
+    stringAppend(result, "  \"required_time\": %s,\n",
+                 delayAsString(end->requiredTimeOffset(this), this, 3));
+    stringAppend(result, "  \"slack\": %s\n",
+                 delayAsString(end->slack(this), this, 3));
   }
   result += "}";
   if (!last)