Merge remote-tracking branch 'origin/master' into chameleon_fix

Author: vijayank88

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

@@ -1,10 +1,4 @@
-proc match_pins { regex } {
-    set pins {}
-    foreach pin [get_ports -regexp $regex] {
-        lappend pins [get_property $pin name]
-    }
-    return $pins
-}
+source designs/asap7/mock-array-big/util.tcl
 
 set assignments [list \
     top bottom \

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

@@ -1,10 +1,4 @@
-proc match_pins { regex } {
-    set pins {}
-    foreach pin [get_ports -regexp $regex] {
-        lappend pins [get_property $pin name]
-    }
-    return $pins
-}
+source designs/asap7/mock-array-big/util.tcl
 
 set assignments [list \
     top \

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

@@ -0,0 +1,50 @@
+# Helper function to split a string into a list of strings and numbers
+proc split {str} {
+    set result {}
+    foreach {all letters numbers} [regexp -all -inline {(\D*)(\d*)} $str] {
+        if {$letters ne ""} {
+            lappend result $letters
+        }
+        if {$numbers ne ""} {
+            lappend result [expr {$numbers + 0}]  ;# Convert to integer
+        }
+    }
+    return $result
+}
+
+# Custom comparison function
+proc natural_compare {str1 str2} {
+    set list1 [split $str1]
+    set list2 [split $str2]
+    set len [expr {min([llength $list1], [llength $list2])}]
+    for {set i 0} {$i < $len} {incr i} {
+        set part1 [lindex $list1 $i]
+        set part2 [lindex $list2 $i]
+        if {$part1 ne $part2} {
+            if {[string is integer -strict $part1] && [string is integer -strict $part2]} {
+                return [expr {$part1 - $part2}]
+            } else {
+                return [string compare $part1 $part2]
+            }
+        }
+    }
+    return [expr {[llength $list1] - [llength $list2]}]  ;# If all parts are equal, compare by length
+}
+
+proc natural_sort {list} {
+    return [lsort -command natural_compare $list]
+}
+
+proc match_pins { regex } {
+    set pins {}
+    # The regex for get_ports is not the tcl regex
+    foreach pin [get_ports -regex .*] {
+        set input [get_property $pin name]
+        # We want the Tcl regex
+        if {![regexp $regex $input]} {
+            continue
+        }
+        lappend pins [get_property $pin name]
+    }
+    return [natural_sort $pins]
+}

jenkins/public_tests_all.Jenkinsfile

@@ -29,42 +29,42 @@ pipeline {
           axis {
             name 'TEST_SLUG';
             values "docker build",
-                  "aes asap7",
-                  "ethmac asap7",
-                  "gcd asap7",
-                  "ibex asap7",
-                  "jpeg asap7",
-                  "riscv32i asap7",
-                  "sha3 asap7",
-                  "uart asap7",
-                  "uart-blocks asap7",
-                  "mock-array-big asap7",
-                  "aes nangate45",
-                  "ariane136 nangate45",
-                  "black_parrot nangate45",
-                  "bp_be_top nangate45",
-                  "bp_fe_top nangate45",
-                  "bp_multi_top nangate45",
-                  "dynamic_node nangate45",
-                  "gcd nangate45",
-                  "ibex nangate45",
-                  "jpeg nangate45",
-                  "swerv nangate45",
-                  "swerv_wrapper nangate45",
-                  "tinyRocket nangate45",
-                  "aes sky130hd",
-                  "chameleon sky130hd",
-                  "gcd sky130hd",
-                  "ibex sky130hd",
-                  "jpeg sky130hd",
-                  "microwatt sky130hd",
-                  "riscv32i sky130hd",
-                  "aes sky130hs",
-                  "gcd sky130hs",
-                  "ibex sky130hs",
-                  "jpeg sky130hs",
-                  "riscv32i sky130hs",
-                  "aes gf180";
+                   "aes asap7",
+                   "ethmac asap7",
+                   "gcd asap7",
+                   "ibex asap7",
+                   "jpeg asap7",
+                   "riscv32i asap7",
+                   "sha3 asap7",
+                   "uart asap7",
+                   "uart-blocks asap7",
+                   "mock-array-big asap7",
+                   "aes nangate45",
+                   "bp_be_top nangate45",
+                   "bp_fe_top nangate45",
+                   "bp_multi_top nangate45",
+                   "dynamic_node nangate45",
+                   "gcd nangate45",
+                   "ibex nangate45",
+                   "jpeg nangate45",
+                   "swerv nangate45",
+                   "swerv_wrapper nangate45",
+                   "tinyRocket nangate45",
+                   "aes sky130hd",
+                   "chameleon sky130hd",
+                   "gcd sky130hd",
+                   "ibex sky130hd",
+                   "jpeg sky130hd",
+                   "microwatt sky130hd",
+                   "riscv32i sky130hd",
+                   "aes sky130hs",
+                   "gcd sky130hs",
+                   "ibex sky130hs",
+                   "jpeg sky130hs",
+                   "riscv32i sky130hs",
+                   "aes gf180",
+                   "ibex gf180",
+                   "jpeg gf180";
           }
         }
 

jenkins/public_tests_small.Jenkinsfile

@@ -34,10 +34,12 @@ pipeline {
                    "gcd asap7",
                    "ibex asap7",
                    "jpeg asap7",
+                   "riscv32i asap7",
                    "sha3 asap7",
                    "uart asap7",
+                   "uart-blocks asap7",
+                   "mock-array-big asap7",
                    "aes nangate45",
-                   "black_parrot nangate45",
                    "bp_be_top nangate45",
                    "bp_fe_top nangate45",
                    "bp_multi_top nangate45",