gem5.git
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 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

18 years agoFixes for blocking in the caches that needed to be pulled
Ron Dreslinski [Wed, 16 Aug 2006 19:54:02 +0000 (15:54 -0400)]
Fixes for blocking in the caches that needed to be pulled

src/mem/cache/base_cache.cc:
    Add in retry path for blocking with multi-level caches
src/mem/cache/base_cache.hh:
    Pull more of the blocking fixes into head
src/mem/packet.hh:
    Fix typo

--HG--
extra : convert_revision : d4d149adfa414136ebd2c4789b739bb065710f7a

18 years agoAdd ppls contributions from looking at Authors header... Probably missed stuff so...
Ali Saidi [Wed, 16 Aug 2006 19:15:57 +0000 (15:15 -0400)]
Add ppls contributions from looking at Authors header... Probably missed stuff so look it over.

Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/tmp/m5.newmem

AUTHORS:
    merge kevin's changes in

--HG--
extra : convert_revision : 86344b6d89d90ec7002584d48736e29a9a3c72e5

18 years agoI threw together the authors file from looking at the Authors of files.
Ali Saidi [Wed, 16 Aug 2006 19:08:58 +0000 (15:08 -0400)]
I threw together the authors file from looking at the Authors of files.
Feel free to change as you see fit

AUTHORS:
    I threw together the authors file from looking at the Authors of files

--HG--
extra : convert_revision : c13b52c60bbc429b29c64b5bebf5bf4971274a8d

18 years agoMerge ksewell@zizzer:/bk/newmem
Korey Sewell [Wed, 16 Aug 2006 18:59:27 +0000 (14:59 -0400)]
Merge ksewell@zizzer:/bk/newmem
into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3

--HG--
extra : convert_revision : 8b6f649623cecec0964cff6fce6f4e6a041ae9a1

18 years agoAUTHORS:
Korey Sewell [Wed, 16 Aug 2006 18:57:53 +0000 (14:57 -0400)]
AUTHORS:
add in contributions

AUTHORS:
    add in contributions

