d9ef772e8d
Use O3CPU when building instead of AlphaO3CPU.
I could use some better python magic in the cpu_models.py file!
AUTHORS:
add middle initial
SConstruct:
change from AlphaO3CPU to O3CPU
src/cpu/SConscript:
edits to build O3CPU instead of AlphaO3CPU
src/cpu/cpu_models.py:
change substitution template to use proper CPU EXEC CONTEXT For O3CPU Model...
Actually, some Python expertise could be used here. The 'env' variable is not
passed to this file, so I had to parse through the ARGV to find the ISA...
src/cpu/o3/base_dyn_inst.cc:
src/cpu/o3/bpred_unit.cc:
src/cpu/o3/commit.cc:
src/cpu/o3/cpu.cc:
src/cpu/o3/cpu.hh:
src/cpu/o3/decode.cc:
src/cpu/o3/fetch.cc:
src/cpu/o3/iew.cc:
src/cpu/o3/inst_queue.cc:
src/cpu/o3/lsq.cc:
src/cpu/o3/lsq_unit.cc:
src/cpu/o3/mem_dep_unit.cc:
src/cpu/o3/rename.cc:
src/cpu/o3/rob.cc:
use isa_specific.hh
src/sim/process.cc:
only initi NextNPC if not ALPHA
src/cpu/o3/alpha/cpu.cc:
alphao3cpu impl
src/cpu/o3/alpha/cpu.hh:
move AlphaTC to it's own file
src/cpu/o3/alpha/cpu_impl.hh:
Move AlphaTC to it's own file ...
src/cpu/o3/alpha/dyn_inst.cc:
src/cpu/o3/alpha/dyn_inst.hh:
src/cpu/o3/alpha/dyn_inst_impl.hh:
include paths
src/cpu/o3/alpha/impl.hh:
include paths, set default MaxThreads to 2 instead of 4
src/cpu/o3/alpha/params.hh:
set Alpha Specific Params here
src/python/m5/objects/O3CPU.py:
add O3CPU class
src/cpu/o3/SConscript:
include isa-specific build files
src/cpu/o3/alpha/thread_context.cc:
NEW HOME of AlphaTC
src/cpu/o3/alpha/thread_context.hh:
new home of AlphaTC
src/cpu/o3/isa_specific.hh:
includes ISA specific files
src/cpu/o3/params.hh:
base o3 params
src/cpu/o3/thread_context.hh:
base o3 thread context
src/cpu/o3/thread_context_impl.hh:
base o3 thead context impl
--HG--
rename : src/cpu/o3/alpha_cpu.cc => src/cpu/o3/alpha/cpu.cc
rename : src/cpu/o3/alpha_cpu.hh => src/cpu/o3/alpha/cpu.hh
rename : src/cpu/o3/alpha_cpu_builder.cc => src/cpu/o3/alpha/cpu_builder.cc
rename : src/cpu/o3/alpha_cpu_impl.hh => src/cpu/o3/alpha/cpu_impl.hh
rename : src/cpu/o3/alpha_dyn_inst.cc => src/cpu/o3/alpha/dyn_inst.cc
rename : src/cpu/o3/alpha_dyn_inst.hh => src/cpu/o3/alpha/dyn_inst.hh
rename : src/cpu/o3/alpha_dyn_inst_impl.hh => src/cpu/o3/alpha/dyn_inst_impl.hh
rename : src/cpu/o3/alpha_impl.hh => src/cpu/o3/alpha/impl.hh
rename : src/cpu/o3/alpha_params.hh => src/cpu/o3/alpha/params.hh
rename : src/python/m5/objects/AlphaO3CPU.py => src/python/m5/objects/O3CPU.py
extra : convert_revision : d377d6417452ac337bc502f28b2fde907d6b340e
96 lines
3.9 KiB
Python
96 lines
3.9 KiB
Python
# Copyright (c) 2003-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: Steve Reinhardt
|
|
|
|
import os
|
|
import os.path
|
|
import sys
|
|
|
|
################
|
|
# CpuModel class
|
|
#
|
|
# The CpuModel class encapsulates everything the ISA parser needs to
|
|
# know about a particular CPU model.
|
|
|
|
class CpuModel:
|
|
# Dict of available CPU model objects. Accessible as CpuModel.dict.
|
|
dict = {}
|
|
|
|
# Constructor. Automatically adds models to CpuModel.dict.
|
|
def __init__(self, name, filename, includes, strings):
|
|
self.name = name
|
|
self.filename = filename # filename for output exec code
|
|
self.includes = includes # include files needed in exec file
|
|
# The 'strings' dict holds all the per-CPU symbols we can
|
|
# substitute into templates etc.
|
|
self.strings = strings
|
|
# Add self to dict
|
|
CpuModel.dict[name] = self
|
|
|
|
#
|
|
# Define CPU models.
|
|
#
|
|
# Parameters are:
|
|
# - name of model
|
|
# - filename for generated ISA execution file
|
|
# - includes needed for generated ISA execution file
|
|
# - substitution strings for ISA description templates
|
|
#
|
|
|
|
CpuModel('AtomicSimpleCPU', 'atomic_simple_cpu_exec.cc',
|
|
'#include "cpu/simple/atomic.hh"',
|
|
{ 'CPU_exec_context': 'AtomicSimpleCPU' })
|
|
CpuModel('TimingSimpleCPU', 'timing_simple_cpu_exec.cc',
|
|
'#include "cpu/simple/timing.hh"',
|
|
{ 'CPU_exec_context': 'TimingSimpleCPU' })
|
|
CpuModel('FullCPU', 'full_cpu_exec.cc',
|
|
'#include "encumbered/cpu/full/dyn_inst.hh"',
|
|
{ 'CPU_exec_context': 'DynInst' })
|
|
CpuModel('OzoneSimpleCPU', 'ozone_simple_exec.cc',
|
|
'#include "cpu/ozone/dyn_inst.hh"',
|
|
{ 'CPU_exec_context': 'OzoneDynInst<SimpleImpl>' })
|
|
CpuModel('OzoneCPU', 'ozone_exec.cc',
|
|
'#include "cpu/ozone/dyn_inst.hh"',
|
|
{ 'CPU_exec_context': 'OzoneDynInst<OzoneImpl>' })
|
|
CpuModel('CheckerCPU', 'checker_cpu_exec.cc',
|
|
'#include "cpu/checker/cpu.hh"',
|
|
{ 'CPU_exec_context': 'CheckerCPU' })
|
|
|
|
# Maybe there is a more clever way to determine ISA
|
|
# here but since the environment variable isnt passed through
|
|
# here the easiest way is this...
|
|
sub_template = 'not found'
|
|
for argument in sys.argv:
|
|
if 'ALPHA' in argument:
|
|
sub_template = 'AlphaDynInst<AlphaSimpleImpl>'
|
|
|
|
if sub_template == 'not found':
|
|
sys.exit('NO CPU_exec_context substitution defined for this ISA')
|
|
|
|
CpuModel('O3CPU', 'o3_cpu_exec.cc',
|
|
'#include "cpu/o3/isa_specific.hh"',
|
|
{ 'CPU_exec_context': sub_template })
|