Changeset 876 for branches

Timestamp:

Nov 12, 2014, 3:14:46 PM (9 years ago)

Author:

cfuguet

Message:

reconf: relax mesh size constraints

• The mesh number of rows and columns can be any value between 1 and 16. It may or not be a power of 2.

File:

• branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py (modified) (1 diff)

branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

@@ -74 +74 @@
 
     # parameters checking
-    assert nb_procs <= 4
-
-    assert ((x_size == 1) or (x_size == 2) or (x_size == 4) or (x_size == 8) or
-            (x_size == 16))
-
-    assert ((y_size == 1) or (y_size == 2) or (y_size == 4) or (y_size == 8) or
-            (y_size == 16))
+    assert (nb_procs <= (1 << P_WIDTH))
+
+    assert ((x_size >= 1) and (x_size <= (1 << X_WIDTH)))
+
+    assert ((y_size >= 1) and (y_size <= (1 << Y_WIDTH)))
 
     assert ((nb_ttys >= 1) and (nb_ttys <= 16))
 
     assert (((X_IO == 0) and (Y_IO == 0)) or
-            ((X_IO == x_size-1) and (Y_IO == y_size-1)))
+            ((X_IO == (x_size - 1)) and (Y_IO == (y_size - 1))))
 
     platform_name = 'reconf-tsar_iob_%d_%d_%d' % (x_size, y_size, nb_procs)