--HG--
extra : convert_revision : 93b5a74d3ab35cdba1d0c12b04e5cb27e5906b11

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Wed, 16 Aug 2006 18:46:17 +0000 (14:46 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : 9eb38f53b5cab92e53a832d0e24e74ef68210abf

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

--HG--
extra : convert_revision : ab7e77844985372cc69899066fb26bee864598d2

18 years agoAdd in contributions.
Kevin Lim [Wed, 16 Aug 2006 18:45:34 +0000 (14:45 -0400)]
Add in contributions.

--HG--
extra : convert_revision : 2f71f772f8fba536aa2d8f2beb6039b3fda9bbfc

18 years agoUpdate reference outputs
Steve Reinhardt [Wed, 16 Aug 2006 18:45:12 +0000 (14:45 -0400)]
Update reference outputs

--HG--
extra : convert_revision : df9cf835e0910df1e8e80152825fde9327d4aadb

18 years agoFinish test clean-up & reorg.
Steve Reinhardt [Wed, 16 Aug 2006 18:42:44 +0000 (14:42 -0400)]
Finish test clean-up & reorg.

configs/common/FSConfig.py:
    Add default Machine() param
configs/example/fs.py:
configs/example/se.py:
    make it work again
src/python/m5/objects/BaseCPU.py:
    Make mem PhysicalMemory so that a Parent.any proxy works well
src/sim/process.cc:
    Increase default stack size so we don't get an
    'increasing stack' message on 'hello world'
tests/SConscript:
    Add full list of current configs.
tests/configs/simple-atomic.py:
tests/configs/simple-timing.py:
    don't need SEConfig anymore
tests/quick/00.hello/test.py:
tests/quick/20.eio-short/test.py:
    fix
tests/run.py:
    move configs to separate dir

--HG--
rename : configs/test/fs.py => configs/example/fs.py
rename : configs/test/test.py => configs/example/se.py
rename : tests/simple-atomic.py => tests/configs/simple-atomic.py
rename : tests/simple-timing.py => tests/configs/simple-timing.py
rename : tests/linux-mpboot/ref/alpha/atomic/config.ini => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
rename : tests/linux-mpboot/ref/alpha/atomic/config.out => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
rename : tests/linux-mpboot/ref/alpha/atomic/console.system.sim_console => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/console.system.sim_console
rename : tests/linux-mpboot/ref/alpha/atomic/m5stats.txt => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
rename : tests/linux-mpboot/ref/alpha/atomic/stderr => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
rename : tests/linux-mpboot/ref/alpha/atomic/stdout => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
rename : tests/linux-boot/ref/alpha/atomic/config.ini => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
rename : tests/linux-boot/ref/alpha/atomic/config.out => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
rename : tests/linux-boot/ref/alpha/atomic/console.system.sim_console => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/console.system.sim_console
rename : tests/linux-boot/ref/alpha/atomic/m5stats.txt => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
rename : tests/linux-boot/ref/alpha/atomic/stderr => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
rename : tests/linux-boot/ref/alpha/atomic/stdout => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
rename : tests/linux-mpboot/ref/alpha/timing/config.ini => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
rename : tests/linux-mpboot/ref/alpha/timing/config.out => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
rename : tests/linux-mpboot/ref/alpha/timing/console.system.sim_console => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console
rename : tests/linux-mpboot/ref/alpha/timing/m5stats.txt => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
rename : tests/linux-mpboot/ref/alpha/timing/stderr => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
rename : tests/linux-mpboot/ref/alpha/timing/stdout => tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
rename : tests/test-progs/hello/bin/mips/linux/hello_mips => tests/test-progs/hello/bin/mips/linux/hello
rename : tests/test-progs/hello/bin/sparc/bin => tests/test-progs/hello/bin/sparc/linux/hello
extra : convert_revision : d68ee6d7eefa7ba57370f3fb3c3589f86a6ea6b4

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

--HG--
extra : convert_revision : 8b4b1529fc20d6fa94cb6e2bd5ff25c984e722f5

18 years agoAdded the SPARC ISA as a contribution.
Gabe Black [Wed, 16 Aug 2006 17:46:22 +0000 (13:46 -0400)]
Added the SPARC ISA as a contribution.

--HG--
extra : convert_revision : 74b061a14436425b2ac475bb498d71105bfa8e01

18 years agoAUTHORS:
Lisa Hsu [Wed, 16 Aug 2006 17:46:21 +0000 (13:46 -0400)]
AUTHORS:
author file contribution

AUTHORS:
    author file contribution

--HG--
extra : convert_revision : f4a08695fb4bf37df6144529c5791c75c11a0515

18 years agoMore restructuring of regression tests.
Steve Reinhardt [Wed, 16 Aug 2006 16:52:05 +0000 (09:52 -0700)]
More restructuring of regression tests.
Moving work back to zizzer...

configs/common/FSConfig.py:
configs/test/fs.py:
    Move CPU connections out of makeLinuxAlphaSystem()
src/python/m5/objects/BaseCPU.py:
    Create default TLBs in full system.
    Move utility cache functions here.
src/python/m5/objects/O3CPU.py:
    Add _mem_ports
tests/run.py:
    Add binpath()
    Change maxtick default to 'forever'
tests/simple-atomic.py:
    Use connectmemPorts()
tests/simple-timing.py:
    Fix up.

--HG--
rename : tests/quick/eio1/ref/alpha/eio/detailed/config.ini => tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini
rename : tests/quick/eio1/ref/alpha/eio/detailed/config.out => tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out
rename : tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt
rename : tests/quick/eio1/ref/alpha/eio/detailed/stderr => tests/quick/20.eio-short/ref/alpha/eio/detailed/stderr
rename : tests/quick/eio1/ref/alpha/eio/detailed/stdout => tests/quick/20.eio-short/ref/alpha/eio/detailed/stdout
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr
rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/config.out => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/stderr => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr
rename : tests/quick/eio1/ref/alpha/eio/simple-timing/stdout => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout
rename : tests/quick/eio1/test.py => tests/quick/20.eio-short/test.py
rename : configs/test/hello => tests/test-progs/hello/bin/alpha/linux/hello
rename : configs/test/hello_mips => tests/test-progs/hello/bin/mips/linux/hello_mips
rename : configs/test/sparc_tests/hello_sparc => tests/test-progs/hello/bin/sparc/bin
extra : convert_revision : 1f891392ecc11ffcc3b3182fa673c401c0efc8a5

18 years agofix e-mail addr in readme
Ali Saidi [Wed, 16 Aug 2006 15:01:37 +0000 (11:01 -0400)]
fix e-mail addr in readme

--HG--
extra : convert_revision : 2cd6dd468f7c45f09707d311e43168f9b3470ab3

18 years agoHalfway through setting up new test structure... committing so
Steve Reinhardt [Wed, 16 Aug 2006 13:45:46 +0000 (09:45 -0400)]
Halfway through setting up new test structure... committing so
O can move to my laptop.

tests/SConscript:
    Start to simplify.

--HG--
rename : tests/test1/ref/alpha/detailed/config.ini => tests/quick/eio1/ref/alpha/eio/detailed/config.ini
rename : tests/test1/ref/alpha/detailed/config.out => tests/quick/eio1/ref/alpha/eio/detailed/config.out
rename : tests/test1/ref/alpha/detailed/m5stats.txt => tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt
rename : tests/test1/ref/alpha/detailed/stderr => tests/quick/eio1/ref/alpha/eio/detailed/stderr
rename : tests/test1/ref/alpha/detailed/stdout => tests/quick/eio1/ref/alpha/eio/detailed/stdout
rename : tests/test1/ref/alpha/atomic/config.ini => tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini
rename : tests/test1/ref/alpha/atomic/config.out => tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out
rename : tests/test1/ref/alpha/atomic/m5stats.txt => tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt
rename : tests/test1/ref/alpha/atomic/stderr => tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr
rename : tests/test1/ref/alpha/atomic/stdout => tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout
rename : tests/test1/ref/alpha/timing/config.ini => tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini
rename : tests/test1/ref/alpha/timing/config.out => tests/quick/eio1/ref/alpha/eio/simple-timing/config.out
rename : tests/test1/ref/alpha/timing/m5stats.txt => tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt
rename : tests/test1/ref/alpha/timing/stderr => tests/quick/eio1/ref/alpha/eio/simple-timing/stderr
rename : tests/test1/ref/alpha/timing/stdout => tests/quick/eio1/ref/alpha/eio/simple-timing/stdout
extra : convert_revision : 924d2ee29d2a2709135ff8e5c5822fe47a8a60f6

18 years agoTweaks to Ali's changes
Gabe Black [Tue, 15 Aug 2006 23:17:18 +0000 (19:17 -0400)]
Tweaks to Ali's changes

--HG--
extra : convert_revision : ca2a81dd38012ae780f88cfd6be60f21fb43bb81

18 years agoimplement benchmark selection code
Ali Saidi [Tue, 15 Aug 2006 23:12:19 +0000 (19:12 -0400)]
implement benchmark selection code

--HG--
extra : convert_revision : 84632fdad7019e177e61c56ae30ea2f3fdbc0995

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Tue, 15 Aug 2006 21:41:37 +0000 (17:41 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/tmp/m5.newmem

--HG--
extra : convert_revision : d490a68eeabd0da7cd9791e14ca3678ed0fd31e6

18 years agofixes for gcc 4.1
Ali Saidi [Tue, 15 Aug 2006 21:41:22 +0000 (17:41 -0400)]
fixes for gcc 4.1
Nate needs to fix sinic builder stuff
Gabe needs to verify my fixes to decoder.isa

OPT/DEBUG compiles for ALPHA_FS, ALPHA_SE, MIPS_SE, SPARC_SE with this changeset

README:
    Fix the swig version in the readme
src/SConscript:
    remove sinic until nate fixes the builder crap for it
src/arch/alpha/system.hh:
src/arch/mips/isa/includes.isa:
src/arch/sparc/isa/decoder.isa:
src/base/stats/visit.cc:
src/base/timebuf.hh:
src/dev/ide_disk.cc:
src/dev/sinic.cc:
src/mem/cache/miss/mshr.cc:
src/mem/cache/miss/mshr_queue.cc:
src/mem/packet.hh:
src/mem/request.hh:
src/sim/builder.hh:
src/sim/system.hh:
    fixes for gcc 4.1

--HG--
extra : convert_revision : 3775427c0047b282574d4831dd602c96cac3ba17

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

--HG--
extra : convert_revision : 27bfbce7c674f0628ef53921329c08f31db6ef44

18 years agoMake test1 capable of running with caches (-C, --caches) for testing.
Ron Dreslinski [Tue, 15 Aug 2006 20:24:01 +0000 (16:24 -0400)]
Make test1 capable of running with caches (-C, --caches) for testing.

--HG--
extra : convert_revision : 0b018f9e33b83c346ca0fb1b4e4066fb80c96b8c

18 years agoPulled out changes to fix EIO programs with caches. Also fixes any translatingPort...
Ron Dreslinski [Tue, 15 Aug 2006 20:21:46 +0000 (16:21 -0400)]
Pulled out changes to fix EIO programs with caches.  Also fixes any translatingPort read/write Blob function problems with caches.

-Basically removed the ASID from places it is no longer needed due to PageTable

src/mem/cache/cache.hh:
src/mem/cache/cache_impl.hh:
src/mem/cache/miss/blocking_buffer.cc:
src/mem/cache/miss/blocking_buffer.hh:
src/mem/cache/miss/miss_queue.cc:
src/mem/cache/miss/miss_queue.hh:
src/mem/cache/miss/mshr.cc:
src/mem/cache/miss/mshr.hh:
src/mem/cache/miss/mshr_queue.cc:
src/mem/cache/miss/mshr_queue.hh:
src/mem/cache/prefetch/base_prefetcher.cc:
src/mem/cache/prefetch/base_prefetcher.hh:
src/mem/cache/tags/fa_lru.cc:
src/mem/cache/tags/fa_lru.hh:
src/mem/cache/tags/iic.cc:
src/mem/cache/tags/iic.hh:
src/mem/cache/tags/lru.cc:
src/mem/cache/tags/lru.hh:
src/mem/cache/tags/split.cc:
src/mem/cache/tags/split.hh:
src/mem/cache/tags/split_lifo.cc:
src/mem/cache/tags/split_lifo.hh:
src/mem/cache/tags/split_lru.cc:
src/mem/cache/tags/split_lru.hh:
    Remove asid where it wasn't neccesary anymore due to Page Table

--HG--
extra : convert_revision : ab8bbf4cc47b9eaefa9cdfa790881a21d0e7bf28

18 years agoREADME:
Steve Reinhardt [Tue, 15 Aug 2006 19:43:00 +0000 (15:43 -0400)]
README:
Fix SWIG version number.

README:
    Fix SWIG version number.

--HG--
extra : convert_revision : 618d6e63d44bc7664dace545d4e35119f52b8407

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

--HG--
extra : convert_revision : 8a8d7fe59610806015c8242a2f5eacf9afce7164

18 years agoSome changes to support blocking in the caches
Ron Dreslinski [Tue, 15 Aug 2006 18:24:49 +0000 (14:24 -0400)]
Some changes to support blocking in the caches

src/mem/cache/base_cache.cc:
src/mem/cache/base_cache.hh:
src/mem/cache/cache_impl.hh:
    Outstanding blocking updates for cache

--HG--
extra : convert_revision : 3a7b4aa4921de8239f604f1852f262a2305862c0

18 years agoUpdate release files.
Steve Reinhardt [Tue, 15 Aug 2006 15:49:15 +0000 (08:49 -0700)]
Update release files.

README:
    Add brief build instructions for the impatient.
    A few minor fixes.
RELEASE_NOTES:
    Change date; add beta disclaimer.

--HG--
extra : convert_revision : d31af687c657feb36a2694ef9f0abd67390c7023

18 years agoSome touchup to the reorganized includes and "using" directives.
Gabe Black [Tue, 15 Aug 2006 09:49:52 +0000 (05:49 -0400)]
Some touchup to the reorganized includes and "using" directives.

--HG--
extra : convert_revision : 956c80d6d826b08e52c0892a480a0a9b74b96b9d

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

src/cpu/static_inst.hh:
    SCCS merged

--HG--
extra : convert_revision : a4f6377dbd691ab58fe5f7958b983b092575f250

18 years agoCleaned up include files and got rid of many using directives in header files.
Gabe Black [Tue, 15 Aug 2006 09:07:15 +0000 (05:07 -0400)]
Cleaned up include files and got rid of many using directives in header files.

--HG--
extra : convert_revision : 6b11e039cbc061dab75195fa1aebe6ca2cdc6f91

18 years agoFixed ALPHA_FS by moving the remnants of isa_fullsys_traits.hh into arch/alpha/pageta...
Gabe Black [Tue, 15 Aug 2006 08:46:51 +0000 (04:46 -0400)]
Fixed ALPHA_FS by moving the remnants of isa_fullsys_traits.hh into arch/alpha/pagetable.hh and fixing up some includes

--HG--
extra : convert_revision : 02a47fa62b17245763314890beb68339c789d18f

18 years agoMore cleanup for release.
Steve Reinhardt [Tue, 15 Aug 2006 06:08:25 +0000 (02:08 -0400)]
More cleanup for release.

--HG--
extra : convert_revision : 94b45da5d1a658c4d0f87c73ce72facc9da8d981

18 years agoFix up doxygen.
Steve Reinhardt [Mon, 14 Aug 2006 23:25:07 +0000 (19:25 -0400)]
Fix up doxygen.

--HG--
rename : docs/footer.html => src/doxygen/footer.html
rename : docs/stl.hh => src/doxygen/stl.hh
extra : convert_revision : 2b2e5637930843c1be07deaa708fd4126213cda2

18 years agoChanges for release.
Steve Reinhardt [Mon, 14 Aug 2006 22:15:53 +0000 (18:15 -0400)]
Changes for release.

README:
    s/m5.eecs.umich.edu/www.m5sim.org/
    whack mentions of "CD distribution"
RELEASE_NOTES:
    Set date of 2.0 beta release
    Fix typo

--HG--
extra : convert_revision : 5baa113a98f89dbf56f60adb4513ca22b63673b1

18 years agoChanged the size parameter from int to int64_t
Gabe Black [Mon, 14 Aug 2006 07:18:38 +0000 (03:18 -0400)]
Changed the size parameter from int to int64_t

--HG--
extra : convert_revision : a19404bdc3a6434fe28f8aa278dc6addf764be22

18 years agoStarted to add support for O3 for sparc.
Gabe Black [Sat, 12 Aug 2006 00:29:15 +0000 (20:29 -0400)]
Started to add support for O3 for sparc.

--HG--
extra : convert_revision : 3f94bda14024a09b9fbd7a5d13284d4987349ddf

18 years agoChanged the compiler guards to say SPARC
Gabe Black [Sat, 12 Aug 2006 00:28:35 +0000 (20:28 -0400)]
Changed the compiler guards to say SPARC

--HG--
extra : convert_revision : e79964148c7fb7075627f46add6687f6cd0ee241

18 years agoAdded code to support setting up all of the auxillieary vectors configured by the...
Gabe Black [Sat, 12 Aug 2006 00:27:22 +0000 (20:27 -0400)]
Added code to support setting up all of the auxillieary vectors configured by the sparc linux elf loader.

src/arch/sparc/process.cc:
    All of the auxilliary vectors are now set like they are in the linux elf loader. This code should probably be moved to arch/sparc/linux/process.cc somehow.

--HG--
extra : convert_revision : 4a90cacf70b1032cad3f18b0f833a6df8237e0de

18 years ago#include of iostream needed.
Gabe Black [Sat, 12 Aug 2006 00:23:31 +0000 (20:23 -0400)]
#include of iostream needed.

--HG--
extra : convert_revision : d31bb943ab25103cf715159054df318a5b88abc9

18 years agoAdjusted the decoder a little.
Gabe Black [Sat, 12 Aug 2006 00:22:36 +0000 (20:22 -0400)]
Adjusted the decoder a little.

--HG--
extra : convert_revision : 5bdbe00342837ae4caacb3ad86c7becca36ba6ce

18 years agoStarted adding a system to output data after every instruction.
Gabe Black [Sat, 12 Aug 2006 00:21:35 +0000 (20:21 -0400)]
Started adding a system to output data after every instruction.

src/arch/alpha/regfile.hh:
src/arch/mips/regfile/float_regfile.hh:
src/arch/mips/regfile/int_regfile.hh:
src/arch/mips/regfile/misc_regfile.hh:
src/cpu/exetrace.hh:
    Added functions to start to support dumping register values once per cycle.
src/cpu/exetrace.cc:
    Added some code to support printing the value of registers after each cycle.
src/python/m5/main.py:
    Options to turn on output after every instruction. They are commented out.

--HG--
extra : convert_revision : 168a48a6b98ab6be412a96bdee831c71906958b0

18 years agoPushed most of constants.hh back into isa_traits.hh and regfile.hh and created a...
Gabe Black [Fri, 11 Aug 2006 23:43:10 +0000 (19:43 -0400)]
Pushed most of constants.hh back into isa_traits.hh and regfile.hh and created a seperate file for the syscallreturn class.

--HG--
extra : convert_revision : 9507ea1c09fda959f00aec9ec8ffb887ec8dd0f9

18 years agomake test3.py usable again ... I guess I should fix up test4 and test5 too???
Korey Sewell [Fri, 11 Aug 2006 22:42:43 +0000 (18:42 -0400)]
make test3.py usable again ... I guess I should fix up test4 and test5 too???

Also, What happened to the "lets make real names for these tests" thing we
were talking about? Is test1 - test(n) OK now?

--HG--
extra : convert_revision : 60716e41ecc79a78241be383ab3cae4b9e382335

18 years agoreally confused about this license but OK...
Korey Sewell [Fri, 11 Aug 2006 00:51:43 +0000 (20:51 -0400)]
really confused about this license but OK...

--HG--
extra : convert_revision : 85e40593e344b9eff325061630db27d178937258

18 years agoClean up some more config stuff.
Kevin Lim [Thu, 27 Jul 2006 21:49:00 +0000 (17:49 -0400)]
Clean up some more config stuff.

configs/common/FSConfig.py:
    Clean up some code to make functions look less like classes.  Also put makeList function (formerly listWrapper) into m5 itself.
configs/test/fs.py:
    Update for changed code.
src/python/m5/__init__.py:
    Put makeList into m5.

--HG--
extra : convert_revision : 731806a7486f9abf986f52926126df666b024b1d

18 years agoUpdate ref stats.
Kevin Lim [Thu, 27 Jul 2006 21:47:43 +0000 (17:47 -0400)]
Update ref stats.

tests/test1/ref/alpha/atomic/stdout:
tests/test1/ref/alpha/detailed/stderr:
tests/test1/ref/alpha/detailed/stdout:
tests/test1/ref/alpha/timing/stdout:
    Updated output.

--HG--
extra : convert_revision : 3189564725ac4d2b3d63e6a71151a52326f8d416

18 years agoOutput the command line.
Kevin Lim [Thu, 27 Jul 2006 21:37:28 +0000 (17:37 -0400)]
Output the command line.

src/python/m5/main.py:
    Output the command line being used.

--HG--
extra : convert_revision : 51dadb0ef79ca1e8bbb5a3bd64110071c30ade0d

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Thu, 27 Jul 2006 20:43:29 +0000 (16:43 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 70221af596bddbfcc40646d03f175ef5e4b75909

18 years agoNeed config read/write latency.
Kevin Lim [Thu, 27 Jul 2006 20:43:02 +0000 (16:43 -0400)]
Need config read/write latency.

--HG--
extra : convert_revision : 2d978635db89e727f228890738b24fcad9b6ced6

18 years agoMIPS ISA runs 'hello world' in O3CPU ...
Korey Sewell [Wed, 26 Jul 2006 22:47:06 +0000 (18:47 -0400)]
MIPS ISA runs 'hello world' in O3CPU ...

src/arch/mips/isa/base.isa:
    special case syscall disasembly... maybe give own instruction class?
src/arch/mips/isa/decoder.isa:
    add 'IsSerializeAfter' flag for syscall
src/cpu/o3/commit.hh:
    Add skidBuffer to commit
src/cpu/o3/commit_impl.hh:
    Use skidbuffer in MIPS ISA
src/cpu/o3/fetch_impl.hh:
    Print name out when there is a fault
src/cpu/o3/mips/cpu_impl.hh:
    change comment

--HG--
extra : convert_revision : d032549e07102bdd50aa09f044fce8de6f0239b5

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Wed, 26 Jul 2006 07:48:48 +0000 (03:48 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 3bb2cdd9b286e7f0235fb5fd5099b89775e05a10

18 years agoAdded alot of fp instructions, and some impdep instructions.
Gabe Black [Wed, 26 Jul 2006 07:42:16 +0000 (03:42 -0400)]
Added alot of fp instructions, and some impdep instructions.

--HG--
extra : convert_revision : cc703919b59e674044ae370a65dc03deece6d69e

18 years agoNow ignore sigaction
Gabe Black [Wed, 26 Jul 2006 07:40:56 +0000 (03:40 -0400)]
Now ignore sigaction

src/arch/sparc/isa/operands.isa:
    Added the GSR register as a control register

--HG--
extra : convert_revision : 11ff4016d5c72468dd2daeba3a6105d4e84220ce

18 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Korey Sewell [Sun, 23 Jul 2006 17:41:53 +0000 (13:41 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3

--HG--
extra : convert_revision : be1e5dcb1c5025db8526e628c2060b1790d38227

18 years agoThis changeset gets the MIPS ISA pretty much working in the O3CPU. It builds, runs...
Korey Sewell [Sun, 23 Jul 2006 17:39:42 +0000 (13:39 -0400)]
This changeset gets the MIPS ISA pretty much working in the O3CPU. It builds, runs, and gets very very close to completing the hello world
succesfully but there are some minor quirks to iron out. Who would've known a DELAY SLOT introduces that much complexity?! arrgh!

Anyways, a lot of this stuff had to do with my project at MIPS and me needing to know how I was going to get this working for the MIPS
ISA. So I figured I would try to touch it up and throw it in here (I hate to introduce non-completely working components... )

src/arch/alpha/isa/mem.isa:
    spacing
src/arch/mips/faults.cc:
src/arch/mips/faults.hh:
    Gabe really authored this
src/arch/mips/isa/decoder.isa:
    add StoreConditional Flag to instruction
src/arch/mips/isa/formats/basic.isa:
    Steven really did this file
src/arch/mips/isa/formats/branch.isa:
    fix bug for uncond/cond control
src/arch/mips/isa/formats/mem.isa:
    Adjust O3CPU memory access to use new memory model interface.
src/arch/mips/isa/formats/util.isa:
    update LoadStoreBase template
src/arch/mips/isa_traits.cc:
    update SERIALIZE partially
src/arch/mips/process.cc:
src/arch/mips/process.hh:
    no need for this for NOW. ASID/Virtual addressing handles it
src/arch/mips/regfile/misc_regfile.hh:
    add in clear() function and comments for future usage of special misc. regs
src/cpu/base_dyn_inst.hh:
    add in nextNPC variable and supporting functions.

    add isCondDelaySlot function

    Update predTaken and mispredicted functions
src/cpu/base_dyn_inst_impl.hh:
    init nextNPC
src/cpu/o3/SConscript:
    add MIPS files to compile
src/cpu/o3/alpha/thread_context.hh:
    no need for my name on this file
src/cpu/o3/bpred_unit_impl.hh:
    Update RAS appropriately for MIPS
src/cpu/o3/comm.hh:
    add some extra communication variables to aid in handling the
    delay slots
src/cpu/o3/commit.hh:
    minor name fix for nextNPC functions.
src/cpu/o3/commit_impl.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:
    Fix necessary variables and functions for squashes with delay slots
src/cpu/o3/cpu.cc:
    Update function interface ...

    adjust removeInstsNotInROB function to recognize delay slots insts
src/cpu/o3/cpu.hh:
    update removeInstsNotInROB
src/cpu/o3/decode.hh:
    declare necessary variables for handling delay slot
src/cpu/o3/dyn_inst.hh:
    Add in MipsDynInst
src/cpu/o3/fetch.hh:
src/cpu/o3/iew.hh:
src/cpu/o3/rename.hh:
    declare necessary variables and adjust functions for handling delay slot
src/cpu/o3/inst_queue.hh:
src/cpu/simple/base.cc:
    no need for my name here
src/cpu/o3/isa_specific.hh:
    add in MIPS files
src/cpu/o3/scoreboard.hh:
    dont include alpha specific isa traits!
src/cpu/o3/thread_context.hh:
    no need for my name here, i just rearranged where the file goes
src/cpu/static_inst.hh:
    add isCondDelaySlot function
src/cpu/o3/mips/cpu.cc:
src/cpu/o3/mips/cpu.hh:
src/cpu/o3/mips/cpu_builder.cc:
src/cpu/o3/mips/cpu_impl.hh:
src/cpu/o3/mips/dyn_inst.cc:
src/cpu/o3/mips/dyn_inst.hh:
src/cpu/o3/mips/dyn_inst_impl.hh:
src/cpu/o3/mips/impl.hh:
src/cpu/o3/mips/params.hh:
src/cpu/o3/mips/thread_context.cc:
src/cpu/o3/mips/thread_context.hh:
    MIPS file for O3CPU...mirrors ALPHA definition

--HG--
extra : convert_revision : 9bb199b4085903e49ffd5a4c8ac44d11460d988c

18 years agoMerge m5.eecs.umich.edu:/bk/newmem
Gabe Black [Sun, 23 Jul 2006 07:06:12 +0000 (03:06 -0400)]
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : f6a68bbf8aad9be54ff24310b3e51eaed9abb8b5

18 years agoAdded myself to the authors list.
Gabe Black [Sun, 23 Jul 2006 07:04:46 +0000 (03:04 -0400)]
Added myself to the authors list.

--HG--
extra : convert_revision : d90154159473ed93c5b50cf3221e132eda242852

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Sun, 23 Jul 2006 04:10:52 +0000 (00:10 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 45650c90385b4e13e79ccf271a30bb55552b380f

18 years agoFix up test.py
Kevin Lim [Sun, 23 Jul 2006 04:10:11 +0000 (00:10 -0400)]
Fix up test.py

configs/test/test.py:
    Fix up this config.

--HG--
extra : convert_revision : e15071ee27b860cc3ad79277aa61f3e6bb7405d3

18 years agoReorganized SPARC binaries
Gabe Black [Sat, 22 Jul 2006 21:30:50 +0000 (17:30 -0400)]
Reorganized SPARC binaries

--HG--
rename : configs/test/hello_sparc => configs/test/sparc_tests/hello_sparc
extra : convert_revision : d8f36fc9b346f0e89dc8406403576e88bb2dc139

18 years agoFixed subtract with carry, and started some work with floating point.
Gabe Black [Sat, 22 Jul 2006 19:50:40 +0000 (15:50 -0400)]
Fixed subtract with carry, and started some work with floating point.

src/arch/sparc/isa/decoder.isa:
    fixed subc, subccc, added decoding for impdep1 to fit with ua2005, and started work on floating point.
src/arch/sparc/isa/operands.isa:
    Added in floating point operands, and changed the numbering of operands.
src/arch/sparc/regfile.hh:
    Fixed some memory errors related to floating point.

--HG--
extra : convert_revision : fa0aef2021a5cf99f175fceeb533fe63eb5f805c

18 years agoLast minute check in. Very few functional changes other than some minor config updat...
Kevin Lim [Sat, 22 Jul 2006 19:50:39 +0000 (15:50 -0400)]
Last minute check in.  Very few functional changes other than some minor config updates.  Also include some recently generated stats.

SConstruct:
    Make test CPUs option non-sticky.
configs/common/FSConfig.py:
    Be sure to set the memory mode.
configs/test/fs.py:
    Wrong string.
tests/SConscript:
    Only test valid CPUs that have been compiled in.
tests/test1/ref/alpha/atomic/config.ini:
tests/test1/ref/alpha/atomic/config.out:
tests/test1/ref/alpha/atomic/m5stats.txt:
tests/test1/ref/alpha/atomic/stdout:
tests/test1/ref/alpha/detailed/config.ini:
tests/test1/ref/alpha/detailed/config.out:
tests/test1/ref/alpha/detailed/m5stats.txt:
tests/test1/ref/alpha/detailed/stdout:
tests/test1/ref/alpha/timing/config.ini:
tests/test1/ref/alpha/timing/config.out:
tests/test1/ref/alpha/timing/m5stats.txt:
tests/test1/ref/alpha/timing/stdout:
    Update output.

--HG--
extra : convert_revision : 6eee2a5eae0291b5121b41bcd7021179cdd520a3

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Fri, 21 Jul 2006 20:08:17 +0000 (16:08 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

configs/test/fs.py:
    Hand merge.

--HG--
extra : convert_revision : 78f7c46084f66d52ddfe0386fd7c08de8017331e

18 years agoRearrange the FS configs to be more shared. Also check in the full-system tests...
Kevin Lim [Fri, 21 Jul 2006 19:56:35 +0000 (15:56 -0400)]
Rearrange the FS configs to be more shared.  Also check in the full-system tests.  Reference stats coming soon.

configs/test/fs.py:
    Pull out a lot of common code and put it into configs/common/FSConfig.py.

--HG--
extra : convert_revision : 175b18d75f82ddecbcc9a6418fe40df314db55d5

18 years agoMissed some files in a previous check-in. Also check-in the SMT tests. Reference...
Kevin Lim [Fri, 21 Jul 2006 19:53:07 +0000 (15:53 -0400)]
Missed some files in a previous check-in.  Also check-in the SMT tests.  Reference stats will be coming soon.

--HG--
extra : convert_revision : c2f7ea613f350e62395f2b50e4c8cc21c6960a22

18 years agoMinor functionality updates.
Kevin Lim [Fri, 21 Jul 2006 19:46:12 +0000 (15:46 -0400)]
Minor functionality updates.

SConstruct:
    Include an option to specify the CPUs being tested.
src/cpu/SConscript:
    Checker isn't SMT right now, so don't do SMT tests with the O3CPU if we're using the checker.
src/python/m5/objects/O3CPU.py:
    Include default options.  Unfortunately FullO3Config.py is still needed because it specifies which FUPool is being used.
tests/SConscript:
    Several minor updates (sorry for one commit).  Updated the copyright and fixed some m5 style issues.  Also added the ability to specify which CPUs to run the tests on.

--HG--
extra : convert_revision : b0b801115705544ea02e572e31314f7bb8b5f0f2

18 years agoSome reorganization. Options are all handled at the user level script. Move createC...
Kevin Lim [Fri, 21 Jul 2006 19:42:44 +0000 (15:42 -0400)]
Some reorganization.  Options are all handled at the user level script.  Move createCpus function (now called connectCpu) to Util.py, where it can be used by other configs.

--HG--
rename : configs/test/SysPaths.py => configs/common/SysPaths.py
extra : convert_revision : 2b1b95c5f29e7ade08b1abd6f24c129d600fe2e8

18 years agoFixed a glitch in the disassembly output.
Gabe Black [Fri, 21 Jul 2006 01:01:57 +0000 (21:01 -0400)]
Fixed a glitch in the disassembly output.

--HG--
extra : convert_revision : 833aa358b12ac987e0ab467708425c17e5a8fdb7

18 years agoMerge m5.eecs.umich.edu:/bk/newmem
Gabe Black [Thu, 20 Jul 2006 23:04:09 +0000 (19:04 -0400)]
Merge m5.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 0c696374b19b27c0bd50ffa7f75117b1e211e4bc

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Thu, 20 Jul 2006 23:04:08 +0000 (19:04 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : c7fedc68996f2f6cbfb70baebf7c87e0736da883

18 years agoMove PioPort timing code into Simple Timing Port object
Ali Saidi [Thu, 20 Jul 2006 23:03:47 +0000 (19:03 -0400)]
Move PioPort timing code into Simple Timing Port object
Make PioPort use it
Make Physical memory use it as well

src/SConscript:
    Add timing port to sconscript
src/dev/io_device.cc:
src/dev/io_device.hh:
    Move simple timing pio port stuff into a simple timing port class so it can be used by the physical memory
src/mem/physical.cc:
src/mem/physical.hh:
    use a simple timing port stuff instead of rolling our own here

--HG--
extra : convert_revision : e5befbd295a572568cfdca533efb5ed1984c59d1

18 years agoEnforce the timing cpu ticking at it's clock rate
Ali Saidi [Thu, 20 Jul 2006 23:00:40 +0000 (19:00 -0400)]
Enforce the timing cpu ticking at it's clock rate
Add a max time option in seconds and a single system root clock be 1THz

configs/test/fs.py:
    Add a max time option in seconds and a single system root clock be 1THz
src/cpu/simple/timing.cc:
src/cpu/simple/timing.hh:
    Enforce the timing cpu ticking at it's clock rate

--HG--
extra : convert_revision : a1b0de27abde867f9c3da5bec11639e3d82a95f5

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Wed, 19 Jul 2006 21:59:04 +0000 (17:59 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 8c747208d72ffbb0160a2ad4a75383420debdf83

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Wed, 19 Jul 2006 21:24:45 +0000 (17:24 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : c5dbee4ba46fae1edba732f4bd05ef984a46d088