gem5.git
18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Fri, 15 Sep 2006 04:59:39 +0000 (00:59 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 91aacb435c223e8c37f6ba0a458b0dee55edcaf2

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Mon, 11 Sep 2006 21:57:30 +0000 (17:57 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 14ac24236ff65b7e489c1ce4b4e9a295966013b8

18 years agoadd annotation code to m5
Ali Saidi [Mon, 11 Sep 2006 21:57:20 +0000 (17:57 -0400)]
add annotation code to m5

configs/common/Benchmarks.py:
    add annotate test app
src/SConscript:
    add annotate.cc to lis
src/arch/alpha/isa/decoder.isa:
    add annotate instructions
src/base/traceflags.py:
    Add annotate trace flag
src/sim/pseudo_inst.cc:
src/sim/pseudo_inst.hh:
    add annotate pseudo ops
util/m5/m5op.S:
util/m5/m5op.h:
    add anotate ops

--HG--
extra : convert_revision : 7f965c0d84e41ce34f2ec8ec27a009276d67d8d6

18 years agoAdded cscope-find.py utility to generate file list for cscope.
Steve Reinhardt [Fri, 8 Sep 2006 23:22:25 +0000 (19:22 -0400)]
Added cscope-find.py utility to generate file list for cscope.

--HG--
extra : convert_revision : 80f2db90f1c2406039d0447b84aa0442b7b974f8

18 years agoAdd support for assigning lists of ports or proxies to VectorPorts.
Steve Reinhardt [Fri, 8 Sep 2006 23:10:11 +0000 (19:10 -0400)]
Add support for assigning lists of ports or proxies to VectorPorts.
Includes support for printing readable VectorPort and Proxy names
(via __str__).

--HG--
extra : convert_revision : c48534a498b3036fe6ac45ff1606656546c79afb

18 years agoUpdate port numbers from new unproxy ordering.
Steve Reinhardt [Thu, 7 Sep 2006 06:07:06 +0000 (02:07 -0400)]
Update port numbers from new unproxy ordering.

--HG--
extra : convert_revision : 514d2c53bd6afa6bea43c37c1242b6775e86c556

18 years agoTry to make unproxy order more deterministic.
Steve Reinhardt [Thu, 7 Sep 2006 05:37:35 +0000 (22:37 -0700)]
Try to make unproxy order more deterministic.

--HG--
extra : convert_revision : 0bc543014dced6dfed4122d4c1b8f22e6c8d7a13

18 years agoDelete some output files that never should have been
Steve Reinhardt [Wed, 6 Sep 2006 22:36:50 +0000 (15:36 -0700)]
Delete some output files that never should have been
committed.

--HG--
extra : convert_revision : 29780a4cc82dc397681a2b4a61eaa658e6eed83e

18 years agoEnable proxies (Self/Parent) for specifying ports.
Steve Reinhardt [Wed, 6 Sep 2006 05:04:34 +0000 (22:04 -0700)]
Enable proxies (Self/Parent) for specifying ports.
Significant revamp of Port code.
Some cleanup of SimObject code too, particularly to
make the SimObject and MetaSimObject implementations of
__setattr__ more consistent.
Unproxy code split out of print_ini().

src/python/m5/multidict.py:
    Make get() return None by default, to match semantics
    of built-in dictionary objects.

--HG--
extra : convert_revision : db73b6cdd004a82a08b2402afd1e16544cb902a4

18 years agoUpdate reference config.ini files to include port mappings.
Steve Reinhardt [Tue, 5 Sep 2006 20:24:47 +0000 (16:24 -0400)]
Update reference config.ini files to include port mappings.

--HG--
extra : convert_revision : f9e91a60fa09b707d2a26be57f265b7ab1c07263

18 years agoPrint ports in config.ini as well.
Steve Reinhardt [Tue, 5 Sep 2006 19:22:47 +0000 (12:22 -0700)]
Print ports in config.ini as well.

--HG--
extra : convert_revision : 703d3a57250613315735709de8f40a9956cee6e2

18 years agoMore Python hacking to deal with config.py split
Steve Reinhardt [Tue, 5 Sep 2006 00:14:07 +0000 (17:14 -0700)]
More Python hacking to deal with config.py split
and resulting recursive import trickiness.

--HG--
extra : convert_revision : 1ea93861eb8d260c9f3920dda0b8106db3e03705

18 years agoSplit config.py into multiple files.
Steve Reinhardt [Mon, 4 Sep 2006 17:52:26 +0000 (10:52 -0700)]
Split config.py into multiple files.
Some tweaking to deal with mutually recursive imports.

--HG--
rename : src/python/m5/config.py => src/python/m5/SimObject.py
extra : convert_revision : 166f7bfabfd20100e93d26a89382469465859988

18 years agoconfig.py:
Steve Reinhardt [Mon, 4 Sep 2006 17:40:33 +0000 (10:40 -0700)]
config.py:
Import of changes for auto-generation of C++ param structs
from my old m5 working directory.
This code is *broken* because pieces need to be shuffled around
to satisfy name dependencies, but that really messes up the
diff, so I want to make an intermediate commit here.

src/python/m5/config.py:
    Import of changes for auto-generation of C++ param structs
    from my old m5 working directory.
    This code is *broken* because pieces need to be shuffled around
    to satisfy name dependencies, but that really messes up the
    diff, so I want to make an intermediate commit here.

--HG--
extra : convert_revision : cb25ee1f4f77d1902511ee9aa766403733dd8841

18 years agoMade system calls use the uid, etc parameters from the live process.
Gabe Black [Sun, 3 Sep 2006 06:12:11 +0000 (02:12 -0400)]
Made system calls use the uid, etc parameters from the live process.

--HG--
extra : convert_revision : 2aadb87b4602324423aadb903010f5b49fcef41b

18 years agoFix up the parameters to getInstRecord
Gabe Black [Sun, 3 Sep 2006 06:10:05 +0000 (02:10 -0400)]
Fix up the parameters to getInstRecord

--HG--
extra : convert_revision : 0fac43035a2510d3a3f596d3d8f57193045570f6

18 years agoMake the ASI constants available to the decoder.
Gabe Black [Sun, 3 Sep 2006 06:09:25 +0000 (02:09 -0400)]
Make the ASI constants available to the decoder.

--HG--
extra : convert_revision : 65f2e02ce8f5e4f0c8727ebf16c927c7a6a4fe7f

18 years agoMake the auxiliary vectors use the uid, euid, gid and egid parameters from the live...
Gabe Black [Sun, 3 Sep 2006 06:08:24 +0000 (02:08 -0400)]
Make the auxiliary vectors use the uid, euid, gid and egid parameters from the live process

--HG--
extra : convert_revision : 945b5883a15a6df35709edea2731f54a2448e418

18 years agoFixing up parameters of getInstRecord
Gabe Black [Sun, 3 Sep 2006 06:05:44 +0000 (02:05 -0400)]
Fixing up parameters of getInstRecord

--HG--
extra : convert_revision : 4ce06ac4f7d135cc04b39cf0e957a2539c7e946d

18 years agoAdded uid, euid, gid, egid, pid and ppid parameters to a live process.
Gabe Black [Sun, 3 Sep 2006 06:04:25 +0000 (02:04 -0400)]
Added uid, euid, gid, egid, pid and ppid parameters to a live process.

--HG--
extra : convert_revision : 2101be8000bcdaf683730cfc079b4b78e34365d0

18 years agoA quick fix to isolate the tracing code to SPARC
Gabe Black [Sun, 3 Sep 2006 06:02:56 +0000 (02:02 -0400)]
A quick fix to isolate the tracing code to SPARC

--HG--
extra : convert_revision : 90c77f4d01101cad55f60d528b2a8be92d2f9aba

18 years agoregress:
Steve Reinhardt [Sat, 2 Sep 2006 15:20:54 +0000 (08:20 -0700)]
regress:
Clean up help output.

util/regress:
    Clean up help output.

--HG--
extra : convert_revision : 8375d58a9d72e1871a15690991dc8fc60d47a2b3

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Steve Reinhardt [Sat, 2 Sep 2006 00:12:43 +0000 (17:12 -0700)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : 8b0fbb6b1ea38d01d048381f18fd95ab63c4c0f1

18 years agoGet rid of extra stuff in util/regress only needed by cron job,
Steve Reinhardt [Sat, 2 Sep 2006 00:11:50 +0000 (20:11 -0400)]
Get rid of extra stuff in util/regress only needed by cron job,
to make it more usable by regular folks.

util/regress:
    Get rid of extra stuff only needed by cron job,
    to make it more usable by regular folks.

--HG--
extra : convert_revision : e113c05af5eec846db526d734cce8ff66aa95d72

18 years agoAdd o3-timing configuration for ALPHA_SE "Hello world" tests.
Steve Reinhardt [Fri, 1 Sep 2006 21:59:36 +0000 (17:59 -0400)]
Add o3-timing configuration for ALPHA_SE "Hello world" tests.

build_opts/ALPHA_SE:
    Add O3CPU to default CPU model list.
tests/SConscript:
    Add o3-timing configuration.

--HG--
extra : convert_revision : 378feacc07cefdaf1e2df9080c9b9d5d71e4d2a1

18 years agodiff-out:
Steve Reinhardt [Fri, 1 Sep 2006 20:27:24 +0000 (16:27 -0400)]
diff-out:
Don't consider it a success if no stats at all were found.

tests/diff-out:
    Don't consider it a success if no stats at all were found.

--HG--
extra : convert_revision : 733f10abdf17d1f7eeca912f84f3df37e56fe510

18 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Steve Reinhardt [Fri, 1 Sep 2006 16:59:48 +0000 (12:59 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : 54c63c9a8c7146bb45ecfa9a177ab0bda9541d1b

18 years agoTweak proxy resolution error message.
Steve Reinhardt [Fri, 1 Sep 2006 00:58:46 +0000 (17:58 -0700)]
Tweak proxy resolution error message.

--HG--
extra : convert_revision : 3b186209515975be0d8bc9acc214425adcaa16f2

18 years agoadd ISA_HAS_DELAY_SLOT directive instead of "#if THE_ISA == ALPHA_ISA" throughout...
Korey Sewell [Fri, 1 Sep 2006 00:51:30 +0000 (20:51 -0400)]
add ISA_HAS_DELAY_SLOT directive instead of "#if THE_ISA == ALPHA_ISA" throughout CPU models

src/arch/alpha/isa_traits.hh:
src/arch/mips/isa_traits.hh:
src/arch/sparc/isa_traits.hh:
    define 'ISA_HAS_DELAY_SLOT'
src/cpu/base_dyn_inst.hh:
src/cpu/o3/bpred_unit_impl.hh:
src/cpu/o3/commit_impl.hh:
src/cpu/o3/cpu.cc:
src/cpu/o3/cpu.hh:
src/cpu/o3/decode_impl.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue_impl.hh:
src/cpu/o3/rename_impl.hh:
src/cpu/simple/base.cc:
    use ISA_HAS_DELAY_SLOT instead of THE_ISA == ALPHA_ISA

--HG--
extra : convert_revision : 24c7460d9391e8d443c9fe08e17c331ae8e9c36a

18 years agoMove more common functionality into SimpleTimingPort,
Steve Reinhardt [Wed, 30 Aug 2006 23:24:26 +0000 (16:24 -0700)]
Move more common functionality into SimpleTimingPort,
allowing derived classes to be simplified.

--HG--
extra : convert_revision : c980d3aec5e6c044d8f41e96252726fe9a256605

18 years agoChange the cpu pointer in the InstRecord object to a thread context pointer.
Gabe Black [Wed, 30 Aug 2006 23:08:24 +0000 (19:08 -0400)]
Change the cpu pointer in the InstRecord object to a thread context pointer.

--HG--
extra : convert_revision : 7efb2680cef4219281b94d680a4a7c75c123f89d

18 years agoForgot some commas
Gabe Black [Wed, 30 Aug 2006 22:33:47 +0000 (18:33 -0400)]
Forgot some commas

--HG--
extra : convert_revision : d178c87ba156be6302f871f1ab1030889586168f

18 years agoMinor include file & formatting cleanup.
Steve Reinhardt [Wed, 30 Aug 2006 16:57:46 +0000 (09:57 -0700)]
Minor include file & formatting cleanup.

--HG--
extra : convert_revision : fa23563b2897687752379d63ddab5cccb92484ba

18 years agoAdd FULL_SYSTEM check to example/fs.py.
Steve Reinhardt [Tue, 29 Aug 2006 21:36:35 +0000 (14:36 -0700)]
Add FULL_SYSTEM check to example/fs.py.

--HG--
extra : convert_revision : 4cab46e73f29d2c9d24d9c0c847d598bf6d5c389

18 years agoAdd missing cpu mem param to example/se.py.
Steve Reinhardt [Tue, 29 Aug 2006 21:14:29 +0000 (14:14 -0700)]
Add missing cpu mem param to example/se.py.

configs/example/se.py:
    Add missing cpu mem param.

--HG--
extra : convert_revision : 29a11b09524612f079b8998e99b8f5ee8c67c8a6

18 years agoASI constants.
Gabe Black [Tue, 29 Aug 2006 20:08:56 +0000 (16:08 -0400)]
ASI constants.

--HG--
extra : convert_revision : 888024c9f7e909fa377de6d67a41ea1d4cf9945a

18 years agoSet both xcc.c and icc.c on return from a syscall.
Gabe Black [Tue, 29 Aug 2006 20:07:22 +0000 (16:07 -0400)]
Set both xcc.c and icc.c on return from a syscall.

--HG--
extra : convert_revision : 9c2b32d735b816021cdd3af24002f309e22a8d64

18 years agoDon't store if there's a fault.
Gabe Black [Tue, 29 Aug 2006 20:06:27 +0000 (16:06 -0400)]
Don't store if there's a fault.

--HG--
extra : convert_revision : fc852bee572b36daab7a34ee1820f856ccd71ca5

18 years agoExtended the reg delta output.
Gabe Black [Tue, 29 Aug 2006 20:04:28 +0000 (16:04 -0400)]
Extended the reg delta output.

--HG--
extra : convert_revision : 61c714a8c4faeb30d784b1ef1da0295474b8dc45

18 years agoFiddled with the floating point accessors.
Gabe Black [Tue, 29 Aug 2006 20:02:54 +0000 (16:02 -0400)]
Fiddled with the floating point accessors.

--HG--
extra : convert_revision : 78cbd0c28d3fa1109eb2eacaf2a8009f13158a9b

18 years agoCleaned up floating point by removing unnecessary conversions and by implementing...
Gabe Black [Tue, 29 Aug 2006 06:40:24 +0000 (02:40 -0400)]
Cleaned up floating point by removing unnecessary conversions and by implementing faligndata more correctly.

--HG--
extra : convert_revision : 44e778ce8f8d8606b6a50f3f12f0b87e1bf0ed66

18 years agoClean up BAR setting code.
Steve Reinhardt [Mon, 28 Aug 2006 18:17:49 +0000 (11:17 -0700)]
Clean up BAR setting code.

--HG--
extra : convert_revision : 8378be6cd6f55af7a199296cb2ff61ee94849bf7

18 years agoGet rid of unneeded union.
Steve Reinhardt [Mon, 28 Aug 2006 18:01:25 +0000 (11:01 -0700)]
Get rid of unneeded union.
Verify that BAR sizes are powers of two.

--HG--
extra : convert_revision : ce8dca07aaf1a340cc166b99b5858613a954e2fd

18 years agoGet rid of unused BARAddrs[] in PciConfigData object.
Steve Reinhardt [Mon, 28 Aug 2006 17:34:15 +0000 (10:34 -0700)]
Get rid of unused BARAddrs[] in PciConfigData object.

--HG--
extra : convert_revision : a82e05326ca6150c70cb288b28f9f6eee89ad93d

18 years agoCleanup: formatting, comments, DPRINTFs.
Steve Reinhardt [Mon, 28 Aug 2006 17:28:31 +0000 (10:28 -0700)]
Cleanup: formatting, comments, DPRINTFs.

--HG--
extra : convert_revision : 565ab099f1c0744a13959e721c19dd03b7630f04

18 years agoFix remote gdb buffer overflow.
Steve Reinhardt [Mon, 28 Aug 2006 16:58:03 +0000 (09:58 -0700)]
Fix remote gdb buffer overflow.

--HG--
extra : convert_revision : e5e5206bdd48120cebcb1e339b1dab2e10f4b6cf

18 years agoMake address formats consistent in DPRINTFs.
Steve Reinhardt [Mon, 28 Aug 2006 16:55:13 +0000 (09:55 -0700)]
Make address formats consistent in DPRINTFs.

--HG--
extra : convert_revision : 73c6616aa9228c08e21fcc134dd0e675cd57aee6

18 years agoFix command for new options processing.
Steve Reinhardt [Mon, 28 Aug 2006 16:48:31 +0000 (09:48 -0700)]
Fix command for new options processing.

--HG--
extra : convert_revision : 49eee05a6deddae378013f7c2117eabe621b69d9

18 years agoAdd dup() support (from Antti Miettinen).
Steve Reinhardt [Mon, 28 Aug 2006 14:39:56 +0000 (07:39 -0700)]
Add dup() support (from Antti Miettinen).

--HG--
extra : convert_revision : 72c834666afa3c353da026617ad5e7a762eb645f

18 years agoUpdate for 2.0 beta 1 patch 1 m5_2.0_beta1_patch1
Steve Reinhardt [Fri, 25 Aug 2006 19:17:25 +0000 (15:17 -0400)]
Update for 2.0 beta 1 patch 1

--HG--
extra : convert_revision : 01c1a993bc111127e7bd51564e8c9a8adbeaffd4

18 years agoUpdate for new regression test structure.
Steve Reinhardt [Fri, 25 Aug 2006 17:04:21 +0000 (13:04 -0400)]
Update for new regression test structure.

--HG--
extra : convert_revision : f533bc237710c2c634a20e51733f66f9f5dd0929

18 years agoUpdate a few bogus reference outputs
Steve Reinhardt [Thu, 24 Aug 2006 18:31:31 +0000 (14:31 -0400)]
Update a few bogus reference outputs

tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout:
    Update reference outputs

--HG--
extra : convert_revision : 4b7837c90c14f0822b38d36bd821bc9eed316fd0

18 years agoStill need LL/SC support in cache, add hack to always return success for now
Ron Dreslinski [Tue, 22 Aug 2006 20:09:34 +0000 (16:09 -0400)]
Still need LL/SC support in cache, add hack to always return success for now

--HG--
extra : convert_revision : b354bd91be8c1bbb3aca7b4ba9e7e3e117ced164

18 years agoCommiting a version of the multi-phase snoop atomic bus so people can see the framewo...
Ron Dreslinski [Tue, 22 Aug 2006 20:08:18 +0000 (16:08 -0400)]
Commiting a version of the multi-phase snoop atomic bus so people can see the framework.  Doesn't work, but also doesn't break uni-processor systems.
Working on pulling out the changes in the cache so that it remains working.

src/mem/bus.cc:
    Changes for multi-phase snoop
    Some code for registering snoop ranges (a version that compiles and runs, but does nothing)
src/mem/bus.hh:
    Changes for multi-phase snoop
src/mem/packet.hh:
    Flag for multi-phase snoop
src/mem/port.hh:
    Status for multi-phase snoop

--HG--
extra : convert_revision : 4c2e5263bba16e3bcf03aabe36ff45ec36de4720

18 years agoMerge zizzer:/z/m5/Bitkeeper/newmem
Ron Dreslinski [Tue, 22 Aug 2006 15:09:53 +0000 (11:09 -0400)]
Merge zizzer:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

--HG--
extra : convert_revision : ccbca1320471d809d25a6359b79d9f2d46c6ce73

18 years agoUpdate refs for tru64 with initialized cache stats
Ron Dreslinski [Tue, 22 Aug 2006 15:08:02 +0000 (11:08 -0400)]
Update refs for tru64 with initialized cache stats

--HG--
extra : convert_revision : 708553b57307c353d6a8e403dc1ed4deb6dd2dfb

18 years agoFix annulled unconditional branches
Gabe Black [Tue, 22 Aug 2006 02:41:57 +0000 (22:41 -0400)]
Fix annulled unconditional branches

--HG--
extra : convert_revision : 698b0ce38c7a47306f97df2cc80cdae4a51b22c7

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Mon, 21 Aug 2006 22:25:34 +0000 (18:25 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 46e14792cfd18e4e27935b848c9953a7c44e9334

18 years agoSConstruct:
Steve Reinhardt [Mon, 21 Aug 2006 22:25:33 +0000 (18:25 -0400)]
SConstruct:
Add checks for swig & libz, version check for swig.
Factor out version check code into function, use for mysql too.

SConstruct:
    Add checks for swig & libz, version check for swig.
    Factor out version check code into function, use for mysql too.

--HG--
extra : convert_revision : a077d961ae52011141fbf5021b167485f8638139

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Mon, 21 Aug 2006 19:09:18 +0000 (15:09 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 15d8fd51f0c70da4d2e52c11864f3ab0f3f62811

18 years agoUpdate REFs for statistics patch in cache
Ron Dreslinski [Mon, 21 Aug 2006 19:09:17 +0000 (15:09 -0400)]
Update REFs for statistics patch in cache

--HG--
extra : convert_revision : 8987d3ab62ea4b2fa18ebd40fc980b30561d7e45

18 years agoGot rid of the aux_data array since it shouldn't have existed.
Gabe Black [Mon, 21 Aug 2006 18:29:50 +0000 (14:29 -0400)]
Got rid of the aux_data array since it shouldn't have existed.
Added in the filename parameter which is provided for the user space linker.
Fix the ordering and alignment of stack elements.
Made mmap start with the address it has been seen starting with "in the wild"

--HG--
extra : convert_revision : 8734753145f59a6cb433e4f92f43cb28a44b56d4

18 years agoFixed the parameters to memset. sizeof(regSegments[x]) may have been returning the...
Gabe Black [Mon, 21 Aug 2006 18:25:51 +0000 (14:25 -0400)]
Fixed the parameters to memset. sizeof(regSegments[x]) may have been returning the size of a pointer to an IntReg

--HG--
extra : convert_revision : 02c04ffceb447b7683ba5ebd4752819d0014cc19

18 years agoTwo bugs found by my tracing tool.
Gabe Black [Mon, 21 Aug 2006 18:23:39 +0000 (14:23 -0400)]
Two bugs found by my tracing tool.
1. alignaddr wrote it's address to a floating point register rather than a gpr.
2. sethi was sign extending it's immediate value.

--HG--
extra : convert_revision : 9aa30a6485bc4cba916367973b986d439b7c7588

18 years agoMerge zizzer:/z/m5/Bitkeeper/newmem
Ron Dreslinski [Mon, 21 Aug 2006 17:20:35 +0000 (13:20 -0400)]
Merge zizzer:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

src/python/m5/objects/BaseCPU.py:
    Merge duplicate change

--HG--
extra : convert_revision : 214e57999ee78aadfc86e1f0b7198ff0d981ce16

18 years agoChanges so that time in the packet is actually set properly.
Ron Dreslinski [Mon, 21 Aug 2006 17:16:46 +0000 (13:16 -0400)]
Changes so that time in the packet is actually set properly.

src/mem/packet.hh:
    Make sure packets set the time parameter correctly.

--HG--
extra : convert_revision : e381d2789e0aaa1b6c2fbde417b7ba5815deec61

18 years agofs.py:
Steve Reinhardt [Mon, 21 Aug 2006 16:31:59 +0000 (12:31 -0400)]
fs.py:
Add temporary cpu.mem parameter settings.

configs/example/fs.py:
    Add temporary cpu.mem parameter settings.

--HG--
extra : convert_revision : d7c2fcd8df8dc809b0511485877b2a85769aaf43

18 years agoTEST_CPU_MODELS isn't used anymore.
Steve Reinhardt [Mon, 21 Aug 2006 06:13:35 +0000 (23:13 -0700)]
TEST_CPU_MODELS isn't used anymore.

--HG--
extra : convert_revision : 742bda87e79657573cec404b8650fa26d189d1a1

18 years agoAdd Alpha Linux version of "hello world" test.
Steve Reinhardt [Mon, 21 Aug 2006 02:48:30 +0000 (22:48 -0400)]
Add Alpha Linux version of "hello world" test.

--HG--
extra : convert_revision : 22cd31c58f18fd92bd61ee4b4a218926f7290045

18 years agoAlpha "hello world" test is really Tru64 not Linux... oops.
Steve Reinhardt [Mon, 21 Aug 2006 02:40:15 +0000 (22:40 -0400)]
Alpha "hello world" test is really Tru64 not Linux... oops.

--HG--
rename : tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt => tests/quick/00.hello/ref/alpha/tru64/simple-atomic/m5stats.txt
rename : tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr => tests/quick/00.hello/ref/alpha/tru64/simple-atomic/stderr
rename : tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout => tests/quick/00.hello/ref/alpha/tru64/simple-atomic/stdout
rename : tests/quick/00.hello/ref/alpha/linux/simple-timing/config.ini => tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.ini
rename : tests/quick/00.hello/ref/alpha/linux/simple-timing/config.out => tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.out
rename : tests/quick/00.hello/ref/alpha/linux/simple-timing/m5stats.txt => tests/quick/00.hello/ref/alpha/tru64/simple-timing/m5stats.txt
rename : tests/quick/00.hello/ref/alpha/linux/simple-timing/stderr => tests/quick/00.hello/ref/alpha/tru64/simple-timing/stderr
rename : tests/quick/00.hello/ref/alpha/linux/simple-timing/stdout => tests/quick/00.hello/ref/alpha/tru64/simple-timing/stdout
rename : tests/test-progs/hello/bin/alpha/linux/hello => tests/test-progs/hello/bin/alpha/tru64/hello
extra : convert_revision : 583c30603e51304c9a19e3ae25fbf0623be0489d

18 years agoconfigs/example/fs.py:
Steve Reinhardt [Mon, 21 Aug 2006 02:28:58 +0000 (19:28 -0700)]
configs/example/fs.py:
Arg to m5.simulate() is a delta, not an absolute curTick value.
I didn't test this change, but I'm not convinced the previous
example was tested either, so I don't feel too badly about it.

configs/example/fs.py:
    Arg to m5.simulate() is a delta, not an absolute curTick value.
    I didn't test this change, but I'm not convinced the previous
    example was tested either, so I don't feel too badly about it.

--HG--
extra : convert_revision : ef7df7b83b3e2b5da02408c674169ccbed75a441

18 years agoSConscript:
Steve Reinhardt [Sat, 19 Aug 2006 07:16:11 +0000 (03:16 -0400)]
SConscript:
Fix BATCH_CMD bug.

tests/SConscript:
    Fix BATCH_CMD bug.

--HG--
extra : convert_revision : 696d51a67790506db749244edf4afab920a63d1b

18 years agoUpdate reference outputs m5_2.0_beta1
Steve Reinhardt [Fri, 18 Aug 2006 04:17:21 +0000 (00:17 -0400)]
Update reference outputs

--HG--
extra : convert_revision : 110a6c51cc1c562d115492b7360bfdbbded8eefd

18 years agoAdd caches in, fix cpu.mem param
Steve Reinhardt [Fri, 18 Aug 2006 04:16:23 +0000 (00:16 -0400)]
Add caches in, fix cpu.mem param

--HG--
extra : convert_revision : 486283d83786807c72bb4601e4b9613b55d8802c

18 years agoChanges to build m5.fast
Steve Reinhardt [Fri, 18 Aug 2006 03:13:11 +0000 (23:13 -0400)]
Changes to build m5.fast

--HG--
extra : convert_revision : 2ec600b8e72e40e8b96e3b1dbe0334aa05e0f30b

18 years agoAdd readfile back in.
Kevin Lim [Thu, 17 Aug 2006 23:16:03 +0000 (19:16 -0400)]
Add readfile back in.

--HG--
extra : convert_revision : 0b64f2d95b439b19f1131fe00f45da56617b0026

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Thu, 17 Aug 2006 22:47:04 +0000 (18:47 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : 49289cfe8d547045dd89133db71d16318bc8510b

18 years agoadd default range to PhysicalMemory
Ali Saidi [Thu, 17 Aug 2006 22:46:43 +0000 (18:46 -0400)]
add default range to PhysicalMemory

--HG--
extra : convert_revision : 0a622ab0f0f7653d28d4ed3dd27113ae2bc82cae

18 years agoSConstruct:
Steve Reinhardt [Thu, 17 Aug 2006 08:04:28 +0000 (04:04 -0400)]
SConstruct:
rename build/*/test dir to build/*/tests for consistency

SConstruct:
    rename build/*/test dir to build/*/tests for consistency

--HG--
extra : convert_revision : 6af3cf6b2d6582b2c4d2bc9211e44767e0fa494f

18 years agoAUTHORS:
Lisa Hsu [Thu, 17 Aug 2006 04:44:54 +0000 (00:44 -0400)]
AUTHORS:
minor change

AUTHORS:
    minor change

--HG--
extra : convert_revision : b638f14f0541ff5d48546c7fcd27d1bf0bdf615f

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Thu, 17 Aug 2006 04:02:38 +0000 (00:02 -0400)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : 382a9d4b420a9bdb35f93049306b7b7af0d33ad5

18 years agomake tree rcS files reflect what we've been actually using in /dist.
Lisa Hsu [Thu, 17 Aug 2006 04:00:27 +0000 (00:00 -0400)]
make tree rcS files reflect what we've been actually using in /dist.

also, update all the rcS files so that they are in sync with the new linux-dist build system.

configs/boot/devtime.rcS:
configs/boot/iscsi-client.rcS:
configs/boot/iscsi-server.rcS:
configs/boot/micro_memlat.rcS:
configs/boot/micro_stream.rcS:
configs/boot/micro_tlblat.rcS:
configs/boot/nat-netperf-maerts-client.rcS:
configs/boot/nat-netperf-server.rcS:
configs/boot/nat-netperf-stream-client.rcS:
configs/boot/nat-spec-surge-client.rcS:
configs/boot/nat-spec-surge-server.rcS:
configs/boot/natbox-netperf.rcS:
configs/boot/natbox-spec-surge.rcS:
configs/boot/netperf-rr.rcS:
configs/boot/netperf-server.rcS:
configs/boot/netperf-stream-client.rcS:
configs/boot/netperf-stream-nt-client.rcS:
configs/boot/nfs-client-nhfsstone.rcS:
configs/boot/nfs-client-tcp-smallb.rcS:
configs/boot/nfs-client-tcp.rcS:
configs/boot/nfs-client.rcS:
configs/boot/nfs-server-nhfsstone.rcS:
configs/boot/nfs-server.rcS:
configs/boot/ping-client.rcS:
configs/boot/ping-server.rcS:
configs/boot/spec-surge-client.rcS:
configs/boot/spec-surge-server.rcS:
configs/boot/surge-client.rcS:
configs/boot/surge-server.rcS:
    make tree rcS files reflect what we've been actually using in /dist.

--HG--
extra : convert_revision : 48fe4fe71938ef9d029e428028a271242c8d2faa

18 years agowe don't want the old memory timing dram model either
Ali Saidi [Thu, 17 Aug 2006 03:56:53 +0000 (23:56 -0400)]
we don't want the old memory timing dram model either

--HG--
extra : convert_revision : 7de51b1e42cff8c0f377a21cfcb6d1d13df1847a

18 years agoFix the caches not working in the regression
Ron Dreslinski [Thu, 17 Aug 2006 03:46:54 +0000 (23:46 -0400)]
Fix the caches not working in the regression

src/python/m5/objects/BaseCPU.py:
    Make mem parameter a MemObject, not just a PhysicalMemory
    Fix a reference not using self
tests/configs/simple-atomic.py:
    Set the mem paramter
tests/configs/simple-timing.py:
    Set the mem parameter

--HG--
extra : convert_revision : 6bd9df36831a1c5bafc9e88ab945c2ebe91db785

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Thu, 17 Aug 2006 03:39:44 +0000 (23:39 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : b754945635cc0864fdd68ec4bee736aab9bca407

18 years agoDRAM Memory doesn't crash the simulator now.. still untested.
Ali Saidi [Thu, 17 Aug 2006 03:39:31 +0000 (23:39 -0400)]
DRAM Memory doesn't crash the simulator now.. still untested.

--HG--
extra : convert_revision : fa2d2c5ec4073383f1b2b2f466d0245f2d6a6c35

18 years agowe don't want the splash2 config files either, they haven't been converted yet
Ali Saidi [Thu, 17 Aug 2006 03:17:10 +0000 (23:17 -0400)]
we don't want the splash2 config files either, they haven't been converted yet

--HG--
extra : convert_revision : 09adadca1ead8d32589cf7a243fddd24fcc51f4b

18 years agoAdd checkpointing and configuration stuff to the people that worked on it
Nathan Binkert [Thu, 17 Aug 2006 02:50:17 +0000 (22:50 -0400)]
Add checkpointing and configuration stuff to the people that worked on it

--HG--
extra : convert_revision : 565f0144d3aa6194665e49e3b0ad314c5d671bba

18 years agoAdded in SPARC ISA specifically. Thanks to whoever fleshed out my entry.
Gabe Black [Thu, 17 Aug 2006 02:17:24 +0000 (22:17 -0400)]
Added in SPARC ISA specifically. Thanks to whoever fleshed out my entry.

--HG--
extra : convert_revision : acb123227c7efbb46cc25e0ca69f7b2e2ec5b9c1

18 years agoadd etherdump file option
Ali Saidi [Thu, 17 Aug 2006 02:17:23 +0000 (22:17 -0400)]
add etherdump file option

--HG--
extra : convert_revision : 6b62398778208bc4e64582e06fb73b71a94f3014

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Wed, 16 Aug 2006 23:01:23 +0000 (19:01 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : f4fa62290ca2bbd4726fb6c8e89655dade53bb68

18 years agoFix Physical Memory to allow memory sizes bigger than 128MB.
Ali Saidi [Wed, 16 Aug 2006 23:01:11 +0000 (19:01 -0400)]
Fix Physical Memory to allow memory sizes bigger than 128MB.
Kinda port DRAM to new memory system. The code is *really* ugly (not my fault) and right now something about the stats it uses
causes a simulator segfault.

src/SConscript:
    Add dram.cc to sconscript
src/mem/physical.cc:
src/mem/physical.hh:
    Add params struct to physical memory, use params, make latency function be virtual
src/python/m5/objects/PhysicalMemory.py:
    Add DRAMMemory python class

--HG--
extra : convert_revision : 5bd9f2e071c62da89e8efa46fa016f342c01535d

18 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Steve Reinhardt [Wed, 16 Aug 2006 22:48:32 +0000 (18:48 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : 3bf1742201e61d61a906d057b52dc158aa7be2d0

18 years agoMore regression updates.
Steve Reinhardt [Wed, 16 Aug 2006 22:48:15 +0000 (18:48 -0400)]
More regression updates.
Get rid of caches in simple-timing config for now.

tests/SConscript:
    another line for diff to ignore
tests/configs/simple-timing.py:
    turn off caches for now
tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout:
    update for inst/tick rate (old one was debug?)
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout:
    works now (no caches)

--HG--
extra : convert_revision : 472030f63297346976db6274a78235c93d4eef8e

18 years agoAdd in checkpointing in the frontend, so that when a checkpoint is called, the python...
Lisa Hsu [Wed, 16 Aug 2006 21:54:00 +0000 (17:54 -0400)]
Add in checkpointing in the frontend, so that when a checkpoint is called, the python handles it, and the simulation continues. Also, make it so that the cycle number is part of the cpt dir name, so that multiple checkpoints do not overwrite each other.

--HG--
extra : convert_revision : a55e4ac20da5a57ea8735951b9070960b9b8298f

18 years agoMinor regression fixes.
Steve Reinhardt [Wed, 16 Aug 2006 21:16:52 +0000 (14:16 -0700)]
Minor regression fixes.

src/python/m5/objects/BaseCPU.py:
    bug fix
tests/SConscript:
    fix up diff ignore strings to reflect changes
    in m5 output

--HG--
extra : convert_revision : b8e4acee34599ddd431b69fc9d40b6f6e440d128

18 years agoAUTHORS:
Korey Sewell [Wed, 16 Aug 2006 20:32:32 +0000 (16:32 -0400)]
AUTHORS:
fix 'reorganization' typo and added o3cpu multiple isa support to list

AUTHORS:
    fix 'reorganization' typo and added o3cpu multiple isa support to list

--HG--
extra : convert_revision : cd5d0ba69b37add0f10135e5772a57a7aacdf06e

18 years agoTweak my author list
Ron Dreslinski [Wed, 16 Aug 2006 20:07:37 +0000 (16:07 -0400)]
Tweak my author list

--HG--
extra : convert_revision : ab79756d1c7fb4f8bfde86ef396597856a7ceb54

18 years agoMerge zizzer:/z/m5/Bitkeeper/newmem
Ron Dreslinski [Wed, 16 Aug 2006 19:59:26 +0000 (15:59 -0400)]
Merge zizzer:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem

--HG--
extra : convert_revision : 659f84c883b9992ae48f26c837983b9f8fcf18ab

18 years agoFixes for Kevins O3 model to work with the blocking caches.
Ron Dreslinski [Wed, 16 Aug 2006 19:56:22 +0000 (15:56 -0400)]
Fixes for Kevins O3 model to work with the blocking caches.

src/cpu/o3/fetch_impl.hh:
    Fix ordering so dereference works
src/cpu/o3/lsq_impl.hh:
    Check to make sure we didn't squash already
src/cpu/o3/lsq_unit.hh:
    Fix for counting squashed retrys in the WB count
src/cpu/o3/lsq_unit_impl.hh:
    Make sure to set retryID for stores, and clear it appropriately

--HG--
extra : convert_revision : 689765a1baea7b36f13eb177d65e97b52b6da09f