Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/z/ehallnor/work/m5

--HG--
extra : convert_revision : 88c83150b7fd9260e0441334f2503b1e029d8c09
This commit is contained in:
Erik Hallnor 2004-06-13 05:52:59 -04:00
commit 9a2202629e
4 changed files with 473 additions and 0 deletions

View file

@ -0,0 +1,120 @@
/*
* Copyright (c) 2003-2004 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.
*/
/**
* @file
* Declaration of a IBM memory trace format reader.
*/
#include <sstream>
#include "cpu/trace/reader/ibm_reader.hh"
#include "sim/builder.hh"
#include "base/misc.hh" // for fatal
using namespace std;
IBMReader::IBMReader(const string &name, const string &filename)
: MemTraceReader(name)
{
if (strcmp((filename.c_str() + filename.length() -3), ".gz") == 0) {
// Compressed file, need to use a pipe to gzip.
stringstream buf;
buf << "gzip -d -c " << filename << endl;
trace = popen(buf.str().c_str(), "r");
} else {
trace = fopen(filename.c_str(), "rb");
}
if (!trace) {
fatal("Can't open file %s", filename);
}
}
Tick
IBMReader::getNextReq(MemReqPtr &req)
{
MemReqPtr tmp_req;
int c = getc(trace);
if (c != EOF) {
tmp_req = new MemReq();
//int cpu_id = (c & 0xf0) >> 4;
int type = c & 0x0f;
// We have L1 miss traces, so all accesses are 128 bytes
tmp_req->size = 128;
tmp_req->paddr = 0;
for (int i = 2; i >= 0; --i) {
c = getc(trace);
if (c == EOF) {
fatal("Unexpected end of file");
}
tmp_req->paddr |= ((c & 0xff) << (8 * i));
}
tmp_req->paddr = tmp_req->paddr << 7;
switch(type) {
case IBM_COND_EXCLUSIVE_FETCH:
case IBM_READ_ONLY_FETCH:
tmp_req->cmd = Read;
break;
case IBM_EXCLUSIVE_FETCH:
case IBM_FETCH_NO_DATA:
tmp_req->cmd = Write;
break;
case IBM_INST_FETCH:
tmp_req->cmd = Read;
break;
default:
fatal("Unknown trace entry type.");
}
}
req = tmp_req;
return 0;
}
BEGIN_DECLARE_SIM_OBJECT_PARAMS(IBMReader)
Param<string> filename;
END_DECLARE_SIM_OBJECT_PARAMS(IBMReader)
BEGIN_INIT_SIM_OBJECT_PARAMS(IBMReader)
INIT_PARAM(filename, "trace file")
END_INIT_SIM_OBJECT_PARAMS(IBMReader)
CREATE_SIM_OBJECT(IBMReader)
{
return new IBMReader(getInstanceName(), filename);
}
REGISTER_SIM_OBJECT("IBMReader", IBMReader)

View file

@ -0,0 +1,73 @@
/*
* Copyright (c) 2003-2004 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.
*/
/**
* @file
* Definition of a IBM memory trace format reader.
*/
#ifndef __IBM_READER_HH__
#define __IBM_READER_HH__
#include <stdio.h>
#include "cpu/trace/reader/mem_trace_reader.hh"
#include "mem/mem_req.hh"
/**
* A memory trace reader for the IBM memory trace format.
*/
class IBMReader : public MemTraceReader
{
/** IBM trace file. */
FILE* trace;
enum IBMType {
IBM_INST_FETCH,
IBM_READ_ONLY_FETCH,
IBM_COND_EXCLUSIVE_FETCH,
IBM_EXCLUSIVE_FETCH,
IBM_FETCH_NO_DATA
};
public:
/**
* Construct an IBMReader.
*/
IBMReader(const std::string &name, const std::string &filename);
/**
* Read the next request from the trace. Returns the request in the
* provided MemReqPtr and the cycle of the request in the return value.
* @param req Return the next request from the trace.
* @return IBM traces don't store timing information, return 0
*/
virtual Tick getNextReq(MemReqPtr &req);
};
#endif //__IBM_READER_HH__

View file

