Merge branch 'openroad' of https://github.com/The-OpenROAD-Project/OpenROAD into openroad

Author: jjcherry56

src/OpenDB

@@ -770,6 +770,14 @@ proc tapcell { args } {
                         puts "\[WARNING\] Tapcell at position ($x, $lly) will cause overlap with endcap. Skipping..."
                         continue
                     }
+
+                    set min_dist [expr 2 * $site_x]
+                    set max_tap_urx [expr $end_llx - $min_dist]
+
+                    while { $tap_urx > $max_tap_urx } {
+                        set tap_urx [expr $tap_urx - $site_x]
+                        set x [expr $x - $site_x]
+                    }
                     set inst [odb::dbInst_create $block $master $inst_name]
                     $inst setOrient $ori
 
@@ -812,7 +820,8 @@ proc tapcell { args } {
             set tb3_master NULL
 
             if {$topbottom_chk == 1} {
-                if {[string match "MX" $ori]} {
+                # top
+                if {[string match "R0" $ori]} {
                     set master [$db findMaster $tap_nwintie_master]
                     set tb2_master [$db findMaster $tap_nwin2_master]
                     set tb3_master [$db findMaster $tap_nwin3_master]
@@ -822,7 +831,8 @@ proc tapcell { args } {
                     set tb3_master [$db findMaster $tap_nwout3_master]
                 }
             } elseif {$topbottom_chk == -1} {
-                if {[string match "R0" $ori]} {
+                # bottom
+                if {[string match "MX" $ori]} {
                     set master [$db findMaster $tap_nwintie_master]
                     set tb2_master [$db findMaster $tap_nwin2_master]
                     set tb3_master [$db findMaster $tap_nwin3_master]
@@ -915,7 +925,7 @@ proc tapcell { args } {
                 set row_urx [[$row getBBox] xMax]
                 set row_ury [[$row getBBox] yMax]
 
-		if {$blockage_llx_ < $row_llx} {
+		        if {$blockage_llx_ < $row_llx} {
                     set blockage_llx $row_llx
                 } else {
                     set blockage_llx $blockage_llx_
@@ -929,7 +939,7 @@ proc tapcell { args } {
 
                 if {($row_lly >= $blockage_ury)} {
                     # If row is at top of macro
-                    if {[string match "MX" $ori]} {
+                    if {[string match "R0" $ori]} {
                         set incnr_master [$db findMaster $incnrcap_nwin_master]
                         set tb2_master [$db findMaster $tap_nwin2_master]
                         set tb3_master [$db findMaster $tap_nwin3_master]
@@ -941,6 +951,8 @@ proc tapcell { args } {
                         set tbtie_master [$db findMaster $tap_nwouttie_master]
                     }
 
+                    set cell_orient $ori
+
                     # Insert incnr cells
                     set row1_num_sites [expr {($blockage_llx - $row_llx)/$site_x}]
 
@@ -956,8 +968,14 @@ proc tapcell { args } {
                     if {$x_start < $row_llx} {
                         set x_start $row_llx
                     } else {
+                        # Insert cell at northwest corner
                         set inst1 [odb::dbInst_create $block $incnr_master $inst1_name]
-                        $inst1 setOrient $ori
+                        if {[string match "R0" $ori]} {
+                            set cell_orient "MY"
+                        } else {
+                            set cell_orient "R180"
+                        }
+                        $inst1 setOrient $cell_orient
                         $inst1 setLocation $x_start $row_lly
                         $inst1 setPlacementStatus LOCKED
 
@@ -967,6 +985,7 @@ proc tapcell { args } {
 
                     if {(($x_end + $endcapwidth) < $corebox_urx)} {
                         if {($x_end + $endcapwidth) <= $row_urx } {
+                            # Insert cell at northeast corner
                             set inst2_name "PHY_${cnt}"
                             set inst2 [odb::dbInst_create $block $incnr_master $inst2_name]
                             $inst2 setOrient $ori
@@ -1040,6 +1059,8 @@ proc tapcell { args } {
                         set tbtie_master [$db findMaster $tap_nwouttie_master]
                     }
 
+                    set cell_orient $ori
+
                     # Insert incnr cells
                     set row1_num_sites [expr {($blockage_llx - $row_llx)/$site_x}]
 
@@ -1055,8 +1076,14 @@ proc tapcell { args } {
                     if {$x_start < $row_llx} {
                         set x_start $row_llx
                     } else {
+                        # Insert cell at southwest corner
                         set inst1 [odb::dbInst_create $block $incnr_master $inst1_name]
-                        $inst1 setOrient $ori
+                        if {[string match "R0" $ori]} {
+                            set cell_orient "MY"
+                        } else {
+                            set cell_orient "R180"
+                        }
+                        $inst1 setOrient $cell_orient
                         $inst1 setLocation $x_start $row_lly
                         $inst1 setPlacementStatus LOCKED