litz-lab · maryyufei21 · Jul 9, 2024
diff --git a/src/cmp_model.c b/src/cmp_model.c
@@ -57,6 +57,7 @@
 #include "decoupled_frontend.h"
 
 Flag perf_pred_started = FALSE;
+Cmp_Model        cmp_model;
 
 /**************************************************************************************/
 /* Static prototypes */

diff --git a/src/cmp_model.h b/src/cmp_model.h
@@ -73,7 +73,7 @@ typedef struct Cmp_Model_struct {
 /**************************************************************************************/
 /* Global vars */
 
-Cmp_Model        cmp_model;
+// Cmp_Model        cmp_model;
 extern Cmp_Model cmp_model;
 
 /**************************************************************************************/

diff --git a/src/debug/memview.c b/src/debug/memview.c
@@ -68,7 +68,7 @@ typedef struct Proc_Info_struct {
 
 FILE*         trace;
 Bank_Info*    bank_infos;
-Proc_Info*    proc_infos;
+static Proc_Info*    proc_infos;
 Trigger*      start_trigger;
 Mem_Req_Type* req_types;
 

diff --git a/src/dumb_model.c b/src/dumb_model.c
@@ -43,7 +43,7 @@
 #include "debug/debug.param.h"
 #include "general.param.h"
 #include "memory/memory.param.h"
-
+Dumb_Model        dumb_model;
 
 /**************************************************************************************/
 /* Types */

diff --git a/src/dumb_model.h b/src/dumb_model.h
@@ -42,7 +42,7 @@ typedef struct Dumb_Model_struct {
 /**************************************************************************************/
 /* Global vars */
 
-Dumb_Model        dumb_model;
+// Dumb_Model        dumb_model;
 extern Dumb_Model dumb_model;
 
 /**************************************************************************************/

diff --git a/src/dvfs/perf_pred.c b/src/dvfs/perf_pred.c
@@ -112,7 +112,7 @@ enum {
 static Counter   chip_cycle_count;
 static Stat_Mon* stat_mon;
 
-Proc_Info* proc_infos;
+static Proc_Info* proc_infos;
 
 /* static function prototypes */
 static void critical_access_plot(uns proc_id, Mem_Req_Type type, uns req_ret,

diff --git a/src/frontend/frontend_table.def b/src/frontend/frontend_table.def
@@ -29,7 +29,7 @@
 // Format: enum name, text name, function name prefix
 FRONTEND_IMPL(PIN_EXEC_DRIVEN, "pin_exec_driven", pin_exec_driven)
 FRONTEND_IMPL(TRACE,           "trace",           trace)
-#ifdef ENABLE_PT_MEMTRACE
+// #ifdef ENABLE_PT_MEMTRACE
 FRONTEND_IMPL(MEMTRACE,	       "memtrace",	      ext_trace)
 FRONTEND_IMPL(PT,	             "pt",	            ext_trace)
-#endif
+// #endif
diff --git a/src/frontend/pin_trace_fe.c b/src/frontend/pin_trace_fe.c
@@ -52,7 +52,7 @@
 /**************************************************************************************/
 /* Global Variables */
 
-char* trace_files[MAX_NUM_PROCS];
+static char* trace_files[MAX_NUM_PROCS];
 
 ctype_pin_inst* next_pi;
 

diff --git a/src/frontend/pt_memtrace/memtrace_fe.cc b/src/frontend/pt_memtrace/memtrace_fe.cc
@@ -53,7 +53,7 @@ extern "C" {
 /**************************************************************************************/
 /* Global Variables */
 
-char*           trace_files[MAX_NUM_PROCS];
+static char*           trace_files[MAX_NUM_PROCS];
 TraceReader*    trace_readers[MAX_NUM_PROCS];
 //TODO: Make per proc?
 uint64_t        ins_id    = 0;

diff --git a/src/frontend/pt_memtrace/trace_fe.cc b/src/frontend/pt_memtrace/trace_fe.cc
@@ -12,6 +12,7 @@
 #include <map>
 #include <fstream>
 #include <iomanip>
+#include <limits>
 
 #include "frontend/pt_memtrace/pt_fe.h"
 #include "frontend/frontend_intf.h"
@@ -167,8 +168,9 @@ void ext_trace_fetch_op(uns proc_id, Op* op) {
     if (!off_path_mode[proc_id]) {
 
       int success = false;
-      if (FRONTEND == FE_PT)
+      if (FRONTEND == FE_PT) {
         success = pt_trace_read(proc_id, &next_onpath_pi[proc_id]);
+      }
       else if (FRONTEND == FE_MEMTRACE)
         success = memtrace_trace_read(proc_id, &next_onpath_pi[proc_id]);
       if(!success) {
@@ -258,12 +260,14 @@ void ext_trace_init() {
   memset(next_onpath_pi, 0, sizeof(next_onpath_pi));
 
   if (FRONTEND == FE_PT) {
+    printf("[ext_trace_init] Initializing pt frontend\n");
     pt_init();
     for(uns proc_id = 0; proc_id < NUM_CORES; proc_id++) {
       pt_trace_read(proc_id, &next_onpath_pi[proc_id]);
     }
   }
   else if (FRONTEND == FE_MEMTRACE) {
+    printf("[ext_trace_init] Initializing memtrace frontend\n");
     memtrace_init();
     for(uns proc_id = 0; proc_id < NUM_CORES; proc_id++) {
       memtrace_trace_read(proc_id, &next_onpath_pi[proc_id]);

diff --git a/src/memory/cache_part.c b/src/memory/cache_part.c
@@ -64,7 +64,7 @@ typedef void (*Search_Func)(void);
 /**************************************************************************************/
 /* Global variables */
 
-Proc_Info* proc_infos;
+static Proc_Info* proc_infos;
 Trigger*   l1_part_start;  // indicates the L1 partition has been enabled
 Trigger* l1_part_trigger;  // external trigger for trigger repart (should not be
                            // set too often)

diff --git a/src/pin/pin_lib/decoder.cc b/src/pin/pin_lib/decoder.cc
@@ -137,7 +137,7 @@ ctype_pin_inst* pin_decoder_get_latest_inst() {
 }
 
 void pin_decoder_print_unknown_opcodes() {
-  for(const auto opcode : unknown_opcodes) {
+  for(const auto &opcode : unknown_opcodes) {
     (*glb_err_ostream) << opcode << std::endl;
   }
 }

diff --git a/src/pin/pin_lib/uop_generator.c b/src/pin/pin_lib/uop_generator.c
@@ -101,7 +101,7 @@ typedef struct Trace_Uop_struct Trace_Uop;
 extern int op_type_delays[NUM_OP_TYPES];
 extern uns NEW_INST_TABLE_SIZE;  // TODO: what is this?
 
-char* trace_files[MAX_NUM_PROCS];
+// static char* trace_files[MAX_NUM_PROCS];
 
 char dbg_print_buf[1024];
 

diff --git a/src/pin/pin_lib/x86_decoder.cc b/src/pin/pin_lib/x86_decoder.cc
@@ -1371,7 +1371,7 @@ void init_pin_opcode_convert(void) {
   iclass_to_scarab_map[XED_ICLASS_SYSCALL]  = {OP_IADD, -1, 1, NONE};
   iclass_to_scarab_map[XED_ICLASS_SYSENTER] = {OP_IADD, -1, 1, NONE};
   iclass_to_scarab_map[XED_ICLASS_SYSRET] = {OP_IADD, -1, 1, NONE};
-  iclass_to_scarab_map[XED_ICLASS_SYSRET64] = {OP_IADD, -1, 1, NONE};
+  // iclass_to_scarab_map[XED_ICLASS_SYSRET64] = {OP_IADD, -1, 1, NONE};
 
   iclass_to_scarab_map[XED_ICLASS_SWAPGS]  = {OP_MOV,-1,1,NONE};
   iclass_to_scarab_map[XED_ICLASS_TEST]     = {OP_LOGIC, -1, 1, NONE};

diff --git a/src/prefetcher/l2l1pref.c b/src/prefetcher/l2l1pref.c
@@ -59,7 +59,7 @@
 
 extern Memory*       mem;
 extern Dcache_Stage* dc;
-Cache*               l1_cache;
+static Cache*               l1_cache;
 
 /***************************************************************************************/
 /* Local Prototypes */

diff --git a/src/prefetcher/l2way_pref.c b/src/prefetcher/l2way_pref.c
@@ -64,7 +64,7 @@ L2way_Rec**    l2way_table;
 L1pref_Req*    l1pref_req_queue;
 static Counter l1pref_send_no;
 static Counter l1pref_req_no;
-Cache*         l1_cache;
+static Cache*         l1_cache;
 
 /**************************************************************************************/
 

diff --git a/src/uop_cache.c b/src/uop_cache.c
@@ -52,7 +52,7 @@ static inline Flag in_uop_cache_search(Addr search_addr, Flag update_repl, Flag
 /**************************************************************************************/
 /* Global Variables */
 
-uns8 proc_id;
+static uns8 proc_id;
 static Flag UOP_CACHE_ON;
 
 // uop trace/bbl accumulation