misc: Miscellaneous changes to SRNoC Model

DPRINTF output to show layer number.
Multiple dynamic ranges, which dictate number
of layers.
Payload Specific delay had a small bug in it.

Author: kunpai

configs/supernetwork/SRNoC.py

@@ -149,10 +149,10 @@ def calculate_power_and_area(radix):
 parser.add_argument(
     "--dynamic-range",
     type=int,
-    default=1000,
-    help="Maximum value for random data generation",
+    nargs="+",
+    default=[1000],
+    help="Maximum value(s) for random data generation. Multiple values create multiple layers.",
 )
-
 args = parser.parse_args()
 
 # Ensure that at least one of --maximum-packets or --file-path is provided
@@ -176,11 +176,12 @@ def calculate_power_and_area(radix):
 
 layers = [
     Layer(
-        dynamic_range=args.dynamic_range,
+        dynamic_range=dr,
         data_cells=data_cells,
         max_packets=args.maximum_packets,
         schedule_path=args.file_path,
     )
+    for dr in args.dynamic_range
 ]
 
 # Create the SuperNetwork and add the DataCells

src/network/Layer.cc

@@ -303,7 +303,7 @@ Layer::processPackets(
             // Calculate precise delivery time
             // within the connection window
             // Use the payload value -> RACE LOGIC
-            payloadSpecificDelay = ((payload + 1) % dynamicRange) *
+            payloadSpecificDelay = ((payload + 1)) *
                 (getTimeSlot()) * clockPeriod()/714;
 
             DPRINTF(Layer,

src/network/SuperNetwork.cc

@@ -60,17 +60,19 @@ namespace gem5
         assert(params.variability_counting_network >= 0);
         assert(params.crosspoint_setup_time >= 0);
 
+        int layerIndex = 0;
         for (auto layer : params.layers) {
             layer->setTimeSlot(calculateTimeSlot(layer->getRadix()));
             DPRINTF(SuperNetwork, "Layer %d: time slot = %d\n",
-                layer->getRadix(), layer->getTimeSlot()
+                layerIndex, layer->getTimeSlot()
             );
-            layer->setConnectionWindow(Cycles(layer->getDynamicRange() *
-                                            timeSlot));
+            layer->setConnectionWindow(
+                Cycles(layer->getDynamicRange() * timeSlot));
             DPRINTF(SuperNetwork, "Layer %d: connection window = %d\n",
-                layer->getRadix(), layer->getConnectionWindow()
+                layerIndex, layer->getConnectionWindow()
             );
             layer->scheduleNextNetworkEvent(curTick());
+            layerIndex++;
         }
     }