Changeset 485


Ignore:
Timestamp:
Aug 7, 2013, 1:51:30 PM (9 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_xbar/Makefile

    r469 r485  
    11simul.x: top.cpp top.desc
    2         soclib-cc -P -p top.desc -I. -o simul.x
     2        soclib-cc -j4 -t systemcass -P -p top.desc -I. -o simul.x
    33
    44clean:
  • trunk/platforms/tsar_generic_xbar/soclib.conf

    r482 r485  
    1 #config.addDescPath("/dsk/l1/misc/joannou/tsar/trunk")
    2 config.addDescPath("/users/cao/joannou/tsar")
    3 config.addDescPath("/users/cao/joannou/soclib/soclib")
    4 
    5 config.systemcass.cflags=config.systemc.cflags+["-fopenmp", "-fpermissive"]
    6 config.systemcass.libs=config.systemc.libs+['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp']
    7 #config.default = config.systemcass_
    8 #
    9 config.systemc.cflags=config.systemc.cflags+["-fopenmp", "-fpermissive"]
    10 config.systemc.libs=config.systemc.libs+['-ldl', '-lm', '-lpthread', '-L%(libdir)s', '-lsystemc', '-rdynamic', '-fopenmp']
    11 config.default = config.systemc_
     1config.addDescPath("/home/lambert/Install/tsar")
  • trunk/platforms/tsar_generic_xbar/top.cpp

    r475 r485  
    251251
    252252#define CHBUF_BASE       0x00B6000000     
    253 #define CHBUF_SIZE       0x0000004000  // For 16 Channels
     253#define CHBUF_SIZE       0x0000004000 * NB_CMA_CHANNELS
    254254
    255255// replicated segments : address is incremented by a cluster offset
     
    655655                nic_tx_name,
    656656                NIC_TIMEOUT,
     657                NB_CMA_CHANNELS,
    657658                loader,
    658659                frozen_cycles,
  • trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h

    r475 r485  
    262262                     char*                              nic_tx_name,   // filename tx
    263263                     uint32_t                           nic_timeout,   // cycles
     264                     size_t                             chbufdma_channels,  // number channels
    264265                     const Loader                       &loader,
    265266                     uint32_t                           frozen_cycles,
  • trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

    r475 r485  
    7575         char*                              nic_tx_name,
    7676         uint32_t                           nic_timeout,
     77         size_t                             chbufdma_channels,
    7778         const Loader                      &loader,
    7879         uint32_t                           frozen_cycles,
     
    375376                     IntTab(cluster_id, tgtid_chbuf),
    376377                     64,
    377                      2 * nic_channels ); // Two chbuf dma channel by nic channel
     378                     chbufdma_channels);
    378379
    379380        wt_chbuf = new VciDspinTargetWrapper<vci_param_int,
     
    718719        chbuf->p_vci_target             (signal_vci_tgt_chbuf);
    719720        chbuf->p_vci_initiator          (signal_vci_ini_chbuf);
    720         for ( size_t i=0 ; i < nic_channels * 2 ; i++ )
     721        for ( size_t i=0 ; i < chbufdma_channels ; i++ )
    721722        {
    722723            chbuf->p_irq[i]          (signal_irq_chbuf[i]);
Note: See TracChangeset for help on using the changeset viewer.