Merge pull request #304 from The-OpenROAD-Project-staging/update-upstream

Update upstream

Author: maliberty

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yml

@@ -0,0 +1,55 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    if: github.repository_owner != 'The-OpenROAD-Project-private'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: true
+
+      - name: Set up dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install -y flex libfl-dev bison tcl-dev tcl-tclreadline libeigen3-dev ninja-build
+
+      - name: Set up cudd-3.0.0
+        run: |
+          wget https://github.com/oscc-ip/artifact/releases/download/cudd-3.0.0/build.tar.gz
+          mkdir -p cudd
+          tar -zxvf build.tar.gz -Ccudd
+
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          cmake .. -G Ninja -DCUDD_DIR=$(pwd)/../cudd -DCMAKE_INSTALL_PREFIX=$(pwd)/install -DCMAKE_BUILD_TYPE=Release
+          cmake --build . --target all -- -j $(nproc)
+          cmake --install .
+          tar -zcvf build.tar.gz -Cinstall .
+
+      - name: Test
+        run: |
+          cd test
+          ./regression
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7
+        if: ${{ !cancelled() }}
+        with:
+          name: artifact
+          path: |
+            build/install/*
+
+      - name: Upload Test Result
+        uses: actions/upload-artifact@v7
+        if: ${{ !cancelled() }}
+        with:
+          name: result
+          path: |
+            test/results/*

CMakeLists.txt

@@ -244,7 +244,6 @@ set(STA_SOURCE
   util/StringSeq.cc
   util/StringSet.cc
   util/StringUtil.cc
-  util/TokenParser.cc
   util/Transition.cc
 
   verilog/VerilogReader.cc

Dockerfile.ubuntu22.04

@@ -6,9 +6,11 @@ LABEL maintainer="James Cherry <cherry@parallaxsw.com>"
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get install -y \
+    git \
     wget \
     cmake \
     gcc \
+    gdb \
     tcl-dev \
     tcl-tclreadline \
     libeigen3-dev \

app/Main.cc

@@ -39,7 +39,6 @@ namespace sta {
 extern const char *tcl_inits[];
 }
 
-using std::string;
 using sta::stringEq;
 using sta::findCmdLineFlag;
 using sta::Sta;
@@ -129,7 +128,7 @@ staTclAppInit(int argc,
   if (!findCmdLineFlag(argc, argv, "-no_init")) {
     const char *home = getenv("HOME");
     if (home) {
-      string init_path = home;
+      std::string init_path = home;
       init_path += "/";
       init_path += init_filename;
       if (std::filesystem::is_regular_file(init_path.c_str()))

dcalc/ArcDcalcWaveforms.cc

@@ -35,8 +35,6 @@
 
 namespace sta {
 
-using std::make_shared;
-
 Waveform
 ArcDcalcWaveforms::inputWaveform(ArcDcalcArg &dcalc_arg,
                                  const Scene *scene,
@@ -68,8 +66,8 @@ ArcDcalcWaveforms::inputWaveform(ArcDcalcArg &dcalc_arg,
       FloatSeq time_values;
       for (float time : in_waveform.axis1()->values())
         time_values.push_back(time + dcalc_arg.inputDelay());
-      TableAxisPtr time_axis = make_shared<TableAxis>(TableAxisVariable::time,
-                                                      std::move(time_values));
+      TableAxisPtr time_axis = std::make_shared<TableAxis>(TableAxisVariable::time,
+                                                           std::move(time_values));
       // Scale the waveform from 0:vdd.
       FloatSeq *scaled_values = new FloatSeq;
       for (float value : *in_waveform.values()) {

dcalc/ArnoldiDelayCalc.cc

@@ -63,10 +63,6 @@ namespace sta {
 //  ra_get_r
 //  ra_get_s
 
-using std::string;
-using std::abs;
-using std::vector;
-
 struct delay_work;
 struct delay_c;
 
@@ -151,15 +147,15 @@ class ArnoldiDelayCalc : public LumpedCapDelayCalc
                            const LoadPinIndexMap &load_pin_index_map,
                            const Scene *scene,
                            const MinMax *min_max) override;
-  string reportGateDelay(const Pin *drvr_pin,
-                         const TimingArc *arc,
-                         const Slew &in_slew,
-                         float load_cap,
-                         const Parasitic *parasitic,
-                         const LoadPinIndexMap &load_pin_index_map,
-                         const Scene *scene,
-                         const MinMax *min_max,
-                         int digits) override;
+  std::string reportGateDelay(const Pin *drvr_pin,
+                              const TimingArc *arc,
+                              const Slew &in_slew,
+                              float load_cap,
+                              const Parasitic *parasitic,
+                              const LoadPinIndexMap &load_pin_index_map,
+                              const Scene *scene,
+                              const MinMax *min_max,
+                              int digits) override;
   void finishDrvrPin() override;
   void delay_work_set_thresholds(delay_work *D,
                                  double lo,
@@ -240,7 +236,7 @@ class ArnoldiDelayCalc : public LumpedCapDelayCalc
   int pin_n_;
   ArnoldiReduce *reduce_;
   delay_work *delay_work_;
-  vector<rcmodel*> unsaved_parasitics_;
+  std::vector<rcmodel*> unsaved_parasitics_;
   bool pocv_enabled_;
 };
 
@@ -469,7 +465,7 @@ ArnoldiDelayCalc::gateDelaySlew(const LibertyCell *drvr_cell,
   return dcalc_result;
 }
 
-string
+std::string
 ArnoldiDelayCalc::reportGateDelay(const Pin *drvr_pin,
                                   const TimingArc *arc,
                                   const Slew &in_slew,
@@ -610,7 +606,8 @@ delay_work_get_residues(delay_work *D,int term_index)
 // calculate_poles_res
 //
 
-void arnoldi1::calculate_poles_res(delay_work *D,double rdrive)
+void arnoldi1::calculate_poles_res(delay_work *D,
+                                   double rdrive)
 {
   if (n > D->nmax) delay_work_alloc(D,n);
   double *p = D->poles;
@@ -689,7 +686,7 @@ tridiagEV(int n,double *din,double *ein,double *d,double **v)
   e[0] = 0.0;
   for (h=n-1;h>=1;h--) {
     iter = 0;
-    while (abs(e[h])>1e-18) { // 1e-6ps
+    while (std::abs(e[h])>1e-18) { // 1e-6ps
       m=0;
       if (m != h) {
         if (iter++ == 20)
@@ -819,14 +816,14 @@ solve_t_bracketed(double s,int order,double *p,double *rr,
     if (0.0<f2) return x2;
     if (f1<0.0) return x1;
   }
-  dxold = abs(x2-x1);
+  dxold = std::abs(x2-x1);
   dx = dxold;
   get_dv(rts,s,order,p,rr,&f,&df);
   f -= val;
   double flast = 0.0;
   for (j=1;j<10;j++) {
     if ((((rts-xh)*df-f)*((rts-xl)*df-f) >= 0.0)
-        || (abs(2.0*f) > abs(dxold*df))) {
+        || (std::abs(2.0*f) > std::abs(dxold*df))) {
       dxold = dx;
       dx = 0.5*(xh-xl);
       if (flast*f >0.0) {
@@ -850,7 +847,7 @@ solve_t_bracketed(double s,int order,double *p,double *rr,
         return rts;
       }
     }
-    if (abs(dx) < xacc) {
+    if (std::abs(dx) < xacc) {
       return rts;
     }
     get_dv(rts,s,order,p,rr,&f,&df); f -= val;
@@ -859,7 +856,7 @@ solve_t_bracketed(double s,int order,double *p,double *rr,
     else
       xh = rts;
   }
-  if (abs(f)<1e-6) // 1uV
+  if (std::abs(f)<1e-6) // 1uV
     return rts;
   return 0.5*(xl+xh);
 }
@@ -1265,36 +1262,36 @@ ArnoldiDelayCalc::ra_solve_for_s(delay_work *D,
   f = (ptlo-pthi)/p - tlohi;
   df = dlo-dhi;
   s = s - f/df;
-  if (abs(f)<.001e-12) return;  // .001ps
+  if (std::abs(f)<.001e-12) return;  // .001ps
 
   ra_solve_for_pt(p*s,vlo,&ptlo,&dlo);
   ra_solve_for_pt(p*s,vhi,&pthi,&dhi);
   f = (ptlo-pthi)/p - tlohi;
   df = dlo-dhi;
   s = s - f/df;
-  if (abs(f)<.001e-12) return;  // .001ps
+  if (std::abs(f)<.001e-12) return;  // .001ps
 
   ra_solve_for_pt(p*s,vlo,&ptlo,&dlo);
   ra_solve_for_pt(p*s,vhi,&pthi,&dhi);
   f = (ptlo-pthi)/p - tlohi;
   df = dlo-dhi;
   s = s - f/df;
-  if (abs(f)<.001e-12) return;  // .001ps
+  if (std::abs(f)<.001e-12) return;  // .001ps
 
   ra_solve_for_pt(p*s,vlo,&ptlo,&dlo);
   ra_solve_for_pt(p*s,vhi,&pthi,&dhi);
   f = (ptlo-pthi)/p - tlohi;
   df = dlo-dhi;
   s = s - f/df;
-  if (abs(f)<.001e-12) return;  // .001ps
+  if (std::abs(f)<.001e-12) return;  // .001ps
 
   ra_solve_for_pt(p*s,vlo,&ptlo,&dlo);
   ra_solve_for_pt(p*s,vhi,&pthi,&dhi);
   f = (ptlo-pthi)/p - tlohi;
   df = dlo-dhi;
   s = s - f/df;
 
-  if (abs(f)>.5e-12) // .5ps
+  if (std::abs(f)>.5e-12) // .5ps
     debugPrint(debug_, "arnoldi", 1, "ra_solve_for_s p %g tlohi %s err %s",
                p,
                units_->timeUnit()->asString(tlohi),

dcalc/ArnoldiReduce.cc

@@ -38,8 +38,6 @@
 
 namespace sta {
 
-using std::string;
-
 rcmodel::rcmodel() :
   pinV(nullptr)
 {
@@ -621,7 +619,7 @@ ArnoldiReduce::makeRcmodelFromTs()
         report_->reportLine(" d[%d] %s",
                             h,
                             units_->timeUnit()->asString(d[h]));
-      string line = stdstrPrint("U[%d]",h);
+      std::string line = stdstrPrint("U[%d]",h);
       for (i=0;i<nterms;i++)
         line += stdstrPrint(" %6.2e",U[h][i]);
       report_->reportLineString(line);

dcalc/CcsCeffDelayCalc.cc

@@ -24,6 +24,8 @@
 
 #include "CcsCeffDelayCalc.hh"
 
+#include <cmath>
+
 #include "Debug.hh"
 #include "Units.hh"
 #include "Liberty.hh"
@@ -38,17 +40,11 @@
 
 namespace sta {
 
-using std::string;
-
 // Implementaion based on:
 // "Gate Delay Estimation with Library Compatible Current Source Models
 // and Effective Capacitance", D. Garyfallou et al,
 // IEEE Transactions on Very Large Scale Integration (VLSI) Systems, March 2021
 
-using std::abs;
-using std::exp;
-using std::make_shared;
-
 ArcDelayCalc *
 makeCcsCeffDelayCalc(StaState *sta)
 {
@@ -144,7 +140,7 @@ CcsCeffDelayCalc::gateDelaySlew(const LibertyLibrary *drvr_library,
   findCsmWaveform();
   ref_time_ = output_waveforms_->referenceTime(in_slew_);
   gate_delay = region_times_[region_vth_idx_] - ref_time_;
-  drvr_slew = abs(region_times_[region_vh_idx_] - region_times_[region_vl_idx_]);
+  drvr_slew = std::abs(region_times_[region_vh_idx_] - region_times_[region_vl_idx_]);
   debugPrint(debug_, "ccs_dcalc", 2,
              "gate_delay %s drvr_slew %s (initial)",
              delayAsString(gate_delay, this),
@@ -184,12 +180,12 @@ CcsCeffDelayCalc::gateDelaySlew(const LibertyLibrary *drvr_library,
     }
     findCsmWaveform();
     gate_delay = region_times_[region_vth_idx_] - ref_time_;
-    drvr_slew = abs(region_times_[region_vh_idx_] - region_times_[region_vl_idx_]);
+    drvr_slew = std::abs(region_times_[region_vh_idx_] - region_times_[region_vl_idx_]);
     debugPrint(debug_, "ccs_dcalc", 2,
                "gate_delay %s drvr_slew %s",
                delayAsString(gate_delay, this),
                delayAsString(drvr_slew, this));
-    if (abs(delayAsFloat(drvr_slew) - prev_drvr_slew) < .01 * prev_drvr_slew)
+    if (std::abs(delayAsFloat(drvr_slew) - prev_drvr_slew) < .01 * prev_drvr_slew)
       break;
     prev_drvr_slew = delayAsFloat(drvr_slew);
   }
@@ -529,8 +525,8 @@ CcsCeffDelayCalc::drvrWaveform()
         drvr_volts->push_back(v);
       }
     }
-    TableAxisPtr drvr_time_axis = make_shared<TableAxis>(TableAxisVariable::time,
-                                                         std::move(*drvr_times));
+    TableAxisPtr drvr_time_axis = std::make_shared<TableAxis>(TableAxisVariable::time,
+                                                              std::move(*drvr_times));
     delete drvr_times;
     Table drvr_table(drvr_volts, drvr_time_axis);
     return drvr_table;
@@ -561,8 +557,8 @@ CcsCeffDelayCalc::loadWaveform(const Pin *load_pin)
         double v1 = (drvr_rf_ == RiseFall::rise()) ? v : vdd_ - v;
         load_volts->push_back(v1);
       }
-      TableAxisPtr load_time_axis = make_shared<TableAxis>(TableAxisVariable::time,
-                                                           std::move(*load_times));
+      TableAxisPtr load_time_axis = std::make_shared<TableAxis>(TableAxisVariable::time,
+                                                                std::move(*load_times));
       delete load_times;
       Table load_table(load_volts, load_time_axis);
       return load_table;
@@ -606,8 +602,8 @@ CcsCeffDelayCalc::drvrRampWaveform(const Pin *in_pin,
         double v1 = (drvr_rf == RiseFall::rise()) ? v : vdd_ - v;
         load_volts->push_back(v1);
       }
-      TableAxisPtr load_time_axis = make_shared<TableAxis>(TableAxisVariable::time,
-                                                           std::move(*load_times));
+      TableAxisPtr load_time_axis = std::make_shared<TableAxis>(TableAxisVariable::time,
+                                                                std::move(*load_times));
       delete load_times;
       Table load_table(load_volts, load_time_axis);
       return load_table;
@@ -663,7 +659,7 @@ CcsCeffDelayCalc::makeWaveformPreamble(const Pin *in_pin,
 
 ////////////////////////////////////////////////////////////////
 
-string
+std::string
 CcsCeffDelayCalc::reportGateDelay(const Pin *drvr_pin,
                                   const TimingArc *arc,
                                   const Slew &in_slew,
@@ -680,7 +676,7 @@ CcsCeffDelayCalc::reportGateDelay(const Pin *drvr_pin,
     pi_elmore = parasitics_->reduceToPiElmore(parasitic, drvr_pin_, rf,
                                                scene, min_max);
   }
-  string report = table_dcalc_->reportGateDelay(drvr_pin, arc, in_slew, load_cap,
+  std::string report = table_dcalc_->reportGateDelay(drvr_pin, arc, in_slew, load_cap,
                                                 pi_elmore, load_pin_index_map,
                                                 scene, min_max, digits);
   parasitics_->deleteDrvrReducedParasitics(drvr_pin);