diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2013-09-04 13:22:56 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2013-09-04 13:22:56 -0400 |
| commit | ea402970185d5df01dbad2c0f41b8d76d2eb01cd (patch) | |
| tree | ca6670c9db05e67783b34a4a1d099b9500ef2bdd /src/cpu/inorder/InOrderCPU.py | |
| parent | bb1d2f39575795f0b369bb3cabb52c9d42a8b1c6 (diff) | |
| download | gem5-ea402970185d5df01dbad2c0f41b8d76d2eb01cd.tar.xz | |
cpu: Move the branch predictor out of the BaseCPU
The branch predictor is guarded by having either the in-order or
out-of-order CPU as one of the available CPU models and therefore
should not be used in the BaseCPU. This patch moves the parameter to
the relevant CPU classes.
Diffstat (limited to 'src/cpu/inorder/InOrderCPU.py')
| -rw-r--r-- | src/cpu/inorder/InOrderCPU.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cpu/inorder/InOrderCPU.py b/src/cpu/inorder/InOrderCPU.py index e29a29556..4caf254c4 100644 --- a/src/cpu/inorder/InOrderCPU.py +++ b/src/cpu/inorder/InOrderCPU.py @@ -68,4 +68,6 @@ class InOrderCPU(BaseCPU): div32Latency = Param.Cycles(1, "Latency for 32-bit Divide Operations") div32RepeatRate = Param.Cycles(1, "Repeat Rate for 32-bit Divide Operations") - branchPred = BranchPredictor(numThreads = Parent.numThreads) + branchPred = Param.BranchPredictor(BranchPredictor(numThreads = + Parent.numThreads), + "Branch Predictor") |