Merge remote-tracking branch 'origin/master' into tune_mpl2

Signed-off-by: Ravi Varadarajan <[email protected]>

Author: ravi-varadarajan

README.md

@@ -93,6 +93,7 @@ including:
 
 #### Open-Source PDKs
 
+-   `GF180` - 180nm
 -   `Skywater130` - 130nm
 -   `Nangate45` - 45nm
 -   `ASAP7` - Predictive FinFET 7nm
@@ -106,7 +107,6 @@ provided due to NDA restrictions. However, if you are able to access
 these platforms independently, you can create the necessary
 platform-specific files yourself.
 
--   `GF180` - 180nm
 -   `GF55` - 55nm
 -   `GF12` - 12nm
 -   `Intel22` - 22nm

docs/conf.py

@@ -94,54 +94,50 @@
 html_theme = "sphinx_symbiflow_theme"
 
 html_theme_options = {
-    # Specify a list of menu in Header.
-    # Tuples forms:
-    #  ('Name', 'external url or path of pages in the document', boolean, 'icon name')
-    #
-    # Third argument:
-    # True indicates an external link.
-    # False indicates path of pages in the document.
-    #
-    # Fourth argument:
-    # Specify the icon name.
-    # For details see link.
-    # https://material.io/icons/
-    'header_links': [
-        ('Home', 'index', False, 'home'),
-        ("The OpenROAD Project", "https://theopenroadproject.org", True, 'launch'),
-        ("GitHub", "https://github.com/The-OpenROAD-Project/OpenROAD", True, 'link')
+    # Repository integration
+    # Set the repo url for the link to appear
+    'github_url': 'https://github.com/The-OpenROAD-Project/OpenROAD',
+    # The name of the repo. If must be set if github_url is set
+    'repo_name': 'OpenROAD',
+    # Must be one of github, gitlab or bitbucket
+    'repo_type': 'github',
+
+    # Set the name to appear in the left sidebar/header. If not provided, uses
+    # html_short_title if defined, or html_title
+    'nav_title': "OpenROAD",
+
+    # A list of dictionaries where each has three keys:
+    #   href: The URL or pagename (str)
+    #   title: The title to appear (str)
+    #   internal: Flag indicating to use pathto (bool)
+    'nav_links': [
+        {"title": "Home", "href": "index", "internal": True},
+        {"title": "The OpenROAD Project", "href": "https://theopenroadproject.org", "internal": False},
     ],
 
     # Customize css colors.
     # For details see link.
     # https://getmdl.io/customize/index.html
     #
-    # Values: amber, blue, brown, cyan deep_orange, deep_purple, green, grey, indigo, light_blue,
-    #         light_green, lime, orange, pink, purple, red, teal, yellow(Default: indigo)
-    'primary_color': 'indigo',
-    # Values: Same as primary_color. (Default: pink)
-    'accent_color': 'blue',
-
-    # Customize layout.
-    # For details see link.
-    # https://getmdl.io/components/index.html#layout-section
-    'fixed_drawer': True,
-    'fixed_header': True,
-    'header_waterfall': True,
-    'header_scroll': False,
-
-    # Render title in header.
-    # Values: True, False (Default: False)
-    'show_header_title': False,
-    # Render title in drawer.
-    # Values: True, False (Default: True)
-    'show_drawer_title': True,
-    # Render footer.
-    # Values: True, False (Default: True)
-    'show_footer': True,
+    # Primary colors:
+    # red, pink, purple, deep-purple, indigo, blue, light-blue, cyan,
+    # teal, green, light-green, lime, yellow, amber, orange, deep-orange,
+    # brown, grey, blue-grey, white
+    # (Default: deep-purple)
+    'color_primary': 'indigo',
+    # Values: Same as color_primary. 
+    #(Default: indigo)
+    'color_accent': 'blue',
 
     # Hide the symbiflow links
     'hide_symbiflow_links': True,
+    
+    "html_minify": False,
+    "html_prettify": True,
+    "css_minify": True,
+    "globaltoc_depth": 2,
+    "table_classes": ["plain"],
+    "master_doc": False,
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,

docs/requirements.txt

@@ -1,5 +1,5 @@
-git+https://github.com/SymbiFlow/sphinx_materialdesign_theme.git#egg=sphinx-symbiflow-theme
+git+https://github.com/f4pga/sphinx_f4pga_theme.git
 git+https://github.com/executablebooks/sphinx-external-toc
 sphinx
 sphinx-autobuild
-myst-parser
+myst-parser

etc/DependencyInstaller.sh

@@ -569,7 +569,6 @@ EOF
         ;;
     *)
         echo "unsupported system: ${os}" >&2
-        echo "supported systems are CentOS 7 and Ubuntu 20.04" >&2
         _help
         ;;
 esac

include/ord/Design.h

@@ -109,6 +109,10 @@ namespace stt {
 class SteinerTreeBuilder;
 }
 
+namespace psm {
+class PDNSim;
+}
+
 namespace ord {
 
 class Tech;
@@ -155,6 +159,7 @@ class Design
   rcx::Ext* getOpenRCX();
   rmp::Restructure* getRestructure();
   stt::SteinerTreeBuilder* getSteinerTreeBuilder();
+  psm::PDNSim* getPDNSim();
 
  private:
   Tech* tech_;

include/ord/OpenRoad.hh

@@ -56,7 +56,6 @@ namespace sta {
 class dbSta;
 class dbNetwork;
 class Resizer;
-class LibertyCell;
 }  // namespace sta
 
 namespace rsz {
@@ -212,11 +211,6 @@ class OpenRoad
                 bool includeFillers);
 
   void readVerilog(const char* filename);
-  // Write a flat verilog netlist for the database.
-  void writeVerilog(const char* filename,
-                    bool sort,
-                    bool include_pwr_gnd,
-                    std::vector<sta::LibertyCell*>* remove_cells);
   void linkDesign(const char* top_cell_name);
 
   // Used if a design is created programmatically rather than loaded

src/CMakeLists.txt

@@ -398,6 +398,7 @@ if (Python3_FOUND AND BUILD_PYTHON)
     rcx_py
     rmp_py
     stt_py
+    psm_py
   )
 else()
   message(STATUS "Python3 disabled")

src/Design.cc

@@ -234,4 +234,10 @@ stt::SteinerTreeBuilder* Design::getSteinerTreeBuilder()
   return app->getSteinerTreeBuilder();
 }
 
