Removed local predictor

Author: prodromou87

src/main.c

@@ -26,7 +26,6 @@ usage()
   fprintf(stderr," --<type>     Branch prediction scheme:\n");
   fprintf(stderr,"    static\n"
                  "    gshare:<# ghistory>\n"
-                 "    local:<# lhistory>:<# index>\n"
                  "    tournament:<# ghistory>:<# lhistory>:<# index>\n"
                  "    custom\n");
 }
@@ -44,9 +43,6 @@ handle_option(char *arg)
   } else if (!strncmp(arg,"--gshare:",9)) {
     bpType = GSHARE;
     sscanf(arg+9,"%d", &ghistoryBits);
-  } else if (!strncmp(arg,"--local:",8)) {
-    bpType = LOCAL;
-    sscanf(arg+8,"%d:%d", &lhistoryBits, &pcIndexBits);
   } else if (!strncmp(arg,"--tournament:",13)) {
     bpType = TOURNAMENT;
     sscanf(arg+13,"%d:%d:%d", &ghistoryBits, &lhistoryBits, &pcIndexBits);

src/predictor.c

@@ -20,7 +20,7 @@ const char *email       = "EMAIL";
 //------------------------------------//
 
 // Handy Global for use in output routines
-const char *bpName[5] = { "Static", "Gshare", "Local",
+const char *bpName[4] = { "Static", "Gshare",
                           "Tournament", "Custom" };
 
 int ghistoryBits; // Number of bits used for Global History
@@ -67,7 +67,6 @@ make_prediction(uint32_t pc)
     case STATIC:
       return TAKEN;
     case GSHARE:
-    case LOCAL:
     case TOURNAMENT:
     case CUSTOM:
     default:

src/predictor.h

@@ -28,10 +28,8 @@ extern const char *email;
 // The Different Predictor Types
 #define STATIC      0
 #define GSHARE      1
-#define LOCAL       2
-#define TOURNAMENT  3
-#define CUSTOM      4
-#define MYTEST      5
+#define TOURNAMENT  2
+#define CUSTOM      3
 extern const char *bpName[];
 
 // Definitions for 2-bit counters