Andreas Hansson [Tue, 26 Mar 2013 18:46:44 +0000 (14:46 -0400)]
mem: Add optional request flags to the packet trace
This patch adds an optional flags field to the packet trace to encode
the request flags that contain information about whether the request
is (un)cacheable, instruction fetch, preftech etc.
Andreas Hansson [Tue, 26 Mar 2013 18:46:42 +0000 (14:46 -0400)]
cpu: Remove CpuPort and use MasterPort in the CPU classes
This patch changes the port in the CPU classes to use MasterPort
instead of the derived CpuPort. The functions of the CpuPort are now
distributed across the relevant subclasses. The port accessor
functions (getInstPort and getDataPort) now return a MasterPort
instead of a CpuPort. This simplifies creating derivative CPUs that do
not use the CpuPort.
Andreas Sandberg [Mon, 25 Mar 2013 12:20:15 +0000 (13:20 +0100)]
x86: Revert [
02321b16685f] which breaks m5ops on x86
Changeset
02321b16685f added m5_writefile to m5op_x86.S a second time,
which causes a compilation error on when compiling for x86. This
changeset reverts that changeset and fixes the error.
Nilay Vaish [Fri, 22 Mar 2013 22:31:24 +0000 (17:31 -0500)]
config: return exit event instead of cause
changeset:
a4739b6f799d made some changes that where an exit event
should have been returned in place of exit cause. This patch corrects
the error.
Nilay Vaish [Fri, 22 Mar 2013 22:21:25 +0000 (17:21 -0500)]
regressions: updates to config.ini for ruby tests
Nilay Vaish [Fri, 22 Mar 2013 22:21:23 +0000 (17:21 -0500)]
ruby: slicc: set sender, receiver clock objs for optional queue
Nilay Vaish [Fri, 22 Mar 2013 22:21:22 +0000 (17:21 -0500)]
ruby: message buffer: correct previous errors
A recent set of patches added support for multiple clock domains to ruby.
I had made some errors while writing those patches. The sender was using
the receiver side clock while enqueuing a message in the buffer. Those
errors became visible while creating (or restoring from) checkpoints. The
errors also become visible when a multi eventq scenario occurs.
Nilay Vaish [Fri, 22 Mar 2013 20:53:27 +0000 (15:53 -0500)]
ruby: message buffer: remove _ptr from some variables
The names were getting too long.
Nilay Vaish [Fri, 22 Mar 2013 20:53:26 +0000 (15:53 -0500)]
ruby: message buffer node: used Tick in place of Cycles
The message buffer node used to keep time in terms of Cycles. Since the
sender and the receiver can have different clock periods, storing node
time in cycles requires some conversion. Instead store the time directly
in Ticks.
Nilay Vaish [Fri, 22 Mar 2013 20:53:26 +0000 (15:53 -0500)]
ruby: consumer: avoid using receiver side clock
A set of patches was recently committed to allow multiple clock domains
in ruby. In those patches, I had inadvertently made an incorrect use of
the clocks. Suppose object A needs to schedule an event on object B. It
was possible that A accesses B's clock to schedule the event. This is not
possible in actual system. Hence, changes are being to the Consumer class
so as to avoid such happenings. Note that in a multi eventq simulation,
this can possibly lead to an incorrect simulation.
There are two functions in the Consumer class that are used for scheduling
events. The first function takes in the relative delay over the current time
as the argument and adds the current time to it for scheduling the event.
The second function takes in the absolute time (in ticks) for scheduling the
event. The first function is now being moved to protected section of the
class so that only objects of the derived classes can use it. All other
objects will have to specify absolute time while scheduling an event
for some consumer.
Nilay Vaish [Fri, 22 Mar 2013 20:53:25 +0000 (15:53 -0500)]
ruby: remove unsued profile functions
Nilay Vaish [Fri, 22 Mar 2013 20:53:25 +0000 (15:53 -0500)]
ruby: keep histogram of outstanding requests in seq
The histogram for tracking outstanding counts per cycle is maintained
in the profiler. For a parallel implementation of the memory system, we
need that this histogram is maintained locally. Hence it will now be
kept in the sequencer itself. The resulting histograms will be merged
when the stats are printed.
Nilay Vaish [Fri, 22 Mar 2013 20:53:24 +0000 (15:53 -0500)]
slicc: remove check if the L1Cache has a sequencer
Nilay Vaish [Fri, 22 Mar 2013 20:53:24 +0000 (15:53 -0500)]
ruby: move stall and wakeup functions to AbstractController
These functions are currently implemented in one of the files related to Slicc.
Since these are purely C++ functions, they are better suited to be in the base
class.
Nilay Vaish [Fri, 22 Mar 2013 20:53:23 +0000 (15:53 -0500)]
ruby: connect two controllers using only message buffers
This patch modifies ruby so that two controllers can be connected to each
other with only message buffers in between. Before this patch, all the
controllers had to be connected to the network for them to communicate
with each other. With this patch, one can have protocols where a controller
is not connected to the network, but communicates with another controller
through a message buffer.
Nilay Vaish [Fri, 22 Mar 2013 20:53:23 +0000 (15:53 -0500)]
ruby: convert Topology to regular class
The Topology class in Ruby does not need to inherit from SimObject class.
This patch turns it into a regular class. The topology object is now created
in the constructor of the Network class. All the parameters for the topology
class have been moved to the network class.
Nilay Vaish [Fri, 22 Mar 2013 20:53:22 +0000 (15:53 -0500)]
ruby: network: move routers from topology to network
Andreas Hansson [Wed, 20 Mar 2013 10:41:23 +0000 (06:41 -0400)]
cpu: Avoid including inorder TLBUnit to avoid gcc LTO bug
This patch comments out the inclusion of the inorder TLBUnit which is
only used in the 9-stage pipeline. With the TLBUnit present, gcc >=
4.6 in combination with LTO ends up throwing away the definition of
the TLBUnit destructor, and consequently fail to link. See
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53808 for more details
about the bug, and http://gcc.gnu.org/ml/gcc/2012-06/msg00397.html for
the discussion thread that also touches on similar issues seen with
clang.
Andreas Sandberg [Mon, 18 Mar 2013 10:24:56 +0000 (11:24 +0100)]
scons: Try to use 'tcmalloc' before 'tcmalloc_minimal'
tcmalloc_minimal doesn't support the heap checker on Debian, while
tcmalloc does. Instead of always linking with tcmalloc_minimal, if it
exists, we first check for tcmalloc and then use tcmalloc_minimal as a
fallback.
Andreas Sandberg [Mon, 18 Mar 2013 09:57:26 +0000 (10:57 +0100)]
scons: Avoid malloc/free compiler optimization when using tcmalloc
According to the tcmalloc readme, the recommended way of compiling
applications that make use of tcmalloc is to disable compiler
optimizations that make assumptions about malloc and friends. This
changeset adds the necessary compiler flags for both gcc and clang.
From the tcmalloc readme:
"NOTE: When compiling with programs with gcc, that you plan to link
with libtcmalloc, it's safest to pass in the flags
-fno-builtin-malloc -fno-builtin-calloc
-fno-builtin-realloc -fno-builtin-free
when compiling."
Andreas Sandberg [Mon, 18 Mar 2013 09:44:34 +0000 (10:44 +0100)]
scons: Don't explicitly add tcmalloc_minimal to LIBS
SCons automatically adds a library to LIBS if conf.CheckLib succeeds,
so there is no need to explicitly add the library.
Andreas Sandberg [Mon, 18 Mar 2013 09:22:21 +0000 (10:22 +0100)]
scons: Include flags required to link statically with Python
Python requires the flags in LINKFORSHARED to be added the linker
flags when linking with a statically with Python. Failing to do so can
lead to errors from the Python's dynamic module loader at start up.
--HG--
extra : rebase_source :
e7a8daf72f4ede7ee5a4a5398a0b12e978a919b9
Andreas Hansson [Mon, 18 Mar 2013 09:22:45 +0000 (05:22 -0400)]
mem: Fix missing delete of packet in DRAM access
This patch fixes a memory leak caused by not deleting packets that
require no response.
Nilay Vaish [Fri, 15 Mar 2013 21:28:08 +0000 (16:28 -0500)]
ruby: set: corrects csprintf() call introduced by
7d95b650c9b6
Andreas Sandberg [Thu, 14 Mar 2013 15:08:55 +0000 (16:08 +0100)]
scons: Check for known buggy version of SWIG (2.0.9)
SWIG version 2.0.9 uses fully qualified module names despite of the
importing module being in the same package as the imported
module. This has the unfortunate consequence of causing the following
error when importing m5.internal.event:
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "src/python/importer.py", line 75, in load_module
exec code in mod.__dict__
File "src/python/m5/__init__.py", line 35, in <module>
import internal
File "src/python/importer.py", line 75, in load_module
exec code in mod.__dict__
File "src/python/m5/internal/__init__.py", line 32, in <module>
import event
File "src/python/importer.py", line 75, in load_module
exec code in mod.__dict__
File "build/X86/python/swig/event.py", line 107, in <module>
class Event(m5.internal.serialize.Serializable):
AttributeError: 'module' object has no attribute 'internal'
When 'event' is loaded, it triggers 'serialize' to be loaded. However,
it seems like the dictionary of 'm5' isn't updated until after
__init__.py terminates, which means that 'event' never sees the
'internal' attribute on 'm5'. Older versions of SWIG didn't include
the fully qualified module name if the modules were in the same
package.
Andreas Sandberg [Tue, 12 Mar 2013 17:41:29 +0000 (18:41 +0100)]
cpu: Fix state transition bug in the traffic generator
The traffic generator used to incorrectly determine the next state in
when state 0 had a non-zero probability. Due to the way the next
transition was determined, state 0 could never be entered other than
as an initial state. This changeset updates the transitition() method
to correctly handle such cases and cases where the transition matrix
is a 1x1 matrix.
Nilay Vaish [Mon, 11 Mar 2013 22:45:09 +0000 (17:45 -0500)]
regressions: x86: stats updates due to new x87 insts
Nilay Vaish [Mon, 11 Mar 2013 18:15:46 +0000 (13:15 -0500)]
x86: implement some of the x87 instructions
This patch implements ftan, fprem, fyl2x, fld* floating-point instructions.
Andreas Hansson [Thu, 7 Mar 2013 10:55:03 +0000 (05:55 -0500)]
base: Fix address range granularity calculations
This patch fixes a bug in the address range granularity
calculations. Previously it incorrectly used the high bit to establish
the size of the regions created, when it should really be looking at
the low bit.
Andreas Hansson [Thu, 7 Mar 2013 10:55:02 +0000 (05:55 -0500)]
ruby: Fix gcc 4.8 maybe-uninitialized compilation error
This patch fixes the one-and-only gcc 4.8 compilation error, being a
warning about "maybe uninitialized" in Orion.
Andreas Hansson [Thu, 7 Mar 2013 10:55:01 +0000 (05:55 -0500)]
x86: Make the table walker reset the packet delay
This patch fixes an issue related to the table walker recycling
packets that still have a bus delay that is not accounted for. For
now, we simply ignore the values and reset them to zero.
Nilay Vaish [Thu, 7 Mar 2013 03:57:10 +0000 (21:57 -0600)]
regressions: stats updates due to no physmem in ruby
Nilay Vaish [Thu, 7 Mar 2013 03:53:57 +0000 (21:53 -0600)]
ruby: remove the functional copy of memory in se mode
This patch removes the functional copy of the memory that was maintained in
the se mode. Now ruby itself will provide the data.
Nilay Vaish [Thu, 7 Mar 2013 03:53:16 +0000 (21:53 -0600)]
ruby: garnet: fixed: implement functional access
Ali Saidi [Tue, 5 Mar 2013 04:33:47 +0000 (23:33 -0500)]
stats: update patches for branch predictor and fetch updates.
Ali Saidi [Tue, 5 Mar 2013 04:33:47 +0000 (23:33 -0500)]
cpu: fix a switching issue with the o3 cpu.
This change fixes the switcheroo test that broke earlier this month. The code
that was checking for the pipeline being blocked wasn't checking for a pending
translation, only for a icache access.
Ali Saidi [Tue, 5 Mar 2013 04:33:47 +0000 (23:33 -0500)]
ARM: fix some cases where instructions that write to fp reg 15 are accidently branches.
ruby: fixes functional writes to RubyRequest
The functional write code was assuming that all writes are block sized,
which may not be true for Ruby Requests. This bug can lead to a buffer
overflow.
Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Nilay Vaish [Sun, 3 Mar 2013 00:04:51 +0000 (18:04 -0600)]
sim: remove duplicate check on stack size
Andreas Hansson [Fri, 1 Mar 2013 18:20:33 +0000 (13:20 -0500)]
mem: Add check if SimpleDRAM nextReqEvent is scheduled
This check covers a case where a retry is called from the SimpleDRAM
causing a new request to appear before the DRAM itself schedules a
nextReqEvent. By adding this check, the event is not scheduled twice.
Andreas Hansson [Fri, 1 Mar 2013 18:20:32 +0000 (13:20 -0500)]
mem: Add a method to build multi-channel DRAM configurations
This patch adds a class method that allows easy creation of
channel-interleaved multi-channel DRAM configurations. It is enabled
by a class method to allow customisation of the class independent of
the channel configuration. For example, the user can create a MyDDR
subclass of e.g. SimpleDDR3, and then create a four-channel
configuration of the subclass by calling MyDDR.makeMultiChannel(4,
mem_start, mem_size).
Andreas Hansson [Fri, 1 Mar 2013 18:20:30 +0000 (13:20 -0500)]
stats: Update stats to reflect SimpleDRAM changes
This patch bumps the stats to reflect the slight change in how the
retry is handled, and also the pruning of some redundant stats.
Andreas Hansson [Fri, 1 Mar 2013 18:20:24 +0000 (13:20 -0500)]
mem: SimpleDRAM variable naming and whitespace fixes
This patch fixes a number of small cosmetic issues in the SimpleDRAM
module. The most important change is to move the accounting of
received packets to after the check is made if the packet should be
retried or not. Thus, packets are only counted if they are actually
accepted.
Andreas Hansson [Fri, 1 Mar 2013 18:20:22 +0000 (13:20 -0500)]
mem: Add support for multi-channel DRAM configurations
This patch adds support for multi-channel instances of the DRAM
controller model by stripping away the channel bits in the address
decoding. The patch relies on the availiability of address
interleaving and, at this time, it is up to the user to configure the
interleaving appropriately. At the moment it is assumed that the
channel interleaving bits are immediately following the column bits
(smallest sensible interleaving). Convenience methods for building
multi-channel configurations will be added later.
Andreas Hansson [Fri, 1 Mar 2013 18:20:21 +0000 (13:20 -0500)]
mem: Merge interleaved ranges when creating backing store
This patch adds merging of interleaved ranges before creating the
backing stores. The backing stores are always a contigous chunk of the
address space, and with this patch it is possible to have interleaved
memories in the system.
Andreas Hansson [Fri, 1 Mar 2013 18:20:19 +0000 (13:20 -0500)]
mem: Merge ranges in bus before passing them on
This patch adds basic merging of address ranges to the bus, such that
interleaved ranges are merged together before being passed on by the
bus. As such, the bus aggregates the address ranges of the connected
slave ports and then passes on the merged ranges through its master
ports. The bus thus hides the complexity of the interleaved ranges and
only exposes contigous ranges to the surrounding system.
As part of this patch, the bus ranges are also cached for any future
queries.
ruby: mesi coherence protocol: invalidate lock
The MESI CMP directory coherence protocol, while transitioning from SM to IM,
did not invalidate the lock that it might have taken on a cache line. This
patch adds an action for doing so.
The problem was found by Dibakar, but I was not happy with his proposed
solution. So I implemented a different solution.
Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Ali Saidi [Wed, 20 Feb 2013 13:18:22 +0000 (08:18 -0500)]
config: Fix --prog-interval command line option
Nilay Vaish [Wed, 20 Feb 2013 04:58:51 +0000 (22:58 -0600)]
slicc: remove unused variable message_buffer_names
Nilay Vaish [Wed, 20 Feb 2013 04:58:50 +0000 (22:58 -0600)]
ruby: remove unused variable m_print_config in class Topology
Andreas Hansson [Tue, 19 Feb 2013 17:57:47 +0000 (12:57 -0500)]
mem: Fix sender state bug and delay popping
This patch fixes a newly introduced bug where the sender state was
popped before checking that it should be. Amazingly all regressions
pass, but Linux fails to boot on the detailed CPU with caches enabled.
Ali Saidi [Tue, 19 Feb 2013 14:53:07 +0000 (09:53 -0500)]
stats: more zizzer stats fun
Andreas Hansson [Tue, 19 Feb 2013 10:56:08 +0000 (05:56 -0500)]
scons: Fix warnings issued by clang 3.2svn (XCode 4.6)
This patch fixes the warnings that clang3.2svn emit due to the "-Wall"
flag. There is one case of an uninitialised value in the ARM neon ISA
description, and then a whole range of unused private fields that are
pruned.
Andreas Hansson [Tue, 19 Feb 2013 10:56:07 +0000 (05:56 -0500)]
scons: Unify the flags shared by gcc and clang
This patch restructures and unifies the flags used by gcc and clang as
they are largely the same. The common parts are now dealt with in a
shared block of code, and the few bits and pieces that are
specifically affecting either gcc or clang are done separately.
Andreas Hansson [Tue, 19 Feb 2013 10:56:07 +0000 (05:56 -0500)]
scons: Add warning delete with non-virtual destructor
This patch enables a warning for deleting derived classes that do not
have a virtual destructor. The patch merely adds additional checks,
and there are currently no cases that had to be fixed.
Andreas Hansson [Tue, 19 Feb 2013 10:56:07 +0000 (05:56 -0500)]
scons: Add warning for missing declarations
This patch enables warnings for missing declarations. To avoid issues
with SWIG-generated code, the warning is only applied to non-SWIG
code.
Andreas Hansson [Tue, 19 Feb 2013 10:56:07 +0000 (05:56 -0500)]
scons: Add warning for overloaded virtual functions
Fix the ISA startup warnings
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
scons: Add warning for overloaded virtual functions
A derived function with a different signature than a base class
function will result in the base class function of the same name being
hidden. The parameter list and return type for the member function in
the derived class must match those of the member function in the base
class, otherwise the function in the derived class will hide the
function in the base class and no polymorphic behaviour will occur.
This patch addresses these warnings by ensuring a unique function name
to avoid (unintentionally) hiding any functions.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
scons: Add warning for missing field initializers
This patch adds a warning for missing field initializers for both gcc
and clang, and addresses the warnings that were generated.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
scons: Fix up numerous warnings about name shadowing
This patch address the most important name shadowing warnings (as
produced when using gcc/clang with -Wshadow). There are many
locations where constructor parameters and function parameters shadow
local variables, but these are left unchanged.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
mem: Enforce strict use of busFirst- and busLastWordTime
This patch adds a check to ensure that the delay incurred by
the bus is not simply disregarded, but accounted for by someone. At
this point, all the modules do is to zero it out, and no additional
time is spent. This highlights where the bus timing is simply dropped
instead of being paid for.
As a follow up, the locations identified in this patch should add this
additional time to the packets in one way or another. For now it
simply acts as a sanity check and highlights where the delay is simply
ignored.
Since no time is added, all regressions remain the same.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
mem: Change accessor function names to match the port interface
This patch changes the names of the cache accessor functions to be in
line with those used by the ports. This is done to avoid confusion and
get closer to a one-to-one correspondence between the interface of the
memory object (the cache in this case) and the port itself.
The member function timingAccess has been split into a snoop/non-snoop
part to avoid branching on the isResponse() of the packet.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
mem: Make packet bus-related time accounting relative
This patch changes the bus-related time accounting done in the packet
to be relative. Besides making it easier to align the cache timing to
cache clock cycles, it also makes it possible to create a Last-Level
Cache (LLC) directly to a memory controller without a bus inbetween.
The bus is unique in that it does not ever make the packets wait to
reflect the time spent forwarding them. Instead, the cache is
currently responsible for making the packets wait. Thus, the bus
annotates the packets with the time needed for the first word to
appear, and also the last word. The cache then delays the packets in
its queues before passing them on. It is worth noting that every
object attached to a bus (devices, memories, bridges, etc) should be
doing this if we opt for keeping this way of accounting for the bus
timing.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
mem: Add deferred packet class to prefetcher
This patch removes the time field from the packet as it was only used
by the preftecher. Similar to the packet queue, the prefetcher now
wraps the packet in a deferred packet, which also has a tick
representing the absolute time when the packet should be sent.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
sim: Make clock private and access using clockPeriod()
This patch makes the clock member private to the ClockedObject and
forces all children to access it using clockPeriod(). This makes it
impossible to inadvertently change the clock, and also makes it easier
to transition to a situation where the clock is derived from e.g. a
clock domain, or through a multiplier.
Andreas Hansson [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
x86: Move APIC clock divider to Python
This patch moves the 16x APIC clock divider to the Python code to
avoid the post-instantiation modifications to the clock. The x86 APIC
was the only object setting the clock after creation time and this
required some custom functionality and configuration. With this patch,
the clock multiplier is moved to the Python code and the objects are
instantiated with the appropriate clock.
Sascha Bischoff [Tue, 19 Feb 2013 10:56:06 +0000 (05:56 -0500)]
mem: Fix SenderState related cache deadlock
This patch fixes a potential deadlock in the caches. This deadlock
could occur when more than one cache is used in a system, and
pkt->senderState is modified in between the two caches. This happened
as the caches relied on the senderState remaining unchanged, and used
it for instantaneous upstream communication with other caches.
This issue has been addressed by iterating over the linked list of
senderStates until we are either able to cast to a MSHR* or
senderState is NULL. If the cast is successful, we know that the
packet has previously passed through another cache, and therefore
update the downstreamPending flag accordingly. Otherwise, we do
nothing.
Andreas Hansson [Tue, 19 Feb 2013 10:56:05 +0000 (05:56 -0500)]
mem: Add predecessor to SenderState base class
This patch adds a predecessor field to the SenderState base class to
make the process of linking them up more uniform, and enable a
traversal of the stack without knowing the specific type of the
subclasses.
There are a number of simplifications done as part of changing the
SenderState, particularly in the RubyTest.
Andreas Hansson [Tue, 19 Feb 2013 10:56:05 +0000 (05:56 -0500)]
base: Fix a bug in the address interleaving
This patch fixes a minor (but important) typo in the matching of an
address to an interleaved range.
Andreas Hansson [Tue, 19 Feb 2013 10:56:05 +0000 (05:56 -0500)]
mem: Ensure trace captures packet fields before forwarding
This patch fixes a bug in the CommMonitor caused by the packet being
modified before it is captured in the trace. By recording the fields
before passing the packet on, and then putting these values in the
trace we ensure that even if the packet is modified the trace captures
what the CommMonitor saw.
Anthony Gutierrez [Fri, 15 Feb 2013 23:48:59 +0000 (18:48 -0500)]
options: add command line option for dtb file
Anthony Gutierrez [Fri, 15 Feb 2013 23:48:59 +0000 (18:48 -0500)]
loader: add a flattened device tree blob (dtb) object
this adds a dtb_object so the loader can load in the dtb
file for linux/android ARM kernels.
Anthony Gutierrez [Fri, 15 Feb 2013 23:48:59 +0000 (18:48 -0500)]
ext lib: add libfdt to enable flattened device tree support
this patch adds libfdt, a library necessary for supporting
flattened device tree support in current and future versions of
the linux/android kernel for ARM.
Ali Saidi [Fri, 15 Feb 2013 22:40:14 +0000 (17:40 -0500)]
stats: update regressions for o3 changes in renaming and translation.
Mrinmoy Ghosh [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
arm: fix a page table walker issue where a page could be translated multiple times
If multiple memory operations to the same page are miss the TLB they are
all inserted into the page table queue and before this change could result
in multiple uncessesary walks as well as duplicate enteries being inserted
into the TLB.
Andreas Sandberg [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
cpu: Document exec trace flags
Andreas Sandberg [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
dev: Use the correct return type for disk offsets
Replace the use of off_t in the various DiskImage related classes with
std::streampos. off_t is a signed 32 bit integer on most 32-bit
systems, whereas std::streampos is normally a 64 bit integer on most
modern systems. Furthermore, std::streampos is the type used by
tellg() and seekg() in the standard library, so it should have been
used in the first place. This patch makes it possible to use disk
images larger than 2 GiB on 32 bit systems with a modern C++ standard
library.
Geoffrey Blake [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
cpu: Avoid duplicate entries in tracking structures for writes to misc regs
setMiscReg currently makes a new entry for each write to a misc reg without
checking for duplicates, this can cause a triggering of the assert if an
instruction get replayed and writes to the same misc regs multiple times.
This fix prevents duplicate entries and instead updates the value.
Geoffrey Blake [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
cpu: Fix rename mis-handling serializing instructions when resource constrained
The rename can mis-handle serializing instructions (i.e. strex) if it gets
into a resource constrained situation and the serializing instruction has
to be placed on the skid buffer to handle blocking. In this situation the
instruction informs the pipeline it is serializing and logs that the next
instruction must be serialized, but since we are blocking the pipeline
defers this action to place the serializing instruction and
incoming instructions into the skid buffer. When resuming from blocking,
rename will pull the serializing instruction from the skid buffer and
the current logic will see this as the "next" instruction that has to
be serialized and because of flags set on the serializing instruction,
it passes through the pipeline stage as normal and resets rename to
non-serializing. This causes instructions to follow the serializing inst
incorrectly and eventually leads to an error in the pipeline. To fix this
rename should check first if it has to block before checking for serializing
instructions.
Chris Emmons [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
ARM: Postpones creation of framebuffer output file until it is actually used.
This delay prevents a potential conflict with the HDLCD if both are in the same
system even if only one is enabled.
Andreas Hansson [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
mem: Tighten up cache constness and scoping
This patch merely adopts a more strict use of const for the cache
member functions and variables, and also moves a large portion of the
member functions from public to protected.
Sascha Bischoff [Fri, 15 Feb 2013 22:40:10 +0000 (17:40 -0500)]
base: Add warn() and inform() to m5.utils for use from python
This patch adds two fuctions to m5.util, warn and inform, which mirror those
found in the C++ side of gem5. These are added in addition to the already
existing m5.util.panic and m5.util.fatal which already mirror the C++
functionality. This ensures that warning and information messages generated
by python are in the same format as those generated by C++.
Occurrences of
print "Warning: %s..." % name
have been replaced with
warn("%s...", name)
Matt Horsnell [Fri, 15 Feb 2013 22:40:09 +0000 (17:40 -0500)]
o3: fix tick used for renaming and issue with range selection
Fixes the tick used from rename:
- previously this gathered the tick on leaving rename which was always 1 less
than the dispatch. This conflated the decode ticks when back pressure built
in the pipeline.
- now picks up tick on entry.
Added --store_completions flag:
- will additionally display the store completion tail in the viewer.
- this highlights periods when large numbers of stores are outstanding (>16 LSQ
blocking)
Allows selection by tick range (previously this caused an infinite loop)
Andreas Sandberg [Thu, 25 Oct 2012 13:08:29 +0000 (14:08 +0100)]
arm: Don't export private GIC methods
Andreas Sandberg [Thu, 25 Oct 2012 13:05:24 +0000 (14:05 +0100)]
arm: Create a GIC base class and make the PL390 derive from it
This patch moves the GIC interface to a separate base class and makes
all interrupt devices use that base class instead of a pointer to the
PL390 implementation. This allows us to have multiple GIC
implementations. Future implementations will allow in-kernel GIC
implementations when using hardware virtualization.
--HG--
rename : src/dev/arm/gic.cc => src/dev/arm/gic_pl390.cc
rename : src/dev/arm/gic.hh => src/dev/arm/gic_pl390.hh
Andreas Sandberg [Fri, 15 Feb 2013 22:40:09 +0000 (17:40 -0500)]
sim: Add a system-global option to bypass caches
Virtualized CPUs and the fastmem mode of the atomic CPU require direct
access to physical memory. We currently require caches to be disabled
when using them to prevent chaos. This is not ideal when switching
between hardware virutalized CPUs and other CPU models as it would
require a configuration change on each switch. This changeset
introduces a new version of the atomic memory mode,
'atomic_noncaching', where memory accesses are inserted into the
memory system as atomic accesses, but bypass caches.
To make memory mode tests cleaner, the following methods are added to
the System class:
* isAtomicMode() -- True if the memory mode is 'atomic' or 'direct'.
* isTimingMode() -- True if the memory mode is 'timing'.
* bypassCaches() -- True if caches should be bypassed.
The old getMemoryMode() and setMemoryMode() methods should never be
used from the C++ world anymore.
Andreas Sandberg [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
cpu: Refactor memory system checks
CPUs need to test that the memory system is in the right mode in two
places, when the CPU is initialized (unless it's switched out) and on
a drainResume(). This led to some code duplication in the CPU
models. This changeset introduces the verifyMemoryMode() method which
is called by BaseCPU::init() if the CPU isn't switched out. The
individual CPU models are responsible for calling this method when
resuming from a drain as this code is CPU model specific.
Andreas Sandberg [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
config: Remove O3 dependencies
The default cache configuration script currently import the O3_ARM_v7a
model configuration, which depends on the O3 CPU. This breaks if gem5
has been compiled without O3 support. This changeset removes the
dependency by only importing the model if it is requested by the
user. As a bonus, it actually removes some code duplication in the
configuration scripts.
Andreas Sandberg [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
config: Move CPU handover logic to m5.switchCpus()
CPU switching consists of the following steps:
1. Drain the system
2. Switch out old CPUs (cpu.switchOut())
3. Change the system timing mode to the mode the new CPUs require
4. Flush caches if switching to hardware virtualization
5. Inform new CPUs of the handover (cpu.takeOverFrom())
6. Resume the system
m5.switchCpus() previously only did step 2 & 5. Since information
about the new processors' memory system requirements is now exposed,
do all of the steps above.
This patch adds automatic memory system switching and flush (if
needed) to switchCpus(). Additionally, it adds optional draining to
switchCpus(). This has the following implications:
* changeToTiming and changeToAtomic are no longer needed, so they have
been removed.
* changeMemoryMode is only used internally, so it is has been renamed
to be private.
* switchCpus requires a reference to the system containing the CPUs as
its first parameter.
WARNING: This changeset breaks compatibility with existing
configuration scripts since it changes the signature of
m5.switchCpus().
Andreas Sandberg [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
config: Cleanup CPU configuration
The CPUs supported by the configuration scripts used to be
hard-coded. This was not ideal for several reasons. For example, the
configuration scripts depend on all CPU models even though only a
subset might have been compiled.
This changeset adds a new module to the configuration scripts that
automatically discovers the available CPU models from the compiled
SimObjects. As a nice bonus, the use of introspection allows us to
automatically generate a list of available CPU models suitable for
printing. This list is augmented with the Python doc string from the
underlying class if available.
Andreas Sandberg [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
cpu: Make checker CPUs inherit from CheckerCPU in the Python hierarchy
Checker CPUs currently don't inherit from the CheckerCPU in the Python
object hierarchy. This has two consequences:
* It makes CPU model discovery from the Python world somewhat
complicated as there is no way of testing if a CPU is a checker.
* Parameters are duplicated in the checker configuration
specification.
This changeset makes all checker CPUs inherit from the base checker
CPU class.
Andreas Sandberg [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
cpu: Add CPU metadata om the Python classes
The configuration scripts currently hard-code the requirements of each
CPU. This is clearly not optimal as it makes writing new configuration
scripts painful and adding new CPU models requires existing scripts to
be updated. This patch adds the following class methods to the base
CPU and all relevant CPUs:
* memory_mode -- Return a string describing the current memory mode
(invalid/atomic/timing).
* require_caches -- Does the CPU model require caches?
* support_take_over -- Does the CPU support CPU handover?
Ali Saidi [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
arm: fix some fp comparisons that worked by accident.
The explict tests in the follwing fp comparison operations were
incorrect as they checked for only signaling NaNs and not quite-NaNs
as well. When compiled with gcc, the comparison generates a fp exception
that causes the FE_INVALID flag to be set and we check for it, so even
though the check was incorrect, the correct exception was set. With clang
this behavior seems to not occur. The checks are updated to test for nans and
the behavior is now correct with both clang and gcc.
Ali Saidi [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
cpu: include set in o3/commit_impl.
While the majority of compilers seemed to pickup set from else where,
one version of gcc 4.7 complains, so explictly add it.
Ali Saidi [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
ARM: Fix an issue with clang generating wrong code.
Clang generated executables would enter the if condition when it wasn't
supposted to, resulting in the wrong simulated behavior.
Implementing the operation this way is a bit faster anyway.
Ali Saidi [Fri, 15 Feb 2013 22:40:08 +0000 (17:40 -0500)]
cpu: fix case with o3 cpu blocking and unblocking decode in cycle
Fix a case in the O3 CPU where the decode stage blocks and unblocks in a
single cycle sending both signals to fetch which causes an assert or worse.
The previous check could never work before since the status was set to Blocked
before a test for the status being Unblocking was executed.
Ali Saidi [Fri, 15 Feb 2013 22:40:07 +0000 (17:40 -0500)]
cpu: Fix a livelock in the o3 cpu.
Check if an instruction just enabled interrupts and we've previously had an
interrupt pending that was not handled because interrupts were subsequently
disabled before the pipeline reached a place to handle the interrupt. In that
case squash now to make sure the interrupt is handled.
Andreas Sandberg [Sun, 10 Feb 2013 12:23:58 +0000 (13:23 +0100)]
base: Add support for newer versions of IPython
IPython is used for the interactive gem5 shell if it exists. IPython
made API changes in version 0.11. This patch adds support for IPython
version 0.11 and above.
--HG--
extra : rebase_source :
5388d0919adb58d97f49a1a637db48cba61283a3
Andreas Hansson [Thu, 14 Feb 2013 17:24:51 +0000 (12:24 -0500)]
Ruby: Fix compilation errors on gcc 4.7 and clang 3.2
This patch fixes a few (recently added) errors that prevented gem5 from
compiling on more recent versions of gcc and clang.
Nilay Vaish [Mon, 11 Feb 2013 03:43:23 +0000 (21:43 -0600)]
regressions: update stats due to changes to ruby