update kitfox_proxy framework for cache-counters

Author: sixshotx

models/cache/mcp-cache/L1_cache.h

@@ -11,6 +11,9 @@
 #include "uarch/DestMap.h"
 #include "uarch/networkPacket.h"
 
+#ifdef LIBKITFOX
+#include "uarch/kitfoxCounter.h"
+#endif
 
 
 namespace manifold {
@@ -27,7 +30,7 @@ struct L1_cache_settings {
 class L1_cache : public manifold::kernel::Component {
 public:
 
-    enum {PORT_PROC=0, PORT_L2};
+    enum {PORT_PROC=0, PORT_L2, PORT_KITFOX};
 
     L1_cache (int nid, const cache_settings&, const L1_cache_settings&);
     virtual ~L1_cache (void);
@@ -61,6 +64,11 @@ class L1_cache : public manifold::kernel::Component {
         CREDIT_MSG = credit;
     }
 
+#ifdef LIBKITFOX
+    template<typename T>
+    void handle_kitfox_proxy_request(int temp, T *kitfox_proxy_request);
+#endif
+
 private:
     //void issue_to_client (cache_req *request);
     //void issue_to_manager (cache_req *request);
@@ -170,6 +178,10 @@ class L1_cache : public manifold::kernel::Component {
     unsigned stats_stall_buffer_max_size;
     unsigned long stats_table_occupancy; //accumulated hash table occupancy
     unsigned stats_table_empty_cycles;
+
+#ifdef LIBKITFOX
+    manifold::uarch::cache_counter_t counter;
+#endif
 };
 
 
@@ -198,6 +210,20 @@ void L1_cache :: handle_processor_request(int, T* request)
 }
 
 
+#ifdef LIBKITFOX
+template <typename T>
+void L1_cache :: handle_kitfox_proxy_request(int temp, T *kitfox_proxy_request)
+{
+    assert(kitfox_proxy_request->get_type() == manifold::uarch::KitFoxType::l1cache_type);
+    assert(kitfox_proxy_request->get_id() == node_id);
+
+    kitfox_proxy_request->set_counter(counter);
+    counter.clear();
+
+    Send(PORT_KITFOX, kitfox_proxy_request);
+}
+#endif // LIBKITFOX
+
 
 
 } //namespace mcp_cache

models/cache/mcp-cache/L2_cache.h

@@ -10,6 +10,10 @@
 #include "uarch/networkPacket.h"
 #include "uarch/DestMap.h"
 
+#ifdef LIBKITFOX
+#include "uarch/kitfoxCounter.h"
+#endif
+
 
 using namespace std;
 
@@ -29,7 +33,7 @@ struct L2_cache_settings {
 
 class L2_cache : public manifold::kernel::Component {
 public:
-    enum {PORT_L1=0};
+    enum {PORT_L1=0, PORT_KITFOX};
 
     L2_cache (int nid, const cache_settings&, const L2_cache_settings&);
     virtual ~L2_cache (void);
@@ -59,6 +63,12 @@ class L2_cache : public manifold::kernel::Component {
         MEM_MSG = mem;
         CREDIT_MSG = credit;
     }
+
+#ifdef LIBKITFOX
+    template <typename T>
+    void handle_kitfox_proxy_request(int temp, T *kitfox_proxy_request);
+#endif
+
 private:
     void process_client_request (Coh_msg* request, bool first);
     void process_client_reply (Coh_msg* reply);
@@ -152,6 +162,10 @@ class L2_cache : public manifold::kernel::Component {
     unsigned stats_mshr_empty_cycles;
     unsigned stats_read_mem;
     unsigned stats_dirty_to_mem;
+
+#ifdef LIBKITFOX
+    manifold::uarch::cache_counter_t counter;
+#endif
 };
 
 
@@ -193,6 +207,19 @@ void L2_cache :: handle_incoming (int, manifold::uarch::NetworkPacket* pkt)
 }
 
 
+#ifdef LIBKITFOX
+template <typename T>
+void L2_cache :: handle_kitfox_proxy_request(int temp, T *kitfox_proxy_request)
+{
+    assert(kitfox_proxy_request->get_type() == manifold::uarch::KitFoxType::l2cache_type);
+    assert(kitfox_proxy_request->get_id() == node_id);
+
+    kitfox_proxy_request->set_counter(counter);
+    counter.clear();
+
+    Send(PORT_KITFOX, kitfox_proxy_request);
+}
+#endif // LIBKITFOX
 
 
 

models/cache/mcp-cache/Makefile.am

@@ -61,7 +61,7 @@ pkginclude_mcp_cache_HEADERS = \
 	lp_lls_unit.h \
 	mux_demux.h
 
-libmcp_cache_a_CPPFLAGS = -I$(KERNEL_INC)
+libmcp_cache_a_CPPFLAGS = -I$(KERNEL_INC) -I$(KITFOX_INC) --std=c++11
 
 EXTRA_DIST = doc
 

models/cache/mcp-cache/configure.ac

@@ -94,6 +94,38 @@ if test "x${forecast_null}" = xyes ; then
     AC_DEFINE(FORECAST_NULL)
 fi
 
+# check kitfox integration
+AC_ARG_WITH([kitfox],
+    [AS_HELP_STRING([--without-kitfox],
+        [do not use QSim @<:@default: no@:>@])],
+    [kitfox=${enableval}], [kitfox=yes])
+
+if test "x${kitfox}" = xyes ; then
+    #check if QSim header files exist
+    # We allow user to specify the location of the header files, e.g.,
+    # configure KITFOXINC=/foo/kitfox
+    if test -z "$KITFOXINC" ; then
+	KITFOXINC='/usr/local/include'
+    fi
+
+    if test ! -e "$KITFOXINC/kitfox.h"; then
+	AC_MSG_ERROR([
+    -----------------------------------------
+    ERROR: kitfox.h not found in $KITFOXINC!
+    -----------------------------------------
+	])
+    else
+	AC_DEFINE(LIBKITFOX)
+	AC_SUBST([KITFOX_INC], [$KITFOXINC])
+    fi
+else # use_kitfox disabled
+    AC_MSG_WARN([
+    -----------------------------------------------------------------
+    LIBKITFOX disabled! Building only processor models not using KitFox.
+    -----------------------------------------------------------------])
+	AC_SUBST([KITFOX_INC], ["."])
+fi
+
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL