Ignore:
Timestamp:
Aug 9, 2013, 11:00:05 AM (11 years ago)
Author:
alain
Message:

Implement both the SYNC and INVAL configuration commands.
Uses the TRT to transmit the cache line to XRAM in cPUT transactions.
Improve the debug.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h

    r483 r489  
    2525 * SOCLIB_LGPL_HEADER_END
    2626 *
    27  * Maintainers: alain eric.guthmuller@polytechnique.edu
     27 * Maintainers: alain.greiner@lip6.fr
     28 *              eric.guthmuller@polytechnique.edu
    2829 *              cesar.fuguet-tortolero@lip6.fr
    2930 *              alexandre.joannou@lip6.fr
     
    150151        MULTI_ACK_UPT_LOCK,
    151152        MULTI_ACK_UPT_CLEAR,
    152         MULTI_ACK_WRITE_RSP,
    153         MULTI_ACK_CONFIG_ACK
     153        MULTI_ACK_WRITE_RSP
    154154      };
    155155
     
    159159        CONFIG_IDLE,
    160160        CONFIG_LOOP,
     161        CONFIG_WAIT,
    161162        CONFIG_RSP,
    162163        CONFIG_DIR_REQ,
    163164        CONFIG_DIR_ACCESS,
    164         CONFIG_DIR_IVT_LOCK,
     165        CONFIG_IVT_LOCK,
    165166        CONFIG_BC_SEND,
    166         CONFIG_BC_WAIT,
    167         CONFIG_INV_SEND,
     167        CONFIG_INVAL_SEND,
    168168        CONFIG_HEAP_REQ,
    169169        CONFIG_HEAP_SCAN,
    170170        CONFIG_HEAP_LAST,
    171         CONFIG_INV_WAIT
     171        CONFIG_TRT_LOCK,
     172        CONFIG_TRT_SET,
     173        CONFIG_PUT_REQ
    172174      };
    173175
     
    197199        WRITE_DIR_REQ,
    198200        WRITE_DIR_LOCK,
    199         WRITE_DIR_READ,
    200201        WRITE_DIR_HIT,
    201202        WRITE_UPT_LOCK,
     
    209210        WRITE_MISS_TRT_SET,
    210211        WRITE_MISS_XRAM_REQ,
     212        WRITE_BC_DIR_READ,
    211213        WRITE_BC_TRT_LOCK,
    212214        WRITE_BC_IVT_LOCK,
     
    221223      {
    222224        IXR_RSP_IDLE,
    223         IXR_RSP_ACK,
    224225        IXR_RSP_TRT_ERASE,
    225226        IXR_RSP_TRT_READ
     
    235236        XRAM_RSP_DIR_UPDT,
    236237        XRAM_RSP_DIR_RSP,
    237         XRAM_RSP_INVAL_LOCK,
     238        XRAM_RSP_IVT_LOCK,
    238239        XRAM_RSP_INVAL_WAIT,
    239240        XRAM_RSP_INVAL,
     
    253254        IXR_CMD_CAS_IDLE,
    254255        IXR_CMD_XRAM_IDLE,
    255         IXR_CMD_READ,
    256         IXR_CMD_WRITE,
    257         IXR_CMD_CAS,
    258         IXR_CMD_XRAM
     256        IXR_CMD_CONFIG_IDLE,
     257        IXR_CMD_READ_TRT,
     258        IXR_CMD_WRITE_TRT,
     259        IXR_CMD_CAS_TRT,
     260        IXR_CMD_XRAM_TRT,
     261        IXR_CMD_CONFIG_TRT,
     262        IXR_CMD_READ_SEND,
     263        IXR_CMD_WRITE_SEND,
     264        IXR_CMD_CAS_SEND,
     265        IXR_CMD_XRAM_SEND,
     266        IXR_CMD_CONFIG_SEND
    259267      };
    260268
     
    302310        CLEANUP_IVT_CLEAR,
    303311        CLEANUP_WRITE_RSP,
    304         CLEANUP_CONFIG_ACK,
    305312        CLEANUP_SEND_CLACK
    306313      };
     
    325332        ALLOC_TRT_CAS,
    326333        ALLOC_TRT_XRAM_RSP,
    327         ALLOC_TRT_IXR_RSP
     334        ALLOC_TRT_IXR_RSP,
     335        ALLOC_TRT_CONFIG,
     336        ALLOC_TRT_IXR_CMD
    328337      };
    329338
     
    386395      };
    387396
    388       /* Configuration commands */
    389       enum cmd_config_type_e
    390       {
    391           CMD_CONFIG_INVAL = 0,
    392           CMD_CONFIG_SYNC  = 1
    393       };
    394 
    395       // debug variables (for each FSM)
     397      // debug variables
    396398      bool                 m_debug;
    397399      bool                 m_debug_previous_valid;
    398400      size_t               m_debug_previous_count;
    399401      bool                 m_debug_previous_dirty;
    400       sc_signal<data_t>*   m_debug_previous_data;
    401       sc_signal<data_t>*   m_debug_data;
    402 
    403       bool         m_monitor_ok;
    404       addr_t       m_monitor_base;
    405       addr_t       m_monitor_length;
     402      data_t *             m_debug_previous_data;
     403      data_t *             m_debug_data;
    406404
    407405      // instrumentation counters
     
    531529      uint32_t                           m_broadcast_boundaries;
    532530
    533       //////////////////////////////////////////////////
    534       // Registers controlled by the TGT_CMD fsm
    535       //////////////////////////////////////////////////
    536 
    537       sc_signal<int>         r_tgt_cmd_fsm;
    538 
    539531      // Fifo between TGT_CMD fsm and READ fsm
    540532      GenericFifo<addr_t>    m_cmd_read_addr_fifo;
     
    580572      sc_signal<size_t>   r_tgt_cmd_config_cmd;
    581573
     574      //////////////////////////////////////////////////
     575      // Registers controlled by the TGT_CMD fsm
     576      //////////////////////////////////////////////////
     577
     578      sc_signal<int>         r_tgt_cmd_fsm;
     579      sc_signal<size_t>      r_tgt_cmd_srcid;           // srcid for response to config
     580      sc_signal<size_t>      r_tgt_cmd_trdid;           // trdid for response to config
     581      sc_signal<size_t>      r_tgt_cmd_pktid;           // pktid for response to config
     582
    582583      ///////////////////////////////////////////////////////
    583584      // Registers controlled by the CONFIG fsm
    584585      ///////////////////////////////////////////////////////
    585586
    586       sc_signal<int>      r_config_fsm;            // FSM state
    587       sc_signal<bool>     r_config_lock;           // lock protecting exclusive access
    588       sc_signal<int>      r_config_cmd;            // config request status
    589       sc_signal<addr_t>   r_config_address;        // target buffer physical address
    590       sc_signal<size_t>   r_config_srcid;          // config request srcid
    591       sc_signal<size_t>   r_config_trdid;          // config request trdid
    592       sc_signal<size_t>   r_config_pktid;          // config request pktid
    593       sc_signal<size_t>   r_config_nlines;         // number of lines covering the buffer
    594       sc_signal<size_t>   r_config_dir_way;        // DIR: selected way
    595       sc_signal<size_t>   r_config_dir_count;      // DIR: number of copies
    596       sc_signal<bool>     r_config_dir_is_cnt;     // DIR: counter mode (broadcast required)
    597       sc_signal<size_t>   r_config_dir_copy_srcid; // DIR: first copy SRCID
    598       sc_signal<bool>     r_config_dir_copy_inst;  // DIR: first copy L1 type
    599       sc_signal<size_t>   r_config_dir_next_ptr;   // DIR: index of next copy in HEAP
    600       sc_signal<size_t>   r_config_heap_next;      // current pointer to scan HEAP
    601 
    602       sc_signal<size_t>   r_config_ivt_index;      // IVT index
     587      sc_signal<int>      r_config_fsm;               // FSM state
     588      sc_signal<bool>     r_config_lock;              // lock protecting exclusive access
     589      sc_signal<int>      r_config_cmd;               // config request type 
     590      sc_signal<addr_t>   r_config_address;           // target buffer physical address
     591      sc_signal<size_t>   r_config_srcid;             // config request srcid
     592      sc_signal<size_t>   r_config_trdid;             // config request trdid
     593      sc_signal<size_t>   r_config_pktid;             // config request pktid
     594      sc_signal<size_t>   r_config_cmd_lines;         // number of lines to be handled
     595      sc_signal<size_t>   r_config_rsp_lines;         // number of lines not completed
     596      sc_signal<size_t>   r_config_dir_way;           // DIR: selected way
     597      sc_signal<bool>     r_config_dir_lock;          // DIR: locked entry
     598      sc_signal<size_t>   r_config_dir_count;         // DIR: number of copies
     599      sc_signal<bool>     r_config_dir_is_cnt;        // DIR: counter mode (broadcast)
     600      sc_signal<size_t>   r_config_dir_copy_srcid;    // DIR: first copy SRCID
     601      sc_signal<bool>     r_config_dir_copy_inst;     // DIR: first copy L1 type
     602      sc_signal<size_t>   r_config_dir_ptr;           // DIR: index of next copy in HEAP
     603      sc_signal<size_t>   r_config_heap_next;         // current pointer to scan HEAP
     604      sc_signal<size_t>   r_config_trt_index;         // selected entry in TRT
     605      sc_signal<size_t>   r_config_ivt_index;         // selected entry in IVT
     606
     607      // Buffer between CONFIG fsm and IXR_CMD fsm
     608      sc_signal<bool>     r_config_to_ixr_cmd_req;    // valid request
     609      sc_signal<size_t>   r_config_to_ixr_cmd_index;  // TRT index
     610
    603611
    604612      // Buffer between CONFIG fsm and TGT_RSP fsm (send a done response to L1 cache)
     
    617625      GenericFifo<size_t> m_config_to_cc_send_srcid_fifo;   // fifo for owners srcid
    618626
    619 #if L1_MULTI_CACHE
    620       GenericFifo<size_t> m_config_to_cc_send_cache_id_fifo; // fifo for cache_id
    621 #endif
    622 
    623627      ///////////////////////////////////////////////////////
    624628      // Registers controlled by the READ fsm
    625629      ///////////////////////////////////////////////////////
    626630
    627       sc_signal<int>      r_read_fsm;          // FSM state
    628       sc_signal<size_t>   r_read_copy;         // Srcid of the first copy
    629       sc_signal<size_t>   r_read_copy_cache;   // Srcid of the first copy
    630       sc_signal<bool>     r_read_copy_inst;    // Type of the first copy
    631       sc_signal<tag_t>    r_read_tag;          // cache line tag (in directory)
    632       sc_signal<bool>     r_read_is_cnt;       // is_cnt bit (in directory)
    633       sc_signal<bool>     r_read_lock;         // lock bit (in directory)
    634       sc_signal<bool>     r_read_dirty;        // dirty bit (in directory)
    635       sc_signal<size_t>   r_read_count;        // number of copies
    636       sc_signal<size_t>   r_read_ptr;          // pointer to the heap
    637       sc_signal<data_t> * r_read_data;         // data (one cache line)
    638       sc_signal<size_t>   r_read_way;          // associative way (in cache)
    639       sc_signal<size_t>   r_read_trt_index;    // Transaction Table index
    640       sc_signal<size_t>   r_read_next_ptr;     // Next entry to point to
    641       sc_signal<bool>     r_read_last_free;    // Last free entry
    642       sc_signal<addr_t>   r_read_ll_key;       // LL key from the llsc_global_table
    643 
    644       // Buffer between READ fsm and IXR_CMD fsm (ask a missing cache line to XRAM)
    645       sc_signal<bool>     r_read_to_ixr_cmd_req;    // valid request
    646       sc_signal<addr_t>   r_read_to_ixr_cmd_nline;  // cache line index
    647       sc_signal<size_t>   r_read_to_ixr_cmd_trdid;  // index in Transaction Table
     631      sc_signal<int>      r_read_fsm;                 // FSM state
     632      sc_signal<size_t>   r_read_copy;                // Srcid of the first copy
     633      sc_signal<size_t>   r_read_copy_cache;          // Srcid of the first copy
     634      sc_signal<bool>     r_read_copy_inst;           // Type of the first copy
     635      sc_signal<tag_t>    r_read_tag;                 // cache line tag (in directory)
     636      sc_signal<bool>     r_read_is_cnt;              // is_cnt bit (in directory)
     637      sc_signal<bool>     r_read_lock;                // lock bit (in directory)
     638      sc_signal<bool>     r_read_dirty;               // dirty bit (in directory)
     639      sc_signal<size_t>   r_read_count;               // number of copies
     640      sc_signal<size_t>   r_read_ptr;                 // pointer to the heap
     641      sc_signal<data_t> * r_read_data;                // data (one cache line)
     642      sc_signal<size_t>   r_read_way;                 // associative way (in cache)
     643      sc_signal<size_t>   r_read_trt_index;           // Transaction Table index
     644      sc_signal<size_t>   r_read_next_ptr;            // Next entry to point to
     645      sc_signal<bool>     r_read_last_free;           // Last free entry
     646      sc_signal<addr_t>   r_read_ll_key;              // LL key from llsc_global_table
     647
     648      // Buffer between READ fsm and IXR_CMD fsm
     649      sc_signal<bool>     r_read_to_ixr_cmd_req;      // valid request
     650      sc_signal<size_t>   r_read_to_ixr_cmd_index;    // TRT index
    648651
    649652      // Buffer between READ fsm and TGT_RSP fsm (send a hit read response to L1 cache)
    650       sc_signal<bool>     r_read_to_tgt_rsp_req;    // valid request
    651       sc_signal<size_t>   r_read_to_tgt_rsp_srcid;  // Transaction srcid
    652       sc_signal<size_t>   r_read_to_tgt_rsp_trdid;  // Transaction trdid
    653       sc_signal<size_t>   r_read_to_tgt_rsp_pktid;  // Transaction pktid
    654       sc_signal<data_t> * r_read_to_tgt_rsp_data;   // data (one cache line)
    655       sc_signal<size_t>   r_read_to_tgt_rsp_word;   // first word of the response
    656       sc_signal<size_t>   r_read_to_tgt_rsp_length; // length of the response
    657       sc_signal<addr_t>   r_read_to_tgt_rsp_ll_key; // LL key from the llsc_global_table
     653      sc_signal<bool>     r_read_to_tgt_rsp_req;      // valid request
     654      sc_signal<size_t>   r_read_to_tgt_rsp_srcid;    // Transaction srcid
     655      sc_signal<size_t>   r_read_to_tgt_rsp_trdid;    // Transaction trdid
     656      sc_signal<size_t>   r_read_to_tgt_rsp_pktid;    // Transaction pktid
     657      sc_signal<data_t> * r_read_to_tgt_rsp_data;     // data (one cache line)
     658      sc_signal<size_t>   r_read_to_tgt_rsp_word;     // first word of the response
     659      sc_signal<size_t>   r_read_to_tgt_rsp_length;   // length of the response
     660      sc_signal<addr_t>   r_read_to_tgt_rsp_ll_key;   // LL key from llsc_global_table
    658661
    659662      ///////////////////////////////////////////////////////////////
     
    661664      ///////////////////////////////////////////////////////////////
    662665
    663       sc_signal<int>      r_write_fsm;        // FSM state
    664       sc_signal<addr_t>   r_write_address;    // first word address
    665       sc_signal<size_t>   r_write_word_index; // first word index in line
    666       sc_signal<size_t>   r_write_word_count; // number of words in line
    667       sc_signal<size_t>   r_write_srcid;      // transaction srcid
    668       sc_signal<size_t>   r_write_trdid;      // transaction trdid
    669       sc_signal<size_t>   r_write_pktid;      // transaction pktid
    670       sc_signal<data_t> * r_write_data;       // data (one cache line)
    671       sc_signal<be_t>   * r_write_be;         // one byte enable per word
    672       sc_signal<bool>     r_write_byte;       // (BE != 0X0) and (BE != 0xF)
    673       sc_signal<bool>     r_write_is_cnt;     // is_cnt bit (in directory)
    674       sc_signal<bool>     r_write_lock;       // lock bit (in directory)
    675       sc_signal<tag_t>    r_write_tag;        // cache line tag (in directory)
    676       sc_signal<size_t>   r_write_copy;       // first owner of the line
    677       sc_signal<size_t>   r_write_copy_cache; // first owner of the line
    678       sc_signal<bool>     r_write_copy_inst;  // is this owner a ICache ?
    679       sc_signal<size_t>   r_write_count;      // number of copies
    680       sc_signal<size_t>   r_write_ptr;        // pointer to the heap
    681       sc_signal<size_t>   r_write_next_ptr;   // next pointer to the heap
    682       sc_signal<bool>     r_write_to_dec;     // need to decrement update counter
    683       sc_signal<size_t>   r_write_way;        // way of the line
    684       sc_signal<size_t>   r_write_trt_index;  // index in Transaction Table
    685       sc_signal<size_t>   r_write_upt_index;  // index in Update Table
    686       sc_signal<bool>     r_write_sc_fail;    // sc command failed
    687       sc_signal<bool>     r_write_pending_sc; // sc command pending
     666      sc_signal<int>      r_write_fsm;                // FSM state
     667      sc_signal<addr_t>   r_write_address;            // first word address
     668      sc_signal<size_t>   r_write_word_index;         // first word index in line
     669      sc_signal<size_t>   r_write_word_count;         // number of words in line
     670      sc_signal<size_t>   r_write_srcid;              // transaction srcid
     671      sc_signal<size_t>   r_write_trdid;              // transaction trdid
     672      sc_signal<size_t>   r_write_pktid;              // transaction pktid
     673      sc_signal<data_t> * r_write_data;               // data (one cache line)
     674      sc_signal<be_t>   * r_write_be;                 // one byte enable per word
     675      sc_signal<bool>     r_write_byte;               // (BE != 0X0) and (BE != 0xF)
     676      sc_signal<bool>     r_write_is_cnt;             // is_cnt bit (in directory)
     677      sc_signal<bool>     r_write_lock;               // lock bit (in directory)
     678      sc_signal<tag_t>    r_write_tag;                // cache line tag (in directory)
     679      sc_signal<size_t>   r_write_copy;               // first owner of the line
     680      sc_signal<size_t>   r_write_copy_cache;         // first owner of the line
     681      sc_signal<bool>     r_write_copy_inst;          // is this owner a ICache ?
     682      sc_signal<size_t>   r_write_count;              // number of copies
     683      sc_signal<size_t>   r_write_ptr;                // pointer to the heap
     684      sc_signal<size_t>   r_write_next_ptr;           // next pointer to the heap
     685      sc_signal<bool>     r_write_to_dec;             // need to decrement update counter
     686      sc_signal<size_t>   r_write_way;                // way of the line
     687      sc_signal<size_t>   r_write_trt_index;          // index in Transaction Table
     688      sc_signal<size_t>   r_write_upt_index;          // index in Update Table
     689      sc_signal<bool>     r_write_sc_fail;            // sc command failed
     690      sc_signal<bool>     r_write_pending_sc;         // sc command pending
    688691
    689692      // Buffer between WRITE fsm and TGT_RSP fsm (acknowledge a write command from L1)
     
    694697      sc_signal<bool>     r_write_to_tgt_rsp_sc_fail; // sc command failed
    695698
    696       // Buffer between WRITE fsm and IXR_CMD fsm (ask a missing cache line to XRAM)
    697       sc_signal<bool>     r_write_to_ixr_cmd_req;   // valid request
    698       sc_signal<bool>     r_write_to_ixr_cmd_write; // write request
    699       sc_signal<addr_t>   r_write_to_ixr_cmd_nline; // cache line index
    700       sc_signal<data_t> * r_write_to_ixr_cmd_data;  // cache line data
    701       sc_signal<size_t>   r_write_to_ixr_cmd_trdid; // index in Transaction Table
     699      // Buffer between WRITE fsm and IXR_CMD fsm
     700      sc_signal<bool>     r_write_to_ixr_cmd_req;     // valid request
     701      sc_signal<bool>     r_write_to_ixr_cmd_put;     // request type (GET/PUT)
     702      sc_signal<size_t>   r_write_to_ixr_cmd_index;   // TRT index
    702703
    703704      // Buffer between WRITE fsm and CC_SEND fsm (Update/Invalidate L1 caches)
     
    713714      GenericFifo<size_t> m_write_to_cc_send_srcid_fifo;    // fifo for srcids
    714715
    715 #if L1_MULTI_CACHE
    716       GenericFifo<size_t> m_write_to_cc_send_cache_id_fifo; // fifo for srcids
    717 #endif
    718 
    719716      // Buffer between WRITE fsm and MULTI_ACK fsm (Decrement UPT entry)
    720717      sc_signal<bool>     r_write_to_multi_ack_req;       // valid request
     
    732729      sc_signal<addr_t>   r_multi_ack_nline;     // pending write nline
    733730
    734       // signaling completion of multi-inval to CONFIG fsm
    735       sc_signal<bool>     r_multi_ack_to_config_ack;
    736 
    737731      // Buffer between MULTI_ACK fsm and TGT_RSP fsm (complete write/update transaction)
    738732      sc_signal<bool>     r_multi_ack_to_tgt_rsp_req;   // valid request
     
    751745      sc_signal<addr_t>   r_cleanup_nline;         // cache line index
    752746
    753 #if L1_MULTI_CACHE
    754       sc_signal<size_t>   r_cleanup_pktid;         // transaction pktid
    755 #endif
    756747
    757748      sc_signal<copy_t>   r_cleanup_copy;          // first copy
     
    780771      sc_signal<size_t>   r_cleanup_index;         // index of the INVAL line (in the UPT)
    781772
    782       // signaling completion of broadcast-inval to CONFIG fsm
    783       sc_signal<bool>     r_cleanup_to_config_ack; 
    784        
    785773      // Buffer between CLEANUP fsm and TGT_RSP fsm (acknowledge a write command from L1)
    786774      sc_signal<bool>     r_cleanup_to_tgt_rsp_req;   // valid request
     
    793781      ///////////////////////////////////////////////////////
    794782
    795       sc_signal<int>      r_cas_fsm;        // FSM state
    796       sc_signal<data_t>   r_cas_wdata;      // write data word
    797       sc_signal<data_t> * r_cas_rdata;      // read data word
    798       sc_signal<uint32_t> r_cas_lfsr;       // lfsr for random introducing
    799       sc_signal<size_t>   r_cas_cpt;        // size of command
    800       sc_signal<copy_t>   r_cas_copy;       // Srcid of the first copy
    801       sc_signal<copy_t>   r_cas_copy_cache; // Srcid of the first copy
    802       sc_signal<bool>     r_cas_copy_inst;  // Type of the first copy
    803       sc_signal<size_t>   r_cas_count;      // number of copies
    804       sc_signal<size_t>   r_cas_ptr;        // pointer to the heap
    805       sc_signal<size_t>   r_cas_next_ptr;   // next pointer to the heap
    806       sc_signal<bool>     r_cas_is_cnt;     // is_cnt bit (in directory)
    807       sc_signal<bool>     r_cas_dirty;      // dirty bit (in directory)
    808       sc_signal<size_t>   r_cas_way;        // way in directory
    809       sc_signal<size_t>   r_cas_set;        // set in directory
    810       sc_signal<data_t>   r_cas_tag;        // cache line tag (in directory)
    811       sc_signal<size_t>   r_cas_trt_index;  // Transaction Table index
    812       sc_signal<size_t>   r_cas_upt_index;  // Update Table index
    813       sc_signal<data_t> * r_cas_data;       // cache line data
    814 
    815       // Buffer between CAS fsm and IXR_CMD fsm (XRAM write)
     783      sc_signal<int>      r_cas_fsm;              // FSM state
     784      sc_signal<data_t>   r_cas_wdata;            // write data word
     785      sc_signal<data_t> * r_cas_rdata;            // read data word
     786      sc_signal<uint32_t> r_cas_lfsr;             // lfsr for random introducing
     787      sc_signal<size_t>   r_cas_cpt;              // size of command
     788      sc_signal<copy_t>   r_cas_copy;             // Srcid of the first copy
     789      sc_signal<copy_t>   r_cas_copy_cache;       // Srcid of the first copy
     790      sc_signal<bool>     r_cas_copy_inst;        // Type of the first copy
     791      sc_signal<size_t>   r_cas_count;            // number of copies
     792      sc_signal<size_t>   r_cas_ptr;              // pointer to the heap
     793      sc_signal<size_t>   r_cas_next_ptr;         // next pointer to the heap
     794      sc_signal<bool>     r_cas_is_cnt;           // is_cnt bit (in directory)
     795      sc_signal<bool>     r_cas_dirty;            // dirty bit (in directory)
     796      sc_signal<size_t>   r_cas_way;              // way in directory
     797      sc_signal<size_t>   r_cas_set;              // set in directory
     798      sc_signal<data_t>   r_cas_tag;              // cache line tag (in directory)
     799      sc_signal<size_t>   r_cas_trt_index;        // Transaction Table index
     800      sc_signal<size_t>   r_cas_upt_index;        // Update Table index
     801      sc_signal<data_t> * r_cas_data;             // cache line data
     802
     803      // Buffer between CAS fsm and IXR_CMD fsm
    816804      sc_signal<bool>     r_cas_to_ixr_cmd_req;   // valid request
    817       sc_signal<addr_t>   r_cas_to_ixr_cmd_nline; // cache line index
    818       sc_signal<size_t>   r_cas_to_ixr_cmd_trdid; // index in Transaction Table
    819       sc_signal<bool>     r_cas_to_ixr_cmd_write; // write request
    820       sc_signal<data_t> * r_cas_to_ixr_cmd_data;  // cache line data
    821 
     805      sc_signal<bool>     r_cas_to_ixr_cmd_put;   // request type (GET/PUT)
     806      sc_signal<size_t>   r_cas_to_ixr_cmd_index; // TRT index
    822807
    823808      // Buffer between CAS fsm and TGT_RSP fsm
     
    840825      GenericFifo<size_t> m_cas_to_cc_send_srcid_fifo;    // fifo for srcids
    841826
    842 #if L1_MULTI_CACHE
    843       GenericFifo<size_t> m_cas_to_cc_send_cache_id_fifo; // fifo for srcids
    844 #endif
    845 
    846827      ////////////////////////////////////////////////////
    847828      // Registers controlled by the IXR_RSP fsm
    848829      ////////////////////////////////////////////////////
    849830
    850       sc_signal<int>      r_ixr_rsp_fsm;       // FSM state
    851       sc_signal<size_t>   r_ixr_rsp_trt_index; // TRT entry index
    852       sc_signal<size_t>   r_ixr_rsp_cpt;       // word counter
     831      sc_signal<int>      r_ixr_rsp_fsm;                // FSM state
     832      sc_signal<size_t>   r_ixr_rsp_trt_index;          // TRT entry index
     833      sc_signal<size_t>   r_ixr_rsp_cpt;                // word counter
     834
     835      // Buffer between IXR_RSP fsm and CONFIG fsm  (response from the XRAM)
     836      sc_signal<bool>     r_ixr_rsp_to_config_ack;      // one single bit   
    853837
    854838      // Buffer between IXR_RSP fsm and XRAM_RSP fsm  (response from the XRAM)
    855       sc_signal<bool>   * r_ixr_rsp_to_xram_rsp_rok; // A xram response is ready
     839      sc_signal<bool>   * r_ixr_rsp_to_xram_rsp_rok;    // one bit per TRT entry
    856840
    857841      ////////////////////////////////////////////////////
     
    896880      GenericFifo<size_t> m_xram_rsp_to_cc_send_srcid_fifo;    // fifo for srcids
    897881
    898 #if L1_MULTI_CACHE
    899       GenericFifo<size_t> m_xram_rsp_to_cc_send_cache_id_fifo; // fifo for srcids
    900 #endif
    901 
    902       // Buffer between XRAM_RSP fsm and IXR_CMD fsm (XRAM write)
     882      // Buffer between XRAM_RSP fsm and IXR_CMD fsm
    903883      sc_signal<bool>     r_xram_rsp_to_ixr_cmd_req;   // Valid request
    904       sc_signal<addr_t>   r_xram_rsp_to_ixr_cmd_nline; // cache line index
    905       sc_signal<data_t> * r_xram_rsp_to_ixr_cmd_data;  // cache line data
    906       sc_signal<size_t>   r_xram_rsp_to_ixr_cmd_trdid; // index in transaction table
     884      sc_signal<size_t>   r_xram_rsp_to_ixr_cmd_index; // TRT index
    907885
    908886      ////////////////////////////////////////////////////
     
    911889
    912890      sc_signal<int>      r_ixr_cmd_fsm;
    913       sc_signal<size_t>   r_ixr_cmd_cpt;
     891      sc_signal<size_t>   r_ixr_cmd_word;              // word index for a put
     892      sc_signal<size_t>   r_ixr_cmd_trdid;             // TRT index value     
     893      sc_signal<addr_t>   r_ixr_cmd_address;           // address to XRAM
     894      sc_signal<data_t> * r_ixr_cmd_wdata;             // cache line buffer
     895      sc_signal<bool>     r_ixr_cmd_get;               // transaction type (PUT/GET)
    914896
    915897      ////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.