sw: Align NoC API with systemRDL

Author: Lore0599

sw/snitch/apps/gemm_2d/src/gemm_2d.c

@@ -33,12 +33,12 @@
 static inline void allocate_l3_buffers(gemm_args_t *largs ) {
 
     uint32_t prec = largs->prec;
-    uint32_t mem_tile_idx = dst_tile_for_cluster(snrt_cluster_idx());
+    uint32_t mem_tile_idx = pb_closest_mem_tile(snrt_cluster_idx());
 
-    uintptr_t a_off = l3_tile_offset((uintptr_t) largs -> a);
-    uintptr_t c_off = l3_tile_offset((uintptr_t) largs -> c);
-    uintptr_t a_dst = l3_tile_address(mem_tile_idx) + a_off;
-    uintptr_t c_dst = l3_tile_address(mem_tile_idx) + c_off;
+    uintptr_t a_off = pb_l3_tile_offset((uintptr_t) largs -> a);
+    uintptr_t c_off = pb_l3_tile_offset((uintptr_t) largs -> c);
+    uintptr_t a_dst = pb_l3_tile_address(mem_tile_idx) + a_off;
+    uintptr_t c_dst = pb_l3_tile_address(mem_tile_idx) + c_off;
 
     // Move data in the correct memory tile location
     uint32_t size_a = (size_t)largs->m * (size_t)largs->k;
@@ -61,7 +61,7 @@ static inline void write_back_c_tiles(gemm_args_t* largs, uint32_t m_tile_size,
 
     // Position of the first element in the Tile to be written back
     c_src = (uintptr_t )largs->c + (snrt_cluster_idx() * largs->n * m_tile_size) * largs->prec;
-    c_dst = l3_tile_address(0) + l3_tile_offset( (uintptr_t) c_src);
+    c_dst = pb_l3_tile_address(0) + pb_l3_tile_offset( (uintptr_t) c_src);
     transfer_size = m_tile_size * largs->n * largs->prec;
 
     if (c_src != c_dst) snrt_dma_start_1d((void *) c_dst, (void *) c_src, transfer_size);

sw/snitch/runtime/src/pb_noc_cfg.h

@@ -4,8 +4,8 @@
 //
 // Lorenzo Leone <[email protected]>
 
-#define L3_START_ADDRESS    0x70000000UL    // Base address of memory tile 0
-#define L3_SIZE             0x100000UL      // Size of memory tile (1MiB)
+#define L3_START_ADDRESS    PICOBELLO_ADDRMAP_L2_SPM_0_BASE_ADDR
+#define L3_SIZE             0x00100000
 
 #define CLUSTER_PER_ROW 4
 #define CLUSTER_PER_COL 4

sw/snitch/runtime/src/pb_team.h

@@ -16,49 +16,82 @@
  * management and core-specific operations.
  */
 
-// TODO (lleone): Chekc if these functions can be difend as static
-
 /**
  * @brief Get start address of a memory tile
  * @param tile_idx The memory tile idx in the NoC
  * @return Start addres of memory tile idx
  */
-inline uintptr_t l3_tile_address(uint32_t tile_idx) {
-    return (uintptr_t)L3_START_ADDRESS +
-           (uintptr_t)tile_idx * (uintptr_t)L3_SIZE;
+inline uintptr_t pb_l3_tile_address(uint32_t tile_idx) {
+    return (uintptr_t) (picobello_addrmap.l2_spm[tile_idx].mem);
 }
 
 /**
  * @brief Get the address offset of a data respect to the memory tile start address
  * @param src_addr The data absolute address
  * @return Address location offset respect to the tile start address
  */
-inline uintptr_t l3_tile_offset(uintptr_t src_addr) {
+inline uintptr_t pb_l3_tile_offset(uintptr_t src_addr) {
     return (src_addr - (uintptr_t)L3_START_ADDRESS) & (uintptr_t)(L3_SIZE - 1);
 }
 
+
 /**
  * @brief Get the NoC row index
  * @param cidx The cluster index
  * @return The Row index
  */
-inline uint32_t cluster_row(uint32_t cidx)
+inline uint32_t pb_cluster_row(uint32_t cidx)
 {
   return cidx % CLUSTER_PER_ROW;
 }
 
+/**
+ * @brief Get the NoC row index
+ * This is a convenience orload of pb_cluster_row()
+ * @return The Row index
+ */
+inline uint32_t pb_cluster_row()
+{
+  return pb_cluster_row(snrt_cluster_idx());
+}
+
+
 /**
  * @brief Get the NoC column index
  * @param cidx The cluster index
  * @return The Column index
  */
-inline uint32_t cluster_col(uint32_t cidx)
+inline uint32_t pb_cluster_col(uint32_t cidx)
 {
   return cidx % CLUSTER_PER_COL;
 }
 
-inline uint32_t dst_tile_for_cluster(uint32_t cidx) {
-    uint32_t row = cluster_row(cidx);
+/**
+ * @brief Get the NoC column index
+ * This is a convenience orload of pb_cluster_row()
+ * @return The Column index
+ */
+inline uint32_t pb_cluster_col()
+{
+  return pb_cluster_col(snrt_cluster_idx());
+}
+
+
+/**
+ * @brief Get the index of the closest memory tile
+ * @param cidx The cluster index
+ * @return Index of the closest memory tile to cidx
+ */
+inline uint32_t pb_closest_mem_tile(uint32_t cidx) {
+    uint32_t row = pb_cluster_row(cidx);
     return (cidx < 8u) ? row        // first 8 clusters -> left column tiles 0..3
                       : (row + 4u); // clusters >= 8  -> right column tiles 4..7
 }
+
+/**
+ * @brief Get the index of the closest memory tile
+ * This is a convenience orload of pb_closest_mem_tile()
+ */
+inline uint32_t pb_closest_mem_tile() {
+    return pb_closest_mem_tile(snrt_cluster_idx());
+}