Changeset 572

Timestamp:

Oct 31, 2013, 6:18:02 PM (11 years ago)

Author:

meunier

Message:

Committing a new hardware mapping in almos for the tsar_generic_xbar platform.

File:

• trunk/platforms/tsar_generic_xbar/top.cpp (modified) (3 diffs)

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -233 +233 @@
 #define MAX_FROZEN_CYCLES     1000000
 
-/////////////////////////////////////////////////////////
-//    Physical segments definition
-/////////////////////////////////////////////////////////
-// There is 3 segments replicated in all clusters
-// and 5 specific segments in the "IO" cluster 
-// (containing address 0xBF000000)
-/////////////////////////////////////////////////////////
-
-#ifdef USE_GIET
-   // specific segments in "IO" cluster : absolute physical address
-   #define BROM_BASE    0x00BFC00000
-   #define BROM_SIZE    0x0000100000   // 1 Mbytes
-
-   #define FBUF_BASE    0x00B2000000
-   #define FBUF_SIZE    (FBUF_X_SIZE * FBUF_Y_SIZE * 2)
-
-   #define BDEV_BASE    0x00B3000000
-   #define BDEV_SIZE    0x0000001000   // 4 Kbytes
-
-   #define MTTY_BASE    0x00B4000000
-   #define MTTY_SIZE    0x0000001000   // 4 Kbytes
-
-   #define MNIC_BASE    0x00B5000000
-   #define MNIC_SIZE    0x0000080000   // 512 Kbytes (for 8 channels)
-
-   #define CDMA_BASE    0x00B6000000
-   #define CDMA_SIZE    0x0000004000 * NB_CMA_CHANNELS
-
-   // replicated segments : address is incremented by a cluster offset
-   //     offset  = cluster(x,y) << (address_width-x_width-y_width);
-
-   #define MEMC_BASE    0x0000000000
-   #define MEMC_SIZE    0x0010000000   // 256 Mbytes per cluster
-
-   #define XICU_BASE    0x00B0000000
-   #define XICU_SIZE    0x0000001000   // 4 Kbytes
-
-   #define MDMA_BASE    0x00B1000000
-   #define MDMA_SIZE    0x0000001000 * NB_DMA_CHANNELS  // 4 Kbytes per channel
-
-   #define SIMH_BASE    0x00B7000000
-   #define SIMH_SIZE    0x0000001000
-#endif
-
-#ifdef USE_ALMOS
-   #define CLUSTER_INC  (0x80000000ULL / (XMAX * YMAX) * 2)
-
-   #define MEMC_BASE    0x0000000000
-   #define MEMC_SIZE    min(0x02000000, (0x80000000 / (XMAX * YMAX)))
-
-   #define BROM_BASE    0x00BFC00000
-   #define BROM_SIZE    0x0000100000   // 1 Mbytes
-
-   #define XICU_BASE    (MEMC_SIZE)
-   #define XICU_SIZE    0x0000001000   // 4 Kbytes
-
-   #define MDMA_BASE    (XICU_BASE + XICU_SIZE)
-   #define MDMA_SIZE    0x0000001000 * NB_DMA_CHANNELS  // 4 Kbytes per channel  
-
-   #define BDEV_BASE    ((cluster_io_id * (CLUSTER_INC)) + MDMA_BASE + MDMA_SIZE)
-   #define BDEV_SIZE    0x0000001000   // 4 Kbytes
-
-   #define MTTY_BASE    (BDEV_BASE + BDEV_SIZE)
-   #define MTTY_SIZE    0x0000001000   // 4 Kbytes
-
-   #define FBUF_BASE    (MTTY_BASE + MTTY_SIZE)
-   #define FBUF_SIZE    (FBUF_X_SIZE * FBUF_Y_SIZE * 2) // Should be 0x80000
-
-   // Unused in almos
-   #define MNIC_BASE    (FBUF_BASE + FBUF_SIZE)
-   #define MNIC_SIZE    0x0000001000
-
-   #define CDMA_BASE    (MNIC_BASE + MNIC_SIZE)
-   #define CDMA_SIZE    0x0000004000 * NB_CMA_CHANNELS
-
-#endif
 
 
@@ -326 +250 @@
 #define CDMA_TGTID      8
 #define SIMH_TGTID      9
