Merge branch 'master' into zircon_regression_refactor

StanfordAHA · Feb 13, 2025 · 293c08f · 293c08f
2 parents e573d31 + e8668e8
commit 293c08f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/mapper/netlist_util.py b/mapper/netlist_util.py
@@ -31,7 +31,6 @@ def __init__(self, inst_info, ready_valid=True):
 
         self.include_E64_HW = "INCLUDE_E64_HW" in os.environ and os.environ.get("INCLUDE_E64_HW") == "1"
         self.exchange_64_mode = "E64_MODE_ON" in os.environ and os.environ.get("E64_MODE_ON") == "1"
-        self.outputCount = 0
 
     def doit(self, dag):
         self.i = 1
@@ -146,8 +145,7 @@ def visit_Output(self, node: Output):
                 port = f"f2io_17"
             else:
                 port = "f2io_16"
-
-            self.outputCount = (self.outputCount + 1) % 4
+
         self.netlist[child_bid].append((node, port))
 
 
@@ -548,8 +546,6 @@ def __init__(
         self.include_E64_HW = "INCLUDE_E64_HW" in os.environ and os.environ.get("INCLUDE_E64_HW") == "1"
         self.exchange_64_mode = "E64_MODE_ON" in os.environ and os.environ.get("E64_MODE_ON") == "1"
 
-        self.inputCount = 0
-
         self.pipeline_inputs = pipeline_inputs
 
         self.harden_flush = harden_flush
@@ -878,7 +874,6 @@ def visit_Select(self, node: DagNode):
                             else:
                                 packet_num = 0
                             new_node = new_children[0].select(f"io2f_17_{packet_num}")
-                            self.inputCount = (self.inputCount + 1) % 4
 
                         else:
                             new_node = new_children[0].select("io2f_17_0") 

diff --git a/tests/test_app/lib/map.c b/tests/test_app/lib/map.c
@@ -360,6 +360,13 @@ int update_io_tile_configuration(struct IOTileInfo *io_tile_info, struct ConfigI
     // Check if we are in exchange_64 mode
     int exchange_64_mode = get_exchange_64_config();
 
+
+    int bytes_written_per_cycle_non_E64_mode = 2;
+
+    // Writing 4x as many bytes in EXCHANGE_64_MODE mode; do -1 b/c addr is 0 indexed
+    int E64_start_addr_increment = (4 - 1) * bytes_written_per_cycle_non_E64_mode;
+
+
     // Convert extent/stride hardware-friendly
     for (int i = 0; i < loop_dim; i++) {
         extent[i] = io_tile_info->extent[i] - 2;
@@ -514,9 +521,8 @@ int update_io_tile_configuration(struct IOTileInfo *io_tile_info, struct ConfigI
                    (1 << AXI_ADDR_WIDTH) + (tile << (AXI_ADDR_WIDTH - TILE_SEL_ADDR_WIDTH)) + GLB_ST_DMA_HEADER_0_DIM_R,
                    loop_dim);
 
-        // Writing 8 bytes at once in EXCHANGE_64_MODE mode. 
         if (exchange_64_mode) {
-            start_addr += 6; 
+            start_addr += E64_start_addr_increment; 
         }
 
         add_config(

diff --git a/tests/test_app/lib/parser.c b/tests/test_app/lib/parser.c
@@ -70,7 +70,6 @@ int parse_num_group(struct KernelInfo *info) {
 
     const char *west_io_env_var = "WEST_IN_IO_SIDES";
     char *west_io_value = getenv(west_io_env_var);
-    printf("GOT TO WEST I/O tiles stuff\n");
     if (west_io_value != NULL && strcmp(west_io_value, "1") == 0) {
         printf("Num groups calculation adjusted due to WEST I/O tiles\n");
         info->num_groups = (max_x-1 + GROUP_SIZE) / GROUP_SIZE;