Changeset 764


Ignore:
Timestamp:
Aug 11, 2014, 9:58:17 PM (8 years ago)
Author:
alain
Message:

Modify arch.py to support idle_task in scheduler.
(scheduler vseg must have 8 Kbytes)

Location:
trunk/platforms/tsar_generic_iob
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/platforms/tsar_generic_iob/arch.py

    r762 r764  
    4343    nb_ttys           = 1
    4444    nb_nics           = 2
    45     fbf_width         = 1024
     45    fbf_width         = 128
    4646    x_io              = 0
    4747    y_io              = 0
     
    5959
    6060    assert( (x_size == 1) or (x_size == 2) or (x_size == 4)
    61              or (y_size == 8) or (x_size == 16) )
     61             or (x_size == 8) or (x_size == 16) )
    6262
    6363    assert( (y_size == 1) or (y_size == 2) or (y_size == 4)
     
    114114
    115115    boot_mapping_vbase   = 0x00000000      # ident
    116     boot_mapping_size    = 0x00080000      # 256 Kbytes
     116    boot_mapping_size    = 0x00080000      # 512 Kbytes
    117117
    118118    boot_code_vbase      = 0x00080000      # ident
     
    120120 
    121121    boot_data_vbase      = 0x000C0000      # ident
    122     boot_data_size       = 0x00080000      # 512 Kbytes (including 128K bytes for the GIET_ELF_BUFFER)
     122    boot_data_size       = 0x00080000      # 512 Kbytes
    123123
    124124    boot_stack_vbase     = 0x00140000      # ident
     
    140140
    141141    kernel_sched_vbase   = 0xF0000000            # distributed in all clusters
    142     kernel_sched_size    = 0x1000 * nb_procs     # 4 kbytes per processor
     142    kernel_sched_size    = 0x2000 * nb_procs     # 8 kbytes per processor
    143143
    144144    ### create mapping
  • trunk/platforms/tsar_generic_iob/top.cpp

    r762 r764  
    206206#define L1_DSETS              64
    207207
    208 #define BDEV_IMAGE_NAME       "../../../giet_vm/hdd/virt_hdd.dmg"
    209 
    210 #define NIC_RX_NAME           "giet_vm/nic/rx_packets.txt"
    211 #define NIC_TX_NAME           "giet_vm/nic/tx_packets.txt"
     208#define BDEV_IMAGE_NAME       "virt_hdd.dmg"
     209
     210#define NIC_RX_NAME           "/dev/null"
     211#define NIC_TX_NAME           "/dev/null"
    212212#define NIC_TIMEOUT           10000
    213213
     
    229229//////////////////////i/////////////////////////////////////
    230230
    231 #define MAX_FROZEN_CYCLES     20000000
     231#define MAX_FROZEN_CYCLES     100000
    232232
    233233/////////////////////////////////////////////////////////
     
    245245// All initiators are in the same indexing space (14 bits).
    246246// The SRCID is structured in two fields:
    247 // - The 10 MSB bits define the cluster index (left aligned)
    248 // - The 4  LSB bits define the local index.
     247// - The 8 MSB bits define the cluster index (left aligned)
     248// - The 6  LSB bits define the local index.
    249249// Two different initiators cannot have the same SRCID, but a given
    250250// initiator can have two alias SRCIDs:
     
    328328   ssize_t  threads_nr       = 1;                          // simulator's threads number
    329329   bool     debug_ok         = false;                      // trace activated
    330    size_t   debug_period     = 1;                          // trace period
    331330   size_t   debug_memc_id    = 0xFFFFFFFF;                 // index of traced memc
    332331   size_t   debug_proc_id    = 0xFFFFFFFF;                 // index of traced proc
     
    418417            frozen_cycles = atoi(argv[n+1]);
    419418         }
    420          else if ((strcmp(argv[n], "-PERIOD") == 0) && (n+1 < argc))
    421          {
    422             debug_period = atoi(argv[n+1]);
    423          }
    424419         else
    425420         {
     
    433428            std::cout << "     -THREADS simulator's threads number" << std::endl;
    434429            std::cout << "     -FROZEN max_number_of_lines" << std::endl;
    435             std::cout << "     -PERIOD number_of_cycles between trace" << std::endl;
    436430            std::cout << "     -MEMCID index_memc_to_be_traced" << std::endl;
    437431            std::cout << "     -XRAMID index_xram_to_be_traced" << std::endl;
     
    14311425
    14321426        // Monitor a specific address for one L2 cache
    1433         // clusters[0][0]->memc->cache_monitor( 0xE1904ULL, true );   // single word
     1427        // clusters[0][0]->memc->cache_monitor( 0x1c4924LL, true );   // single word
    14341428
    14351429        // Monitor a specific address for one XRAM
    14361430        // clusters[0][0]->xram->start_monitor( 0xE1900ULL , 64);
    14371431
    1438         if (debug_ok and (n > debug_from) and (n % debug_period == 0))
     1432        if ( debug_ok and (n > debug_from) )
    14391433        {
    14401434            std::cout << "****************** cycle " << std::dec << n ;
     
    14481442                size_t x          = cluster_xy >> 4;
    14491443                size_t y          = cluster_xy & 0xF;
    1450  
    1451                 clusters[x][y]->proc[l]->print_trace(0x40);
     1444
     1445                clusters[x][y]->proc[l]->print_trace(0x1);
    14521446                std::ostringstream proc_signame;
    14531447                proc_signame << "[SIG]PROC_" << x << "_" << y << "_" << l ;
Note: See TracChangeset for help on using the changeset viewer.