+psm::PDNSim* Design::getPDNSim()
+{
+  auto app = OpenRoad::openRoad();
+  return app->getPDNSim();
+}
+
 }  // namespace ord

src/Main.cc

@@ -97,6 +97,7 @@ using std::string;
   X(rcx)                                 \
   X(rmp)                                 \
   X(stt)                                 \
+  X(psm)                                 \
   X(odb)
 
 #define FOREACH_TOOL(X)            \

src/Metrics.tcl

@@ -37,7 +37,6 @@ namespace eval sta {
 
 define_cmd_args "report_clock_skew_metric" {[-setup]|[-hold]}
 proc report_clock_skew_metric { args } {
-  global sta_report_default_digits
   parse_key_args "report_clock_skew_metric" args keys {} flags {-setup -hold}
 
   set min_max "-setup"
@@ -54,7 +53,6 @@ proc report_clock_skew_metric { args } {
 
 define_cmd_args "report_tns_metric" {[-setup]|[-hold]}
 proc report_tns_metric { args } {
-  global sta_report_default_digits
   parse_key_args "report_tns_metric" args keys {} flags {-setup -hold}
 
   set min_max "max"
@@ -66,7 +64,7 @@ proc report_tns_metric { args } {
     utl::error ORD 18 "both -setup and -hold specified."
   }
 
-  utl::metric_float $metric_name "[format_time [total_negative_slack_cmd  $min_max] $sta_report_default_digits]"
+  utl::metric_float $metric_name [total_negative_slack_cmd $min_max]
 }
 
 define_cmd_args "report_worst_slack_metric" {[-setup]|[-hold]}
@@ -83,20 +81,20 @@ proc report_worst_slack_metric { args } {
     utl::error ORD 17 "both -steup and -hold specified."
   }
 
-  utl::metric_float $metric_name "[format_time [worst_slack_cmd $min_max] $sta_report_default_digits]"
+  utl::metric_float $metric_name [worst_slack_cmd $min_max]
 }
 
 define_cmd_args "report_erc_metrics" {}
-proc report_erc_metrics { args } {
+proc report_erc_metrics { } {
 
     set max_slew_limit [sta::max_slew_check_slack_limit]
     set max_cap_limit [sta::max_capacitance_check_slack_limit]
     set max_fanout_limit [sta::max_fanout_check_limit]
     set max_slew_violation [sta::max_slew_violation_count]
     set max_cap_violation [sta::max_capacitance_violation_count]
     set max_fanout_violation [sta::max_fanout_violation_count]
-    set setup_violation [llength [find_timing_paths -path_delay max -slack_max 0]]
-    set hold_violation [llength [find_timing_paths -path_delay min -slack_max 0]]
+    set setup_violation [sta::endpoint_violation_count max]
+    set hold_violation [sta::endpoint_violation_count min]
 
     utl::metric_float "timing__drv__max_slew_limit" $max_slew_limit
     utl::metric_int "timing__drv__max_slew" $max_slew_violation
@@ -140,8 +138,10 @@ proc report_units_metric { args } {
 define_cmd_args "report_design_area_metrics" {}
 proc report_design_area_metrics {args} {
   set db [::ord::get_db]
-  set dbu_per_uu [[$db getTech] getDbUnitsPerMicron]
+  set dbu_per_uu [expr double([[$db getTech] getDbUnitsPerMicron])]
   set block [[$db getChip] getBlock]
+  set die_bbox [$block getDieArea]
+  set die_area [expr [$die_bbox dx] * [$die_bbox dy]]
   set core_bbox [$block getCoreArea]
   set core_area [expr [$core_bbox dx] * [$core_bbox dy]]
 
@@ -185,6 +185,7 @@ proc report_design_area_metrics {args} {
     }
   }
 
+  set die_area [expr $die_area / [expr $dbu_per_uu * $dbu_per_uu]]
   set core_area [expr $core_area / [expr $dbu_per_uu * $dbu_per_uu]]
   set total_area [expr $total_area / [expr $dbu_per_uu * $dbu_per_uu]]
   set stdcell_area [expr $stdcell_area / [expr $dbu_per_uu * $dbu_per_uu]]
@@ -194,10 +195,21 @@ proc report_design_area_metrics {args} {
 
   set total_active_area [expr $stdcell_area + $macro_area]
 
-  set core_util [expr $total_active_area / $core_area]
-  set stdcell_util [expr $stdcell_area / [expr $core_area - $macro_area]]
+  if {$core_area > 0} {
+    set core_util [expr $total_active_area / $core_area]
+    if {$core_area > $macro_area} {
+      set stdcell_util [expr $stdcell_area / [expr $core_area - $macro_area]]
+    } else {
+      set stdcell_util 0.0
+    }
+  } else {
+    set core_util -1.0
+    set stdcell_util -1.0
+  }
 
   utl::metric_int "design__io" $num_ios
+  utl::metric_float "design__die__area" $die_area
+  utl::metric_float "design__core__area" $core_area
   utl::metric_int "design__instance__count" $num_insts
   utl::metric_float "design__instance__area" $total_active_area
   utl::metric_int "design__instance__count__stdcell" $num_stdcells