@@ -363,7 +363,6 @@ void UnbufferMove::removeBuffer(Instance* buffer)
363363
364364 // Remove the unused buffer
365365 if (out_db_net == nullptr ) {
366- // jk: behavior change point1
367366 dbInst* dbinst_buffer = db_network_->staToDb (buffer);
368367 dbInst::destroy (dbinst_buffer);
369368 return ;
@@ -378,15 +377,11 @@ void UnbufferMove::removeBuffer(Instance* buffer)
378377 Net* removed = out_net;
379378 odb::dbModNet* survivor_modnet = ip_modnet;
380379 odb::dbModNet* removed_modnet = op_modnet;
381- bool out_net_has_port = db_network_->hasPort (out_net);
382- // jk: behavior change point2
383380 bool in_net_has_port = db_network_->hasPort (in_net);
381+ bool out_net_has_port = db_network_->hasPort (out_net);
384382 if (in_net_has_port == false && out_net_has_port == true ) {
385- // if (out_net_has_port == true) {
386- // output net has port, so it should survive
387383 survivor = out_net;
388384 removed = in_net;
389- // jk: behavior change point2
390385 survivor_modnet = op_modnet;
391386 removed_modnet = ip_modnet;
392387 }
@@ -417,19 +412,9 @@ void UnbufferMove::removeBuffer(Instance* buffer)
417412 }
418413 }
419414
420- // jk: behavior change point3
421- // if (db_network_->hasHierarchy() == false) {
422- // if (db_removed) {
423- // db_survivor->mergeNet(db_removed);
424- // }
425- // sta_->disconnectPin(in_pin);
426- // sta_->disconnectPin(out_pin);
427- // } else {
428-
429- // jk: behavior change point4
430415 // Disconnect buffer input/output pins
431- // sta_->disconnectPin(in_pin);
432- // sta_->disconnectPin(out_pin);
416+ sta_->disconnectPin (in_pin);
417+ sta_->disconnectPin (out_pin);
433418
434419 // Merge hier net
435420 // - mergeModNet() should be done before mergeNet() because
@@ -458,12 +443,6 @@ void UnbufferMove::removeBuffer(Instance* buffer)
458443 // Merge flat net
459444 db_survivor->mergeNet (db_removed);
460445
461- // jk: behavior change point4
462- // Disconnect buffer input/output pins
463- sta_->disconnectPin (in_pin);
464- sta_->disconnectPin (out_pin);
465- // }
466-
467446 // Remove buffer
468447 sta_->deleteInstance (buffer);
469448
0 commit comments