Index: branches/RWT/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h
===================================================================
--- branches/RWT/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 780)
+++ branches/RWT/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 783)
@@ -399,12 +399,12 @@
// b1 accÚs table llsc type SW / other
// b2 WRITE/CAS/LL/SC
- TYPE_READ_DATA_UNC = 0x0,
- TYPE_READ_DATA_MISS = 0x1,
- TYPE_READ_INS_UNC = 0x2,
- TYPE_READ_INS_MISS = 0x3,
- TYPE_WRITE = 0x4,
- TYPE_CAS = 0x5,
- TYPE_LL = 0x6,
- TYPE_SC = 0x7
+ TYPE_READ_DATA_UNC = 0x0,
+ TYPE_READ_DATA_MISS = 0x1,
+ TYPE_READ_INS_UNC = 0x2,
+ TYPE_READ_INS_MISS = 0x3,
+ TYPE_WRITE = 0x4,
+ TYPE_CAS = 0x5,
+ TYPE_LL = 0x6,
+ TYPE_SC = 0x7
};
@@ -412,171 +412,173 @@
enum sc_status_type_e
{
- SC_SUCCESS = 0x00000000,
- SC_FAIL = 0x00000001
+ SC_SUCCESS = 0x00000000,
+ SC_FAIL = 0x00000001
};
// debug variables
- bool m_debug;
- bool m_debug_previous_valid;
- size_t m_debug_previous_count;
- bool m_debug_previous_dirty;
- data_t * m_debug_previous_data;
- data_t * m_debug_data;
+ bool m_debug;
+ bool m_debug_previous_valid;
+ size_t m_debug_previous_count;
+ bool m_debug_previous_dirty;
+ data_t * m_debug_previous_data;
+ data_t * m_debug_data;
// instrumentation counters
- uint32_t m_cpt_cycles; // Counter of cycles
-
- // Counters accessible in software (not yet but eventually)
- uint32_t m_cpt_reset_count; // Last cycle at which counters have been reset
- uint32_t m_cpt_read_local; // Number of local READ transactions
- uint32_t m_cpt_read_remote; // number of remote READ transactions
- uint32_t m_cpt_read_cost; // Number of (flits * distance) for READs
-
- uint32_t m_cpt_write_local; // Number of local WRITE transactions
- uint32_t m_cpt_write_remote; // number of remote WRITE transactions
- uint32_t m_cpt_write_flits_local; // number of flits for local WRITEs
- uint32_t m_cpt_write_flits_remote; // number of flits for remote WRITEs
- uint32_t m_cpt_write_cost; // Number of (flits * distance) for WRITEs
- uint32_t m_cpt_write_ncc_miss; // Number of write on ncc line
-
- uint32_t m_cpt_ll_local; // Number of local LL transactions
- uint32_t m_cpt_ll_remote; // number of remote LL transactions
- uint32_t m_cpt_ll_cost; // Number of (flits * distance) for LLs
-
- uint32_t m_cpt_sc_local; // Number of local SC transactions
- uint32_t m_cpt_sc_remote; // number of remote SC transactions
- uint32_t m_cpt_sc_cost; // Number of (flits * distance) for SCs
-
- uint32_t m_cpt_cas_local; // Number of local SC transactions
- uint32_t m_cpt_cas_remote; // number of remote SC transactions
- uint32_t m_cpt_cas_cost; // Number of (flits * distance) for SCs
-
- uint32_t m_cpt_update; // Number of requests causing an UPDATE
- uint32_t m_cpt_update_local; // Number of local UPDATE transactions
- uint32_t m_cpt_update_remote; // Number of remote UPDATE transactions
- uint32_t m_cpt_update_cost; // Number of (flits * distance) for UPDT
-
- uint32_t m_cpt_minval; // Number of requests causing M_INV
- uint32_t m_cpt_minval_local; // Number of local M_INV transactions
- uint32_t m_cpt_minval_remote; // Number of remote M_INV transactions
- uint32_t m_cpt_minval_cost; // Number of (flits * distance) for M_INV
-
- uint32_t m_cpt_binval; // Number of BROADCAST INVAL
-
- uint32_t m_cpt_cleanup_local; // Number of local CLEANUP transactions
- uint32_t m_cpt_cleanup_remote; // Number of remote CLEANUP transactions
- uint32_t m_cpt_cleanup_cost; // Number of (flits * distance) for CLEANUPs
-
- // Counters not accessible by software
- uint32_t m_cpt_read_miss; // Number of MISS READ
- uint32_t m_cpt_write_miss; // Number of MISS WRITE
- uint32_t m_cpt_write_dirty; // Cumulated length for WRITE transactions
- uint32_t m_cpt_write_broadcast;// Number of BROADCAST INVAL because write
-
- uint32_t m_cpt_trt_rb; // Read blocked by a hit in trt
- uint32_t m_cpt_trt_full; // Transaction blocked due to a full trt
+ uint32_t m_cpt_cycles; // Counter of cycles
+
+ // Counters accessible in software (not yet but eventually) and tagged
+ uint32_t m_cpt_reset_count; // Last cycle at which counters have been reset
+ uint32_t m_cpt_read_local; // Number of local READ transactions
+ uint32_t m_cpt_read_remote; // number of remote READ transactions
+ uint32_t m_cpt_read_cost; // Number of (flits * distance) for READs
+
+ uint32_t m_cpt_write_local; // Number of local WRITE transactions
+ uint32_t m_cpt_write_remote; // number of remote WRITE transactions
+ uint32_t m_cpt_write_flits_local; // number of flits for local WRITEs
+ uint32_t m_cpt_write_flits_remote; // number of flits for remote WRITEs
+ uint32_t m_cpt_write_cost; // Number of (flits * distance) for WRITEs
+ uint32_t m_cpt_write_ncc_miss; // Number of write on ncc line
+
+ uint32_t m_cpt_ll_local; // Number of local LL transactions
+ uint32_t m_cpt_ll_remote; // number of remote LL transactions
+ uint32_t m_cpt_ll_cost; // Number of (flits * distance) for LLs
+
+ uint32_t m_cpt_sc_local; // Number of local SC transactions
+ uint32_t m_cpt_sc_remote; // number of remote SC transactions
+ uint32_t m_cpt_sc_cost; // Number of (flits * distance) for SCs
+
+ uint32_t m_cpt_cas_local; // Number of local SC transactions
+ uint32_t m_cpt_cas_remote; // number of remote SC transactions
+ uint32_t m_cpt_cas_cost; // Number of (flits * distance) for SCs
+
+ uint32_t m_cpt_update; // Number of requests causing an UPDATE
+ uint32_t m_cpt_update_local; // Number of local UPDATE transactions
+ uint32_t m_cpt_update_remote; // Number of remote UPDATE transactions
+ uint32_t m_cpt_update_cost; // Number of (flits * distance) for UPDT
+
+ uint32_t m_cpt_minval; // Number of requests causing M_INV
+ uint32_t m_cpt_minval_local; // Number of local M_INV transactions
+ uint32_t m_cpt_minval_remote; // Number of remote M_INV transactions
+ uint32_t m_cpt_minval_cost; // Number of (flits * distance) for M_INV
+
+ uint32_t m_cpt_binval; // Number of BROADCAST INVAL
+
+ uint32_t m_cpt_cleanup_local; // Number of local CLEANUP transactions (all cleanup types)
+ uint32_t m_cpt_cleanup_remote; // Number of remote CLEANUP transactions (all cleanup types)
+ uint32_t m_cpt_cleanup_cost; // Number of (flits * distance) for CLEANUPs (all types)
+
+ // Counters not accessible by software, but tagged
+ uint32_t m_cpt_read_miss; // Number of MISS READ
+ uint32_t m_cpt_write_miss; // Number of MISS WRITE
+ uint32_t m_cpt_write_dirty; // Cumulated length for WRITE transactions
+ uint32_t m_cpt_write_broadcast; // Number of BROADCAST INVAL because write
+
+ uint32_t m_cpt_trt_rb; // Read blocked by a hit in trt
+ uint32_t m_cpt_trt_full; // Transaction blocked due to a full trt
+
+ uint32_t m_cpt_heap_unused; // NB cycles HEAP LOCK unused
+ uint32_t m_cpt_heap_slot_available; // NB HEAP slot available refresh at each cycles
+ uint32_t m_cpt_heap_min_slot_available; // NB HEAP : Min of slot available
+
+ uint32_t m_cpt_ncc_to_cc_read; // NB change from NCC to CC caused by a READ
+ uint32_t m_cpt_ncc_to_cc_write; // NB change from NCC to CC caused by a WRITE
+
+ uint32_t m_cpt_cleanup_data_local; // Number of local cleanups with data
+ uint32_t m_cpt_cleanup_data_remote; // Number of remote cleanups with data
+ uint32_t m_cpt_cleanup_data_cost; // Cost for cleanups with data
+
+ uint32_t m_cpt_update_flits; // Number of flits for UPDATEs
+ uint32_t m_cpt_inval_cost; // Number of (flits * distance) for INVALs
+
+ uint32_t m_cpt_get;
+ uint32_t m_cpt_put;
+
+ // TODO: clean the following counters (not necessarily useful and well-implemented)
+ uint32_t m_cpt_read_fsm_dir_lock; // wait DIR LOCK
+ uint32_t m_cpt_read_fsm_n_dir_lock; // NB DIR LOCK
+ uint32_t m_cpt_write_fsm_dir_lock; // wait DIR LOCK
+ uint32_t m_cpt_write_fsm_n_dir_lock; // NB DIR LOCK
+ uint32_t m_cpt_xram_rsp_fsm_dir_lock; // wait DIR LOCK
+ uint32_t m_cpt_xram_rsp_fsm_n_dir_lock; // NB DIR LOCK
+ uint32_t m_cpt_cas_fsm_dir_lock; // wait DIR LOCK
+ uint32_t m_cpt_cas_fsm_n_dir_lock; // NB DIR LOCK
+ uint32_t m_cpt_cleanup_fsm_dir_lock; // wait DIR LOCK
+ uint32_t m_cpt_cleanup_fsm_n_dir_lock; // NB DIR LOCK
- uint32_t m_cpt_read_fsm_dir_lock; // wait DIR LOCK
- uint32_t m_cpt_read_fsm_n_dir_lock; // NB DIR LOCK
- uint32_t m_cpt_write_fsm_dir_lock; // wait DIR LOCK
- uint32_t m_cpt_write_fsm_n_dir_lock; // NB DIR LOCK
- uint32_t m_cpt_xram_rsp_fsm_dir_lock; // wait DIR LOCK
- uint32_t m_cpt_xram_rsp_fsm_n_dir_lock; // NB DIR LOCK
- uint32_t m_cpt_cas_fsm_dir_lock; // wait DIR LOCK
- uint32_t m_cpt_cas_fsm_n_dir_lock; // NB DIR LOCK
- uint32_t m_cpt_cleanup_fsm_dir_lock; // wait DIR LOCK
- uint32_t m_cpt_cleanup_fsm_n_dir_lock; // NB DIR LOCK
+ uint32_t m_cpt_dir_unused; // NB cycles DIR LOCK unused
+ uint32_t m_cpt_read_fsm_dir_used; // NB cycles DIR LOCK used
+ uint32_t m_cpt_write_fsm_dir_used; // NB cycles DIR LOCK used
+ uint32_t m_cpt_cas_fsm_dir_used; // NB cycles DIR LOCK used
+ uint32_t m_cpt_xram_rsp_fsm_dir_used; // NB cycles DIR LOCK used
+ uint32_t m_cpt_cleanup_fsm_dir_used; // NB cycles DIR LOCK used
+
+ uint32_t m_cpt_read_fsm_trt_lock; // wait TRT LOCK
+ uint32_t m_cpt_write_fsm_trt_lock; // wait TRT LOCK
+ uint32_t m_cpt_cas_fsm_trt_lock; // wait TRT LOCK
+ uint32_t m_cpt_xram_rsp_fsm_trt_lock; // wait TRT LOCK
+ uint32_t m_cpt_ixr_fsm_trt_lock; // wait TRT LOCK
- uint32_t m_cpt_dir_unused; // NB cycles DIR LOCK unused
- uint32_t m_cpt_read_fsm_dir_used; // NB cycles DIR LOCK used
- uint32_t m_cpt_write_fsm_dir_used; // NB cycles DIR LOCK used
- uint32_t m_cpt_cas_fsm_dir_used; // NB cycles DIR LOCK used
- uint32_t m_cpt_xram_rsp_fsm_dir_used; // NB cycles DIR LOCK used
- uint32_t m_cpt_cleanup_fsm_dir_used; // NB cycles DIR LOCK used
-
- uint32_t m_cpt_read_fsm_trt_lock; // wait TRT LOCK
- uint32_t m_cpt_write_fsm_trt_lock; // wait TRT LOCK
- uint32_t m_cpt_cas_fsm_trt_lock; // wait TRT LOCK
- uint32_t m_cpt_xram_rsp_fsm_trt_lock; // wait TRT LOCK
- uint32_t m_cpt_ixr_fsm_trt_lock; // wait TRT LOCK
+ uint32_t m_cpt_read_fsm_n_trt_lock; // NB TRT LOCK
+ uint32_t m_cpt_write_fsm_n_trt_lock; // NB TRT LOCK
+ uint32_t m_cpt_cas_fsm_n_trt_lock; // NB TRT LOCK
+ uint32_t m_cpt_xram_rsp_fsm_n_trt_lock; // NB TRT LOCK
+ uint32_t m_cpt_ixr_fsm_n_trt_lock; // NB TRT LOCK
+
+ uint32_t m_cpt_read_fsm_trt_used; // NB cycles TRT LOCK used
+ uint32_t m_cpt_write_fsm_trt_used; // NB cycles TRT LOCK used
+ uint32_t m_cpt_cas_fsm_trt_used; // NB cycles TRT LOCK used
+ uint32_t m_cpt_xram_rsp_fsm_trt_used; // NB cycles TRT LOCK used
+ uint32_t m_cpt_ixr_fsm_trt_used; // NB cycles TRT LOCK used
- uint32_t m_cpt_read_fsm_n_trt_lock; // NB TRT LOCK
- uint32_t m_cpt_write_fsm_n_trt_lock; // NB TRT LOCK
- uint32_t m_cpt_cas_fsm_n_trt_lock; // NB TRT LOCK
- uint32_t m_cpt_xram_rsp_fsm_n_trt_lock; // NB TRT LOCK
- uint32_t m_cpt_ixr_fsm_n_trt_lock; // NB TRT LOCK
-
- uint32_t m_cpt_read_fsm_trt_used; // NB cycles TRT LOCK used
- uint32_t m_cpt_write_fsm_trt_used; // NB cycles TRT LOCK used
- uint32_t m_cpt_cas_fsm_trt_used; // NB cycles TRT LOCK used
- uint32_t m_cpt_xram_rsp_fsm_trt_used; // NB cycles TRT LOCK used
- uint32_t m_cpt_ixr_fsm_trt_used; // NB cycles TRT LOCK used
+ uint32_t m_cpt_trt_unused; // NB cycles TRT LOCK unused
+
+ uint32_t m_cpt_write_fsm_upt_lock; // wait UPT LOCK
+ uint32_t m_cpt_xram_rsp_fsm_upt_lock; // wait UPT LOCK
+ uint32_t m_cpt_multi_ack_fsm_upt_lock; // wait UPT LOCK
+ uint32_t m_cpt_cleanup_fsm_ivt_lock; // wait UPT LOCK
+ uint32_t m_cpt_cas_fsm_upt_lock; // wait UPT LOCK
- uint32_t m_cpt_trt_unused; // NB cycles TRT LOCK unused
-
- uint32_t m_cpt_write_fsm_upt_lock; // wait UPT LOCK
- uint32_t m_cpt_xram_rsp_fsm_upt_lock; // wait UPT LOCK
- uint32_t m_cpt_multi_ack_fsm_upt_lock; // wait UPT LOCK
- uint32_t m_cpt_cleanup_fsm_ivt_lock; // wait UPT LOCK
- uint32_t m_cpt_cas_fsm_upt_lock; // wait UPT LOCK
+ uint32_t m_cpt_write_fsm_n_upt_lock; // NB UPT LOCK
+ uint32_t m_cpt_xram_rsp_fsm_n_upt_lock; // NB UPT LOCK
+ uint32_t m_cpt_multi_ack_fsm_n_upt_lock; // NB UPT LOCK
+ uint32_t m_cpt_cleanup_fsm_n_upt_lock; // NB UPT LOCK
+ uint32_t m_cpt_cas_fsm_n_upt_lock; // NB UPT LOCK
- uint32_t m_cpt_write_fsm_n_upt_lock; // NB UPT LOCK
- uint32_t m_cpt_xram_rsp_fsm_n_upt_lock; // NB UPT LOCK
- uint32_t m_cpt_multi_ack_fsm_n_upt_lock; // NB UPT LOCK
- uint32_t m_cpt_cleanup_fsm_n_upt_lock; // NB UPT LOCK
- uint32_t m_cpt_cas_fsm_n_upt_lock; // NB UPT LOCK
+ uint32_t m_cpt_write_fsm_upt_used; // NB cycles UPT LOCK used
+ uint32_t m_cpt_xram_rsp_fsm_upt_used; // NB cycles UPT LOCK used
+ uint32_t m_cpt_multi_ack_fsm_upt_used; // NB cycles UPT LOCK used
+ uint32_t m_cpt_cleanup_fsm_ivt_used; // NB cycles UPT LOCK used
+ uint32_t m_cpt_cas_fsm_upt_used; // NB cycles UPT LOCK used
- uint32_t m_cpt_write_fsm_upt_used; // NB cycles UPT LOCK used
- uint32_t m_cpt_xram_rsp_fsm_upt_used; // NB cycles UPT LOCK used
- uint32_t m_cpt_multi_ack_fsm_upt_used; // NB cycles UPT LOCK used
- uint32_t m_cpt_cleanup_fsm_ivt_used; // NB cycles UPT LOCK used
- uint32_t m_cpt_cas_fsm_upt_used; // NB cycles UPT LOCK used
+ uint32_t m_cpt_ivt_unused; // NB cycles UPT LOCK unused
+ uint32_t m_cpt_upt_unused; // NB cycles UPT LOCK unused
+
+ uint32_t m_cpt_read_fsm_heap_lock; // wait HEAP LOCK
+ uint32_t m_cpt_write_fsm_heap_lock; // wait HEAP LOCK
+ uint32_t m_cpt_cas_fsm_heap_lock; // wait HEAP LOCK
+ uint32_t m_cpt_cleanup_fsm_heap_lock; // wait HEAP LOCK
+ uint32_t m_cpt_xram_rsp_fsm_heap_lock; // wait HEAP LOCK
- uint32_t m_cpt_ivt_unused; // NB cycles UPT LOCK unused
- uint32_t m_cpt_upt_unused; // NB cycles UPT LOCK unused
-
- uint32_t m_cpt_read_fsm_heap_lock; // wait HEAP LOCK
- uint32_t m_cpt_write_fsm_heap_lock; // wait HEAP LOCK
- uint32_t m_cpt_cas_fsm_heap_lock; // wait HEAP LOCK
- uint32_t m_cpt_cleanup_fsm_heap_lock; // wait HEAP LOCK
- uint32_t m_cpt_xram_rsp_fsm_heap_lock; // wait HEAP LOCK
+ uint32_t m_cpt_read_fsm_n_heap_lock; // NB HEAP LOCK
+ uint32_t m_cpt_write_fsm_n_heap_lock; // NB HEAP LOCK
+ uint32_t m_cpt_cas_fsm_n_heap_lock; // NB HEAP LOCK
+ uint32_t m_cpt_cleanup_fsm_n_heap_lock; // NB HEAP LOCK
+ uint32_t m_cpt_xram_rsp_fsm_n_heap_lock; // NB HEAP LOCK
- uint32_t m_cpt_read_fsm_n_heap_lock; // NB HEAP LOCK
- uint32_t m_cpt_write_fsm_n_heap_lock; // NB HEAP LOCK
- uint32_t m_cpt_cas_fsm_n_heap_lock; // NB HEAP LOCK
- uint32_t m_cpt_cleanup_fsm_n_heap_lock; // NB HEAP LOCK
- uint32_t m_cpt_xram_rsp_fsm_n_heap_lock; // NB HEAP LOCK
+ uint32_t m_cpt_read_fsm_heap_used; // NB cycles HEAP LOCK used
+ uint32_t m_cpt_write_fsm_heap_used; // NB cycles HEAP LOCK used
+ uint32_t m_cpt_cas_fsm_heap_used; // NB cycles HEAP LOCK used
+ uint32_t m_cpt_cleanup_fsm_heap_used; // NB cycles HEAP LOCK used
+ uint32_t m_cpt_xram_rsp_fsm_heap_used; // NB cycles HEAP LOCK used
- uint32_t m_cpt_read_fsm_heap_used; // NB cycles HEAP LOCK used
- uint32_t m_cpt_write_fsm_heap_used; // NB cycles HEAP LOCK used
- uint32_t m_cpt_cas_fsm_heap_used; // NB cycles HEAP LOCK used
- uint32_t m_cpt_cleanup_fsm_heap_used; // NB cycles HEAP LOCK used
- uint32_t m_cpt_xram_rsp_fsm_heap_used; // NB cycles HEAP LOCK used
-
- uint32_t m_cpt_heap_unused; // NB cycles HEAP LOCK unused
- uint32_t m_cpt_heap_slot_available; // NB HEAP slot available refresh at each cycles
- uint32_t m_cpt_heap_min_slot_available; // NB HEAP : Min of slot available
-
- //RWT
- uint32_t m_cpt_cleanup_data;
- uint32_t m_cpt_ncc_to_cc_read; // NB change from NCC to CC caused by a READ
- uint32_t m_cpt_ncc_to_cc_write; // NB change from NCC to CC caused by a WRITE
-
- uint32_t m_cpt_read_data_unc;
- uint32_t m_cpt_read_data_miss_CC;
- uint32_t m_cpt_read_ins_unc;
- uint32_t m_cpt_read_ins_miss;
- uint32_t m_cpt_read_ll_CC;
- uint32_t m_cpt_read_data_miss_NCC;
- uint32_t m_cpt_read_ll_NCC;
- uint32_t m_cpt_read_WTF;
-
- uint32_t m_cpt_update_flits; // Number of flits for UPDATEs
- uint32_t m_cpt_inval_cost; // Number of (flits * distance) for INVALs
-
- uint32_t m_cpt_get;
- uint32_t m_cpt_put;
-
- size_t m_prev_count;
+ uint32_t m_cpt_read_data_unc;
+ uint32_t m_cpt_read_data_miss_CC;
+ uint32_t m_cpt_read_ins_unc;
+ uint32_t m_cpt_read_ins_miss;
+ uint32_t m_cpt_read_ll_CC;
+ uint32_t m_cpt_read_data_miss_NCC;
+ uint32_t m_cpt_read_ll_NCC;
+
+ size_t m_prev_count;
protected:
Index: branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp
===================================================================
--- branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (revision 780)
+++ branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (revision 783)
@@ -616,5 +616,5 @@
/////////////////////////////////////////////////////
tmpl(void) ::cache_monitor(addr_t addr)
- /////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////
{
size_t way = 0;
@@ -678,5 +678,5 @@
/////////////////////////////////////////////////////
tmpl(uint32_t)::min_value(uint32_t old_value, uint32_t new_value)
- /////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////
{
if (old_value < new_value)
@@ -688,5 +688,5 @@
/////////////////////////////////////////////////////
tmpl(uint32_t)::req_distance(uint32_t req_srcid)
- /////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////
{
const uint32_t srcid_width = vci_param_int::S;
@@ -701,5 +701,5 @@
/////////////////////////////////////////////////////
tmpl(bool)::is_local_req(uint32_t req_srcid)
- /////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////
{
return req_distance(req_srcid) == 0;
@@ -845,44 +845,48 @@
/////////////////////////////////////////
{
- m_cpt_reset_count = m_cpt_cycles;
- m_cpt_read_local = 0;
- m_cpt_read_remote = 0;
- m_cpt_read_cost = 0;
- m_cpt_write_local = 0;
- m_cpt_write_remote = 0;
- m_cpt_write_flits_local = 0;
- m_cpt_write_flits_remote = 0;
- m_cpt_write_cost = 0;
- m_cpt_ll_local = 0;
- m_cpt_ll_remote = 0;
- m_cpt_ll_cost = 0;
- m_cpt_sc_local = 0;
- m_cpt_sc_remote = 0;
- m_cpt_sc_cost = 0;
- m_cpt_cas_local = 0;
- m_cpt_cas_remote = 0;
- m_cpt_cas_cost = 0;
- m_cpt_update = 0;
- m_cpt_update_local = 0;
- m_cpt_update_remote = 0;
- m_cpt_update_cost = 0;
- m_cpt_minval = 0;
- m_cpt_minval_local = 0;
- m_cpt_minval_remote = 0;
- m_cpt_minval_cost = 0;
- m_cpt_binval = 0;
- m_cpt_cleanup_local = 0;
- m_cpt_cleanup_remote = 0;
- m_cpt_cleanup_cost = 0;
- m_cpt_read_miss = 0;
- m_cpt_write_miss = 0;
- m_cpt_write_dirty = 0;
- m_cpt_trt_rb = 0;
- m_cpt_trt_full = 0;
- m_cpt_get = 0;
- m_cpt_put = 0;
- m_cpt_ncc_to_cc_read = 0;
- m_cpt_ncc_to_cc_write = 0;
- m_cpt_write_ncc_miss = 0;
+ m_cpt_reset_count = m_cpt_cycles;
+ m_cpt_read_local = 0;
+ m_cpt_read_remote = 0;
+ m_cpt_read_cost = 0;
+ m_cpt_write_local = 0;
+ m_cpt_write_remote = 0;
+ m_cpt_write_flits_local = 0;
+ m_cpt_write_flits_remote = 0;
+ m_cpt_write_cost = 0;
+ m_cpt_write_ncc_miss = 0;
+ m_cpt_ll_local = 0;
+ m_cpt_ll_remote = 0;
+ m_cpt_ll_cost = 0;
+ m_cpt_sc_local = 0;
+ m_cpt_sc_remote = 0;
+ m_cpt_sc_cost = 0;
+ m_cpt_cas_local = 0;
+ m_cpt_cas_remote = 0;
+ m_cpt_cas_cost = 0;
+ m_cpt_update = 0;
+ m_cpt_update_local = 0;
+ m_cpt_update_remote = 0;
+ m_cpt_update_cost = 0;
+ m_cpt_minval = 0;
+ m_cpt_minval_local = 0;
+ m_cpt_minval_remote = 0;
+ m_cpt_minval_cost = 0;
+ m_cpt_binval = 0;
+ m_cpt_write_broadcast = 0;
+ m_cpt_cleanup_local = 0;
+ m_cpt_cleanup_remote = 0;
+ m_cpt_cleanup_cost = 0;
+ m_cpt_read_miss = 0;
+ m_cpt_write_miss = 0;
+ m_cpt_write_dirty = 0;
+ m_cpt_trt_rb = 0;
+ m_cpt_trt_full = 0;
+ m_cpt_get = 0;
+ m_cpt_put = 0;
+ m_cpt_ncc_to_cc_read = 0;
+ m_cpt_ncc_to_cc_write = 0;
+ m_cpt_cleanup_data_local = 0;
+ m_cpt_cleanup_data_remote = 0;
+ m_cpt_cleanup_data_cost = 0;
}
@@ -941,5 +945,7 @@
<< "[091] REMOTE CLEANUP = " << m_cpt_cleanup_remote << std::endl
<< "[092] CLNUP COST (FLITS * DIST) = " << m_cpt_cleanup_cost << std::endl
- << "[093] CLEANUP DATA = " << m_cpt_cleanup_data << std::endl
+ << "[093] LOCAL CLEANUP DATA = " << m_cpt_cleanup_data_local << std::endl
+ << "[094] REMOTE CLEANUP DATA = " << m_cpt_cleanup_data_remote << std::endl
+ << "[095] CLEANUP DATA COST = " << m_cpt_cleanup_data_cost << std::endl
<< std::endl
<< "[100] READ MISS = " << m_cpt_read_miss << std::endl
@@ -1012,5 +1018,5 @@
/////////////////////////////////
tmpl(/**/) ::~VciMemCache()
- /////////////////////////////////
+ /////////////////////////////////
{
delete [] m_seg;
@@ -1042,5 +1048,5 @@
//////////////////////////////////
tmpl(void) ::transition()
- //////////////////////////////////
+ //////////////////////////////////
{
using soclib::common::uint32_log2;
@@ -1187,36 +1193,40 @@
// Activity counters
- m_cpt_reset_count = 0;
- m_cpt_cycles = 0;
- m_cpt_read_local = 0;
- m_cpt_read_remote = 0;
- m_cpt_read_cost = 0;
- m_cpt_write_local = 0;
- m_cpt_write_remote = 0;
- m_cpt_write_flits_local = 0;
- m_cpt_write_flits_remote = 0;
- m_cpt_write_ncc_miss = 0;
- m_cpt_write_cost = 0;
- m_cpt_ll_local = 0;
- m_cpt_ll_remote = 0;
- m_cpt_ll_cost = 0;
- m_cpt_sc_local = 0;
- m_cpt_sc_remote = 0;
- m_cpt_sc_cost = 0;
- m_cpt_cas_local = 0;
- m_cpt_cas_remote = 0;
- m_cpt_cas_cost = 0;
- m_cpt_update = 0;
- m_cpt_update_local = 0;
- m_cpt_update_remote = 0;
- m_cpt_update_cost = 0;
- m_cpt_minval = 0;
- m_cpt_minval_local = 0;
- m_cpt_minval_remote = 0;
- m_cpt_minval_cost = 0;
- m_cpt_binval = 0;
- m_cpt_cleanup_local = 0;
- m_cpt_cleanup_remote = 0;
- m_cpt_cleanup_cost = 0;
+ m_cpt_reset_count = 0;
+ m_cpt_cycles = 0;
+ m_cpt_read_local = 0;
+ m_cpt_read_remote = 0;
+ m_cpt_read_cost = 0;
+ m_cpt_write_local = 0;
+ m_cpt_write_remote = 0;
+ m_cpt_write_flits_local = 0;
+ m_cpt_write_flits_remote = 0;
+ m_cpt_write_ncc_miss = 0;
+ m_cpt_write_cost = 0;
+ m_cpt_ll_local = 0;
+ m_cpt_ll_remote = 0;
+ m_cpt_ll_cost = 0;
+ m_cpt_sc_local = 0;
+ m_cpt_sc_remote = 0;
+ m_cpt_sc_cost = 0;
+ m_cpt_cas_local = 0;
+ m_cpt_cas_remote = 0;
+ m_cpt_cas_cost = 0;
+ m_cpt_update = 0;
+ m_cpt_update_local = 0;
+ m_cpt_update_remote = 0;
+ m_cpt_update_cost = 0;
+ m_cpt_minval = 0;
+ m_cpt_minval_local = 0;
+ m_cpt_minval_remote = 0;
+ m_cpt_minval_cost = 0;
+ m_cpt_binval = 0;
+ m_cpt_cleanup_local = 0;
+ m_cpt_cleanup_remote = 0;
+ m_cpt_cleanup_cost = 0;
+ m_cpt_cleanup_data_local = 0;
+ m_cpt_cleanup_data_remote = 0;
+ m_cpt_cleanup_data_cost = 0;
+
m_cpt_read_miss = 0;
@@ -1270,6 +1280,4 @@
m_cpt_read_data_miss_NCC = 0;
m_cpt_read_ll_NCC = 0;
- m_cpt_read_WTF = 0;
- m_cpt_cleanup_data = 0;
m_cpt_ncc_to_cc_read = 0;
m_cpt_ncc_to_cc_write = 0;
@@ -5688,13 +5696,4 @@
"MEMC ERROR in CLEANUP_IDLE state : illegal SRCID value");
- //
- if (is_local_req(srcid)) {
- m_cpt_cleanup_local++;
- }
- else {
- m_cpt_cleanup_remote++;
- m_cpt_cleanup_cost += req_distance(srcid);
- }
- //
cc_receive_to_cleanup_fifo_get = true;
r_cleanup_fsm = CLEANUP_GET_NLINE;
@@ -5720,13 +5719,13 @@
case CLEANUP_GET_NLINE: // GET second DSPIN flit of the cleanup command
{
- if(not m_cc_receive_to_cleanup_fifo.rok()) break;
+ if (not m_cc_receive_to_cleanup_fifo.rok()) break;
uint64_t flit = m_cc_receive_to_cleanup_fifo.read();
+ uint32_t srcid = r_cleanup_srcid.read();
addr_t nline = r_cleanup_nline.read() |
DspinRwtParam::dspin_get(flit, DspinRwtParam::CLEANUP_NLINE_LSB);
- bool eop =
- DspinRwtParam::dspin_get(flit, DspinRwtParam::P2M_EOP) == 0x1;
+ bool eop = DspinRwtParam::dspin_get(flit, DspinRwtParam::P2M_EOP) == 0x1;
if (! eop)
@@ -5735,8 +5734,29 @@
r_cleanup_data_index = 0;
r_cleanup_contains_data = true;
+ //
+ if (is_local_req(srcid)) {
+ m_cpt_cleanup_local++;
+ m_cpt_cleanup_data_local++;
+ }
+ else {
+ m_cpt_cleanup_remote++;
+ m_cpt_cleanup_data_remote++;
+ }
+ m_cpt_cleanup_cost += m_words * req_distance(srcid);
+ m_cpt_cleanup_data_cost += m_words * req_distance(srcid);
+ //
}
else
{
r_cleanup_fsm = CLEANUP_DIR_REQ;
+ //
+ if (is_local_req(srcid)) {
+ m_cpt_cleanup_local++;
+ }
+ else {
+ m_cpt_cleanup_remote++;
+ }
+ m_cpt_cleanup_cost += req_distance(srcid);
+ //
}
cc_receive_to_cleanup_fifo_get = true;
@@ -5774,5 +5794,4 @@
{
r_cleanup_contains_data = true;
- m_cpt_cleanup_data ++;
r_cleanup_fsm = CLEANUP_DIR_REQ;
}
@@ -7782,6 +7801,6 @@
{
m_cpt_minval_remote++;
- m_cpt_minval_cost += req_distance(m_config_to_cc_send_srcid_fifo.read());
- }
+ }
+ m_cpt_minval_cost += req_distance(m_config_to_cc_send_srcid_fifo.read());
//
r_cc_send_fsm = CC_SEND_CONFIG_INVAL_NLINE;
@@ -7849,6 +7868,6 @@
{
m_cpt_minval_remote++;
- m_cpt_minval_cost += req_distance(m_xram_rsp_to_cc_send_srcid_fifo.read());
- }
+ }
+ m_cpt_minval_cost += req_distance(m_xram_rsp_to_cc_send_srcid_fifo.read());
//
r_cc_send_fsm = CC_SEND_XRAM_RSP_INVAL_NLINE;
@@ -8002,6 +8021,6 @@
{
m_cpt_update_remote++;
- m_cpt_update_cost += req_distance(m_write_to_cc_send_srcid_fifo.read());
- }
+ }
+ m_cpt_update_cost += req_distance(m_write_to_cc_send_srcid_fifo.read());
//
@@ -8091,6 +8110,6 @@
{
m_cpt_update_remote++;
- m_cpt_update_cost += req_distance(m_cas_to_cc_send_srcid_fifo.read());
- }
+ }
+ m_cpt_update_cost += req_distance(m_cas_to_cc_send_srcid_fifo.read());
//
r_cc_send_fsm = CC_SEND_CAS_UPDT_NLINE;
@@ -8566,5 +8585,5 @@
else
{
- m_cpt_read_WTF ++;
+ assert(false);
}
}
@@ -8658,5 +8677,5 @@
else if (!r_cleanup_to_tgt_rsp_type.read())
{
- m_cpt_read_WTF ++;
+ assert(false);
}
@@ -8754,5 +8773,5 @@
else
{
- m_cpt_read_WTF ++;
+ assert(false);
}