Changeset 485

Timestamp:

Aug 7, 2013, 1:51:30 PM (11 years ago)

Author:

lambert

Message:

• Fixing chbuf dma segment size
• Changing the way number of chained buffer dma channels is defined top.cpp now uses the NB_CMA_CHANNELS present in hard_config.h
• Adding a parameter to TsarXbarCluster? constructor: chbufdma_channels

--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M top.cpp
M tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h
M tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

Location:

trunk/platforms/tsar_generic_xbar

Files:

• Makefile (modified) (1 diff)
• soclib.conf (modified) (1 diff)
• top.cpp (modified) (2 diffs)
• tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h (modified) (1 diff)
• tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (3 diffs)

trunk/platforms/tsar_generic_xbar/Makefile

@@ -1 +1 @@
 simul.x: top.cpp top.desc
-        soclib-cc -P -p top.desc -I. -o simul.x
+        soclib-cc -j4 -t systemcass -P -p top.desc -I. -o simul.x
 
 clean:

trunk/platforms/tsar_generic_xbar/soclib.conf

@@ -1 @@
-#config.addDescPath("/dsk/l1/misc/joannou/tsar/trunk")
-config.addDescPath("/users/cao/joannou/tsar")
-config.addDescPath("/users/cao/joannou/soclib/soclib")
-
-config.systemcass.cflags=config.systemc.cflags+["-fopenmp", "-fpermissive"]
-config.systemcass.libs=config.systemc.libs+['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp']
-#config.default = config.systemcass_
-#
-config.systemc.cflags=config.systemc.cflags+["-fopenmp", "-fpermissive"]
-config.systemc.libs=config.systemc.libs+['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp']
-config.default = config.systemc_
+config.addDescPath("/home/lambert/Install/tsar")

trunk/platforms/tsar_generic_xbar/top.cpp

@@ -251 +251 @@
 
 #define CHBUF_BASE       0x00B6000000      
-#define CHBUF_SIZE       0x0000004000  // For 16 Channels 
+#define CHBUF_SIZE       0x0000004000 * NB_CMA_CHANNELS 
 
 // replicated segments : address is incremented by a cluster offset 
@@ -655 +655 @@
                 nic_tx_name,
                 NIC_TIMEOUT,
+                NB_CMA_CHANNELS,
                 loader,
                 frozen_cycles,

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h

@@ -262 +262 @@
                      char*                              nic_tx_name,   // filename tx
                      uint32_t                           nic_timeout,   // cycles
+                     size_t                             chbufdma_channels,  // number channels
                      const Loader                       &loader,
                      uint32_t                           frozen_cycles,

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

@@ -75 +75 @@
          char*                              nic_tx_name,
          uint32_t                           nic_timeout,
+         size_t                             chbufdma_channels,
          const Loader                      &loader,
          uint32_t                           frozen_cycles,
@@ -375 +376 @@
                      IntTab(cluster_id, tgtid_chbuf),
                      64,
-                     2 * nic_channels ); // Two chbuf dma channel by nic channel
+                     chbufdma_channels); 
 
         wt_chbuf = new VciDspinTargetWrapper<vci_param_int,
@@ -718 +719 @@
         chbuf->p_vci_target             (signal_vci_tgt_chbuf);
         chbuf->p_vci_initiator          (signal_vci_ini_chbuf);
-        for ( size_t i=0 ; i < nic_channels * 2 ; i++ )
+        for ( size_t i=0 ; i < chbufdma_channels ; i++ )
         {
             chbuf->p_irq[i]          (signal_irq_chbuf[i]);