summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-03-15Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 8f25703b016c391217a7daae5f395bd942d589ef
2005-03-15Hard code the SimObject::Params structNathan Binkert
sim/sim_object.cc: Add a new constructor that can take the params struct and tweak the old one to create a params struct if we use the old constructor. sim/sim_object.hh: Hard code a Params struct for SimObject that all other params structs can derive from. Move the name string into the struct and update the code accordingly. New constructor that takes the params struct. --HG-- extra : convert_revision : 30761dab31d7257f9e8c864dcd6cae37309163f2
2005-03-15Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Nathan Binkert
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current --HG-- extra : convert_revision : 772709acc6e5f9976464d6a05ca0e8d6ee748126
2005-03-15Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 1391d03656a1d75809217c5b2e2aecca6f8a04ba
2005-03-15Reduce the client memory requirement for surge so the nat stuffNathan Binkert
runs on the pool --HG-- extra : convert_revision : 79963cc3c2dae681f920b5592129797af8dc4cc5
2005-03-15Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : a94b7e62184ca45c91d5bbebb73c481ca1632236
2005-03-15config file fixesAli Saidi
--HG-- extra : convert_revision : f48bb05dfecb9fb994248cc3dd4b5fe6d40a120e
2005-03-15get rid of issequence and just use the isinstance builtinNathan Binkert
--HG-- extra : convert_revision : eca99aa35ad5c5c1c86325f55cf693ff585c9826
2005-03-15small cleanup to sampling cpu code.Nathan Binkert
cpu/base_cpu.cc: By default we should panic if the system doesn't explicitly support switchover. --HG-- extra : convert_revision : 4da2ec316d609cfb351fc5ceaa6d8fe36be14d4e
2005-03-15Fix comment.Steve Reinhardt
--HG-- extra : convert_revision : 3656b0f1d784d51e6b9a65262a30894f2748f662
2005-03-15Fix the fix, I hope...Steve Reinhardt
--HG-- extra : convert_revision : aca1c091d45fda1f3d1ec7394f338aa9723a7314
2005-03-15fetch.cc:Lisa Hsu
undo ron's one-line fix for No suppliers - this was causing the DEADLOCK --HG-- extra : convert_revision : 07d57b479808b3a03aa097d92c84ff7ddba4fdc4
2005-03-14Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : ba27a3ba99b567f5a8a41d9cd3a09d38c820ed89
2005-03-14g++ 3.4 fixes.Kevin Lim
arch/alpha/alpha_tru64_process.cc: g++ 3.4 fixes. Must cast to an int prior to returning value. --HG-- extra : convert_revision : d8ccfd7aa7ca00d9bc2d76cff014b9f142d10640
2005-03-14Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 1a30850bb81562f153f08e9af81aa9831a71a97a
2005-03-14Bad addr check should be full system only.Kevin Lim
--HG-- extra : convert_revision : 0127d70f400a4d841daf3f01e63f3e1152eac505
2005-03-14Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 145a8416a65d91c8852c85b576d9259fd47a0887
2005-03-14Fix for using Python 2.4Kevin Lim
--HG-- extra : convert_revision : 1682c4b77a76137974d3cb0d28c36e3d02e4e5cd
2005-03-14MergeKevin Lim
--HG-- extra : convert_revision : 22919164108afd74f30207606f59a38992991dae
2005-03-14Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : 9eed6f31249ff099464044b32b882b3cc041b57a
2005-03-14put the syscall emulation error stuff to bed, finallyAli Saidi
remove addr from pciconfig objects and update Monet configuration for ron's changes python/m5/objects/Pci.mpy: I was a little over zelous in my removal of addr, this one should have stayed --HG-- extra : convert_revision : 6c94b11d4c63d50ffe5568b16a131a4105654126
2005-03-14Move adding SRCDIR/python to sys.path fromSteve Reinhardt
multiple SConscript files to SConstruct. build/SConstruct: Add SRCDIR/python to sys.path here. python/SConscript: Move adding SRCDIR/python to sys.path to SConstruct. --HG-- extra : convert_revision : f598d670650f5b4fd501caaf073fe38b44d21855
2005-03-14Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : 9ac1a3bcbfce79300da3f1cb174239897275d8b4
2005-03-14print the daddr to pciconfigall DPRINTF.Lisa Hsu
--HG-- extra : convert_revision : d13ce459d5dac026e596f0bb3ba801b1dbed9ed0
2005-03-14Ron's fix to some of the No supplier problems, don't deal with badaddrs.Lisa Hsu
--HG-- extra : convert_revision : 442edd3c49333fc59953dd089eaaaee4f7b23deb
2005-03-14fix the etherdev2 connection so that nat runs work.Lisa Hsu
--HG-- extra : convert_revision : 8ad4d460836b456b29e5b4ab03081d4af622fb38
2005-03-14Move mpy_importer into m5 package (it logicallySteve Reinhardt
belongs there since it's so tied in with m5.config). python/SConscript: mpy_importer.py now in m5 package --HG-- extra : convert_revision : 3cd7af4e1cd9338aa6bed5306c824ac5f0965085
2005-03-14- Add capability to auto-generate Param structs fromSteve Reinhardt
.mpy SimObject descriptions. Structs are defined in simobj/param/ObjectName.hh. - Move compile-time python params (from CPPDEFINES) to separate dict from run-time params (from os.environ). The former are needed to generate proper param structs. This also helps prevent users from messing things up by setting the wrong environment vars (which could have overridden compile-time settings in the old system). - Other misc cleanup of m5 python package. SConscript: Include simobj/SConscript build/SConstruct: Fix type in comment python/SConscript: Move CPPDEFINES dict-generating code to m5scons.flatten_defines python/m5/__init__.py: - Generate a build_env SmartDict here to hold compile-time params (passed in via __main__.m5_build_env). - Move panic and env here from config.py. python/m5/config.py: Move panic, env to top level (m5/__init__.py) python/m5/objects/BaseCPU.mpy: Use build_env instead of env for compile-time params python/m5/smartdict.py: Add some comments. sim/sim_object.hh: Include auto-generated Param struct. Not used yet, just here as proof of concept. test/genini.py: Put -E arguments in build_env as well as os.environ --HG-- extra : convert_revision : cf6f4a2565b230c495b33b18612d6030988adac5
2005-03-13Minor Python config bug fix.Steve Reinhardt
python/m5/config.py: Add 'panic' to __all__ (some of Nate's scripts use it). --HG-- extra : convert_revision : ae3e2398dffe3edd17ee0155f38bc757d3552df2
2005-03-13A few fixes after trying one of Nate's job scripts.Steve Reinhardt
python/m5/config.py: Add issequence to __all__ export list. Added some more comments too. --HG-- extra : convert_revision : 17cd9205e43fe276f71563fcb96ec3c5069fcc86
2005-03-13Clean up import situation... key things are:Steve Reinhardt
- global tracking of legitimate param types in separate dict keeps us from having to import objects in config.py, which gets rid of nasty circular dependence - use __all__ in config.py and restrict imports from mpy_importer to reduce m5 namespace pollution python/m5/__init__.py: Try to limit namespace pollution by only importing what's needed from mpy_importer. Explicitly set up legal parameter types rather than relying on eval(). python/m5/config.py: Use empty ParamType base class to distinguish types that are legitimate SimObject params. Explicitly add these to global param_types map. Rework CheckedInt and Range classes a little bit to fit in better with the model. No need to import objects here any longer. Add __all__ list to specify subset of names that get exported on 'from m5.config import *'. --HG-- extra : convert_revision : 01c6e82e0b175fc9b3df25dd0cc80ecd842680bc
2005-03-12fix syntax error that affected split configurations.Nathan Binkert
--HG-- extra : convert_revision : db462e57736ccd3b6d21a06f2014eb0850a9ae90
2005-03-11Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- rename : objects/Pci.mpy => python/m5/objects/Pci.mpy extra : convert_revision : 6902e8f9c2a309eb1846094a94b38018587a3761
2005-03-11remove addr from PciConfigDevice since it's not usedAli Saidi
Random some small config file stuff dev/pcidev.cc: objects/Pci.mpy: remove addr since it's not used --HG-- extra : convert_revision : aeb5993552d65a5e3b57f393bcb7d8aaadf6b5a2
2005-03-11I don't know why from m5 import * doesn't work. Steve?Nathan Binkert
--HG-- extra : convert_revision : b89dcd4f329973545dc8a5660daeda9bca7050a1
2005-03-11move the conversion stuff that was in configs/kernel/Config.py intoNathan Binkert
the m5 package as convert.py add a smartdict class which stores strings and can intelligently interpret those string variables as several other types. make the env dict use the smartdict class python/m5/config.py: move a bunch of conversion functions into convert.py turn the env dict into a smartdict adapt the _CheckedInt stuff to deal with derived types python/m5/objects/BaseCPU.mpy: env is now a smartdict and can properly convert to bool --HG-- extra : convert_revision : 8abcd35a5ab14b82f280aea59020953869e33365
2005-03-11Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Nathan Binkert
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current --HG-- extra : convert_revision : abc24d21097770ad323a2c0d537d3e9424db0d7d
2005-03-11Make ConfigNodes as intermediate containers work again.Nathan Binkert
python/m5/config.py: move the type stuff into the Node constructor and only try to grab self.type if the realtype is a SimObject --HG-- extra : convert_revision : 00f6ece47e3812f67f9e1f062fe9c060bd6dd1cf
2005-03-11stick all python stuff into a top level python directory.Nathan Binkert
create an m5 package in python/m5 move the objects package into the m5 package move the m5config into the m5 package as config leave both importers outside of the package. SConscript: sim/main.cc: move sim/pyconfig/* -> python python/SConscript: m5config.py -> m5/config.py (now automatically embedded) objects -> python/m5/objects embed all python files in python/m5 python/m5/config.py: importer renamed mpy_importer move code to m5/__init__.py test/genini.py: deal with new python organization keep track of paths we want to add and add them after parameters are parsed. --HG-- rename : sim/pyconfig/SConscript => python/SConscript rename : sim/pyconfig/m5config.py => python/m5/config.py rename : objects/AlphaConsole.mpy => python/m5/objects/AlphaConsole.mpy rename : objects/AlphaTLB.mpy => python/m5/objects/AlphaTLB.mpy rename : objects/BadDevice.mpy => python/m5/objects/BadDevice.mpy rename : objects/BaseCPU.mpy => python/m5/objects/BaseCPU.mpy rename : objects/BaseCache.mpy => python/m5/objects/BaseCache.mpy rename : objects/BaseSystem.mpy => python/m5/objects/BaseSystem.mpy rename : objects/Bus.mpy => python/m5/objects/Bus.mpy rename : objects/CoherenceProtocol.mpy => python/m5/objects/CoherenceProtocol.mpy rename : objects/Device.mpy => python/m5/objects/Device.mpy rename : objects/DiskImage.mpy => python/m5/objects/DiskImage.mpy rename : objects/Ethernet.mpy => python/m5/objects/Ethernet.mpy rename : objects/Ide.mpy => python/m5/objects/Ide.mpy rename : objects/IntrControl.mpy => python/m5/objects/IntrControl.mpy rename : objects/MemTest.mpy => python/m5/objects/MemTest.mpy rename : objects/Pci.mpy => python/m5/objects/Pci.mpy rename : objects/PhysicalMemory.mpy => python/m5/objects/PhysicalMemory.mpy rename : objects/Platform.mpy => python/m5/objects/Platform.mpy rename : objects/Process.mpy => python/m5/objects/Process.mpy rename : objects/Repl.mpy => python/m5/objects/Repl.mpy rename : objects/Root.mpy => python/m5/objects/Root.mpy rename : objects/SimConsole.mpy => python/m5/objects/SimConsole.mpy rename : objects/SimpleDisk.mpy => python/m5/objects/SimpleDisk.mpy rename : objects/Tsunami.mpy => python/m5/objects/Tsunami.mpy rename : objects/Uart.mpy => python/m5/objects/Uart.mpy extra : convert_revision : aebf6ccda33028b1125974ca8b6aeab6f7570f30
2005-03-11Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Erik Hallnor
into zizzer.eecs.umich.edu:/z/ehallnor/work/m5 --HG-- extra : convert_revision : a19b2143fe78625238ee0a8a4fac8193f673d933
2005-03-11Added config files for splash2 benchmarks. Parameters:Ron Dreslinski
ROOTDIR = root directory of the splash2 code NP = number of proccessors BENCHMARK = name of the splash2 benchmark (Cholesky, FFT, LUContig, LUNoncontig, Radix, Barnes, FMM, OceanContig, OceanNoncontig, Raytrace, WaterNSquared, or WaterSpatial) SYSTEM = Type of system to simulate detailed or simple Note: They use MOESI protocol and do_events is enabled (Multiple L1's and a shared L2) --HG-- extra : convert_revision : c39aa73825ea8108b6c32abd4a4fa4c23391ab09
2005-03-11Fixup after merging.Erik Hallnor
--HG-- extra : convert_revision : 7736a0e62dac7ca1d5c64a1847469d17d2221b35
2005-03-11Need to invalidate blocks by calling the invalidateBlk function, not setting ↵Erik Hallnor
status to 0. --HG-- extra : convert_revision : b46ad0b1d665c60bef03cb711a964cb75e4e1e29
2005-03-10Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : a58535776cf5a3d17f8d9f65144cdf8db54289aa
2005-03-10Merge zizzer:/z/m5/Bitkeeper/m5Ron Dreslinski
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1 --HG-- extra : convert_revision : b75a46439477b3f21333a3cc9f1721923839d14c
2005-03-10Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : 35d9f747fcc75b80b9e4c8674f94c8c18c259f00
2005-03-10Removed unecessary constructor call at each return.Ali Saidi
arch/alpha/isa_traits.hh: updated copyright date --HG-- extra : convert_revision : 30c5fc0eb94138ebd4ee047ebdbff5121f95e5f1
2005-03-10Fixup checkpoint directory nameNathan Binkert
--HG-- extra : convert_revision : 8b3d03a7902484889d58319f453c181c360154ea
2005-03-10Add better support for using checkpoints.Nathan Binkert
--HG-- extra : convert_revision : 4bd3f473be0bfae9ad2c39d982a579aedd68b6f1
2005-03-10update genini so it is more like m5Nathan Binkert
test/genini.py: import m5config after environment variables are setup so the behaviour is more like that of the simulator and so what are normally compile-time variables like FULL_SYSTEM can be properly set from the command line. --HG-- extra : convert_revision : 1951d3015b091338724b66a3a86a818f9ac97b26
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 21:40:55 +0000