Merge remote-tracking branch 'origin/master' into pdn-unique

Author: gadfort

src/odb/src/db/dbJournal.cpp

@@ -1953,7 +1953,7 @@ void dbJournal::undo_deleteObject()
       _log.pop(group_id);
       _log.pop(module_id);
       _log.pop(region_id);
-      inst->setLocation(x, y);
+      inst->setOrigin(x, y);
       if (group_id != 0) {
         auto group = dbGroup::getGroup(_block, group_id);
         group->addInst(inst);

src/odb/test/cpp/TestJournal.cpp

@@ -42,6 +42,7 @@ TEST_F(JournalFixture, test_undo_inst_destroy)
 {
   auto module = dbModule::create(block, "m");
   auto inst = dbInst::create(block, and2, "a", false, module);
+  inst->setOrigin(100, 200);
   // Ensure non-default values are restored
   inst->setPlacementStatus(dbPlacementStatus::PLACED);
   auto group = dbGroup::create(block, "g");
@@ -56,6 +57,7 @@ TEST_F(JournalFixture, test_undo_inst_destroy)
   EXPECT_EQ(inst->getGroup(), group);
   EXPECT_EQ(inst->getModule(), module);
   EXPECT_EQ(inst->getRegion(), region);
+  EXPECT_EQ(inst->getLocation(), Point(100, 200));
 }
 
 TEST_F(JournalFixture, test_undo_mod_inst_destroy)

src/stt/src/pdr/src/pd.cpp

@@ -18,6 +18,7 @@
 #include "lemon/list_graph.h"
 #include "odb/geom.h"
 #include "stt/SteinerTreeBuilder.h"
+#include "utl/Logger.h"
 
 namespace pdr {
 
@@ -434,6 +435,15 @@ Tree primDijkstra(const vector<int>& x,
                   const float alpha,
                   Logger* logger)
 {
+  if (x.size() != y.size()) {
+    logger->error(
+        utl::STT, 8, "x size ({}) != y size ({})", x.size(), y.size());
+  }
+
+  if (x.empty()) {
+    logger->error(utl::STT, 9, "Invalid request for an empty Steiner tree.");
+  }
+
   ListGraph graph;
   ListGraph::NodeMap<Point> node_point(graph);  // Node -> location
 

test/orfs/mock-array/mock-array.bzl

@@ -221,6 +221,7 @@ MACROS = [
 POWER_TESTS = [
     "power",
     "power_instances",
+    "path_groups",
 ]
 
 def mock_array(name, config):

test/orfs/mock-array/path_groups.tcl

@@ -0,0 +1,25 @@
+source $::env(LOAD_POWER_TCL)
+
+# Various checks on path groups
+set first_path [lindex [find_timing_paths] 0]
+set from [get_property [get_property $first_path startpoint] full_name]
+set to [get_property [get_property $first_path endpoint] full_name]
+puts "Checking if we can find timing paths from $from to $to"
+if { [llength [find_timing_paths -from $from -to $to]] == 0 } {
+  puts "Error: find_timing_paths -from $from -to $to failed"
+  exit 1
+}
+puts "Checking if we can create a group_path from $from to $to"
+
+# There is no guarantee that the first node in the
+# tcl path structure is an exception start point, so use -through
+# to ensure we capture a valid path for our testing purposes.
+group_path -name test_group -through $from -to $to
+if { [llength [find_timing_paths -path_group test_group]] == 0 } {
+  puts "Error: find_timing_paths -path_group test_group failed"
+  exit 1
+}
+
+set f [open $::env(OUTPUT) w]
+puts $f OK
+close $f