Changeset 257


Ignore:
Timestamp:
Aug 26, 2012, 7:14:14 PM (12 years ago)
Author:
almaless
Message:
  • Adding two arguments: BLKSZ (sector size) and THREADS (OpenMP threads number).
  • Use the default file name for ALMOS related files.
  • Let the default Hard Disk Drive (H.D.D) file system image to be "hdd-img.bin".
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsarv4_generic_mmu/top.cpp

    r255 r257  
    6161//      OS
    6262///////////////////////////////////////////////////
    63 
    6463#define USE_ALMOS 0
    65 #define almos_bootloader_pathname "/Users/alain/soc/tsar-svn-june-2010/softs/almos/bootloader/bin/bootloader-soclib-mipsel.bin"
    66 #define almos_kernel_pathname "/Users/alain/soc/tsar-svn-june-2010/softs/almos/kernel/bin/kernel-soclib-mipsel.bin@0xbfc10000:D"
    67 #define almos_archinfo_pathname "/Users/alain/soc/tsar-svn-june-2010/softs/almos/arch_bins/arch-info_4_4.bin@0xBFC08000:D"
     64
     65#define almos_bootloader_pathname "bootloader.bin"
     66#define almos_kernel_pathname     "kernel-soclib.bin@0xbfc10000:D"
     67#define almos_archinfo_pathname   "arch-info.bin@0xBFC08000:D"
    6868
    6969///////////////////////////////////////////////////
    7070//               Parallelisation
    7171///////////////////////////////////////////////////
    72 
    7372#define USE_OPENMP               0
    74 #define OPENMP_THREADS_NR        8
    7573
    7674#if USE_OPENMP
    7775#include <omp.h>
    7876#endif
     77///////////////////////////////////////////////////
    7978
    8079//  cluster index (computed from x,y coordinates)
     
    123122
    124123#define BDEV_SECTOR_SIZE      512
    125 #define BDEV_IMAGE_NAME       "/Users/alain/Documents/licence/almo_svn_2011/soft/giet_vm/display/images.raw"
    126 
    127 #define BOOT_SOFT_NAME        "/Users/alain/Documents/licence/almo_svn_2011/soft/giet_vm/soft.elf"
     124#define BDEV_IMAGE_NAME       "hdd-img.bin"
     125
     126#define BOOT_SOFT_NAME        "soft.bin"
    128127
    129128#define MAX_FROZEN_CYCLES     10000
     
    217216   size_t   blk_size       = BDEV_SECTOR_SIZE;   // block size (in bytes)
    218217   size_t   xram_latency   = XRAM_LATENCY;       // external RAM latency
     218   ssize_t  threads_nr     = 1;                  // simulator's threads number
    219219   bool     debug_ok       = false;              // trace activated
    220220   size_t   debug_period   = 1;                  // trace period
     
    281281            strcpy(disk_name, argv[n+1]);
    282282         }
     283         else if ((strcmp(argv[n],"-BLKSZ") == 0) && ((n+1) < argc))
     284         {
     285            blk_size = atoi(argv[n+1]);
     286         }
    283287         else if ((strcmp(argv[n],"-TRACE") == 0) && (n+1<argc) )
    284288         {
     
    309313         {
    310314            xram_latency = atoi(argv[n+1]);
     315         }
     316         else if ((strcmp(argv[n], "-THREADS") == 0) && ((n+1) < argc))
     317         {
     318            threads_nr = atoi(argv[n+1]);
     319            threads_nr = (threads_nr < 1) ? 1 : threads_nr;
    311320         }
    312321         else if ((strcmp(argv[n], "-FROZEN") == 0) && (n+1 < argc))
     
    325334            std::cout << "     -SOFT pathname_for_embedded_soft" << std::endl;
    326335            std::cout << "     -DISK pathname_for_disk_image" << std::endl;
     336            std::cout << "     -BLKSZ disk sector size" << std::endl;
    327337            std::cout << "     -NCYCLES number_of_simulated_cycles" << std::endl;
    328338            std::cout << "     -NPROCS number_of_processors_per_cluster" << std::endl;
     
    337347            std::cout << "     -XFB fram_buffer_number_of_pixels" << std::endl;
    338348            std::cout << "     -YFB fram_buffer_number_of_lines" << std::endl;
     349            std::cout << "     -THREADS simulator's threads number" << std::endl;
    339350            std::cout << "     -FROZEN max_number_of_lines" << std::endl;
    340351            std::cout << "     -PERIOD number_of_cycles between trace" << std::endl;
Note: See TracChangeset for help on using the changeset viewer.