latest STA plus changes to fix prima dcalc and read_spef issues, TCL regression added

Signed-off-by: dsengupta0628 <dsengupta@precisioninno.com>

Author: dsengupta0628

dcalc/PrimaDelayCalc.cc

@@ -931,17 +931,20 @@ std::string
 PrimaDelayCalc::reportGateDelay(const Pin *drvr_pin,
                                 const TimingArc *arc,
                                 const Slew &in_slew,
-                                float,
-                                const Parasitic *,
-                                const LoadPinIndexMap &,
+                                float load_cap,
+                                const Parasitic *parasitic,
+                                const LoadPinIndexMap &load_pin_index_map,
                                 const Scene *scene,
                                 const MinMax *min_max,
                                 int digits)
 {
   GateTimingModel *model = arc->gateModel(scene, min_max);
   if (model) {
+    // Delay calc to find ceff.
+    gateDelay(drvr_pin, arc, in_slew, load_cap, parasitic,
+              load_pin_index_map, scene, min_max);
     float in_slew1 = delayAsFloat(in_slew);
-    float ceff = ceff_vth_[0];
+    float ceff = ceff_vth_.empty() ? load_cap : ceff_vth_[0];
     return model->reportGateDelay(pinPvt(drvr_pin, scene, min_max),
                                   in_slew1, ceff, min_max,
                                   PocvMode::scalar, digits);

dcalc/test/CMakeLists.txt

@@ -1 +1,6 @@
+sta_module_tests("dcalc"
+  TESTS
+    prima_report
+)
+
 add_subdirectory(cpp)

dcalc/test/cpp/TestDcalc.cc

@@ -166,9 +166,8 @@ TEST_F(FindRootAdditionalTest, RootAtX1) {
     y = x - 5.0;
     dy = 1.0;
   };
-  bool fail = false;
   // y1 = 5-5 = 0, y2 = 10-5 = 5
-  double root = findRoot(func, 5.0, 0.0, 10.0, 5.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 5.0, 0.0, 10.0, 5.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 5.0, 1e-8);
 }
@@ -179,9 +178,8 @@ TEST_F(FindRootAdditionalTest, RootAtX2) {
     y = x - 5.0;
     dy = 1.0;
   };
-  bool fail = false;
   // y1 = 0-5 = -5, y2 = 5-5 = 0
-  double root = findRoot(func, 0.0, -5.0, 5.0, 0.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 0.0, -5.0, 5.0, 0.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 5.0, 1e-8);
 }
@@ -192,9 +190,8 @@ TEST_F(FindRootAdditionalTest, BothPositiveFails) {
     y = x * x + 1.0;
     dy = 2.0 * x;
   };
-  bool fail = false;
   // y1 = 2, y2 = 5 -- both positive
-  findRoot(func, 1.0, 2.0, 2.0, 5.0, 1e-10, 100, fail);
+  auto [root_, fail] = findRoot(func, 1.0, 2.0, 2.0, 5.0, 1e-10, 100);
   EXPECT_TRUE(fail);
 }
 
@@ -204,8 +201,7 @@ TEST_F(FindRootAdditionalTest, BothNegativeFails) {
     y = -x * x - 1.0;
     dy = -2.0 * x;
   };
-  bool fail = false;
-  findRoot(func, 1.0, -2.0, 2.0, -5.0, 1e-10, 100, fail);
+  auto [root_, fail] = findRoot(func, 1.0, -2.0, 2.0, -5.0, 1e-10, 100);
   EXPECT_TRUE(fail);
 }
 
@@ -215,9 +211,8 @@ TEST_F(FindRootAdditionalTest, MaxIterationsExceeded) {
     y = x * x - 2.0;
     dy = 2.0 * x;
   };
-  bool fail = false;
   // Very tight tolerance with only 1 iteration
-  findRoot(func, 0.0, 3.0, 1e-15, 1, fail);
+  auto [root_, fail] = findRoot(func, 0.0, 3.0, 1e-15, 1);
   EXPECT_TRUE(fail);
 }
 
@@ -227,9 +222,8 @@ TEST_F(FindRootAdditionalTest, SwapWhenY1Positive) {
     y = x - 3.0;
     dy = 1.0;
   };
-  bool fail = false;
   // y1 = 2.0 > 0, y2 = -2.0 < 0 => swap internally
