2006-05-25 23:13:00 +02:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
|
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
#include "cpu/checker/cpu.hh"
|
2006-04-23 00:45:01 +02:00
|
|
|
#include "cpu/inst_seq.hh"
|
|
|
|
|
#include "cpu/ozone/cpu.hh"
|
|
|
|
|
#include "cpu/ozone/ozone_impl.hh"
|
|
|
|
|
#include "cpu/ozone/simple_impl.hh"
|
|
|
|
|
#include "cpu/ozone/simple_params.hh"
|
|
|
|
|
#include "mem/cache/base_cache.hh"
|
|
|
|
|
#include "sim/builder.hh"
|
|
|
|
|
#include "sim/process.hh"
|
|
|
|
|
#include "sim/sim_object.hh"
|
|
|
|
|
|
|
|
|
|
class DerivOzoneCPU : public OzoneCPU<OzoneImpl>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
DerivOzoneCPU(SimpleParams *p)
|
|
|
|
|
: OzoneCPU<OzoneImpl>(p)
|
|
|
|
|
{ }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class SimpleOzoneCPU : public OzoneCPU<SimpleImpl>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
SimpleOzoneCPU(SimpleParams *p)
|
|
|
|
|
: OzoneCPU<SimpleImpl>(p)
|
|
|
|
|
{ }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// OzoneCPU Simulation Object
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(DerivOzoneCPU)
|
|
|
|
|
|
|
|
|
|
Param<int> clock;
|
|
|
|
|
Param<int> numThreads;
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
SimObjectParam<System *> system;
|
|
|
|
|
Param<int> cpu_id;
|
|
|
|
|
SimObjectParam<AlphaITB *> itb;
|
|
|
|
|
SimObjectParam<AlphaDTB *> dtb;
|
2006-08-24 22:06:45 +02:00
|
|
|
Param<Tick> profile;
|
2006-04-23 00:45:01 +02:00
|
|
|
#else
|
|
|
|
|
SimObjectVectorParam<Process *> workload;
|
2006-04-24 23:11:31 +02:00
|
|
|
//SimObjectParam<PageTable *> page_table;
|
2006-04-23 00:45:01 +02:00
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
|
|
|
|
|
|
SimObjectParam<FunctionalMemory *> mem;
|
|
|
|
|
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
SimObjectParam<BaseCPU *> checker;
|
|
|
|
|
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<Counter> max_insts_any_thread;
|
|
|
|
|
Param<Counter> max_insts_all_threads;
|
|
|
|
|
Param<Counter> max_loads_any_thread;
|
|
|
|
|
Param<Counter> max_loads_all_threads;
|
2006-08-24 22:06:45 +02:00
|
|
|
Param<Counter> stats_reset_inst;
|
2006-08-11 23:42:59 +02:00
|
|
|
Param<Tick> progress_interval;
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
SimObjectParam<BaseCache *> icache;
|
|
|
|
|
SimObjectParam<BaseCache *> dcache;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> cachePorts;
|
|
|
|
|
Param<unsigned> width;
|
2006-08-24 22:06:45 +02:00
|
|
|
Param<unsigned> frontEndLatency;
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<unsigned> frontEndWidth;
|
2006-08-24 22:06:45 +02:00
|
|
|
Param<unsigned> backEndLatency;
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<unsigned> backEndWidth;
|
|
|
|
|
Param<unsigned> backEndSquashLatency;
|
|
|
|
|
Param<unsigned> maxInstBufferSize;
|
|
|
|
|
Param<unsigned> numPhysicalRegs;
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
Param<unsigned> maxOutstandingMemOps;
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
Param<unsigned> decodeToFetchDelay;
|
|
|
|
|
Param<unsigned> renameToFetchDelay;
|
|
|
|
|
Param<unsigned> iewToFetchDelay;
|
|
|
|
|
Param<unsigned> commitToFetchDelay;
|
|
|
|
|
Param<unsigned> fetchWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> renameToDecodeDelay;
|
|
|
|
|
Param<unsigned> iewToDecodeDelay;
|
|
|
|
|
Param<unsigned> commitToDecodeDelay;
|
|
|
|
|
Param<unsigned> fetchToDecodeDelay;
|
|
|
|
|
Param<unsigned> decodeWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> iewToRenameDelay;
|
|
|
|
|
Param<unsigned> commitToRenameDelay;
|
|
|
|
|
Param<unsigned> decodeToRenameDelay;
|
|
|
|
|
Param<unsigned> renameWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> commitToIEWDelay;
|
|
|
|
|
Param<unsigned> renameToIEWDelay;
|
|
|
|
|
Param<unsigned> issueToExecuteDelay;
|
|
|
|
|
Param<unsigned> issueWidth;
|
|
|
|
|
Param<unsigned> executeWidth;
|
|
|
|
|
Param<unsigned> executeIntWidth;
|
|
|
|
|
Param<unsigned> executeFloatWidth;
|
|
|
|
|
Param<unsigned> executeBranchWidth;
|
|
|
|
|
Param<unsigned> executeMemoryWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> iewToCommitDelay;
|
|
|
|
|
Param<unsigned> renameToROBDelay;
|
|
|
|
|
Param<unsigned> commitWidth;
|
|
|
|
|
Param<unsigned> squashWidth;
|
|
|
|
|
|
2006-05-25 23:13:00 +02:00
|
|
|
Param<std::string> predType;
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<unsigned> localPredictorSize;
|
|
|
|
|
Param<unsigned> localCtrBits;
|
|
|
|
|
Param<unsigned> localHistoryTableSize;
|
|
|
|
|
Param<unsigned> localHistoryBits;
|
|
|
|
|
Param<unsigned> globalPredictorSize;
|
|
|
|
|
Param<unsigned> globalCtrBits;
|
|
|
|
|
Param<unsigned> globalHistoryBits;
|
|
|
|
|
Param<unsigned> choicePredictorSize;
|
|
|
|
|
Param<unsigned> choiceCtrBits;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> BTBEntries;
|
|
|
|
|
Param<unsigned> BTBTagSize;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> RASSize;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> LQEntries;
|
|
|
|
|
Param<unsigned> SQEntries;
|
2006-08-24 22:06:45 +02:00
|
|
|
Param<bool> lsqLimits;
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<unsigned> LFSTSize;
|
|
|
|
|
Param<unsigned> SSITSize;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> numPhysIntRegs;
|
|
|
|
|
Param<unsigned> numPhysFloatRegs;
|
|
|
|
|
Param<unsigned> numIQEntries;
|
|
|
|
|
Param<unsigned> numROBEntries;
|
|
|
|
|
|
|
|
|
|
Param<bool> decoupledFrontEnd;
|
|
|
|
|
Param<int> dispatchWidth;
|
|
|
|
|
Param<int> wbWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> smtNumFetchingThreads;
|
|
|
|
|
Param<std::string> smtFetchPolicy;
|
|
|
|
|
Param<std::string> smtLSQPolicy;
|
|
|
|
|
Param<unsigned> smtLSQThreshold;
|
|
|
|
|
Param<std::string> smtIQPolicy;
|
|
|
|
|
Param<unsigned> smtIQThreshold;
|
|
|
|
|
Param<std::string> smtROBPolicy;
|
|
|
|
|
Param<unsigned> smtROBThreshold;
|
|
|
|
|
Param<std::string> smtCommitPolicy;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> instShiftAmt;
|
|
|
|
|
|
|
|
|
|
Param<bool> defer_registration;
|
|
|
|
|
|
|
|
|
|
Param<bool> function_trace;
|
|
|
|
|
Param<Tick> function_trace_start;
|
|
|
|
|
|
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(DerivOzoneCPU)
|
|
|
|
|
|
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(DerivOzoneCPU)
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(clock, "clock speed"),
|
|
|
|
|
INIT_PARAM(numThreads, "number of HW thread contexts"),
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
INIT_PARAM(system, "System object"),
|
|
|
|
|
INIT_PARAM(cpu_id, "processor ID"),
|
|
|
|
|
INIT_PARAM(itb, "Instruction translation buffer"),
|
|
|
|
|
INIT_PARAM(dtb, "Data translation buffer"),
|
2006-08-24 22:06:45 +02:00
|
|
|
INIT_PARAM(profile, ""),
|
2006-04-23 00:45:01 +02:00
|
|
|
#else
|
|
|
|
|
INIT_PARAM(workload, "Processes to run"),
|
2006-04-24 23:11:31 +02:00
|
|
|
// INIT_PARAM(page_table, "Page table"),
|
2006-04-23 00:45:01 +02:00
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(mem, "Memory", NULL),
|
|
|
|
|
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
INIT_PARAM_DFLT(checker, "Checker CPU", NULL),
|
|
|
|
|
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM_DFLT(max_insts_any_thread,
|
|
|
|
|
"Terminate when any thread reaches this inst count",
|
|
|
|
|
0),
|
|
|
|
|
INIT_PARAM_DFLT(max_insts_all_threads,
|
|
|
|
|
"Terminate when all threads have reached"
|
|
|
|
|
"this inst count",
|
|
|
|
|
0),
|
|
|
|
|
INIT_PARAM_DFLT(max_loads_any_thread,
|
|
|
|
|
"Terminate when any thread reaches this load count",
|
|
|
|
|
0),
|
|
|
|
|
INIT_PARAM_DFLT(max_loads_all_threads,
|
|
|
|
|
"Terminate when all threads have reached this load"
|
|
|
|
|
"count",
|
|
|
|
|
0),
|
2006-08-24 22:06:45 +02:00
|
|
|
INIT_PARAM_DFLT(stats_reset_inst,
|
|
|
|
|
"blah",
|
|
|
|
|
0),
|
2006-08-11 23:42:59 +02:00
|
|
|
INIT_PARAM_DFLT(progress_interval, "Progress interval", 0),
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(icache, "L1 instruction cache", NULL),
|
|
|
|
|
INIT_PARAM_DFLT(dcache, "L1 data cache", NULL),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(cachePorts, "Cache Ports", 200),
|
|
|
|
|
INIT_PARAM_DFLT(width, "Width", 1),
|
2006-08-24 22:06:45 +02:00
|
|
|
INIT_PARAM_DFLT(frontEndLatency, "Front end latency", 1),
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM_DFLT(frontEndWidth, "Front end width", 1),
|
2006-08-24 22:06:45 +02:00
|
|
|
INIT_PARAM_DFLT(backEndLatency, "Back end latency", 1),
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM_DFLT(backEndWidth, "Back end width", 1),
|
|
|
|
|
INIT_PARAM_DFLT(backEndSquashLatency, "Back end squash latency", 1),
|
|
|
|
|
INIT_PARAM_DFLT(maxInstBufferSize, "Maximum instruction buffer size", 16),
|
|
|
|
|
INIT_PARAM(numPhysicalRegs, "Number of physical registers"),
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
INIT_PARAM_DFLT(maxOutstandingMemOps, "Maximum outstanding memory operations", 4),
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
INIT_PARAM(decodeToFetchDelay, "Decode to fetch delay"),
|
|
|
|
|
INIT_PARAM(renameToFetchDelay, "Rename to fetch delay"),
|
|
|
|
|
INIT_PARAM(iewToFetchDelay, "Issue/Execute/Writeback to fetch"
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(commitToFetchDelay, "Commit to fetch delay"),
|
|
|
|
|
INIT_PARAM(fetchWidth, "Fetch width"),
|
|
|
|
|
INIT_PARAM(renameToDecodeDelay, "Rename to decode delay"),
|
|
|
|
|
INIT_PARAM(iewToDecodeDelay, "Issue/Execute/Writeback to decode"
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(commitToDecodeDelay, "Commit to decode delay"),
|
|
|
|
|
INIT_PARAM(fetchToDecodeDelay, "Fetch to decode delay"),
|
|
|
|
|
INIT_PARAM(decodeWidth, "Decode width"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(iewToRenameDelay, "Issue/Execute/Writeback to rename"
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(commitToRenameDelay, "Commit to rename delay"),
|
|
|
|
|
INIT_PARAM(decodeToRenameDelay, "Decode to rename delay"),
|
|
|
|
|
INIT_PARAM(renameWidth, "Rename width"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(commitToIEWDelay, "Commit to "
|
|
|
|
|
"Issue/Execute/Writeback delay"),
|
|
|
|
|
INIT_PARAM(renameToIEWDelay, "Rename to "
|
|
|
|
|
"Issue/Execute/Writeback delay"),
|
|
|
|
|
INIT_PARAM(issueToExecuteDelay, "Issue to execute delay (internal"
|
|
|
|
|
"to the IEW stage)"),
|
|
|
|
|
INIT_PARAM(issueWidth, "Issue width"),
|
|
|
|
|
INIT_PARAM(executeWidth, "Execute width"),
|
|
|
|
|
INIT_PARAM(executeIntWidth, "Integer execute width"),
|
|
|
|
|
INIT_PARAM(executeFloatWidth, "Floating point execute width"),
|
|
|
|
|
INIT_PARAM(executeBranchWidth, "Branch execute width"),
|
|
|
|
|
INIT_PARAM(executeMemoryWidth, "Memory execute width"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(iewToCommitDelay, "Issue/Execute/Writeback to commit "
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(renameToROBDelay, "Rename to reorder buffer delay"),
|
|
|
|
|
INIT_PARAM(commitWidth, "Commit width"),
|
|
|
|
|
INIT_PARAM(squashWidth, "Squash width"),
|
|
|
|
|
|
2006-05-25 23:13:00 +02:00
|
|
|
INIT_PARAM(predType, "Type of branch predictor ('local', 'tournament')"),
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM(localPredictorSize, "Size of local predictor"),
|
|
|
|
|
INIT_PARAM(localCtrBits, "Bits per counter"),
|
|
|
|
|
INIT_PARAM(localHistoryTableSize, "Size of local history table"),
|
|
|
|
|
INIT_PARAM(localHistoryBits, "Bits for the local history"),
|
|
|
|
|
INIT_PARAM(globalPredictorSize, "Size of global predictor"),
|
|
|
|
|
INIT_PARAM(globalCtrBits, "Bits per counter"),
|
|
|
|
|
INIT_PARAM(globalHistoryBits, "Bits of history"),
|
|
|
|
|
INIT_PARAM(choicePredictorSize, "Size of choice predictor"),
|
|
|
|
|
INIT_PARAM(choiceCtrBits, "Bits of choice counters"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(BTBEntries, "Number of BTB entries"),
|
|
|
|
|
INIT_PARAM(BTBTagSize, "Size of the BTB tags, in bits"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(RASSize, "RAS size"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(LQEntries, "Number of load queue entries"),
|
|
|
|
|
INIT_PARAM(SQEntries, "Number of store queue entries"),
|
2006-08-24 22:06:45 +02:00
|
|
|
INIT_PARAM_DFLT(lsqLimits, "LSQ size limits dispatch", true),
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM(LFSTSize, "Last fetched store table size"),
|
|
|
|
|
INIT_PARAM(SSITSize, "Store set ID table size"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(numPhysIntRegs, "Number of physical integer registers"),
|
|
|
|
|
INIT_PARAM(numPhysFloatRegs, "Number of physical floating point "
|
|
|
|
|
"registers"),
|
|
|
|
|
INIT_PARAM(numIQEntries, "Number of instruction queue entries"),
|
|
|
|
|
INIT_PARAM(numROBEntries, "Number of reorder buffer entries"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(decoupledFrontEnd, "Decoupled front end", true),
|
|
|
|
|
INIT_PARAM_DFLT(dispatchWidth, "Dispatch width", 0),
|
|
|
|
|
INIT_PARAM_DFLT(wbWidth, "Writeback width", 0),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(smtNumFetchingThreads, "SMT Number of Fetching Threads", 1),
|
|
|
|
|
INIT_PARAM_DFLT(smtFetchPolicy, "SMT Fetch Policy", "SingleThread"),
|
|
|
|
|
INIT_PARAM_DFLT(smtLSQPolicy, "SMT LSQ Sharing Policy", "Partitioned"),
|
|
|
|
|
INIT_PARAM_DFLT(smtLSQThreshold,"SMT LSQ Threshold", 100),
|
|
|
|
|
INIT_PARAM_DFLT(smtIQPolicy, "SMT IQ Policy", "Partitioned"),
|
|
|
|
|
INIT_PARAM_DFLT(smtIQThreshold, "SMT IQ Threshold", 100),
|
|
|
|
|
INIT_PARAM_DFLT(smtROBPolicy, "SMT ROB Sharing Policy", "Partitioned"),
|
|
|
|
|
INIT_PARAM_DFLT(smtROBThreshold,"SMT ROB Threshold", 100),
|
|
|
|
|
INIT_PARAM_DFLT(smtCommitPolicy,"SMT Commit Fetch Policy", "RoundRobin"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(instShiftAmt, "Number of bits to shift instructions by"),
|
|
|
|
|
INIT_PARAM(defer_registration, "defer system registration (for sampling)"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(function_trace, "Enable function trace"),
|
|
|
|
|
INIT_PARAM(function_trace_start, "Cycle to start function trace")
|
|
|
|
|
|
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(DerivOzoneCPU)
|
|
|
|
|
|
|
|
|
|
CREATE_SIM_OBJECT(DerivOzoneCPU)
|
|
|
|
|
{
|
|
|
|
|
DerivOzoneCPU *cpu;
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
// Full-system only supports a single thread for the moment.
|
|
|
|
|
int actual_num_threads = 1;
|
|
|
|
|
#else
|
|
|
|
|
// In non-full-system mode, we infer the number of threads from
|
|
|
|
|
// the workload if it's not explicitly specified.
|
|
|
|
|
int actual_num_threads =
|
|
|
|
|
numThreads.isValid() ? numThreads : workload.size();
|
|
|
|
|
|
|
|
|
|
if (workload.size() == 0) {
|
|
|
|
|
fatal("Must specify at least one workload!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
SimpleParams *params = new SimpleParams;
|
|
|
|
|
|
|
|
|
|
params->clock = clock;
|
|
|
|
|
|
|
|
|
|
params->name = getInstanceName();
|
|
|
|
|
params->numberOfThreads = actual_num_threads;
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
params->system = system;
|
|
|
|
|
params->cpu_id = cpu_id;
|
|
|
|
|
params->itb = itb;
|
|
|
|
|
params->dtb = dtb;
|
2006-08-24 22:06:45 +02:00
|
|
|
params->profile = profile;
|
2006-04-23 00:45:01 +02:00
|
|
|
#else
|
|
|
|
|
params->workload = workload;
|
2006-04-24 23:11:31 +02:00
|
|
|
// params->pTable = page_table;
|
2006-04-23 00:45:01 +02:00
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
|
|
|
|
|
|
params->mem = mem;
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
params->checker = checker;
|
2006-04-23 00:45:01 +02:00
|
|
|
params->max_insts_any_thread = max_insts_any_thread;
|
|
|
|
|
params->max_insts_all_threads = max_insts_all_threads;
|
|
|
|
|
params->max_loads_any_thread = max_loads_any_thread;
|
|
|
|
|
params->max_loads_all_threads = max_loads_all_threads;
|
2006-08-24 22:06:45 +02:00
|
|
|
params->stats_reset_inst = stats_reset_inst;
|
2006-08-11 23:42:59 +02:00
|
|
|
params->progress_interval = progress_interval;
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Caches
|
|
|
|
|
//
|
|
|
|
|
params->icacheInterface = icache ? icache->getInterface() : NULL;
|
|
|
|
|
params->dcacheInterface = dcache ? dcache->getInterface() : NULL;
|
|
|
|
|
params->cachePorts = cachePorts;
|
|
|
|
|
|
|
|
|
|
params->width = width;
|
|
|
|
|
params->frontEndWidth = frontEndWidth;
|
2006-08-24 22:06:45 +02:00
|
|
|
params->frontEndLatency = frontEndLatency;
|
2006-04-23 00:45:01 +02:00
|
|
|
params->backEndWidth = backEndWidth;
|
|
|
|
|
params->backEndSquashLatency = backEndSquashLatency;
|
|
|
|
|
params->backEndLatency = backEndLatency;
|
|
|
|
|
params->maxInstBufferSize = maxInstBufferSize;
|
|
|
|
|
params->numPhysicalRegs = numPhysIntRegs + numPhysFloatRegs;
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
params->maxOutstandingMemOps = maxOutstandingMemOps;
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
params->decodeToFetchDelay = decodeToFetchDelay;
|
|
|
|
|
params->renameToFetchDelay = renameToFetchDelay;
|
|
|
|
|
params->iewToFetchDelay = iewToFetchDelay;
|
|
|
|
|
params->commitToFetchDelay = commitToFetchDelay;
|
|
|
|
|
params->fetchWidth = fetchWidth;
|
|
|
|
|
|
|
|
|
|
params->renameToDecodeDelay = renameToDecodeDelay;
|
|
|
|
|
params->iewToDecodeDelay = iewToDecodeDelay;
|
|
|
|
|
params->commitToDecodeDelay = commitToDecodeDelay;
|
|
|
|
|
params->fetchToDecodeDelay = fetchToDecodeDelay;
|
|
|
|
|
params->decodeWidth = decodeWidth;
|
|
|
|
|
|
|
|
|
|
params->iewToRenameDelay = iewToRenameDelay;
|
|
|
|
|
params->commitToRenameDelay = commitToRenameDelay;
|
|
|
|
|
params->decodeToRenameDelay = decodeToRenameDelay;
|
|
|
|
|
params->renameWidth = renameWidth;
|
|
|
|
|
|
|
|
|
|
params->commitToIEWDelay = commitToIEWDelay;
|
|
|
|
|
params->renameToIEWDelay = renameToIEWDelay;
|
|
|
|
|
params->issueToExecuteDelay = issueToExecuteDelay;
|
|
|
|
|
params->issueWidth = issueWidth;
|
|
|
|
|
params->executeWidth = executeWidth;
|
|
|
|
|
params->executeIntWidth = executeIntWidth;
|
|
|
|
|
params->executeFloatWidth = executeFloatWidth;
|
|
|
|
|
params->executeBranchWidth = executeBranchWidth;
|
|
|
|
|
params->executeMemoryWidth = executeMemoryWidth;
|
|
|
|
|
|
|
|
|
|
params->iewToCommitDelay = iewToCommitDelay;
|
|
|
|
|
params->renameToROBDelay = renameToROBDelay;
|
|
|
|
|
params->commitWidth = commitWidth;
|
|
|
|
|
params->squashWidth = squashWidth;
|
|
|
|
|
|
2006-05-25 23:13:00 +02:00
|
|
|
params->predType = predType;
|
2006-04-23 00:45:01 +02:00
|
|
|
params->localPredictorSize = localPredictorSize;
|
|
|
|
|
params->localCtrBits = localCtrBits;
|
|
|
|
|
params->localHistoryTableSize = localHistoryTableSize;
|
|
|
|
|
params->localHistoryBits = localHistoryBits;
|
|
|
|
|
params->globalPredictorSize = globalPredictorSize;
|
|
|
|
|
params->globalCtrBits = globalCtrBits;
|
|
|
|
|
params->globalHistoryBits = globalHistoryBits;
|
|
|
|
|
params->choicePredictorSize = choicePredictorSize;
|
|
|
|
|
params->choiceCtrBits = choiceCtrBits;
|
|
|
|
|
|
|
|
|
|
params->BTBEntries = BTBEntries;
|
|
|
|
|
params->BTBTagSize = BTBTagSize;
|
|
|
|
|
|
|
|
|
|
params->RASSize = RASSize;
|
|
|
|
|
|
|
|
|
|
params->LQEntries = LQEntries;
|
|
|
|
|
params->SQEntries = SQEntries;
|
2006-08-24 22:06:45 +02:00
|
|
|
params->lsqLimits = lsqLimits;
|
2006-04-23 00:45:01 +02:00
|
|
|
|
|
|
|
|
params->SSITSize = SSITSize;
|
|
|
|
|
params->LFSTSize = LFSTSize;
|
|
|
|
|
|
|
|
|
|
params->numPhysIntRegs = numPhysIntRegs;
|
|
|
|
|
params->numPhysFloatRegs = numPhysFloatRegs;
|
|
|
|
|
params->numIQEntries = numIQEntries;
|
|
|
|
|
params->numROBEntries = numROBEntries;
|
|
|
|
|
|
|
|
|
|
params->decoupledFrontEnd = decoupledFrontEnd;
|
|
|
|
|
params->dispatchWidth = dispatchWidth;
|
|
|
|
|
params->wbWidth = wbWidth;
|
|
|
|
|
|
|
|
|
|
params->smtNumFetchingThreads = smtNumFetchingThreads;
|
|
|
|
|
params->smtFetchPolicy = smtFetchPolicy;
|
|
|
|
|
params->smtIQPolicy = smtIQPolicy;
|
|
|
|
|
params->smtLSQPolicy = smtLSQPolicy;
|
|
|
|
|
params->smtLSQThreshold = smtLSQThreshold;
|
|
|
|
|
params->smtROBPolicy = smtROBPolicy;
|
|
|
|
|
params->smtROBThreshold = smtROBThreshold;
|
|
|
|
|
params->smtCommitPolicy = smtCommitPolicy;
|
|
|
|
|
|
|
|
|
|
params->instShiftAmt = 2;
|
|
|
|
|
|
|
|
|
|
params->deferRegistration = defer_registration;
|
|
|
|
|
|
|
|
|
|
params->functionTrace = function_trace;
|
|
|
|
|
params->functionTraceStart = function_trace_start;
|
|
|
|
|
|
|
|
|
|
cpu = new DerivOzoneCPU(params);
|
|
|
|
|
|
|
|
|
|
return cpu;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
REGISTER_SIM_OBJECT("DerivOzoneCPU", DerivOzoneCPU)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// OzoneCPU Simulation Object
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(SimpleOzoneCPU)
|
|
|
|
|
|
|
|
|
|
Param<int> clock;
|
|
|
|
|
Param<int> numThreads;
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
SimObjectParam<System *> system;
|
|
|
|
|
Param<int> cpu_id;
|
|
|
|
|
SimObjectParam<AlphaITB *> itb;
|
|
|
|
|
SimObjectParam<AlphaDTB *> dtb;
|
|
|
|
|
#else
|
|
|
|
|
SimObjectVectorParam<Process *> workload;
|
2006-04-24 23:11:31 +02:00
|
|
|
//SimObjectParam<PageTable *> page_table;
|
2006-04-23 00:45:01 +02:00
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
|
|
|
|
|
|
SimObjectParam<FunctionalMemory *> mem;
|
|
|
|
|
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
SimObjectParam<BaseCPU *> checker;
|
|
|
|
|
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<Counter> max_insts_any_thread;
|
|
|
|
|
Param<Counter> max_insts_all_threads;
|
|
|
|
|
Param<Counter> max_loads_any_thread;
|
|
|
|
|
Param<Counter> max_loads_all_threads;
|
|
|
|
|
|
|
|
|
|
SimObjectParam<BaseCache *> icache;
|
|
|
|
|
SimObjectParam<BaseCache *> dcache;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> cachePorts;
|
|
|
|
|
Param<unsigned> width;
|
|
|
|
|
Param<unsigned> frontEndWidth;
|
|
|
|
|
Param<unsigned> backEndWidth;
|
|
|
|
|
Param<unsigned> backEndSquashLatency;
|
|
|
|
|
Param<unsigned> backEndLatency;
|
|
|
|
|
Param<unsigned> maxInstBufferSize;
|
|
|
|
|
Param<unsigned> numPhysicalRegs;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> decodeToFetchDelay;
|
|
|
|
|
Param<unsigned> renameToFetchDelay;
|
|
|
|
|
Param<unsigned> iewToFetchDelay;
|
|
|
|
|
Param<unsigned> commitToFetchDelay;
|
|
|
|
|
Param<unsigned> fetchWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> renameToDecodeDelay;
|
|
|
|
|
Param<unsigned> iewToDecodeDelay;
|
|
|
|
|
Param<unsigned> commitToDecodeDelay;
|
|
|
|
|
Param<unsigned> fetchToDecodeDelay;
|
|
|
|
|
Param<unsigned> decodeWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> iewToRenameDelay;
|
|
|
|
|
Param<unsigned> commitToRenameDelay;
|
|
|
|
|
Param<unsigned> decodeToRenameDelay;
|
|
|
|
|
Param<unsigned> renameWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> commitToIEWDelay;
|
|
|
|
|
Param<unsigned> renameToIEWDelay;
|
|
|
|
|
Param<unsigned> issueToExecuteDelay;
|
|
|
|
|
Param<unsigned> issueWidth;
|
|
|
|
|
Param<unsigned> executeWidth;
|
|
|
|
|
Param<unsigned> executeIntWidth;
|
|
|
|
|
Param<unsigned> executeFloatWidth;
|
|
|
|
|
Param<unsigned> executeBranchWidth;
|
|
|
|
|
Param<unsigned> executeMemoryWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> iewToCommitDelay;
|
|
|
|
|
Param<unsigned> renameToROBDelay;
|
|
|
|
|
Param<unsigned> commitWidth;
|
|
|
|
|
Param<unsigned> squashWidth;
|
|
|
|
|
|
2006-05-25 23:13:00 +02:00
|
|
|
Param<std::string> predType;
|
2006-04-23 00:45:01 +02:00
|
|
|
Param<unsigned> localPredictorSize;
|
|
|
|
|
Param<unsigned> localCtrBits;
|
|
|
|
|
Param<unsigned> localHistoryTableSize;
|
|
|
|
|
Param<unsigned> localHistoryBits;
|
|
|
|
|
Param<unsigned> globalPredictorSize;
|
|
|
|
|
Param<unsigned> globalCtrBits;
|
|
|
|
|
Param<unsigned> globalHistoryBits;
|
|
|
|
|
Param<unsigned> choicePredictorSize;
|
|
|
|
|
Param<unsigned> choiceCtrBits;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> BTBEntries;
|
|
|
|
|
Param<unsigned> BTBTagSize;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> RASSize;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> LQEntries;
|
|
|
|
|
Param<unsigned> SQEntries;
|
|
|
|
|
Param<unsigned> LFSTSize;
|
|
|
|
|
Param<unsigned> SSITSize;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> numPhysIntRegs;
|
|
|
|
|
Param<unsigned> numPhysFloatRegs;
|
|
|
|
|
Param<unsigned> numIQEntries;
|
|
|
|
|
Param<unsigned> numROBEntries;
|
|
|
|
|
|
|
|
|
|
Param<bool> decoupledFrontEnd;
|
|
|
|
|
Param<int> dispatchWidth;
|
|
|
|
|
Param<int> wbWidth;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> smtNumFetchingThreads;
|
|
|
|
|
Param<std::string> smtFetchPolicy;
|
|
|
|
|
Param<std::string> smtLSQPolicy;
|
|
|
|
|
Param<unsigned> smtLSQThreshold;
|
|
|
|
|
Param<std::string> smtIQPolicy;
|
|
|
|
|
Param<unsigned> smtIQThreshold;
|
|
|
|
|
Param<std::string> smtROBPolicy;
|
|
|
|
|
Param<unsigned> smtROBThreshold;
|
|
|
|
|
Param<std::string> smtCommitPolicy;
|
|
|
|
|
|
|
|
|
|
Param<unsigned> instShiftAmt;
|
|
|
|
|
|
|
|
|
|
Param<bool> defer_registration;
|
|
|
|
|
|
|
|
|
|
Param<bool> function_trace;
|
|
|
|
|
Param<Tick> function_trace_start;
|
|
|
|
|
|
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(SimpleOzoneCPU)
|
|
|
|
|
|
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleOzoneCPU)
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(clock, "clock speed"),
|
|
|
|
|
INIT_PARAM(numThreads, "number of HW thread contexts"),
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
INIT_PARAM(system, "System object"),
|
|
|
|
|
INIT_PARAM(cpu_id, "processor ID"),
|
|
|
|
|
INIT_PARAM(itb, "Instruction translation buffer"),
|
|
|
|
|
INIT_PARAM(dtb, "Data translation buffer"),
|
|
|
|
|
#else
|
|
|
|
|
INIT_PARAM(workload, "Processes to run"),
|
2006-04-24 23:11:31 +02:00
|
|
|
// INIT_PARAM(page_table, "Page table"),
|
2006-04-23 00:45:01 +02:00
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(mem, "Memory", NULL),
|
|
|
|
|
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
INIT_PARAM_DFLT(checker, "Checker CPU", NULL),
|
|
|
|
|
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM_DFLT(max_insts_any_thread,
|
|
|
|
|
"Terminate when any thread reaches this inst count",
|
|
|
|
|
0),
|
|
|
|
|
INIT_PARAM_DFLT(max_insts_all_threads,
|
|
|
|
|
"Terminate when all threads have reached"
|
|
|
|
|
"this inst count",
|
|
|
|
|
0),
|
|
|
|
|
INIT_PARAM_DFLT(max_loads_any_thread,
|
|
|
|
|
"Terminate when any thread reaches this load count",
|
|
|
|
|
0),
|
|
|
|
|
INIT_PARAM_DFLT(max_loads_all_threads,
|
|
|
|
|
"Terminate when all threads have reached this load"
|
|
|
|
|
"count",
|
|
|
|
|
0),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(icache, "L1 instruction cache", NULL),
|
|
|
|
|
INIT_PARAM_DFLT(dcache, "L1 data cache", NULL),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(cachePorts, "Cache Ports", 200),
|
|
|
|
|
INIT_PARAM_DFLT(width, "Width", 1),
|
|
|
|
|
INIT_PARAM_DFLT(frontEndWidth, "Front end width", 1),
|
|
|
|
|
INIT_PARAM_DFLT(backEndWidth, "Back end width", 1),
|
|
|
|
|
INIT_PARAM_DFLT(backEndSquashLatency, "Back end squash latency", 1),
|
|
|
|
|
INIT_PARAM_DFLT(backEndLatency, "Back end latency", 1),
|
|
|
|
|
INIT_PARAM_DFLT(maxInstBufferSize, "Maximum instruction buffer size", 16),
|
|
|
|
|
INIT_PARAM(numPhysicalRegs, "Number of physical registers"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(decodeToFetchDelay, "Decode to fetch delay"),
|
|
|
|
|
INIT_PARAM(renameToFetchDelay, "Rename to fetch delay"),
|
|
|
|
|
INIT_PARAM(iewToFetchDelay, "Issue/Execute/Writeback to fetch"
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(commitToFetchDelay, "Commit to fetch delay"),
|
|
|
|
|
INIT_PARAM(fetchWidth, "Fetch width"),
|
|
|
|
|
INIT_PARAM(renameToDecodeDelay, "Rename to decode delay"),
|
|
|
|
|
INIT_PARAM(iewToDecodeDelay, "Issue/Execute/Writeback to decode"
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(commitToDecodeDelay, "Commit to decode delay"),
|
|
|
|
|
INIT_PARAM(fetchToDecodeDelay, "Fetch to decode delay"),
|
|
|
|
|
INIT_PARAM(decodeWidth, "Decode width"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(iewToRenameDelay, "Issue/Execute/Writeback to rename"
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(commitToRenameDelay, "Commit to rename delay"),
|
|
|
|
|
INIT_PARAM(decodeToRenameDelay, "Decode to rename delay"),
|
|
|
|
|
INIT_PARAM(renameWidth, "Rename width"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(commitToIEWDelay, "Commit to "
|
|
|
|
|
"Issue/Execute/Writeback delay"),
|
|
|
|
|
INIT_PARAM(renameToIEWDelay, "Rename to "
|
|
|
|
|
"Issue/Execute/Writeback delay"),
|
|
|
|
|
INIT_PARAM(issueToExecuteDelay, "Issue to execute delay (internal"
|
|
|
|
|
"to the IEW stage)"),
|
|
|
|
|
INIT_PARAM(issueWidth, "Issue width"),
|
|
|
|
|
INIT_PARAM(executeWidth, "Execute width"),
|
|
|
|
|
INIT_PARAM(executeIntWidth, "Integer execute width"),
|
|
|
|
|
INIT_PARAM(executeFloatWidth, "Floating point execute width"),
|
|
|
|
|
INIT_PARAM(executeBranchWidth, "Branch execute width"),
|
|
|
|
|
INIT_PARAM(executeMemoryWidth, "Memory execute width"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(iewToCommitDelay, "Issue/Execute/Writeback to commit "
|
|
|
|
|
"delay"),
|
|
|
|
|
INIT_PARAM(renameToROBDelay, "Rename to reorder buffer delay"),
|
|
|
|
|
INIT_PARAM(commitWidth, "Commit width"),
|
|
|
|
|
INIT_PARAM(squashWidth, "Squash width"),
|
|
|
|
|
|
2006-05-25 23:13:00 +02:00
|
|
|
INIT_PARAM(predType, "Type of branch predictor ('local', 'tournament')"),
|
2006-04-23 00:45:01 +02:00
|
|
|
INIT_PARAM(localPredictorSize, "Size of local predictor"),
|
|
|
|
|
INIT_PARAM(localCtrBits, "Bits per counter"),
|
|
|
|
|
INIT_PARAM(localHistoryTableSize, "Size of local history table"),
|
|
|
|
|
INIT_PARAM(localHistoryBits, "Bits for the local history"),
|
|
|
|
|
INIT_PARAM(globalPredictorSize, "Size of global predictor"),
|
|
|
|
|
INIT_PARAM(globalCtrBits, "Bits per counter"),
|
|
|
|
|
INIT_PARAM(globalHistoryBits, "Bits of history"),
|
|
|
|
|
INIT_PARAM(choicePredictorSize, "Size of choice predictor"),
|
|
|
|
|
INIT_PARAM(choiceCtrBits, "Bits of choice counters"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(BTBEntries, "Number of BTB entries"),
|
|
|
|
|
INIT_PARAM(BTBTagSize, "Size of the BTB tags, in bits"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(RASSize, "RAS size"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(LQEntries, "Number of load queue entries"),
|
|
|
|
|
INIT_PARAM(SQEntries, "Number of store queue entries"),
|
|
|
|
|
INIT_PARAM(LFSTSize, "Last fetched store table size"),
|
|
|
|
|
INIT_PARAM(SSITSize, "Store set ID table size"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(numPhysIntRegs, "Number of physical integer registers"),
|
|
|
|
|
INIT_PARAM(numPhysFloatRegs, "Number of physical floating point "
|
|
|
|
|
"registers"),
|
|
|
|
|
INIT_PARAM(numIQEntries, "Number of instruction queue entries"),
|
|
|
|
|
INIT_PARAM(numROBEntries, "Number of reorder buffer entries"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(decoupledFrontEnd, "Decoupled front end", true),
|
|
|
|
|
INIT_PARAM_DFLT(dispatchWidth, "Dispatch width", 0),
|
|
|
|
|
INIT_PARAM_DFLT(wbWidth, "Writeback width", 0),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM_DFLT(smtNumFetchingThreads, "SMT Number of Fetching Threads", 1),
|
|
|
|
|
INIT_PARAM_DFLT(smtFetchPolicy, "SMT Fetch Policy", "SingleThread"),
|
|
|
|
|
INIT_PARAM_DFLT(smtLSQPolicy, "SMT LSQ Sharing Policy", "Partitioned"),
|
|
|
|
|
INIT_PARAM_DFLT(smtLSQThreshold,"SMT LSQ Threshold", 100),
|
|
|
|
|
INIT_PARAM_DFLT(smtIQPolicy, "SMT IQ Policy", "Partitioned"),
|
|
|
|
|
INIT_PARAM_DFLT(smtIQThreshold, "SMT IQ Threshold", 100),
|
|
|
|
|
INIT_PARAM_DFLT(smtROBPolicy, "SMT ROB Sharing Policy", "Partitioned"),
|
|
|
|
|
INIT_PARAM_DFLT(smtROBThreshold,"SMT ROB Threshold", 100),
|
|
|
|
|
INIT_PARAM_DFLT(smtCommitPolicy,"SMT Commit Fetch Policy", "RoundRobin"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(instShiftAmt, "Number of bits to shift instructions by"),
|
|
|
|
|
INIT_PARAM(defer_registration, "defer system registration (for sampling)"),
|
|
|
|
|
|
|
|
|
|
INIT_PARAM(function_trace, "Enable function trace"),
|
|
|
|
|
INIT_PARAM(function_trace_start, "Cycle to start function trace")
|
|
|
|
|
|
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(SimpleOzoneCPU)
|
|
|
|
|
|
|
|
|
|
CREATE_SIM_OBJECT(SimpleOzoneCPU)
|
|
|
|
|
{
|
|
|
|
|
SimpleOzoneCPU *cpu;
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
// Full-system only supports a single thread for the moment.
|
|
|
|
|
int actual_num_threads = 1;
|
|
|
|
|
#else
|
|
|
|
|
// In non-full-system mode, we infer the number of threads from
|
|
|
|
|
// the workload if it's not explicitly specified.
|
|
|
|
|
int actual_num_threads =
|
|
|
|
|
numThreads.isValid() ? numThreads : workload.size();
|
|
|
|
|
|
|
|
|
|
if (workload.size() == 0) {
|
|
|
|
|
fatal("Must specify at least one workload!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
SimpleParams *params = new SimpleParams;
|
|
|
|
|
|
|
|
|
|
params->clock = clock;
|
|
|
|
|
|
|
|
|
|
params->name = getInstanceName();
|
|
|
|
|
params->numberOfThreads = actual_num_threads;
|
|
|
|
|
|
|
|
|
|
#if FULL_SYSTEM
|
|
|
|
|
params->system = system;
|
|
|
|
|
params->cpu_id = cpu_id;
|
|
|
|
|
params->itb = itb;
|
|
|
|
|
params->dtb = dtb;
|
|
|
|
|
#else
|
|
|
|
|
params->workload = workload;
|
2006-04-24 23:11:31 +02:00
|
|
|
// params->pTable = page_table;
|
2006-04-23 00:45:01 +02:00
|
|
|
#endif // FULL_SYSTEM
|
|
|
|
|
|
|
|
|
|
params->mem = mem;
|
Fixes for ozone CPU to successfully boot and run linux.
cpu/base_dyn_inst.hh:
Remove snoop function (did not mean to commit it).
cpu/ozone/back_end_impl.hh:
Set instruction as having its result ready, not completed.
cpu/ozone/cpu.hh:
Fixes for store conditionals. Use an additional lock addr list to make sure that the access is valid. I don't know if this is fully necessary, but it gives me a peace of mind (at some performance cost).
Make sure to schedule for cycles(1) and not just 1 cycle in the future as tick = 1ps.
Also support the new Checker.
cpu/ozone/cpu_builder.cc:
Add parameter for maxOutstandingMemOps so it can be set through the config.
Also add in the checker. Right now it's a BaseCPU simobject, but that may change in the future.
cpu/ozone/cpu_impl.hh:
Add support for the checker. For now there's a dynamic cast to convert the simobject passed back from the builder to the proper Checker type. It's ugly, but only happens at startup, and is probably a justified use of dynamic cast.
Support switching out/taking over from other CPUs.
Correct indexing problem for float registers.
cpu/ozone/dyn_inst.hh:
Add ability for instructions to wait on memory instructions in addition to source register instructions. This is needed for memory dependence predictors and memory barriers.
cpu/ozone/dyn_inst_impl.hh:
Support waiting on memory operations.
Use "resultReady" to differentiate an instruction having its registers produced vs being totally completed.
cpu/ozone/front_end.hh:
Support switching out.
Also record if an interrupt is pending.
cpu/ozone/front_end_impl.hh:
Support switching out. Also support stalling the front end if an interrupt is pending.
cpu/ozone/lw_back_end.hh:
Add checker in.
Support switching out.
Support memory barriers.
cpu/ozone/lw_back_end_impl.hh:
Lots of changes to get things to work right.
Faults, traps, interrupts all wait until all stores have written back (important).
Memory barriers are supported, as is the general ability for instructions to be dependent on other memory instructions.
cpu/ozone/lw_lsq.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
cpu/ozone/lw_lsq_impl.hh:
Support switching out.
Also use store writeback events in all cases, not just dcache misses.
Support the checker CPU. Marks instructions as completed once the functional access is done (which has to be done for the checker to be able to verify results).
cpu/ozone/simple_params.hh:
Add max outstanding mem ops parameter.
python/m5/objects/OzoneCPU.py:
Add max outstanding mem ops, checker.
--HG--
extra : convert_revision : f4d408e1bb1f25836a097b6abe3856111e950c59
2006-05-12 01:18:36 +02:00
|
|
|
params->checker = checker;
|
2006-04-23 00:45:01 +02:00
|
|
|
params->max_insts_any_thread = max_insts_any_thread;
|
|
|
|
|
params->max_insts_all_threads = max_insts_all_threads;
|
|
|
|
|
params->max_loads_any_thread = max_loads_any_thread;
|
|
|
|
|
params->max_loads_all_threads = max_loads_all_threads;
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Caches
|
|
|
|
|
//
|
|
|
|
|
params->icacheInterface = icache ? icache->getInterface() : NULL;
|
|
|
|
|
params->dcacheInterface = dcache ? dcache->getInterface() : NULL;
|
|
|
|
|
params->cachePorts = cachePorts;
|
|
|
|
|
|
|
|
|
|
params->width = width;
|
|
|
|
|
params->frontEndWidth = frontEndWidth;
|
|
|
|
|
params->backEndWidth = backEndWidth;
|
|
|
|
|
params->backEndSquashLatency = backEndSquashLatency;
|
|
|
|
|
params->backEndLatency = backEndLatency;
|
|
|
|
|
params->maxInstBufferSize = maxInstBufferSize;
|
|
|
|
|
params->numPhysicalRegs = numPhysIntRegs + numPhysFloatRegs;
|
|
|
|
|
|
|
|
|
|
params->decodeToFetchDelay = decodeToFetchDelay;
|
|
|
|
|
params->renameToFetchDelay = renameToFetchDelay;
|
|
|
|
|
params->iewToFetchDelay = iewToFetchDelay;
|
|
|
|
|
params->commitToFetchDelay = commitToFetchDelay;
|
|
|
|
|
params->fetchWidth = fetchWidth;
|
|
|
|
|
|
|
|
|
|
params->renameToDecodeDelay = renameToDecodeDelay;
|
|
|
|
|
params->iewToDecodeDelay = iewToDecodeDelay;
|
|
|
|
|
params->commitToDecodeDelay = commitToDecodeDelay;
|
|
|
|
|
params->fetchToDecodeDelay = fetchToDecodeDelay;
|
|
|
|
|
params->decodeWidth = decodeWidth;
|
|
|
|
|
|
|
|
|
|
params->iewToRenameDelay = iewToRenameDelay;
|
|
|
|
|
params->commitToRenameDelay = commitToRenameDelay;
|
|
|
|
|
params->decodeToRenameDelay = decodeToRenameDelay;
|
|
|
|
|
params->renameWidth = renameWidth;
|
|
|
|
|
|
|
|
|
|
params->commitToIEWDelay = commitToIEWDelay;
|
|
|
|
|
params->renameToIEWDelay = renameToIEWDelay;
|
|
|
|
|
params->issueToExecuteDelay = issueToExecuteDelay;
|
|
|
|
|
params->issueWidth = issueWidth;
|
|
|
|
|
params->executeWidth = executeWidth;
|
|
|
|
|
params->executeIntWidth = executeIntWidth;
|
|
|
|
|
params->executeFloatWidth = executeFloatWidth;
|
|
|
|
|
params->executeBranchWidth = executeBranchWidth;
|
|
|
|
|
params->executeMemoryWidth = executeMemoryWidth;
|
|
|
|
|
|
|
|
|
|
params->iewToCommitDelay = iewToCommitDelay;
|
|
|
|
|
params->renameToROBDelay = renameToROBDelay;
|
|
|
|
|
params->commitWidth = commitWidth;
|
|
|
|
|
params->squashWidth = squashWidth;
|
|
|
|
|
|
2006-05-25 23:13:00 +02:00
|
|
|
params->predType = predType;
|
2006-04-23 00:45:01 +02:00
|
|
|
params->localPredictorSize = localPredictorSize;
|
|
|
|
|
params->localCtrBits = localCtrBits;
|
|
|
|
|
params->localHistoryTableSize = localHistoryTableSize;
|
|
|
|
|
params->localHistoryBits = localHistoryBits;
|
|
|
|
|
params->globalPredictorSize = globalPredictorSize;
|
|
|
|
|
params->globalCtrBits = globalCtrBits;
|
|
|
|
|
params->globalHistoryBits = globalHistoryBits;
|
|
|
|
|
params->choicePredictorSize = choicePredictorSize;
|
|
|
|
|
params->choiceCtrBits = choiceCtrBits;
|
|
|
|
|
|
|
|
|
|
params->BTBEntries = BTBEntries;
|
|
|
|
|
params->BTBTagSize = BTBTagSize;
|
|
|
|
|
|
|
|
|
|
params->RASSize = RASSize;
|
|
|
|
|
|
|
|
|
|
params->LQEntries = LQEntries;
|
|
|
|
|
params->SQEntries = SQEntries;
|
|
|
|
|
|
|
|
|
|
params->SSITSize = SSITSize;
|
|
|
|
|
params->LFSTSize = LFSTSize;
|
|
|
|
|
|
|
|
|
|
params->numPhysIntRegs = numPhysIntRegs;
|
|
|
|
|
params->numPhysFloatRegs = numPhysFloatRegs;
|
|
|
|
|
params->numIQEntries = numIQEntries;
|
|
|
|
|
params->numROBEntries = numROBEntries;
|
|
|
|
|
|
|
|
|
|
params->decoupledFrontEnd = decoupledFrontEnd;
|
|
|
|
|
params->dispatchWidth = dispatchWidth;
|
|
|
|
|
params->wbWidth = wbWidth;
|
|
|
|
|
|
|
|
|
|
params->smtNumFetchingThreads = smtNumFetchingThreads;
|
|
|
|
|
params->smtFetchPolicy = smtFetchPolicy;
|
|
|
|
|
params->smtIQPolicy = smtIQPolicy;
|
|
|
|
|
params->smtLSQPolicy = smtLSQPolicy;
|
|
|
|
|
params->smtLSQThreshold = smtLSQThreshold;
|
|
|
|
|
params->smtROBPolicy = smtROBPolicy;
|
|
|
|
|
params->smtROBThreshold = smtROBThreshold;
|
|
|
|
|
params->smtCommitPolicy = smtCommitPolicy;
|
|
|
|
|
|
|
|
|
|
params->instShiftAmt = 2;
|
|
|
|
|
|
|
|
|
|
params->deferRegistration = defer_registration;
|
|
|
|
|
|
|
|
|
|
params->functionTrace = function_trace;
|
|
|
|
|
params->functionTraceStart = function_trace_start;
|
|
|
|
|
|
|
|
|
|
cpu = new SimpleOzoneCPU(params);
|
|
|
|
|
|
|
|
|
|
return cpu;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
REGISTER_SIM_OBJECT("SimpleOzoneCPU", SimpleOzoneCPU)
|
|
|
|
|
|