Merge pull request #7916 from The-OpenROAD-Project/revert-7902-secure-jhkim-hier-fix

Revert "Secure jhkim hier fix"

Author: maliberty

src/rsz/src/Rebuffer.cc

@@ -1815,22 +1815,16 @@ int Rebuffer::exportBufferTree(const BufferedNetPtr& choice,
   Instance* parent = parent_in;
   switch (choice->type()) {
     case BufferedNetType::buffer: {
-      // Decide new buffer name
-      std::string buffer_full_name;
-      if (parent && parent != db_network_->topInstance()) {
-        buffer_full_name = db_network_->pathName(parent);
-        buffer_full_name += db_network_->pathDivider();
-      }
-      buffer_full_name += instance_base_name;
-      buffer_full_name = resizer_->makeUniqueInstName(buffer_full_name.c_str());
+      std::string buffer_name
+          = resizer_->makeUniqueInstName(instance_base_name);
 
       // HFix: make net in hierarchy
       std::string net_name = resizer_->makeUniqueNetName();
       Net* net2 = db_network_->makeNet(net_name.c_str(), parent);
 
       LibertyCell* buffer_cell = choice->bufferCell();
       Instance* buffer = resizer_->makeBuffer(
-          buffer_cell, buffer_full_name.c_str(), parent, choice->location());
+          buffer_cell, buffer_name.c_str(), parent, choice->location());
 
       resizer_->level_drvr_vertices_valid_ = false;
       LibertyPort *input, *output;
@@ -1843,7 +1837,7 @@ int Rebuffer::exportBufferTree(const BufferedNetPtr& choice,
                  "",
                  level,
                  sdc_network_->pathName(net),
-                 buffer_full_name.c_str(),
+                 buffer_name.c_str(),
                  buffer_cell->name(),
                  sdc_network_->pathName(net2));
 

src/rsz/test/CMakeLists.txt

@@ -89,8 +89,6 @@ or_integration_tests(
     repair_setup7
     repair_setup7_limit
     repair_setup8
-    repair_setup9
-    repair_setup9_hier
     repair_setup_undo
     repair_slew1
     repair_slew2
@@ -149,8 +147,6 @@ or_integration_tests(
     resize_slack1
     resize_slack2
     resize_slack3
-    rebuffer1
-    rebuffer1_hier
     set_dont_touch1
     set_dont_use1
     split_load_hier