-  double root = findRoot(func, 5.0, 2.0, 1.0, -2.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 5.0, 2.0, 1.0, -2.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 3.0, 1e-8);
 }
@@ -240,8 +234,7 @@ TEST_F(FindRootAdditionalTest, CubicRoot) {
     y = x * x * x - 8.0;
     dy = 3.0 * x * x;
   };
-  bool fail = false;
-  double root = findRoot(func, 1.0, 3.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 3.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 2.0, 1e-8);
 }
@@ -252,8 +245,7 @@ TEST_F(FindRootAdditionalTest, TwoArgOverloadCubic) {
     y = x * x * x - 27.0;
     dy = 3.0 * x * x;
   };
-  bool fail = false;
-  double root = findRoot(func, 2.0, 4.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 2.0, 4.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 3.0, 1e-8);
 }
@@ -1503,9 +1495,8 @@ TEST_F(FindRootAdditionalTest, FlatDerivative) {
     y = (x - 2.0) * (x - 2.0) * (x - 2.0);
     dy = 3.0 * (x - 2.0) * (x - 2.0);
   };
-  bool fail = false;
   // y at x=1 = -1, y at x=3 = 1
-  double root = findRoot(func, 1.0, 3.0, 1e-8, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 3.0, 1e-8, 100);
   if (!fail) {
     EXPECT_NEAR(root, 2.0, 1e-4);
   }
@@ -1517,8 +1508,7 @@ TEST_F(FindRootAdditionalTest, LinearFunction) {
     y = 2.0 * x - 6.0;
     dy = 2.0;
   };
-  bool fail = false;
-  double root = findRoot(func, 0.0, 10.0, 1e-12, 100, fail);
+  auto [root, fail] = findRoot(func, 0.0, 10.0, 1e-12, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 3.0, 1e-8);
 }
@@ -1529,9 +1519,8 @@ TEST_F(FindRootAdditionalTest, FourArgNormalBracket) {
     y = x * x - 4.0;
     dy = 2.0 * x;
   };
-  bool fail = false;
   // y1 = 1-4 = -3, y2 = 9-4 = 5
-  double root = findRoot(func, 1.0, -3.0, 3.0, 5.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, -3.0, 3.0, 5.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 2.0, 1e-8);
 }
@@ -2092,9 +2081,8 @@ TEST_F(FindRootAdditionalTest, TightBoundsLinear) {
     y = 2.0 * x - 6.0;
     dy = 2.0;
   };
-  bool fail = false;
   // y1 = 2*2.9-6 = -0.2, y2 = 2*3.1-6 = 0.2
-  double root = findRoot(func, 2.9, -0.2, 3.1, 0.2, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 2.9, -0.2, 3.1, 0.2, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 3.0, 1e-8);
 }
@@ -2106,8 +2094,7 @@ TEST_F(FindRootAdditionalTest, NewtonOutOfBracket) {
     y = x * x * x - x - 2.0;
     dy = 3.0 * x * x - 1.0;
   };
-  bool fail = false;
-  double root = findRoot(func, 1.0, 2.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 2.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   // Root is near 1.52138
   EXPECT_NEAR(root, 1.52138, 1e-4);
@@ -2119,9 +2106,8 @@ TEST_F(FindRootAdditionalTest, SinRoot) {
     y = sin(x);
     dy = cos(x);
   };
-  bool fail = false;
   // Root near pi
-  double root = findRoot(func, 3.0, 3.3, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 3.0, 3.3, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, M_PI, 1e-8);
 }
@@ -2132,8 +2118,7 @@ TEST_F(FindRootAdditionalTest, ExpMinusConst) {
     y = exp(x) - 3.0;
     dy = exp(x);
   };
-  bool fail = false;
-  double root = findRoot(func, 0.0, 2.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 0.0, 2.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, log(3.0), 1e-8);
 }
@@ -2395,8 +2380,7 @@ TEST_F(FindRootAdditionalTest, QuadraticExact) {
     y = x * x - 4.0;
     dy = 2.0 * x;
   };
-  bool fail = false;
-  double root = findRoot(func, 1.0, 3.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 3.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 2.0, 1e-8);
 }
@@ -2407,9 +2391,8 @@ TEST_F(FindRootAdditionalTest, QuadraticFourArg) {
     y = x * x - 9.0;
     dy = 2.0 * x;
   };
