changeset f694764d656d in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=f694764d656d
description:
cpu. arch: add initiateMemRead() to ExecContext interface
For historical reasons, the ExecContext interface had a single
function, readMem(), that did two different things depending on
whether the ExecContext supported atomic memory mode (i.e.,
AtomicSimpleCPU) or timing memory mode (all the other models).
In the former case, it actually performed a memory read; in the
latter case, it merely initiated a read access, and the read
completion did not happen until later when a response packet
arrived from the memory system.
This led to some confusing things, including timing accesses
being required to provide a pointer for the return data even
though that pointer was only used in atomic mode.
This patch splits this interface, adding a new initiateMemRead()
function to the ExecContext interface to replace the timing-mode
use of readMem().
For consistency and clarity, the readMemTiming() helper function
in the ISA definitions is renamed to initiateMemRead() as well.
For x86, where the access size is passed in explicitly, we can
also get rid of the data parameter at this level. For other ISAs,
where the access size is determined from the type of the data
parameter, we have to keep the parameter for that purpose.
diffstat:
src/arch/alpha/isa/mem.isa | 2 +-
src/arch/arm/isa/templates/mem.isa | 8 +++-----
src/arch/arm/isa/templates/mem64.isa | 2 +-
src/arch/arm/isa/templates/neon64.isa | 5 +----
src/arch/generic/memhelpers.hh | 10 ++++++----
src/arch/mips/isa/formats/mem.isa | 2 +-
src/arch/power/isa/formats/mem.isa | 2 +-
src/arch/sparc/isa/formats/mem/util.isa | 2 +-
src/arch/x86/isa/formats/monitor_mwait.isa | 3 +--
src/arch/x86/isa/microops/ldstop.isa | 2 +-
src/arch/x86/memhelpers.hh | 7 ++++---
src/cpu/base_dyn_inst.hh | 12 ++----------
src/cpu/exec_context.hh | 30 +++++++++++++++++++++++++++++-
src/cpu/minor/exec_context.hh | 5 ++---
src/cpu/simple/atomic.cc | 6 ++++++
src/cpu/simple/atomic.hh | 2 ++
src/cpu/simple/base.hh | 2 ++
src/cpu/simple/exec_context.hh | 6 ++++++
src/cpu/simple/timing.cc | 7 +++++++
src/cpu/simple/timing.hh | 2 ++
20 files changed, 79 insertions(+), 38 deletions(-)
diffs (truncated from 360 to 300 lines):
diff -r bce9037689b0 -r f694764d656d src/arch/alpha/isa/mem.isa
--- a/src/arch/alpha/isa/mem.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/alpha/isa/mem.isa Sun Jan 17 18:27:46 2016 -0800
@@ -223,7 +223,7 @@
%(ea_code)s;
if (fault == NoFault) {
- fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
+ fault = initiateMemRead(xc, traceData, EA, Mem, memAccessFlags);
}
return fault;
diff -r bce9037689b0 -r f694764d656d src/arch/arm/isa/templates/mem.isa
--- a/src/arch/arm/isa/templates/mem.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/arm/isa/templates/mem.isa Sun Jan 17 18:27:46 2016 -0800
@@ -438,7 +438,8 @@
if (%(predicate_test)s)
{
if (fault == NoFault) {
- fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
+ fault = initiateMemRead(xc, traceData, EA, Mem,
+ memAccessFlags);
}
} else {
xc->setPredicate(false);
@@ -461,13 +462,10 @@
%(op_rd)s;
%(ea_code)s;
- MemUnion memUnion;
- uint8_t *dataPtr = memUnion.bytes;
-
if (%(predicate_test)s)
{
if (fault == NoFault) {
- fault = xc->readMem(EA, dataPtr, %(size)d, memAccessFlags);
+ fault = xc->initiateMemRead(EA, %(size)d, memAccessFlags);
}
} else {
xc->setPredicate(false);
diff -r bce9037689b0 -r f694764d656d src/arch/arm/isa/templates/mem64.isa
--- a/src/arch/arm/isa/templates/mem64.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/arm/isa/templates/mem64.isa Sun Jan 17 18:27:46 2016 -0800
@@ -191,7 +191,7 @@
%(ea_code)s;
if (fault == NoFault) {
- fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
+ fault = initiateMemRead(xc, traceData, EA, Mem, memAccessFlags);
}
return fault;
diff -r bce9037689b0 -r f694764d656d src/arch/arm/isa/templates/neon64.isa
--- a/src/arch/arm/isa/templates/neon64.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/arm/isa/templates/neon64.isa Sun Jan 17 18:27:46 2016 -0800
@@ -313,11 +313,8 @@
%(op_rd)s;
%(ea_code)s;
- MemUnion memUnion;
- uint8_t *dataPtr = memUnion.bytes;
-
if (fault == NoFault) {
- fault = xc->readMem(EA, dataPtr, accSize, memAccessFlags);
+ fault = xc->initiateMemRead(EA, accSize, memAccessFlags);
}
return fault;
diff -r bce9037689b0 -r f694764d656d src/arch/generic/memhelpers.hh
--- a/src/arch/generic/memhelpers.hh Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/generic/memhelpers.hh Sun Jan 17 18:27:46 2016 -0800
@@ -48,13 +48,15 @@
#include "sim/byteswap.hh"
#include "sim/insttracer.hh"
-/// Read from memory in timing mode.
+/// Initiate a read from memory in timing mode. Note that the 'mem'
+/// parameter is unused; only the type of that parameter is used
+/// to determine the size of the access.
template <class XC, class MemT>
Fault
-readMemTiming(XC *xc, Trace::InstRecord *traceData, Addr addr,
- MemT &mem, unsigned flags)
+initiateMemRead(XC *xc, Trace::InstRecord *traceData, Addr addr,
+ MemT &mem, unsigned flags)
{
- return xc->readMem(addr, (uint8_t *)&mem, sizeof(MemT), flags);
+ return xc->initiateMemRead(addr, sizeof(MemT), flags);
}
/// Extract the data returned from a timing mode read.
diff -r bce9037689b0 -r f694764d656d src/arch/mips/isa/formats/mem.isa
--- a/src/arch/mips/isa/formats/mem.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/mips/isa/formats/mem.isa Sun Jan 17 18:27:46 2016 -0800
@@ -253,7 +253,7 @@
%(ea_code)s;
if (fault == NoFault) {
- fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
+ fault = initiateMemRead(xc, traceData, EA, Mem, memAccessFlags);
}
return fault;
diff -r bce9037689b0 -r f694764d656d src/arch/power/isa/formats/mem.isa
--- a/src/arch/power/isa/formats/mem.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/power/isa/formats/mem.isa Sun Jan 17 18:27:46 2016 -0800
@@ -109,7 +109,7 @@
%(ea_code)s;
if (fault == NoFault) {
- fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags);
+ fault = initiateMemRead(xc, traceData, EA, Mem, memAccessFlags);
xc->setEA(EA);
}
diff -r bce9037689b0 -r f694764d656d src/arch/sparc/isa/formats/mem/util.isa
--- a/src/arch/sparc/isa/formats/mem/util.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/sparc/isa/formats/mem/util.isa Sun Jan 17 18:27:46 2016 -0800
@@ -171,7 +171,7 @@
%(fault_check)s;
if (fault == NoFault) {
%(EA_trunc)s
- fault = readMemTiming(xc, traceData, EA, Mem, %(asi_val)s);
+ fault = initiateMemRead(xc, traceData, EA, Mem, %(asi_val)s);
}
return fault;
}
diff -r bce9037689b0 -r f694764d656d src/arch/x86/isa/formats/monitor_mwait.isa
--- a/src/arch/x86/isa/formats/monitor_mwait.isa Sun Jan 17 18:27:46
2016 -0800
+++ b/src/arch/x86/isa/formats/monitor_mwait.isa Sun Jan 17 18:27:46
2016 -0800
@@ -67,10 +67,9 @@
Fault %(class_name)s::initiateAcc(CPU_EXEC_CONTEXT * xc,
Trace::InstRecord * traceData) const
{
- uint64_t m = 0; //mem
unsigned s = 0x8; //size
unsigned f = 0; //flags
- readMemTiming(xc, traceData, xc->getAddrMonitor()->vAddr, m, s, f);
+ initiateMemRead(xc, traceData, xc->getAddrMonitor()->vAddr, s, f);
return NoFault;
}
}};
diff -r bce9037689b0 -r f694764d656d src/arch/x86/isa/microops/ldstop.isa
--- a/src/arch/x86/isa/microops/ldstop.isa Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/x86/isa/microops/ldstop.isa Sun Jan 17 18:27:46 2016 -0800
@@ -127,7 +127,7 @@
%(ea_code)s;
DPRINTF(X86, "%s : %s: The address is %#x\n", instMnem, mnemonic, EA);
- fault = readMemTiming(xc, traceData, EA, Mem, dataSize, memFlags);
+ fault = initiateMemRead(xc, traceData, EA, dataSize, memFlags);
return fault;
}
diff -r bce9037689b0 -r f694764d656d src/arch/x86/memhelpers.hh
--- a/src/arch/x86/memhelpers.hh Sun Jan 17 18:27:46 2016 -0800
+++ b/src/arch/x86/memhelpers.hh Sun Jan 17 18:27:46 2016 -0800
@@ -38,12 +38,13 @@
namespace X86ISA
{
+/// Initiate a read from memory in timing mode.
template <class XC>
Fault
-readMemTiming(XC *xc, Trace::InstRecord *traceData, Addr addr,
- uint64_t &mem, unsigned dataSize, unsigned flags)
+initiateMemRead(XC *xc, Trace::InstRecord *traceData, Addr addr,
+ unsigned dataSize, unsigned flags)
{
- return xc->readMem(addr, (uint8_t *)&mem, dataSize, flags);
+ return xc->initiateMemRead(addr, dataSize, flags);
}
static inline uint64_t
diff -r bce9037689b0 -r f694764d656d src/cpu/base_dyn_inst.hh
--- a/src/cpu/base_dyn_inst.hh Sun Jan 17 18:27:46 2016 -0800
+++ b/src/cpu/base_dyn_inst.hh Sun Jan 17 18:27:46 2016 -0800
@@ -313,7 +313,7 @@
cpu->demapPage(vaddr, asn);
}
- Fault readMem(Addr addr, uint8_t *data, unsigned size, unsigned flags);
+ Fault initiateMemRead(Addr addr, unsigned size, unsigned flags);
Fault writeMem(uint8_t *data, unsigned size,
Addr addr, unsigned flags, uint64_t *res);
@@ -873,8 +873,7 @@
template<class Impl>
Fault
-BaseDynInst<Impl>::readMem(Addr addr, uint8_t *data,
- unsigned size, unsigned flags)
+BaseDynInst<Impl>::initiateMemRead(Addr addr, unsigned size, unsigned flags)
{
instFlags[ReqMade] = true;
Request *req = NULL;
@@ -916,13 +915,6 @@
// instruction as executed.
this->setExecuted();
}
-
- if (fault != NoFault) {
- // Return a fixed value to keep simulation deterministic even
- // along misspeculated paths.
- if (data)
- bzero(data, size);
- }
}
if (traceData)
diff -r bce9037689b0 -r f694764d656d src/cpu/exec_context.hh
--- a/src/cpu/exec_context.hh Sun Jan 17 18:27:46 2016 -0800
+++ b/src/cpu/exec_context.hh Sun Jan 17 18:27:46 2016 -0800
@@ -12,6 +12,7 @@
* modified or unmodified, in source code or in binary form.
*
* Copyright (c) 2002-2005 The Regents of The University of Michigan
+ * Copyright (c) 2015 Advanced Micro Devices, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -173,9 +174,36 @@
*/
virtual Addr getEA() const = 0;
+ /**
+ * Perform an atomic memory read operation. Must be overridden
+ * for exec contexts that support atomic memory mode. Not pure
+ * virtual since exec contexts that only support timing memory
+ * mode need not override (though in that case this function
+ * should never be called).
+ */
virtual Fault readMem(Addr addr, uint8_t *data, unsigned int size,
- unsigned int flags) = 0;
+ unsigned int flags)
+ {
+ panic("ExecContext::readMem() should be overridden\n");
+ }
+ /**
+ * Initiate a timing memory read operation. Must be overridden
+ * for exec contexts that support timing memory mode. Not pure
+ * virtual since exec contexts that only support atomic memory
+ * mode need not override (though in that case this function
+ * should never be called).
+ */
+ virtual Fault initiateMemRead(Addr addr, unsigned int size,
+ unsigned int flags)
+ {
+ panic("ExecContext::initiateMemRead() should be overridden\n");
+ }
+
+ /**
+ * For atomic-mode contexts, perform an atomic memory write operation.
+ * For timing-mode contexts, initiate a timing memory write operation.
+ */
virtual Fault writeMem(uint8_t *data, unsigned int size, Addr addr,
unsigned int flags, uint64_t *res) = 0;
diff -r bce9037689b0 -r f694764d656d src/cpu/minor/exec_context.hh
--- a/src/cpu/minor/exec_context.hh Sun Jan 17 18:27:46 2016 -0800
+++ b/src/cpu/minor/exec_context.hh Sun Jan 17 18:27:46 2016 -0800
@@ -103,10 +103,9 @@
}
Fault
- readMem(Addr addr, uint8_t *data, unsigned int size,
- unsigned int flags)
+ initiateMemRead(Addr addr, unsigned int size, unsigned int flags)
{
- execute.getLSQ().pushRequest(inst, true /* load */, data,
+ execute.getLSQ().pushRequest(inst, true /* load */, nullptr,
size, addr, flags, NULL);
return NoFault;
}
diff -r bce9037689b0 -r f694764d656d src/cpu/simple/atomic.cc
--- a/src/cpu/simple/atomic.cc Sun Jan 17 18:27:46 2016 -0800
+++ b/src/cpu/simple/atomic.cc Sun Jan 17 18:27:46 2016 -0800
@@ -415,6 +415,12 @@
}
}
+Fault
+AtomicSimpleCPU::initiateMemRead(Addr addr, unsigned size, unsigned flags)
+{
+ panic("initiateMemRead() is for timing accesses, and should "
+ "never be called on AtomicSimpleCPU.\n");
+}
Fault
AtomicSimpleCPU::writeMem(uint8_t *data, unsigned size,
diff -r bce9037689b0 -r f694764d656d src/cpu/simple/atomic.hh
--- a/src/cpu/simple/atomic.hh Sun Jan 17 18:27:46 2016 -0800
+++ b/src/cpu/simple/atomic.hh Sun Jan 17 18:27:46 2016 -0800
@@ -205,6 +205,8 @@
Fault readMem(Addr addr, uint8_t *data, unsigned size,
unsigned flags) override;
+ Fault initiateMemRead(Addr addr, unsigned size, unsigned flags) override;
+
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