@ -0,0 +1,198 @@
/*
* Copyright (c) 2003-2004 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.
*/
/**
* @file
* Declaration of a Intel ITX memory trace format reader.
*/
#include <sstream>
#include "cpu/trace/reader/itx_reader.hh"
#include "sim/builder.hh"
#include "base/misc.hh" // for fatal
using namespace std;
ITXReader::ITXReader(const string &name, const string &filename)
: MemTraceReader(name)
{
if (strcmp((filename.c_str() + filename.length() -3), ".gz") == 0) {
// Compressed file, need to use a pipe to gzip.
stringstream buf;
buf << "gzip -d -c " << filename << endl;
trace = popen(buf.str().c_str(), "r");
} else {
trace = fopen(filename.c_str(), "rb");
}
if (!trace) {
fatal("Can't open file %s", filename);
}
traceFormat = 0;
int c;
for (int i = 0; i < 4; ++i) {
c = getc(trace);
if (c == EOF) {
fatal("Unexpected end of trace file.");
}
traceFormat |= (c & 0xff) << (8 * i);
}
if (traceFormat > 2)
fatal("Invalid trace format.");
}
Tick
ITXReader::getNextReq(MemReqPtr &req)
{
MemReqPtr tmp_req = new MemReq();
bool phys_val;
do {
int c = getc(trace);
if (c != EOF) {
// Decode first byte
// phys_val<1> | type <2:0> | size <3:0>
phys_val = c & 0x80;
tmp_req->size = (c & 0x0f) + 1;
int type = (c & 0x70) >> 4;
// Could be a compressed instruction entry, expand if necessary
if (type == ITXCodeComp) {
if (traceFormat != 2) {
fatal("Compressed code entry in non CompCode trace.");
}
if (!codeVirtValid) {
fatal("Corrupt CodeComp entry.");
}
tmp_req->vaddr = codeVirtAddr;
codeVirtAddr += tmp_req->size;
if (phys_val) {
if (!codePhysValid) {
fatal("Corrupt CodeComp entry.");
}
tmp_req->paddr = codePhysAddr;
if (((tmp_req->paddr & 0xfff) + tmp_req->size) & ~0xfff) {
// Crossed page boundary, next physical address is
// invalid
codePhysValid = false;
} else {
codePhysAddr += tmp_req->size;
}
} else {
codePhysValid = false;
}
type = ITXCode;
tmp_req->cmd = Read;
} else {
// Normal entry
tmp_req->vaddr = 0;
for (int i = 0; i < 4; ++i) {
c = getc(trace);
if (c == EOF) {
fatal("Unexpected end of trace file.");
}
tmp_req->vaddr |= (c & 0xff) << (8 * i);
}
if (type == ITXCode) {
codeVirtAddr = tmp_req->vaddr + tmp_req->size;
codeVirtValid = true;
}
tmp_req->paddr = 0;
if (phys_val) {
c = getc(trace);
if (c == EOF) {
fatal("Unexpected end of trace file.");
}
// Get the page offset from the virtual address.
tmp_req->paddr = tmp_req->vaddr & 0xfff;
tmp_req->paddr |= (c & 0xf0) << 8;
for (int i = 2; i < 4; ++i) {
c = getc(trace);
if (c == EOF) {
fatal("Unexpected end of trace file.");
}
tmp_req->paddr |= (c & 0xff) << (8 * i);
}
if (type == ITXCode) {
if (((tmp_req->paddr & 0xfff) + tmp_req->size)
& ~0xfff) {
// Crossing the page boundary, next physical
// address isn't valid
codePhysValid = false;
} else {
codePhysAddr = tmp_req->paddr + tmp_req->size;
codePhysValid = true;
}
}
} else if (type == ITXCode) {
codePhysValid = false;
}
switch(type) {
case ITXRead:
tmp_req->cmd = Read;
break;
case ITXWrite:
tmp_req->cmd = Write;
break;
case ITXCode:
tmp_req->cmd = Read;
break;
default:
fatal("Unknown ITX type");
}
}
} else {
// EOF need to return a null request
MemReqPtr null_req;
req = null_req;
return 0;
}
} while (!phys_val);
req = tmp_req;
return 0;
}
BEGIN_DECLARE_SIM_OBJECT_PARAMS(ITXReader)
Param<string> filename;
END_DECLARE_SIM_OBJECT_PARAMS(ITXReader)
BEGIN_INIT_SIM_OBJECT_PARAMS(ITXReader)
INIT_PARAM(filename, "trace file")
END_INIT_SIM_OBJECT_PARAMS(ITXReader)
CREATE_SIM_OBJECT(ITXReader)
{
return new ITXReader(getInstanceName(), filename);
}
REGISTER_SIM_OBJECT("ITXReader", ITXReader)

View file

@ -0,0 +1,82 @@
/*
* Copyright (c) 2003-2004 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.
*/
/**
* @file
* Definition of a Intel ITX memory trace format reader.
*/
#ifndef __ITX_READER_HH__
#define __ITX_READER_HH__
#include <stdio.h>
#include "cpu/trace/reader/mem_trace_reader.hh"
#include "mem/mem_req.hh"
/**
* A memory trace reader for the Intel ITX memory trace format.
*/
class ITXReader : public MemTraceReader
{
/** Trace file. */
FILE *trace;
bool codeVirtValid;
Addr codeVirtAddr;
bool codePhysValid;
Addr codePhysAddr;
int traceFormat;
enum ITXType {
ITXRead,
ITXWrite,
ITXWriteback,
ITXCode,
ITXCodeComp
};
public:
/**
* Construct an ITXReader.
*/
ITXReader(const std::string &name, const std::string &filename);
/**
* Read the next request from the trace. Returns the request in the
* provided MemReqPtr and the cycle of the request in the return value.
* @param req Return the next request from the trace.
* @return ITX traces don't store timing information, return 0
*/
virtual Tick getNextReq(MemReqPtr &req);
};
#endif //__ITX_READER_HH__