changeset cba563d00376 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=cba563d00376
description:
cpu: Remove Ozone CPU from the source tree
The Ozone CPU is now very much out of date and completely
non-functional, with no one actively working on restoring it. It is a
source of confusion for new users who attempt to use it before
realizing its current state. RIP
diffstat:
src/cpu/checker/cpu_impl.hh | 2 +-
src/cpu/o3/SConscript | 8 +-
src/cpu/ozone/OzoneCPU.py | 118 -
src/cpu/ozone/OzoneChecker.py | 38 -
src/cpu/ozone/SConscript | 57 -
src/cpu/ozone/SConsopts | 35 -
src/cpu/ozone/SimpleOzoneCPU.py | 111 -
src/cpu/ozone/back_end.cc | 34 -
src/cpu/ozone/back_end.hh | 535 --------
src/cpu/ozone/back_end_impl.hh | 1919 --------------------------------
src/cpu/ozone/base_dyn_inst.cc | 35 -
src/cpu/ozone/bpred_unit.cc | 36 -
src/cpu/ozone/checker_builder.cc | 100 -
src/cpu/ozone/cpu.cc | 37 -
src/cpu/ozone/cpu.hh | 419 ------
src/cpu/ozone/cpu_builder.cc | 200 ---
src/cpu/ozone/cpu_impl.hh | 886 --------------
src/cpu/ozone/dyn_inst.cc | 37 -
src/cpu/ozone/dyn_inst.hh | 225 ---
src/cpu/ozone/dyn_inst_impl.hh | 277 ----
src/cpu/ozone/ea_list.cc | 80 -
src/cpu/ozone/ea_list.hh | 75 -
src/cpu/ozone/front_end.cc | 36 -
src/cpu/ozone/front_end.hh | 317 -----
src/cpu/ozone/front_end_impl.hh | 995 ----------------
src/cpu/ozone/inorder_back_end.cc | 34 -
src/cpu/ozone/inorder_back_end.hh | 382 ------
src/cpu/ozone/inorder_back_end_impl.hh | 527 --------
src/cpu/ozone/inst_queue.cc | 38 -
src/cpu/ozone/inst_queue.hh | 508 --------
src/cpu/ozone/inst_queue_impl.hh | 1349 ----------------------
src/cpu/ozone/lsq_unit.cc | 36 -
src/cpu/ozone/lsq_unit.hh | 636 ----------
src/cpu/ozone/lsq_unit_impl.hh | 844 --------------
src/cpu/ozone/lw_back_end.cc | 34 -
src/cpu/ozone/lw_back_end.hh | 435 -------
src/cpu/ozone/lw_back_end_impl.hh | 1677 ---------------------------
src/cpu/ozone/lw_lsq.cc | 36 -
src/cpu/ozone/lw_lsq.hh | 695 -----------
src/cpu/ozone/lw_lsq_impl.hh | 965 ----------------
src/cpu/ozone/null_predictor.hh | 105 -
src/cpu/ozone/ozone_base_dyn_inst.cc | 39 -
src/cpu/ozone/ozone_impl.hh | 74 -
src/cpu/ozone/rename_table.cc | 36 -
src/cpu/ozone/rename_table.hh | 56 -
src/cpu/ozone/rename_table_impl.hh | 58 -
src/cpu/ozone/simple_base_dyn_inst.cc | 39 -
src/cpu/ozone/simple_cpu_builder.cc | 196 ---
src/cpu/ozone/simple_impl.hh | 70 -
src/cpu/ozone/simple_params.hh | 192 ---
src/cpu/ozone/thread_state.hh | 152 --
51 files changed, 4 insertions(+), 15821 deletions(-)
diffs (truncated from 16048 to 300 lines):
diff -r ceb471d74fe9 -r cba563d00376 src/cpu/checker/cpu_impl.hh
--- a/src/cpu/checker/cpu_impl.hh Thu Oct 09 17:51:57 2014 -0400
+++ b/src/cpu/checker/cpu_impl.hh Thu Oct 09 17:51:58 2014 -0400
@@ -410,7 +410,7 @@
if (FullSystem) {
// @todo: Determine if these should happen only if the
// instruction hasn't faulted. In the SimpleCPU case this may
- // not be true, but in the O3 or Ozone case this may be true.
+ // not be true, but in the O3 case this may be true.
Addr oldpc;
int count = 0;
do {
diff -r ceb471d74fe9 -r cba563d00376 src/cpu/o3/SConscript
--- a/src/cpu/o3/SConscript Thu Oct 09 17:51:57 2014 -0400
+++ b/src/cpu/o3/SConscript Thu Oct 09 17:51:58 2014 -0400
@@ -32,11 +32,6 @@
Import('*')
-if 'O3CPU' in env['CPU_MODELS'] or 'OzoneCPU' in env['CPU_MODELS']:
- DebugFlag('CommitRate')
- DebugFlag('IEW')
- DebugFlag('IQ')
-
if 'O3CPU' in env['CPU_MODELS']:
SimObject('FUPool.py')
SimObject('FuncUnitConfig.py')
@@ -64,6 +59,9 @@
Source('store_set.cc')
Source('thread_context.cc')
+ DebugFlag('CommitRate')
+ DebugFlag('IEW')
+ DebugFlag('IQ')
DebugFlag('LSQ')
DebugFlag('LSQUnit')
DebugFlag('MemDepUnit')
diff -r ceb471d74fe9 -r cba563d00376 src/cpu/ozone/OzoneCPU.py
--- a/src/cpu/ozone/OzoneCPU.py Thu Oct 09 17:51:57 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-# Copyright (c) 2006-2007 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Kevin Lim
-
-from m5.defines import buildEnv
-from m5.params import *
-from BaseCPU import BaseCPU
-from OzoneChecker import OzoneChecker
-
-class DerivOzoneCPU(BaseCPU):
- type = 'DerivOzoneCPU'
-
- numThreads = Param.Unsigned("number of HW thread contexts")
-
- width = Param.Unsigned("Width")
- frontEndWidth = Param.Unsigned("Front end width")
- frontEndLatency = Param.Unsigned("Front end latency")
- backEndWidth = Param.Unsigned("Back end width")
- backEndSquashLatency = Param.Unsigned("Back end squash latency")
- backEndLatency = Param.Unsigned("Back end latency")
- maxInstBufferSize = Param.Unsigned("Maximum instruction buffer size")
- maxOutstandingMemOps = Param.Unsigned("Maximum number of outstanding
memory operations")
- decodeToFetchDelay = Param.Unsigned("Decode to fetch delay")
- renameToFetchDelay = Param.Unsigned("Rename to fetch delay")
- iewToFetchDelay = Param.Unsigned("Issue/Execute/Writeback to fetch "
- "delay")
- commitToFetchDelay = Param.Unsigned("Commit to fetch delay")
- fetchWidth = Param.Unsigned("Fetch width")
-
- renameToDecodeDelay = Param.Unsigned("Rename to decode delay")
- iewToDecodeDelay = Param.Unsigned("Issue/Execute/Writeback to decode "
- "delay")
- commitToDecodeDelay = Param.Unsigned("Commit to decode delay")
- fetchToDecodeDelay = Param.Unsigned("Fetch to decode delay")
- decodeWidth = Param.Unsigned("Decode width")
-
- iewToRenameDelay = Param.Unsigned("Issue/Execute/Writeback to rename "
- "delay")
- commitToRenameDelay = Param.Unsigned("Commit to rename delay")
- decodeToRenameDelay = Param.Unsigned("Decode to rename delay")
- renameWidth = Param.Unsigned("Rename width")
-
- commitToIEWDelay = Param.Unsigned("Commit to "
- "Issue/Execute/Writeback delay")
- renameToIEWDelay = Param.Unsigned("Rename to "
- "Issue/Execute/Writeback delay")
- issueToExecuteDelay = Param.Unsigned("Issue to execute delay (internal "
- "to the IEW stage)")
- issueWidth = Param.Unsigned("Issue width")
- executeWidth = Param.Unsigned("Execute width")
- executeIntWidth = Param.Unsigned("Integer execute width")
- executeFloatWidth = Param.Unsigned("Floating point execute width")
- executeBranchWidth = Param.Unsigned("Branch execute width")
- executeMemoryWidth = Param.Unsigned("Memory execute width")
-
- iewToCommitDelay = Param.Unsigned("Issue/Execute/Writeback to commit "
- "delay")
- renameToROBDelay = Param.Unsigned("Rename to reorder buffer delay")
- commitWidth = Param.Unsigned("Commit width")
- squashWidth = Param.Unsigned("Squash width")
-
- predType = Param.String("Type of branch predictor ('local', 'tournament')")
- localPredictorSize = Param.Unsigned("Size of local predictor")
- localCtrBits = Param.Unsigned("Bits per counter")
- localHistoryTableSize = Param.Unsigned("Size of local history table")
- localHistoryBits = Param.Unsigned("Bits for the local history")
- globalPredictorSize = Param.Unsigned("Size of global predictor")
- globalCtrBits = Param.Unsigned("Bits per counter")
- globalHistoryBits = Param.Unsigned("Bits of history")
- choicePredictorSize = Param.Unsigned("Size of choice predictor")
- choiceCtrBits = Param.Unsigned("Bits of choice counters")
-
- BTBEntries = Param.Unsigned("Number of BTB entries")
- BTBTagSize = Param.Unsigned("Size of the BTB tags, in bits")
-
- RASSize = Param.Unsigned("RAS size")
-
- LQEntries = Param.Unsigned("Number of load queue entries")
- SQEntries = Param.Unsigned("Number of store queue entries")
- lsqLimits = Param.Bool(True, "LSQ size limits dispatch")
- LFSTSize = Param.Unsigned("Last fetched store table size")
- SSITSize = Param.Unsigned("Store set ID table size")
-
- numPhysIntRegs = Param.Unsigned("Number of physical integer registers")
- numPhysFloatRegs = Param.Unsigned("Number of physical floating point "
- "registers")
- numIQEntries = Param.Unsigned("Number of instruction queue entries")
- numROBEntries = Param.Unsigned("Number of reorder buffer entries")
-
- instShiftAmt = Param.Unsigned("Number of bits to shift instructions by")
-
- # If the CheckerCPU is brought back to useability in the OzoneCPU, create a
- # function here called addCheckerCpu() to create a non-NULL Checker and
- # connect its TLBs (if needed)
diff -r ceb471d74fe9 -r cba563d00376 src/cpu/ozone/OzoneChecker.py
--- a/src/cpu/ozone/OzoneChecker.py Thu Oct 09 17:51:57 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2007 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nathan Binkert
-
-from m5.params import *
-from BaseCPU import BaseCPU
-
-class OzoneChecker(BaseCPU):
- type = 'OzoneChecker'
- exitOnError = Param.Bool(False, "Exit on an error")
- updateOnError = Param.Bool(False,
- "Update the checker with the main CPU's state on an error")
- warnOnlyOnLoadError = Param.Bool(False,
- "If a load result is incorrect, only print a warning and do not exit")
diff -r ceb471d74fe9 -r cba563d00376 src/cpu/ozone/SConscript
--- a/src/cpu/ozone/SConscript Thu Oct 09 17:51:57 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-# -*- mode:python -*-
-
-# Copyright (c) 2006 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nathan Binkert
-
-Import('*')
-
-if 'OzoneCPU' in env['CPU_MODELS']:
- SimObject('OzoneCPU.py')
- SimObject('SimpleOzoneCPU.py')
-
- need_bp_unit = True
- Source('base_dyn_inst.cc')
- Source('bpred_unit.cc')
- Source('cpu.cc')
- Source('cpu_builder.cc')
- Source('dyn_inst.cc')
- Source('front_end.cc')
- Source('lw_back_end.cc')
- Source('lw_lsq.cc')
- Source('rename_table.cc')
-
- DebugFlag('BE')
- DebugFlag('FE')
- DebugFlag('IBE')
- DebugFlag('OzoneCPU')
- DebugFlag('OzoneLSQ')
-
- CompoundFlag('OzoneCPUAll', [ 'BE', 'FE', 'IBE', 'OzoneLSQ', 'OzoneCPU' ])
-
- SimObject('OzoneChecker.py')
- Source('checker_builder.cc')
diff -r ceb471d74fe9 -r cba563d00376 src/cpu/ozone/SConsopts
--- a/src/cpu/ozone/SConsopts Thu Oct 09 17:51:57 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# -*- mode:python -*-
-
-# Copyright (c) 2006 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Nathan Binkert
-
-Import('*')
-
-CpuModel('OzoneSimpleCPU')
-CpuModel('OzoneCPU')
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
