Cross Reference: /gem5/src/cpu/pred/bpred

Deleted Added

sdiff udiff text old ( 13810:f50e3b82df73 ) new ( 13831:4fba790d88be )

full compact

199c199,201
< DPRINTF(Branch, "[tid:%i]: Unconditional control.\n", tid);
---
> DPRINTF(Branch, "[tid:%i] [sn:%llu] "
> "Unconditional control\n",
> tid,seqNum);
207,208c209,211
< DPRINTF(Branch, "[tid:%i]: [sn:%i] Branch predictor"
< " predicted %i for PC %s\n", tid, seqNum, pred_taken, pc);
---
> DPRINTF(Branch, "[tid:%i] [sn:%llu] "
> "Branch predictor predicted %i for PC %s\n",
> tid, seqNum, pred_taken, pc);
216c219,220
< DPRINTF(Branch, "[tid:%i]: [sn:%i] Creating prediction history "
---
> DPRINTF(Branch, "[tid:%i] [sn:%llu] "
> "Creating prediction history "
239,241c243,245
< DPRINTF(Branch, "[tid:%i]: Instruction %s is a return, "
< "RAS predicted target: %s, RAS index: %i.\n",
< tid, pc, target, predict_record.RASIndex);
---
> DPRINTF(Branch, "[tid:%i] [sn:%llu] Instruction %s is a return, "
> "RAS predicted target: %s, RAS index: %i\n",
> tid, seqNum, pc, target, predict_record.RASIndex);
253,255c257,260
< DPRINTF(Branch, "[tid:%i]: Instruction %s was a "
< "call, adding %s to the RAS index: %i.\n",
< tid, pc, pc, RAS[tid].topIdx());
---
> DPRINTF(Branch,
> "[tid:%i] [sn:%llu] Instruction %s was a call, adding "
> "%s to the RAS index: %i\n",
> tid, seqNum, pc, pc, RAS[tid].topIdx());
262d266
<
265,268c269,272
<
< DPRINTF(Branch, "[tid:%i]: Instruction %s predicted"
< " target is %s.\n", tid, pc, target);
<
---
> DPRINTF(Branch,
> "[tid:%i] [sn:%llu] Instruction %s predicted "
> "target is %s\n",
> tid, seqNum, pc, target);
270,271c274,275
< DPRINTF(Branch, "[tid:%i]: BTB doesn't have a "
< "valid entry.\n",tid);
---
> DPRINTF(Branch, "[tid:%i] [sn:%llu] BTB doesn't have a "
> "valid entry\n",tid,seqNum);
278,279c282,285
< DPRINTF(Branch, "[tid:%i]:[sn:%i] btbUpdate"
< " called for %s\n", tid, seqNum, pc);
---
> DPRINTF(Branch,
> "[tid:%i] [sn:%llu] btbUpdate "
> "called for %s\n",
> tid, seqNum, pc);
293,294c299,303
< DPRINTF(Branch, "[tid:%i]: Instruction %s predicted "
< "indirect target is %s.\n", tid, pc, target);
---
> DPRINTF(Branch,
> "[tid:%i] [sn:%llu] "
> "Instruction %s predicted "
> "indirect target is %s\n",
> tid, seqNum, pc, target);
298,299c307,311
< DPRINTF(Branch, "[tid:%i]: Instruction %s no indirect "
< "target.\n", tid, pc);
---
> DPRINTF(Branch,
> "[tid:%i] [sn:%llu] "
> "Instruction %s no indirect "
> "target\n",
> tid, seqNum, pc);
333,334c345,348
< DPRINTF(Branch, "[tid:%i]: [sn:%i]: History entry added."
< "predHist.size(): %i\n", tid, seqNum, predHist[tid].size());
---
> DPRINTF(Branch,
> "[tid:%i] [sn:%llu] History entry added. "
> "predHist.size(): %i\n",
> tid, seqNum, predHist[tid].size());
342,343c356,357
< DPRINTF(Branch, "[tid:%i]: Committing branches until "
< "[sn:%lli].\n", tid, done_sn);
---
> DPRINTF(Branch, "[tid:%i] Committing branches until "
> "sn:%llu]\n", tid, done_sn);
374,375c388,390
< DPRINTF(Branch, "[tid:%i]: Restoring top of RAS to: %i,"
< " target: %s.\n", tid,
---
> DPRINTF(Branch, "[tid:%i] [squash sn:%llu]"
> " Restoring top of RAS to: %i,"
> " target: %s\n", tid, squashed_sn,
382,383c397,398
< DPRINTF(Branch, "[tid: %i] Squashing"
< " Call [sn:%i] PC: %s Popping RAS\n", tid,
---
> DPRINTF(Branch, "[tid:%i] [squash sn:%llu] Squashing"
> " Call [sn:%llu] PC: %s Popping RAS\n", tid, squashed_sn,
394,395c409,411
< DPRINTF(Branch, "[tid:%i]: Removing history for [sn:%i] "
< "PC %s.\n", tid, pred_hist.front().seqNum,
---
> DPRINTF(Branch, "[tid:%i] [squash sn:%llu] "
> "Removing history for [sn:%llu] "
> "PC %#x\n", tid, squashed_sn, pred_hist.front().seqNum,
400,401c416,417
< DPRINTF(Branch, "[tid:%i]: predHist.size(): %i\n",
< tid, predHist[tid].size());
---
> DPRINTF(Branch, "[tid:%i] [squash sn:%llu] predHist.size(): %i\n",
> tid, squashed_sn, predHist[tid].size());
426,427c442,443
< DPRINTF(Branch, "[tid:%i]: Squashing from sequence number %i, "
< "setting target to %s.\n", tid, squashed_sn, corrTarget);
---
> DPRINTF(Branch, "[tid:%i] Squashing from sequence number %i, "
> "setting target to %s\n", tid, squashed_sn, corrTarget);
452,453c468,470
< DPRINTF(Branch, "[tid:%i]: Incorrect RAS [sn:%i]\n",
< tid, hist_it->seqNum);
---
> DPRINTF(Branch,
> "[tid:%i] [squash sn:%llu] Incorrect RAS [sn:%llu]\n",
> tid, squashed_sn, hist_it->seqNum);
480,482c497,501
< DPRINTF(Branch, "[tid: %i] Incorrectly predicted"
< " return [sn:%i] PC: %s\n", tid, hist_it->seqNum,
< hist_it->pc);
---
> DPRINTF(Branch, "[tid:%i] [squash sn:%llu] "
> "Incorrectly predicted "
> "return [sn:%llu] PC: %#x\n", tid, squashed_sn,
> hist_it->seqNum,
> hist_it->pc);
492,493c511,514
< DPRINTF(Branch,"[tid: %i] BTB Update called for [sn:%i]"
< " PC: %s\n", tid,hist_it->seqNum, hist_it->pc);
---
> DPRINTF(Branch,"[tid:%i] [squash sn:%llu] "
> "BTB Update called for [sn:%llu] "
> "PC %#x\n", tid, squashed_sn,
> hist_it->seqNum, hist_it->pc);
500,501c521,524
< DPRINTF(Branch,"[tid: %i] Incorrectly predicted"
< " return [sn:%i] PC: %s Restoring RAS\n", tid,
---
> DPRINTF(Branch,
> "[tid:%i] [squash sn:%llu] Incorrectly predicted "
> "return [sn:%llu] PC: %#x Restoring RAS\n", tid,
> squashed_sn,
503,504c526,528
< DPRINTF(Branch, "[tid:%i]: Restoring top of RAS"
< " to: %i, target: %s.\n", tid,
---
> DPRINTF(Branch,
> "[tid:%i] [squash sn:%llu] Restoring top of RAS "
> "to: %i, target: %s\n", tid, squashed_sn,
510,512c534,539
< DPRINTF(Branch, "[tid: %i] Incorrectly predicted"
< " Call [sn:%i] PC: %s Popping RAS\n", tid,
< hist_it->seqNum, hist_it->pc);
---
> DPRINTF(Branch,
> "[tid:%i] [squash sn:%llu] "
> "Incorrectly predicted "
> "Call [sn:%llu] PC: %s Popping RAS\n",
> tid, squashed_sn,
> hist_it->seqNum, hist_it->pc);
518,519c545,546
< DPRINTF(Branch, "[tid:%i]: [sn:%i] pred_hist empty, can't "
< "update.\n", tid, squashed_sn);
---
> DPRINTF(Branch, "[tid:%i] [sn:%llu] pred_hist empty, can't "
> "update\n", tid, squashed_sn);
534c561
< cprintf("[sn:%lli], PC:%#x, tid:%i, predTaken:%i, "
---
> cprintf("sn:%llu], PC:%#x, tid:%i, predTaken:%i, "