Ignore:
Timestamp:
Oct 15, 2014, 11:41:49 AM (10 years ago)
Author:
meunier
Message:

Trunk:

  • Cosmetic in mem_cache_directory.h and xram_transaction.h
  • Renamed mem_cache param dspin_in_width and dspin_out_width to memc_dspin_in_width and memc_dspin_out_width (because of a bug in soclib-cc ?). Should have updated these names in the .sd or .py files of all platforms
  • Updated the scripts for tsar_generic_xbar to take into account the ideal write-through + added a graph in create_graphs.py
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_xbar/scripts/run_simus.py

    r790 r836  
    1212# User parameters
    1313nb_procs = [ 4 ]
    14 #nb_procs = [ 16, 32, 64, 128, 256 ]
     14#nb_procs = [ 1, 4, 8, 16, 32, 64, 128, 256 ]
    1515rerun_stats = False
    1616use_omp = False
    17 protocol = 'dhccp'
     17protocol = 'wtidl'
    1818
    1919#apps = [ 'histogram', 'mandel', 'filter', 'radix_ga', 'fft_ga', 'kmeans' ]
     
    3232# to come: 'barnes', 'fmm', 'ocean', 'raytrace', 'radiosity', 'waters', 'watern'
    3333
    34 all_protocols = [ 'dhccp', 'rwt', 'hmesi' ]
     34all_protocols = [ 'dhccp', 'rwt', 'hmesi', 'wtidl' ]
    3535
    3636top_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
     
    6666 - apps_dir:      path to almos-tsar-mipsel/apps directory
    6767 - almos_src_dir: path to almos source directory (for kernel and bootloader binaries)
    68  - hdd_img_name:  path to the hdd image to use
     68 - hdd_img_name:  path to the hdd image to use (will be copied but not modified)
     69 - tsar_dir:      path to tsar repository
     70Optional definitions (necessary if you want to use alternative protocols):
     71 - rwt_dir:       path to the RWT repository
     72 - hmesi_dir:     path to HMESI directory
     73 - wtidl_dir:     path to the ideal write-through protocol directory
    6974*** Stopping execution
    7075'''
     
    98103    if not os.path.exists(hmesi_dir):
    99104        print "*** Error: variable hmesi_dir does not define a valid path"
     105        sys.exit()
     106
     107if protocol == "wtidl":
     108    if wtidl_dir == "":
     109        print "*** Error: variable wtidl_dir not defined in config file"
     110        sys.exit()
     111    if not os.path.exists(wtidl_dir):
     112        print "*** Error: variable wtidl_dir does not define a valid path"
    100113        sys.exit()
    101114
     
    156169            'modules/vci_io_bridge',
    157170            'modules/vci_iox_network',
    158             'modules/vci_spi'
     171            'modules/vci_spi',
    159172            'platforms/tsar_generic_xbar/tsar_xbar_cluster'
    160173    ]
     
    164177            'lib/generic_cache_tsar',
    165178            'modules/vci_cc_vcache_wrapper',
    166             'modules/vci_mem_cache'
     179            'modules/vci_mem_cache',
    167180    ]
    168181
     
    179192    elif protocol == "hmesi":
    180193        arch_dir = hmesi_dir
     194    elif protocol == "wtidl":
     195        arch_dir = wtidl_dir
    181196    else:
    182197        assert(False)
     
    213228#define IOMMU_ACTIVE        0
    214229
    215 #define   IRQ_PER_PROCESSOR   1
    216 
    217 #endif //_HD_CONFIG_H
     230#define IRQ_PER_PROCESSOR   1
    218231''' % dict(x = x, y = y, nb_clus = x * y)
     232
     233   if protocol == 'wtidl':
     234       header += '#define WT_IDL\n'
     235
     236   header += '#endif //_HD_CONFIG_H\n'
     237
    219238   file = open(hard_config, 'w')
    220239   file.write(header)
    221240   file.close()
     241
    222242
    223243
Note: See TracChangeset for help on using the changeset viewer.