cpu-o3: move mbtb to s0

Change-Id: I65f24ad3248d174598d0f09d46757527fc58041d

Author: Cao Jiaming

src/cpu/pred/BranchPredictor.py

@@ -981,7 +981,7 @@ class MBTB(TimedBaseBTBPredictor):
     instShiftAmt = Param.Unsigned(1, "Amount to shift PC to get inst bits")
     numThreads = Param.Unsigned(1, "Number of threads")
     numWays = Param.Unsigned(4, "Number of ways per set") # for 2 SRAMs, 4 ways per SRAM
-    numDelay = 2
+    numDelay = 0
     blockSize = 32  # max 64 byte block, 32 byte aligned
     # MBTB is always half-aligned - no parameter needed
     victimCacheSize = Param.Unsigned(0, "Number of entries in the victim cache")

src/cpu/pred/btb/decoupled_bpred.cc

@@ -55,10 +55,10 @@ DecoupledBPUWithBTB::DecoupledBPUWithBTB(const DecoupledBPUWithBTBParams &p)
     }
     bpType = DecoupledBTBType;
     // Only add enabled components to the list
-    if (ubtb->isEnabled()) components.push_back(ubtb);
-    if (abtb->isEnabled()) components.push_back(abtb);
-    if (microtage->isEnabled()) components.push_back(microtage);
+    // if (ubtb->isEnabled()) components.push_back(ubtb);
+    // if (abtb->isEnabled()) components.push_back(abtb);
     if (mbtb->isEnabled()) components.push_back(mbtb);
+    if (microtage->isEnabled()) components.push_back(microtage);
     if (tage->isEnabled()) components.push_back(tage);
     if (ras->isEnabled()) components.push_back(ras);
     if (ittage->isEnabled()) components.push_back(ittage);