-  bool fail = false;
   // y(2.5) = 6.25-9 = -2.75, y(3.5) = 12.25-9 = 3.25
-  double root = findRoot(func, 2.5, -2.75, 3.5, 3.25, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 2.5, -2.75, 3.5, 3.25, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 3.0, 1e-8);
 }
@@ -2590,8 +2573,7 @@ TEST_F(FindRootAdditionalTest, LinearFunction2) {
     y = 2.0 * x - 10.0;
     dy = 2.0;
   };
-  bool fail = false;
-  double root = findRoot(func, 0.0, 10.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 0.0, 10.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 5.0, 1e-8);
 }
@@ -2601,9 +2583,8 @@ TEST_F(FindRootAdditionalTest, FourArgLinear) {
     y = 3.0 * x - 6.0;
     dy = 3.0;
   };
-  bool fail = false;
   // y(1.0) = -3, y(3.0) = 3
-  double root = findRoot(func, 1.0, -3.0, 3.0, 3.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, -3.0, 3.0, 3.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 2.0, 1e-8);
 }
@@ -2613,8 +2594,7 @@ TEST_F(FindRootAdditionalTest, HighOrderPoly) {
     y = x * x * x * x - 16.0;
     dy = 4.0 * x * x * x;
   };
-  bool fail = false;
-  double root = findRoot(func, 1.0, 3.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 3.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 2.0, 1e-6);
 }
@@ -2624,8 +2604,7 @@ TEST_F(FindRootAdditionalTest, NegativeRoot) {
     y = x + 3.0;
     dy = 1.0;
   };
-  bool fail = false;
-  double root = findRoot(func, -5.0, -1.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, -5.0, -1.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, -3.0, 1e-8);
 }
@@ -2635,9 +2614,8 @@ TEST_F(FindRootAdditionalTest, TrigFunction) {
     y = std::cos(x);
     dy = -std::sin(x);
   };
-  bool fail = false;
   // Root at pi/2
-  double root = findRoot(func, 1.0, 2.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 2.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, M_PI / 2.0, 1e-8);
 }
@@ -2647,8 +2625,7 @@ TEST_F(FindRootAdditionalTest, VeryTightBounds) {
     y = x - 5.0;
     dy = 1.0;
   };
-  bool fail = false;
-  double root = findRoot(func, 4.999, 5.001, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 4.999, 5.001, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 5.0, 1e-8);
 }
@@ -2658,8 +2635,7 @@ TEST_F(FindRootAdditionalTest, ExpFunction) {
     y = std::exp(x) - 10.0;
     dy = std::exp(x);
   };
-  bool fail = false;
-  double root = findRoot(func, 1.0, 3.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 1.0, 3.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, std::log(10.0), 1e-8);
 }
@@ -2669,9 +2645,8 @@ TEST_F(FindRootAdditionalTest, FourArgSwap) {
     y = x - 7.0;
     dy = 1.0;
   };
-  bool fail = false;
   // y1 = 3.0 > 0, y2 = -7.0 < 0 => internal swap
-  double root = findRoot(func, 10.0, 3.0, 0.0, -7.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 10.0, 3.0, 0.0, -7.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 7.0, 1e-8);
 }
@@ -3369,8 +3344,7 @@ TEST_F(FindRootAdditionalTest, SteepDerivative) {
     y = 1000.0 * x - 500.0;
     dy = 1000.0;
   };
-  bool fail = false;
-  double root = findRoot(func, 0.0, 1.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 0.0, 1.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 0.5, 1e-8);
 }
@@ -3381,8 +3355,7 @@ TEST_F(FindRootAdditionalTest, QuarticRoot) {
     y = x*x*x*x - 81.0;
     dy = 4.0*x*x*x;
   };
-  bool fail = false;
-  double root = findRoot(func, 2.0, 4.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, 2.0, 4.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, 3.0, 1e-6);
 }
@@ -3393,8 +3366,7 @@ TEST_F(FindRootAdditionalTest, FourArgNegBracket) {
     y = x + 5.0;
     dy = 1.0;
   };
-  bool fail = false;
-  double root = findRoot(func, -8.0, -3.0, -2.0, 3.0, 1e-10, 100, fail);
+  auto [root, fail] = findRoot(func, -8.0, -3.0, -2.0, 3.0, 1e-10, 100);
   EXPECT_FALSE(fail);
   EXPECT_NEAR(root, -5.0, 1e-8);
 }