Changeset 599

Timestamp:

Dec 11, 2013, 6:08:30 PM (11 years ago)

Author:

cfuguet

Message:

Improvement in vci_mem_cache component:

• No need to pass x_self and y_self constructor parameters. They are computed from the most significant bits of one of the memory segments mapped to this component.

• Erasing these two parameters from the vci_mem_cache constructor in all TSAR platforms

Location:

trunk

Files:

• modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (modified) (1 diff)
• modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (modified) (2 diffs)
• modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (4 diffs)
• platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (modified) (1 diff)
• platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (1 diff)
• platforms/tsar_mono_mmu/top.cpp (modified) (1 diff)

trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp

@@ -31 +31 @@
 #include <fcntl.h>
 #include "vci_block_device_tsar.h"
+#include "block_device_tsar.h"
 
 #define DEBUG_BDEV   0

trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h

@@ -499 +499 @@
           const soclib::common::IntTab       &srcid_x,        // global index RAM network
           const soclib::common::IntTab       &tgtid_d,        // global index INT network
-          const size_t                       x_self,          // self X coordinate
-          const size_t                       y_self,          // self Y coordinate
           const size_t                       x_width,         // X width in platform
           const size_t                       y_width,         // Y width in platform
@@ -543 +541 @@
       const size_t                       m_sets;             // Number of cache sets
       const size_t                       m_words;            // Number of words in a line
-      const size_t                       m_x_self;           // X self coordinate
-      const size_t                       m_y_self;           // Y self coordinate
+      size_t                             m_x_self;           // X self coordinate
+      size_t                             m_y_self;           // Y self coordinate
       const size_t                       m_x_width;          // number of x bits in platform
       const size_t                       m_y_width;          // number of y bits in platform

trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -334 +334 @@
             const IntTab        &srcid_x,          // global index on external network
             const IntTab        &tgtid_d,          // global index on direct network
-            const size_t        x_self,            // self x coordinate
-            const size_t        y_self,            // self y coordinate
             const size_t        x_width,           // number of x bits in platform
             const size_t        y_width,           // number of x bits in platform
@@ -367 +365 @@
         m_sets(nsets),
         m_words(nwords),
-        m_x_self(x_self),
-        m_y_self(y_self),
         m_x_width(x_width),
         m_y_width(y_width),
@@ -529 +525 @@
             }
 
+            assert( (m_nseg > 0) and
+                    "MEMC ERROR : At least one segment must be mapped to this component");
+
             m_seg = new soclib::common::Segment*[m_nseg];
 
@@ -537 +536 @@
                 i++;
             }
+
+            addr_t gid = m_seg[0]->baseAddress() >> (vci_param_int::N - x_width - y_width);
+            m_x_self = (gid >> m_y_width) & ((1 << m_x_width) - 1);
+            m_y_self =  gid               & ((1 << m_y_width) - 1);
 
             // Allocation for IXR_RSP FSM

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -171 +171 @@
                      IntTab(cluster_id, memc_ram_srcid), // SRCID RAM network
                      IntTab(cluster_id, memc_int_tgtid), // TGTID INT network
-                     x_id,                               // X self coordinate
-                     y_id,                               // Y self coordinate
                      x_width,                            // number of bits for x coordinate
                      y_width,                            // number of bits for y coordinate

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -148 +148 @@
                      IntTab(cluster_id),                 // SRCID external space
                      IntTab(cluster_id, tgtid_memc),     // TGTID direct space
-                     x_id,                               // X self coordinate
-                     y_id,                               // Y self coordinate
                      x_width,                            // Number of x bits in platform
                      y_width,                            // Number of y bits in platform

trunk/platforms/tsar_mono_mmu/top.cpp

@@ -279 +279 @@
           ("xram", IntTab(0), maptabx, loader);
         memc = new soclib::caba::VciMemCache<vci_param, vci_param_ext, dspin_rsp_width, dspin_cmd_width>
-          ("memc",maptabp,maptabx,IntTab(0),IntTab(0, 0), 0, 0, 0, 0,16,256,16, 3, 4096, 8, 8, 8, from_cycle, trace_ok);
+          ("memc",maptabp,maptabx,IntTab(0),IntTab(0, 0), 0, 0,16,256,16, 3, 4096, 8, 8, 8, from_cycle, trace_ok);
         VciDspinTargetWrapper<vci_param, dspin_cmd_width, dspin_rsp_width>
             wt_memc("wt_memc", srcid_width);