add performance counters in mcp-cache, and update the kitfox configuration file

Author: sixshotx

models/cache/mcp-cache/L1_cache.cpp

@@ -146,6 +146,23 @@ void L1_cache :: process_processor_request (cache_req *request, bool first)
 
     DBG_L1_CACHE_TICK_ID( cout,  "###### " << " process_processor_request():  addr= " <<hex<< request->addr <<dec<< ((request->op_type==OpMemLd) ? " LD" : " ST") << "\n" );
 
+#ifdef LIBKITFOX
+    if(request->op_type==OpMemLd) {
+        counter.cache.read += 3;
+        counter.cache.search += 3;
+        counter.cache.read_tag += 3;
+    } else {
+        counter.cache.write += 3;
+        counter.cache.search += 3;
+        counter.cache.read_tag += 3;
+        counter.cache.write_tag += 3;
+    }
+    counter.tlb.search += 3;
+    counter.tlb.read += 3;
+    counter.tlb.write += 3;
+    counter.tlb.read_tag += 3;
+#endif
+
     /** This code may be modified in the future to enable parallel events while transient (read while waiting for previous read-unblock).  For the time being, just assume no parallel events for a single address */
     if (mshr->has_match(request->addr))
     {
@@ -189,6 +206,17 @@ void L1_cache :: process_processor_request (cache_req *request, bool first)
     if (!my_table->has_match (request->addr)) {
     DBG_L1_CACHE(cout, "    miss.\n");
 
+#ifdef LIBKITFOX
+    counter.missbuf.search += 3;
+    counter.missbuf.read_tag += 3;
+    counter.missbuf.write_tag += 3;
+    counter.missbuf.write += 3;
+    counter.prefetch.search += 3;
+    counter.prefetch.read_tag += 3;
+    counter.prefetch.write_tag += 3;
+    counter.prefetch.write += 3;
+#endif
+
         /** Check if an invalid block exists already or the LRU block can begin eviction. */
     hash_table_entry = my_table->reserve_block_for (request->addr);
 
@@ -200,6 +228,16 @@ void L1_cache :: process_processor_request (cache_req *request, bool first)
         DBG_L1_CACHE(cout, "  start eviction line= " <<hex<< my_table->get_replacement_entry(request->addr)->get_line_addr() <<dec<< "\n");
 
         start_eviction (mshr_entry, request);
+
+#ifdef LIBKITFOX
+        counter.linefill.search += 3;
+        counter.linefill.write_tag += 3;
+        counter.linefill.write += 3;
+        counter.writeback.search += 3;
+        counter.writeback.write_tag += 3;
+        counter.writeback.write += 3;
+#endif
+
         }
         else {
         //the client for the victim is in transient, so it must have a stalled request in the
@@ -401,6 +439,24 @@ void L1_cache :: process_peer_and_manager_request(Coh_msg* request)
                 stall request
 */
 
+#ifdef LIBKITFOX
+    if(request->rw == 0) {
+        counter.cache.read += 3;
+        counter.cache.search += 3;
+        counter.cache.read_tag += 3;
+    } else {
+        counter.cache.write += 3;
+        counter.cache.search += 3;
+        counter.cache.read_tag += 3;
+        counter.cache.write_tag += 3;
+    }
+
+    counter.tlb.search += 3;
+    counter.tlb.read += 3;
+    counter.tlb.write += 3;
+    counter.tlb.read_tag += 3;
+#endif
+
     if(request->type == Coh_msg::COH_RPLY) {
         DBG_L1_CACHE(cout, "    it is a reply.\n");
 

models/cache/mcp-cache/L2_cache.cpp

@@ -116,7 +116,15 @@ void L2_cache :: process_incoming_coh(Coh_msg* request)
 {
     DBG_L2_CACHE_TICK_ID(cout, "######  handle_incoming()_coh, srcID= " << request->src_id << " type= " << int(request->type) << " addr=(" <<hex<< request->addr <<dec<< ")" << endl);
 
-
+#ifdef LIBKITFOX
+    counter.cache.read_tag += 100;
+    counter.cache.search += 100;
+    if (request->rw == 1) { //write
+        counter.cache.write_tag += 100;
+        counter.cache.write += 100;
+    } else
+        counter.cache.read += 100;
+#endif
 
     if(request->type == Coh_msg :: COH_REQ) {
         stats_num_reqs++;
@@ -141,6 +149,15 @@ void L2_cache :: process_mem_resp (Mem_msg *request)
 {
     DBG_L2_CACHE_TICK_ID(cout,  "######## process_mem_resp(), addr= " << hex << request->addr << dec << endl);
 
+#ifdef LIBKITFOX
+    counter.cache.read_tag += 100;
+    counter.cache.search += 100;
+    if (request->op_type == OpMemSt) { //write
+        counter.cache.write_tag += 100;
+        counter.cache.write += 100;
+    } else
+        counter.cache.read += 100;
+#endif
 
     if(request->op_type == OpMemLd) {
         assert(l2_map);
@@ -225,6 +242,17 @@ void L2_cache::process_client_request (Coh_msg* request, bool first)
     {
         DBG_L2_CACHE(cout, "    L2_cache: request is miss.\n");
 
+#ifdef LIBKITFOX
+        counter.missbuf.search += 35;
+        counter.missbuf.read_tag += 35;
+        counter.missbuf.write_tag += 35;
+        counter.missbuf.write += 35;
+        counter.prefetch.search += 35;
+        counter.prefetch.read_tag += 35;
+        counter.prefetch.write_tag += 35;
+        counter.prefetch.write += 35;
+#endif
+
         //first check if request is an invalidation request; a missed invalidation request should
         //be ignored.
         if(managers[0]->is_invalidation_request(request)) {
@@ -259,6 +287,16 @@ void L2_cache::process_client_request (Coh_msg* request, bool first)
                 assert(mshr->has_match(victim->get_line_addr()) == false); //victim shouldn't have an mshr entry.
 
                 start_eviction(victim_manager, request);
+
+#ifdef LIBKITFOX
+                counter.linefill.search += 35;
+                counter.linefill.write_tag += 35;
+                counter.linefill.write += 35;
+                counter.writeback.search += 35;
+                counter.writeback.write_tag += 35;
+                counter.writeback.write += 35;
+#endif
+
             }
             else
             {

models/cache/mcp-cache/LLP_cache.h

@@ -15,7 +15,7 @@ class LLP_cache : public L1_cache {
 public:
     friend class MuxDemux;
 
-    enum {PORT_LOCAL_L2=2};
+    enum {PORT_LOCAL_L2=3};
 
 //    enum {LLP_ID=234, LLS_ID};
 

models/cache/mcp-cache/LLS_cache.h

@@ -15,7 +15,8 @@ class LLS_cache : public L2_cache {
 public:
     friend class MuxDemux;
 
-    enum {PORT_L1=0, PORT_LOCAL_L1};
+    // enum {PORT_L1=0, PORT_LOCAL_L1=2};
+    enum {PORT_LOCAL_L1=3};
 
     LLS_cache (int nid, const cache_settings&, const L2_cache_settings&);
     ~LLS_cache (void);

models/kitfox/proxy/kitfox_proxy.cc

@@ -629,6 +629,12 @@ void kitfox_proxy_t::calculate_power(manifold::uarch::cache_counter_t c, manifol
     assert(comp_id != INVALID_COMP_ID);
     kitfox->calculate_power(comp_id, t, m_clk->period, c.cache);
 
+    // tlb
+    comp = prefix + ".tlb";
+    comp_id = kitfox->get_component_id(comp);
+    assert(comp_id != INVALID_COMP_ID);
+    kitfox->calculate_power(comp_id, t, m_clk->period, c.cache);
+
     // prefetch
     comp = prefix + ".prefetch";
     comp_id = kitfox->get_component_id(comp);

models/kitfox/proxy/kitfox_proxy.h

@@ -104,22 +104,22 @@ void kitfox_proxy_t::handle_kitfox_proxy_response(int temp, kitfox_proxy_request
         assert(package_id != INVALID_COMP_ID);
         kitfox->calculate_temperature(package_id, Req->get_time(), m_clk->period);
 
-        for(unsigned int i = 0; i < manifold_node.size(); i++){
+        for(unsigned int i = 0, core_id = 0, l1_id = 0, l2_id = 0; i < manifold_node.size(); i++){
             libKitFox::Kelvin t;
             string partition;
             libKitFox::Comp_ID par_id;
 
             switch (manifold_node[i].second) {
             case manifold::uarch::KitFoxType::core_type: {
-                partition = "package.core_die.core" + std::to_string(i);
+                partition = "package.core_die.core" + std::to_string(core_id++);
                 break;
             }
             case manifold::uarch::KitFoxType::l1cache_type: {
-                partition = "package.core_die.l1cache" + std::to_string(i);
+                partition = "package.core_die.l1cache" + std::to_string(l1_id++);
                 break;
             }
             case manifold::uarch::KitFoxType::l2cache_type: {
-                partition = "package.llc_die.cache" + std::to_string(i);
+                partition = "package.llc_die.cache" + std::to_string(l2_id++);
                 break;
             }
             default:

simulator/smp/common/sysBuilder_llp.cc

@@ -666,6 +666,7 @@ void SysBuilder_llp :: connect_components()
 #ifdef LIBKITFOX
     if(m_kitfox_builder){
         m_proc_builder->connect_proc_kitfox_proxy(m_kitfox_builder);
+        m_cache_builder->connect_cache_kitfox_proxy(m_kitfox_builder);
     }
 #endif
 }

simulator/smp/config/conf2x2_spx_t6p_llp.a64.cfg

@@ -1,4 +1,4 @@
-simulation_stop = 5e6;
+simulation_stop = 50e6;
 default_clock = 1e9;
 qsim_interrupt_handler_clock = 1e3;
 kitfox_config = "../config/kitfox-4core.config";