Merge remote-tracking branch 'origin' into cts_improve_automatic_clustering

Signed-off-by: luis201420 <[email protected]>

Author: luis201420

.github/workflows/github-actions-clang-tidy.yml

@@ -21,7 +21,7 @@ jobs:
           build_dir: "./build"
           cmake_command: cmake . -B build
           config_file: ".clang-tidy"
-          exclude: "*/codeGenerator/templates/*,*/third-party/*,*/test/orfs/*"
+          exclude: "*/codeGenerator/templates/*,third-party/*,test/orfs/*"
           split_workflow: true
           apt_packages: libomp-15-dev,libfl-dev,libyaml-cpp-dev
       - uses: The-OpenROAD-Project/clang-tidy-review/upload@master

MODULE.bazel

@@ -162,7 +162,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "06be7f48c85f3e66e4a79205a68ae2170be88273",
+    commit = "60f7488a0480dc8f17aba1d28da18f0b3e777f73",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -171,10 +171,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 orfs.default(
     # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-4230-g26b521c49",
+    image = "docker.io/openroad/orfs:v3.0-4324-g16e8a645e",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "8fc7ac130828053d7f0a9ad93ae8e3a74e9b24be6e76f9900f809ff93a80d005",
+    sha256 = "675813db8a9fbfd08bc86e40675c2a376fc3461b59cbf22d96a2f1905dbb4519",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -225,6 +225,7 @@ class OpenRoad
   void read3Dbv(const std::string& filename);
   void read3Dbx(const std::string& filename);
   void write3Dbv(const std::string& filename);
+  void write3Dbx(const std::string& filename);
   void read3DBloxBMap(const std::string& filename);
 
   void readDb(std::istream& stream);

include/ord/OpenRoad.hh

@@ -507,6 +507,11 @@ void OpenRoad::write3Dbv(const std::string& filename)
   odb::ThreeDBlox writer(logger_, db_, sta_);
   writer.writeDbv(filename, db_->getChip());
 }
+void OpenRoad::write3Dbx(const std::string& filename)
+{
+  odb::ThreeDBlox writer(logger_, db_, sta_);
+  writer.writeDbx(filename, db_->getChip());
+}
 void OpenRoad::readDb(const char* filename, bool hierarchy)
 {
   try {

src/OpenRoad.cc

@@ -383,6 +383,13 @@ write_3dbv_cmd(const char *filename)
   ord->write3Dbv(filename);
 }
 
+void
+write_3dbx_cmd(const char *filename)
+{
+  OpenRoad *ord = getOpenRoad();
+  ord->write3Dbx(filename);
+}
+
 void
 read_db_cmd(const char *filename, bool hierarchy)
 {

src/OpenRoad.i

@@ -191,6 +191,13 @@ proc write_3dbv { args } {
   ord::write_3dbv_cmd $filename
 }
 
+proc write_3dbx { args } {
+  sta::parse_key_args "write_3dbx" args keys {} flags {}
+  sta::check_argc_eq1 "write_3dbx" $args
+  set filename [file nativename [lindex $args 0]]
+  ord::write_3dbx_cmd $filename
+}
+
 sta::define_cmd_args "read_3dbx" {filename}
 
 proc read_3dbx { args } {

src/OpenRoad.tcl

@@ -856,15 +856,16 @@ void GraphicsImpl::saveLabeledImageImpl(std::string_view path,
 
 void GraphicsImpl::gifStart(std::string_view path)
 {
-  gui::Gui::get()->gifStart(std::string(path));
+  gif_key_ = gui::Gui::get()->gifStart(std::string(path));
 }
 
 void GraphicsImpl::gifAddFrameImpl(const odb::Rect& region,
                                    int width_px,
                                    double dbu_per_pixel,
                                    std::optional<int> delay)
 {
-  gui::Gui::get()->gifAddFrame(region, width_px, dbu_per_pixel, delay);
+  gui::Gui::get()->gifAddFrame(
+      gif_key_, region, width_px, dbu_per_pixel, delay);
 }
 
 void GraphicsImpl::deleteLabel(std::string_view label_name)
@@ -874,7 +875,7 @@ void GraphicsImpl::deleteLabel(std::string_view label_name)
 
 void GraphicsImpl::gifEnd()
 {
-  gui::Gui::get()->gifEnd();
+  gui::Gui::get()->gifEnd(gif_key_);
 }
 
 }  // namespace gpl

src/gpl/src/graphicsImpl.cpp

@@ -173,7 +173,8 @@ class GraphicsImpl : public gpl::AbstractGraphics,
   gui::Chart* density_chart_{nullptr};
   gui::Chart* phi_chart_{nullptr};
   gui::Chart* stepLength_chart_{nullptr};
-  bool debug_on_ = false;
+  bool debug_on_{false};
+  int gif_key_{0};
 
   void initHeatmap();
   void drawNesterov(gui::Painter& painter);

src/gpl/src/graphicsImpl.h

@@ -165,13 +165,19 @@ save_histogram_image
 
 This command can be used to generate an animated gif.
 
+When used with -start this command returns an integer key that can be
+used to distinguish files if multiple are generated.  That key can be
+provided when using -add or -end.  If only a single file is being used
+the key can be ignored.
+
 ```tcl
 save_animated_gif
     -start|-add|-end
     [-resolution microns_per_pixel]
     [-area {x0 y0 x1 y1}]
     [-width width]
     [-delay delay]
+    [-key key]
     [filename]
 ```
 
@@ -187,6 +193,7 @@ save_animated_gif
 | `-resolution`| resolution in microns per pixel to use when saving the image, default will match what the GUI has selected.|
 | `-width`| width of the output image in pixels, default will be computed from the resolution. Cannot be used with ``-resolution``.|
 | `-delay`| delay between frames in the GIF.|
+| `-key`| used to distinguish multiple GIF files (returned by -add).|
 
 ### Select Objects