Merge pull request #955 from Pinata-Consulting/clean-up-mock-array

Clean up/extend mock-array-big

Author: maliberty

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

@@ -7,26 +7,34 @@ proc pin1 {fmt p} {
 }
 
 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_2[%d]} $data_width] \
-        {*}[pin1 {io_outs_2[%d]} $data_width] \
+        {*}[pin1 {io_ins_down[%d]} $data_width] \
+        {*}[pin1 {io_outs_up[%d]} $data_width] \
     ] \
     [ concat \
-        {*}[pin1 {io_outs_0[%d]} $data_width] \
-        {*}[pin1 {io_ins_0[%d]} $data_width] \
+        {*}[pin1 {io_outs_down[%d]} $data_width] \
+        {*}[pin1 {io_ins_up[%d]} $data_width] \
     ]] \
     left right \
     [list [ concat \
-        {*}[pin1 {io_ins_3[%d]} $data_width] \
-        {*}[pin1 {io_outs_3[%d]} $data_width] \
+        {*}[pin1 {io_ins_right[%d]} $data_width] \
+        {*}[pin1 {io_outs_left[%d]} $data_width] \
     ] \
     [ concat \
-        {*}[pin1 {io_outs_1[%d]} $data_width] \
-        {*}[pin1 {io_ins_1[%d]} $data_width] \
+        {*}[pin1 {io_outs_right[%d]} $data_width] \
+        {*}[pin1 {io_ins_left[%d]} $data_width] \
     ]] \
+    left right \
+    [list [ concat \
+        {*}[pin1 {io_lsbIns_%d} $cols] \
+    ] \
+    [ concat \
+        {*}[pin1 {io_lsbOuts_%d} $cols] \
+    ]]
 ]
 
 proc zip {list1 list2} {

flow/designs/asap7/mock-array-big/configure.sh

@@ -10,4 +10,4 @@ cd $DIR
 cd ../../src/mock-array-big
 
 sbt -Duser.home="$HOME" -Djline.terminal=jline.UnsupportedTerminal -batch \
-     "test:runMain GenerateMockArray --width ${MOCK_ARRAY_WIDTH:-8} --height ${MOCK_ARRAY_HEIGHT:-8} --dataWidth ${MOCK_ARRAY_DATAWIDTH:-8} -- --emit-modules verilog --target-dir ."
+     "test:runMain GenerateMockArray --width ${MOCK_ARRAY_WIDTH:-8} --height ${MOCK_ARRAY_HEIGHT:-8} --dataWidth ${MOCK_ARRAY_DATAWIDTH:-8} -- --emit-modules verilog --emission-options disableMemRandomization,disableRegisterRandomization --target-dir ."

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

@@ -1,3 +1,11 @@
+proc pin1 {fmt p} {
+    set result [list]
+    for {set m 0} {$m < $p} {incr m} {
+        lappend result [format $fmt $m]
+    }
+    return $result
+}
+
 proc pin2 {fmt p q} {
     set result [list]
     for {set m 0} {$m < $p} {incr m} {
@@ -15,23 +23,24 @@ set cols [expr {[info exists ::env(MOCK_ARRAY_WIDTH)] ? $::env(MOCK_ARRAY_WIDTH)
 set assignments [list \
     top \
     [ concat \
-        {*}[pin2 {io_insHorizontal_1_%d[%d]} $cols $data_width] \
-        {*}[pin2 {io_outsHorizontal_1_%d[%d]} $cols $data_width] \
+        {*}[pin2 {io_insDown_%d[%d]} $cols $data_width] \
+        {*}[pin2 {io_outsUp_%d[%d]} $cols $data_width] \
     ] \
     bottom \
     [ concat \
-        {*}[pin2 {io_insHorizontal_0_%d[%d]} $cols $data_width] \
-        {*}[pin2 {io_outsHorizontal_0_%d[%d]} $cols $data_width] \
+        {*}[pin2 {io_insUp_%d[%d]} $cols $data_width] \
+        {*}[pin2 {io_outsDown_%d[%d]} $cols $data_width] \
     ] \
     left \
     [ concat \
-        {*}[pin2 {io_insVertical_1_%d[%d]} $rows $data_width] \
-        {*}[pin2 {io_outsVertical_1_%d[%d]} $rows $data_width] \
+        {*}[pin2 {io_insRight_%d[%d]} $rows $data_width] \
+        {*}[pin2 {io_outsLeft_%d[%d]} $rows $data_width] \
     ] \
     right \
     [ concat \
-        {*}[pin2 {io_insVertical_0_%d[%d]} $rows $data_width] \
-        {*}[pin2 {io_outsVertical_0_%d[%d]} $rows $data_width] \
+        {*}[pin2 {io_insLeft_%d[%d]} $rows $data_width] \
+        {*}[pin2 {io_outsRight_%d[%d]} $rows $data_width] \
+        {*}[pin1 {io_lsbs_%d} $cols] \
     ] \
 ]