+
+
+
+/////////////////////////////////////////////////////////
+//    Physical segments definition
+/////////////////////////////////////////////////////////
+// There is 3 segments replicated in all clusters
+// and 5 specific segments in the "IO" cluster 
+// (containing address 0xBF000000)
+/////////////////////////////////////////////////////////
+
+#ifdef USE_GIET
+   // specific segments in "IO" cluster : absolute physical address
+   #define BROM_BASE    0x00BFC00000
+   #define BROM_SIZE    0x0000100000   // 1 Mbytes
+
+   #define FBUF_BASE    0x00B2000000
+   #define FBUF_SIZE    (FBUF_X_SIZE * FBUF_Y_SIZE * 2)
+
+   #define BDEV_BASE    0x00B3000000
+   #define BDEV_SIZE    0x0000001000   // 4 Kbytes
+
+   #define MTTY_BASE    0x00B4000000
+   #define MTTY_SIZE    0x0000001000   // 4 Kbytes
+
+   #define MNIC_BASE    0x00B5000000
+   #define MNIC_SIZE    0x0000080000   // 512 Kbytes (for 8 channels)
+
+   #define CDMA_BASE    0x00B6000000
+   #define CDMA_SIZE    0x0000004000 * NB_CMA_CHANNELS
+
+   // replicated segments : address is incremented by a cluster offset
+   //     offset  = cluster(x,y) << (address_width-x_width-y_width);
+
+   #define MEMC_BASE    0x0000000000
+   #define MEMC_SIZE    0x0010000000   // 256 Mbytes per cluster
+
+   #define XICU_BASE    0x00B0000000
+   #define XICU_SIZE    0x0000001000   // 4 Kbytes
+
+   #define MDMA_BASE    0x00B1000000
+   #define MDMA_SIZE    0x0000001000 * NB_DMA_CHANNELS  // 4 Kbytes per channel
+
+   #define SIMH_BASE    0x00B7000000
+   #define SIMH_SIZE    0x0000001000
+#endif
+
+#ifdef USE_ALMOS
+   // 2^19 is the offset for the local id (8 bits for global ID :
+   // 1 bit for Memcache or Peripheral, 4 for local peripheral id)
+   // (Almos supports 32 bits physical addresses)
+
+   #define CLUSTER_IO_INC  (cluster_io_id * (0x80000000ULL / (XMAX * YMAX) * 2))
+
+   #define MEMC_MAX_SIZE (0x80000000 / (XMAX * YMAX))
+
+   #define BROM_BASE    0x00BFC00000
+   #define BROM_SIZE    0x0000100000   // 1 Mbytes
+
+   #define MEMC_BASE    0x0000000000
+   #define MEMC_SIZE    min(0x02000000, MEMC_MAX_SIZE)
+
+   #define XICU_BASE    MEMC_MAX_SIZE + (XICU_TGTID << 19)
+   #define XICU_SIZE    0x0000001000   // 4 Kbytes
+   
+   #define MDMA_BASE    MEMC_MAX_SIZE + (MDMA_TGTID << 19)
+   #define MDMA_SIZE    (0x0000001000 * NB_DMA_CHANNELS)  // 4 Kbytes per channel  
+
+   #define BDEV_BASE    MEMC_MAX_SIZE + (BDEV_TGTID << 19) + (CLUSTER_IO_INC)
+   #define BDEV_SIZE    0x0000001000   // 4 Kbytes
+   
+   #define MTTY_BASE    MEMC_MAX_SIZE + (MTTY_TGTID << 19) + (CLUSTER_IO_INC)
+   #define MTTY_SIZE    0x0000001000   // 4 Kbytes
+   
+   #define FBUF_BASE    MEMC_MAX_SIZE + (FBUF_TGTID << 19) + (CLUSTER_IO_INC)
+   #define FBUF_SIZE    (FBUF_X_SIZE * FBUF_Y_SIZE * 2) // Should be 0x80000
+   
+   #define MNIC_BASE    MEMC_MAX_SIZE + (MNIC_TGTID << 19) + (CLUSTER_IO_INC)
+   #define MNIC_SIZE    0x0000080000
+   
+   #define CDMA_BASE    MEMC_MAX_SIZE + (CDMA_TGTID << 19) + (CLUSTER_IO_INC)
+   #define CDMA_SIZE    (0x0000004000 * NB_CMA_CHANNELS)
+   
+   #define SIMH_BASE    MEMC_MAX_SIZE + (SIMH_TGTID << 19) + (CLUSTER_IO_INC)
+   #define SIMH_SIZE    0x0000001000
+
+#endif
+
 
 bool stop_called = false;
@@ -530 +542 @@
    // internal network
    MappingTable maptabd(vci_address_width, 
-                        IntTab(x_width + y_width, 20 - x_width - y_width), 
+                        IntTab(x_width + y_width, 16 - x_width - y_width), 
                         IntTab(x_width + y_width, vci_srcid_width - x_width - y_width), 
                         0x00FF800000);