summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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
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 : a5ee8e5187503203058da35ca44918f1ff7ae1eb
2005-03-10Updated to be frequency independentAli Saidi
--HG-- extra : convert_revision : d1cf4183b650e10acb9c9954286b066b12e89855
2005-03-10fix typo in SyscallReturn ObjectAli Saidi
--HG-- extra : convert_revision : 97d34a02a29a9ac3e2256d92194e3a46b9e8021e
2005-03-09Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : a61ddd67647fc6a6e8e12d918cc71ae9da69f869
2005-03-09Added new ping and memory latency stride 8 testAli Saidi
--HG-- extra : convert_revision : 29ab825ea971a0fd06f7e2cdc001892cef884669
2005-03-09Changed all syscalls to use syscall return object.Ali Saidi
arch/alpha/alpha_linux_process.cc: arch/alpha/alpha_tru64_process.cc: cpu/exec_context.hh: sim/process.hh: sim/syscall_emul.cc: sim/syscall_emul.hh: Changed all syscalls to use syscall return object arch/alpha/isa_traits.hh: Added syscall return object that packages return value and return status into an object. sim/process.cc: renamed variable name to nm so base class function name() can be called --HG-- extra : convert_revision : 6609c5ffecc9e3519d7a0cd160879fd21d54abfc
2005-03-09Add support for using the variables that m5 was compiled with forNathan Binkert
determining which parameters belong to a class. This allows us to remove the disable flag since it is not the correct model for variable checking anyway. objects/BaseCPU.mpy: Use the FULL_SYSTEM environment variable to enable or disable parameters. sim/pyconfig/m5config.py: remove the disable flag since it is not the correct model for variable checking. --HG-- extra : convert_revision : a8ccb78ba16d23006225df282a09187d32557608
2005-03-09We should import m5config *after* we do the CPPDEFINES stuff,Nathan Binkert
otherwise m5config and the object descriptions cannot take advantage of them. sim/pyconfig/SConscript: We should import m5config *after* we do the CPPDEFINES stuff, otherwise m5config and the object descriptions cannot take advantage of them. This means that we can't use the env dict alias. We should instead use os.environ. --HG-- extra : convert_revision : 392f99a3c15cfba74a5cde79a709ecfad3820e63
2005-03-09Merge zizzer:/z/m5/Bitkeeper/m5Ron Dreslinski
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1 --HG-- extra : convert_revision : 0121d59e46f0961f753c2e1bd0fa1c63642d859e
2005-03-09fix typo in the fixed etherlink serialization.Lisa Hsu
dev/etherlink.cc: fix type in serialization. --HG-- extra : convert_revision : 87f47db14b90f414fef9a0db869da4d7ef72216a
2005-03-09Fix tracediff to work with new parameter and output directory structure.Steve Reinhardt
util/tracediff: Fix to work with new parameter and output directory structure. --HG-- extra : convert_revision : 421ed14fa02df7c9e95eb93f4d36b9ff046f1e39
2005-03-09Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5-head --HG-- extra : convert_revision : daaeb6a596b08fbedd6a14833dcb3825c637d486
2005-03-09Fix a couple of bugs introduced (or tickled) by the .ini sorting change.Steve Reinhardt
sim/pyconfig/m5config.py: Don't sort child nodes, as this can change timing in memory system. (Really ought to be fixed in memory system, but we'll just take the sort back out for now to avoid intoducing gratuitous changes.) --HG-- extra : convert_revision : 07e950c25911443cbc7a84435969ca596fb04348
2005-03-08Pass all scons defined pre-processor macro variables to theNathan Binkert
python configuration stuff as environment variables. sim/pyconfig/SConscript: generate a python file that updates the env dict with all variables in the CPPDEFINES so the python code can use those variables in configuration scripts. --HG-- extra : convert_revision : 50b0719b044f7adc87ce6ae1571d156ca0c5644c
2005-03-08Split the string importer from the rest of the mpy parsingNathan Binkert
and importing stuff to avoid some confusion. sim/pyconfig/SConscript: Split the string importer from the rest of the importer code. The importer.py code can be embedded like m5config.py sim/pyconfig/m5config.py: import what we need from importer --HG-- extra : convert_revision : 9d57f43381b55e717b5b10adfb8f0a522280ac57
2005-03-08Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5/pact05Lisa Hsu
--HG-- extra : convert_revision : bfaaeebd7ec4ee8ee182909e928581f95ac2af93
2005-03-08make some changes to bonnie - now that the simulator uses more memory the ↵Lisa Hsu
old config didn't fit anymore in pools VM, this does fit. --HG-- extra : convert_revision : b5fef2896276be675f79791b084ba97dd953d4ca
2005-03-08By default, we don't want to be samplingNathan Binkert
--HG-- extra : convert_revision : 77c1ec0f2425d24704a587ad2097dfaa6bab4a5c
2005-03-08Fix serialization of the EtherLink objectNathan Binkert
dev/etherlink.cc: - The EtherLink::Link object is no lonver serializable, so it is now necessary to prepend the object's name (as determined by the parent) to all parameters. - Fix the serialization of the LinkDelayEvent so it actually works - Rename some variables to make serialization simpler dev/etherlink.hh: - Make the EtherLink::Link object *not* derive from serializeable. Instead, the serialize function will take a base name from the parent EtherLink object and prepend that base name to each of its variable names when serializing. This is similar to the PacketData and PacketFifo classes. - Make the EtherLink::Link object keep a pointer to its parent and its link number so the LinkDelayEvent can be properly serialized. - Rename some variables to make serialization simpler. --HG-- extra : convert_revision : e5aa54cd9e07b5e033989809100e1640abfb8bed
2005-03-08Fix the singalling from server to client so that theNathan Binkert
benchmark begins properly. configs/boot/nat-netperf-maerts-client.rcS: Fix the echo message configs/boot/nat-netperf-server.rcS: Wait a second before signalling the natbox to make sure it's had time to boot. Fix echo message. --HG-- extra : convert_revision : f9d32c98f24b9617ebf917790a4ca554b7b02bba
2005-03-08Only try to import cpt.mpy if we need it.Nathan Binkert
--HG-- extra : convert_revision : bee61a5026221d47fa00705ccd96595e1415f220
2005-03-07Merge zizzer:/bk/m5 into vm1.reinhardt.house:/z/stever/bk/m5Steve Reinhardt
--HG-- extra : convert_revision : d5b97b8f5af42115989e7f9f4baa421d61a13b70
2005-03-07More restructuring on Python config code for auto-generatingSteve Reinhardt
of Param structs. objects/CoherenceProtocol.mpy: objects/Ide.mpy: Update for new Enum syntax. sim/pyconfig/m5config.py: More modest restructuring heading for auto-generating of param structs. - Revamped Enum handling: Enums are regular classes so they know their names now (makes it easier for generating C++ equivalents). - Created MetaSimObject class and moved some SimObject-specific stuff there (i.e. does not apply to ConfigNodes in general). --HG-- extra : convert_revision : a93b40dda3b038ebe8bffecac97e9079c22af561
2005-03-07Merge zizzer:/z/m5/Bitkeeper/m5Ron Dreslinski
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1 --HG-- extra : convert_revision : 34c73338a0552b59d4264a1cbc091ad3fc9a3a41
2005-03-07Make it easier to find a jobfile.Nathan Binkert
util/pbs/jobfile.py: Search for the jobfile in sys.path --HG-- extra : convert_revision : 50d2c2c13b6b9de4f6bc4e833961e309a98b0d2b
2005-03-07Merge zizzer:/z/m5/Bitkeeper/m5Ron Dreslinski
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1 --HG-- extra : convert_revision : 2b73bffea88cb0e3bb5dff232a15afea8498f4e3
2005-03-05Sort fields in .ini files generated by Python configSteve Reinhardt
to make it easier to diff output from modified versions. sim/pyconfig/m5config.py: Sort .ini outputs for repeatable results across versions. --HG-- extra : convert_revision : fa918f2c53635eca3a02ce02af9b320eacd1f057
2005-03-05the client and server aren't rate-matched anymore and the timing of the ↵Lisa Hsu
netcats are off - add a sleep 1 to make it actually work. --HG-- extra : convert_revision : 3fa730a94d9270945d34061513ab9ce0ab60e7ba
2005-03-03fix naming error - before we set CLIENT_MEMORY_SIZE and then when we wanted ↵Lisa Hsu
that value, used CLIENT_MEMSIZE! This caused the NFS failure I was seeing. --HG-- extra : convert_revision : 845fd7f42d7df771c59ce9a3e77667aff22967c2
2005-03-02Make AddToPath and LoadMpyFile visible inside .mpy modulesSteve Reinhardt
even though they're not in m5config anymore. --HG-- extra : convert_revision : 1e49d5a432790ad1c92e47f1b5e6f1b34a422fa0
2005-03-02Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : cc69c3009fe34de4b4a658a383ce1d2750f227f6
2005-03-01Two fixes to try and get TLB miss cost more in line with real platform:Steve Reinhardt
1) Add fault_handler_delay param to FullCPU to wait N cycles after committing faulting instruction before fetching fault handler. 2) Make hw_rei a serializing instruction (flushes pipe, basically). arch/alpha/isa_desc: Make hw_rei a serializing instruction (guarantees previous insts complete before hw_rei will issue). --HG-- extra : convert_revision : 704cef65b3869be9eee724055cedb22114a78359
2005-03-01add the new func unit into the overall list.Lisa Hsu
--HG-- extra : convert_revision : 2d425ec36de0443e094640fdbbc43754bfc7ed2e
2005-03-01add some comments.Nathan Binkert
sim/pyconfig/m5config.py: Add some comments to indicate what the decorators mean. --HG-- extra : convert_revision : fbcbcbe4ad8cd62f2bd12af6b1f141c66752b870
2005-03-01Add FUDesc for IprAccessAli Saidi
--HG-- extra : convert_revision : 42c5f8765185aba6a5ca59180d93c579ef759449
2005-03-01Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : 439e7d84ea9a66177b0cc2cab4cd77ecb90aa6fe