rsz: Fix and clean up size move preliminaries

Make sure we don't attempt to size an instance which isn't a standard
cell. Also clean up the clone move condition. This condition looks to
have been introduced in commit 533c037 as a workaround for undo
limitations (mistakenly with flipped logic) and carried over to other
places.

Signed-off-by: Martin Povišer <[email protected]>

Author: povik

src/rsz/src/SizeDownMove.cc

@@ -123,7 +123,8 @@ bool SizeDownMove::doMove(const Path* drvr_path,
     LibertyCell* load_cell = load_port->libertyCell();
     Instance* load_inst = network_->instance(load_pin);
 
-    if (resizer_->dontTouch(load_inst)) {
+    if (resizer_->dontTouch(load_inst)
+        || !resizer_->isLogicStdCell(load_inst)) {
       continue;
     }
 

src/rsz/src/SizeUpMove.cc

@@ -44,10 +44,7 @@ bool SizeUpMove::doMove(const Path* drvr_path,
   Pin* in_pin = in_path->pin(sta_);
   LibertyPort* in_port = network_->libertyPort(in_pin);
 
-  // We always size the cloned gates for some reason, but it would be good if we
-  // also down-sized here instead since we might want smaller original.
-  if (!resizer_->dontTouch(drvr)
-      || resizer_->clone_move_->hasPendingMoves(drvr)) {
+  if (!resizer_->dontTouch(drvr) && resizer_->isLogicStdCell(drvr)) {
     float prev_drive;
     if (drvr_index >= 2) {
       const int prev_drvr_index = drvr_index - 2;
@@ -120,9 +117,7 @@ bool SizeUpMatchMove::doMove(const Path* drvr_path,
     return false;
   }
 
-  // Also size cloned cells if possible
-  if (!resizer_->dontTouch(drvr)
-      || resizer_->clone_move_->hasPendingMoves(drvr)) {
+  if (!resizer_->dontTouch(drvr) && resizer_->isLogicStdCell(drvr)) {
     LibertyPort* drvr_port = network_->libertyPort(drvr_pin);
     if (drvr_port == nullptr) {
       return false;

src/rsz/src/VTSwapMove.cc

@@ -91,6 +91,11 @@ bool VTSwapSpeedMove::isSwappable(const Path*& drvr_path,
                     network_->pathName(drvr_pin));
     return false;
   }
+  if (!resizer_->isLogicStdCell(drvr)) {
+    debugMovePrint1("REJECT vt_swap {}: drvr instance is not a standard cell",
+                    network_->pathName(drvr_pin));
+    return false;
+  }
   LibertyPort* drvr_port = network_->libertyPort(drvr_pin);
   if (drvr_port == nullptr) {
     debugMovePrint1("REJECT vt_swap {}: drvr pin has no library port",