Merge pull request #1013 from Pinata-Consulting/mock-array-big-cleanup

Mock array big cleanup

Author: maliberty

flow/designs/asap7/mock-array-big/Element/config.mk

@@ -15,6 +15,4 @@ export DIE_AREA = $(shell python3 designs/asap7/mock-array-big/ce_die_area.py)
 
 export IO_CONSTRAINTS = designs/asap7/mock-array-big/Element/io.tcl
 
-export MACRO_PLACE_HALO = 1 1
-
 export PDN_TCL = designs/asap7/mock-array-big/Element/pdn.tcl

flow/designs/asap7/mock-array-big/Element/io.tcl

@@ -1,39 +1,36 @@
-proc pin1 {fmt p} {
-    set result [list]
-    for {set m 0} {$m < $p} {incr m} {
-        lappend result [format $fmt $m]
+proc match_pins { regex } {
+    set pins {}
+    foreach pin [get_ports -regexp $regex] {
+        lappend pins [get_property $pin name]
     }
-    return $result
+    return $pins
 }
 
-set data_width [expr {[info exists ::env(MOCK_ARRAY_DATAWIDTH)] ? $::env(MOCK_ARRAY_DATAWIDTH) : 8}]
-set cols [expr {[info exists ::env(MOCK_ARRAY_WIDTH)] ? $::env(MOCK_ARRAY_WIDTH) : 8}]
-
 set assignments [list \
     top bottom \
     [list [ concat \
-        {*}[pin1 {io_ins_down[%d]} $data_width] \
-        {*}[pin1 {io_outs_up[%d]} $data_width] \
+        {*}[match_pins io_ins_down.*] \
+        {*}[match_pins io_outs_up.*] \
     ] \
     [ concat \
-        {*}[pin1 {io_outs_down[%d]} $data_width] \
-        {*}[pin1 {io_ins_up[%d]} $data_width] \
+        {*}[match_pins io_outs_down.*] \
+        {*}[match_pins io_ins_up.*] \
     ]] \
     left right \
     [list [ concat \
-        {*}[pin1 {io_ins_right[%d]} $data_width] \
-        {*}[pin1 {io_outs_left[%d]} $data_width] \
+        {*}[match_pins io_ins_right.*] \
+        {*}[match_pins io_outs_left.*] \
     ] \
     [ concat \
-        {*}[pin1 {io_outs_right[%d]} $data_width] \
-        {*}[pin1 {io_ins_left[%d]} $data_width] \
+        {*}[match_pins io_outs_right.*] \
+        {*}[match_pins io_ins_left.*] \
     ]] \
     left right \
     [list [ concat \
-        {*}[pin1 {io_lsbIns_%d} $cols] \
+        {*}[match_pins io_lsbIns_.*] \
     ] \
     [ concat \
-        {*}[pin1 {io_lsbOuts_%d} $cols] \
+        {*}[match_pins io_lsbOuts_.*] \
     ]]
 ]
 

flow/designs/asap7/mock-array-big/config.mk

@@ -21,6 +21,4 @@ export MACRO_PLACEMENT_TCL = ./designs/asap7/mock-array-big/macro-placement.tcl
 
 export IO_CONSTRAINTS = designs/asap7/mock-array-big/io.tcl
 
-export MACRO_PLACE_HALO = 1 1
-
 export PDN_TCL = designs/asap7/mock-array-big/pdn.tcl

flow/designs/asap7/mock-array-big/io.tcl

@@ -1,46 +1,32 @@
-proc pin1 {fmt p} {
-    set result [list]
-    for {set m 0} {$m < $p} {incr m} {
-        lappend result [format $fmt $m]
+proc match_pins { regex } {
+    set pins {}
+    foreach pin [get_ports -regexp $regex] {
+        lappend pins [get_property $pin name]
     }
-    return $result
+    return $pins
 }
 
-proc pin2 {fmt p q} {
-    set result [list]
-    for {set m 0} {$m < $p} {incr m} {
-        for {set n 0} {$n < $q} {incr n} {
-            lappend result [format $fmt $m $n]
-        }
-    }
-    return $result
-}
-
-set data_width [expr {[info exists ::env(MOCK_ARRAY_DATAWIDTH)] ? $::env(MOCK_ARRAY_DATAWIDTH) : 8}]
-set rows [expr {[info exists ::env(MOCK_ARRAY_HEIGHT)] ? $::env(MOCK_ARRAY_HEIGHT) : 8}]
-set cols [expr {[info exists ::env(MOCK_ARRAY_WIDTH)] ? $::env(MOCK_ARRAY_WIDTH) : 8}]
-
 set assignments [list \
     top \
     [ concat \
-        {*}[pin2 {io_insDown_%d[%d]} $cols $data_width] \
-        {*}[pin2 {io_outsUp_%d[%d]} $cols $data_width] \
+        {*}[match_pins io_insDown_.*] \
+        {*}[match_pins io_outsUp_.*] \
     ] \
     bottom \
     [ concat \
-        {*}[pin2 {io_insUp_%d[%d]} $cols $data_width] \
-        {*}[pin2 {io_outsDown_%d[%d]} $cols $data_width] \
+        {*}[match_pins io_insUp_.*] \
+        {*}[match_pins io_outsDown_.*] \
     ] \
     left \
     [ concat \
-        {*}[pin2 {io_insRight_%d[%d]} $rows $data_width] \
-        {*}[pin2 {io_outsLeft_%d[%d]} $rows $data_width] \
+        {*}[match_pins io_insRight_.*] \
+        {*}[match_pins io_outsLeft_.*] \
     ] \
     right \
     [ concat \
-        {*}[pin2 {io_insLeft_%d[%d]} $rows $data_width] \
-        {*}[pin2 {io_outsRight_%d[%d]} $rows $data_width] \
-        {*}[pin1 {io_lsbs_%d} $cols] \
+        {*}[match_pins io_insLeft_.*] \
+        {*}[match_pins io_outsRight_.*] \
+        {*}[match_pins io_lsbs_.*] \
     ] \
 ]