summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-02-11Merge ktlim@zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 11832134b169aa827a1d03c96ef89edddf4b3dab
2005-02-11Fix up #defines to use full path; fix up code for g++ 3.4Kevin Lim
SConscript: Remove efence option from automatically being used. --HG-- extra : convert_revision : 466bb8077aa341db0b409720e2a73535b1fa6b69
2005-02-11Merge zizzer.eecs.umich.edu:/bk/m5Nathan Binkert
into ziff.eecs.umich.edu:/z/binkertn/research/m5/merge --HG-- extra : convert_revision : 5d73046310a64b80a6ba3832df3b30b55532d707
2005-02-11Rework the command line paramters for python output and howNathan Binkert
output files and the output directory are are handled. Make the output directory configuration via a command line parameter, or an environment variable. SConscript: Add new output file stuff base/misc.cc: dev/simconsole.cc: use new output file code cpu/base_cpu.cc: use new output file code to generate output streams dev/etherdump.cc: use the output file code to find the output directory use a real stream instead of a pointer dev/etherdump.hh: use a real stream instead of a pointer objects/Root.mpy: output_dir and config_output_file are not longer configured here. sim/main.cc: - Completely rework the command line argument passing to deal with changes in python and output files. - Update help output to reflect changes. - Remove all direct support for .ini files. They are strictly for intermediate representation. - Remove the --foo:bar=blah syntax for .ini files and add --foo.bar=blah syntax for python. This will generate: foo.bar = 'blah' in the python script. - Add '-d' to set the output directory. - Use new output file code to access the output stream. sim/serialize.cc: use the new code to find the output directory sim/universe.cc: Get rid of makeOutputStream. Use the new output file code. Remove output_dir and config_output_file as parameters. --HG-- extra : convert_revision : df2f0e13d401c3a60cae1239aa1ec3511721544d
2005-02-11Make sure we have all values when trying to generate the ini fileNathan Binkert
sim/pyconfig/m5config.py: When getting all values, make sure we get the ones that are parameter defaults as well. --HG-- extra : convert_revision : 2b1c4b2f27dfab17ef9df18d7e5936e4a00bb12e
2005-02-10Some cosmetic changes to MyPOpenNathan Binkert
util/pbs/pbs.py: More tweaks that I forgot --HG-- extra : convert_revision : 7298f91b80bc7d8d946be93fc622e5f9f6e155f9
2005-02-09More fixes to the pbs stuff to make it more robust.Nathan Binkert
sim/pyconfig/SConscript: Embed the jobfile.py script into the binary so that we don't need to copy it into the Base directory every time. test/genini.py: Add the util/pbs directory to the path so we can get to jobfile.py Add a -I argument to set to add to the path. util/pbs/pbs.py: Create a MyPOpen class. This is a lot like the popen2.Popen3 class in the python library except that my version allows redirection of standard in and standard out to a file instead of a pipe. Use this popen class to execute qsub or ssh qsub. This was important for the ssh version of qsub because we need to pipe the script into standard in of ssh so that the script can get to the qsub command. (Otherwise we have a problem discovering the path.) util/pbs/send.py: Tweak the script so it figures out paths in NFS correctly. Use the new system for running qsub. --HG-- extra : convert_revision : 1289915ba99cec6fd464b71215c32d2197ff2824
2005-02-09Fix bug in trace param context so we can compileNathan Binkert
--HG-- extra : convert_revision : 667c76132adb143e1f2c0726c80ad3e567a530aa
2005-02-09More fixes for running from anywhere.Nathan Binkert
util/pbs/send.py: always access the job directory via full path --HG-- extra : convert_revision : 1792aadb39428e7c91953ac58f6da212b7f92835
2005-02-09enable the Trace, Statistics, and Serialize param contexts.Nathan Binkert
objects/Root.mpy: Fake the param context stuff for now. sim/param.cc: Make empty vector enums work sim/serialize.cc: serialize_dir is always valid --HG-- extra : convert_revision : c46373f0f4c70e6a2f01a81c0fa6bacab72d4c4f
2005-02-09Fixes to thes pbs send scriptNathan Binkert
util/pbs/send.py: - add a -d to set the job root directory allowing one to run send.py from anywhere. - specify full paths to files instead of relative paths to make -d work and to allow ssh qsub to work again. - make the Link directory only copy links that point to regular files. --HG-- extra : convert_revision : dd330cee08b97c5d72c3d58ef123f83ac7ccede7
2005-02-09Add the split_first and split_last functions on strings.Nathan Binkert
base/str.cc: base/str.hh: Add a couple functions that allow you to split a string at the first or last instance of a delimiter. --HG-- extra : convert_revision : 2af22639e1b67ac61577c00475a555841a56f902
2005-02-09Fix the panic message so that it looks more like M5's panic.Nathan Binkert
Make it so the same path is not added to the system path twice. --HG-- extra : convert_revision : fe18db38cc4e335ad3525a364e9f8faf62b60e52
2005-02-09fix indent (so emacs and vi aren't screwed up.)Nathan Binkert
--HG-- extra : convert_revision : 589f37476fec14aa5e3c6e018631e291113d4e69
2005-02-05Tweak genini.Nathan Binkert
test/genini.py: Make it possible to run genini from a different directory. --HG-- extra : convert_revision : 57cfb010d6114512040bf334ea21c9ed87234be0
2005-02-05Make pbs submission scripts available to all.Nathan Binkert
Fix up configuration scrupts to have better support for running on the simulation pool. --HG-- extra : convert_revision : 0178c8600b193d6c0ca69163fb735a7fa0e70782
2005-02-04Hand mergeKevin Lim
--HG-- extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b
2005-02-03Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : 0151e501074988eedb52d91254870c265935f229
2005-02-03Add Monet configuration, update p4 parameters, couple of typo fixesAli Saidi
dev/tsunami_cchip.cc: add a fake register to tsunami that we can do 32bit reads to. Warn on access. --HG-- extra : convert_revision : d87860f3b527528151c23431556039bca6e12945
2005-02-03Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : aea0708fa6684e3203c03f17e8ae6ae87e893f04
2005-02-03Minor bug fix/update to tracediff util.Steve Reinhardt
util/tracediff: Fix bug (used += instead of .= for string concatenation in Perl... wrong language!). Also updated for new config (s/Universe/root/). --HG-- extra : convert_revision : 0db3f22794037dc51cc29f78a75bd22012a8ecd9
2005-02-03Add support for CPU models to execute the effectiveSteve Reinhardt
address calculation and memory access portions separately. Not currently used by any CPU models, but Kevin says he needs this. Also clean up handling of execution tracing for memory accesses (move it all into isa_desc and out of CPU models). Got rid of some ancient unused code too. arch/alpha/isa_desc: Add execute() methods to EAComp and MemAcc portions of memory access instructions, to allow CPU models to execute the effective address calculation and memory access portions separately. Requires the execution context to remember the effective address across the two invocations. Added setEA() and getEA() methods to execution context to support this. A model that does not use the split execution model can panic if these methods are called. Also added hook to call traceData->setAddr() after EA computation on any load or store operation. arch/isa_parser.py: Call traceData->setData() on memory writes (stores). cpu/simple_cpu/simple_cpu.cc: Get rid of unused code. cpu/simple_cpu/simple_cpu.hh: Add (non-functional) setEA() and getEA() methods for new split memory access execution support. --HG-- extra : convert_revision : bc2d2c758c4ca753812b9fa81f21038e55929ff0
2005-02-03get rid of defined and just access the env dict directlyNathan Binkert
get rid of the alias for true to True and false to False to keep consistent python syntax. util/stats/info.py: Fix typo --HG-- extra : convert_revision : e69588a8de52424e043315e70008ca3a3ede7d5b
2005-02-03small python config related fixes.Nathan Binkert
dev/simconsole.cc: sim/universe.cc: isValid isn't compatible with new python stuff, so whack it. --HG-- extra : convert_revision : 0c50038769a558650479c51122a8be5d92e7d9c4
2005-02-03Fix minor doxygen problem.Steve Reinhardt
--HG-- extra : convert_revision : c15b1c5ab1c87b8d1cea87ffa383d1f4d45f107c
2005-02-02Update config file language to take simobj and no longer use siminstNathan Binkert
objects/AlphaConsole.mpy: objects/AlphaTLB.mpy: objects/BadDevice.mpy: objects/BaseCPU.mpy: objects/BaseCache.mpy: objects/BaseSystem.mpy: objects/Bus.mpy: objects/CoherenceProtocol.mpy: objects/Device.mpy: objects/DiskImage.mpy: objects/Ethernet.mpy: objects/Ide.mpy: objects/IntrControl.mpy: objects/MemTest.mpy: objects/Pci.mpy: objects/PhysicalMemory.mpy: objects/Platform.mpy: objects/Process.mpy: objects/Repl.mpy: objects/Root.mpy: objects/SimConsole.mpy: objects/SimpleDisk.mpy: objects/Tsunami.mpy: objects/Uart.mpy: simobj now requires a type= line if it is actually intended to be a type sim/pyconfig/SConscript: keep track of the filename of embedded files for better error messages. sim/pyconfig/m5config.py: Add support for the trickery done with the compiler to get the simobj language feature added to the importer. fix the bug that gave objects the wrong name in error messages. test/genini.py: Globals have been fixed and use execfile --HG-- extra : convert_revision : b74495fd6f3479a87ecea7f1234ebb6731279b2b
2005-02-01some changes for a split lifo in the new python config.Lisa Hsu
objects/BaseCache.mpy: add all the Split parameters to the BaseCache simobj. --HG-- extra : convert_revision : 4fcba3ce730f730ca8628ac7f4aa0fb9476474ab
2005-02-01checking in outstanding changes for partitioning that never made it to the ↵Lisa Hsu
head in my mad prelim rush. --HG-- extra : convert_revision : 59ca9cca2f2090d234708a695228bf4a91fc5f52
2005-01-30removed all tsunami dependence on tlaserreg.h (RTC defines) andAli Saidi
all but tlaser_node.cc dependence on tlaserreg.h dev/tsunami_io.cc: dev/tsunamireg.h: removed tlaserreg.h --HG-- extra : convert_revision : 148a5d79530e5ed721a49279f684a48041deed2b
2005-01-28make nat runs used vegas congestion avoidance implementation.Lisa Hsu
--HG-- extra : convert_revision : 29d2c4b70c56f13642466bd88c82f36ba849ed9d
2005-01-27Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : ed089f6062639ae5be930fbaea3dd7f7622653cc
2005-01-27added support for outputing Dot if pydot is installedAli Saidi
--HG-- extra : convert_revision : bdb1032cddb2478e999399647f893d320260ef7e
2005-01-25Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Kevin Lim
into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/m5-patched/m5-new --HG-- extra : convert_revision : 2848966f3daf7aba741d4d38db9c87145d72ee26
2005-01-25We need more cshrs so we don't segfault.Nathan Binkert
--HG-- extra : convert_revision : 54b1987d86e3f307e13de0396cf149653f4f6e6a
2005-01-25Fix the stats ParamContextNathan Binkert
--HG-- extra : convert_revision : 23e49ca8bd9f50be32a4c28ba435a358d7093f83
2005-01-25Fix pc_sample_interval defaultNathan Binkert
--HG-- extra : convert_revision : 553b0489e8b8a83a4e8bbf9601eb82902436c761
2005-01-21Merge zizzer.eecs.umich.edu:/bk/m5Kevin Lim
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new --HG-- extra : convert_revision : e802c800a478c297d3aa780a9ea3c6701453d91d
2005-01-21send output to the JOBDIRNathan Binkert
--HG-- extra : convert_revision : d53864c55f20aa00754106390878ce04a4ff468e
2005-01-21fix bug in python codeNathan Binkert
--HG-- extra : convert_revision : 67a931326e5a8e6b814ea6d3bcd384126b0cbba4
2005-01-21Fixup checkpointing with the new config stuff.Nathan Binkert
objects/Root.mpy: add checkpointing as a parameter to the root object. --HG-- extra : convert_revision : 3b809ebd776c8a9256a4ad6f8783cd96ab5cb1b3
2005-01-21Make it so that with dual CPU's we create more writebuffers by default, so ↵Ron Dreslinski
that we can handle more uncached access (we will get some from multiple processors) --HG-- extra : convert_revision : 4bb913340cda47925321da5f95aaa2ff95dbe9dd
2005-01-21Fix some mysql code issues.Nathan Binkert
base/stats/events.cc: cast this to an unsigned long long to make the compiler happy on 64-bit platforms. --HG-- extra : convert_revision : e893d21bb228cbfb0c23adb7c4eeb1f62209ca1c
2005-01-21Add more options that we may want to tweak on a per-job basis.Nathan Binkert
Fix the nat config. --HG-- extra : convert_revision : 22bd4f20408371b644b51fd8d6b79486e1e5a59b
2005-01-21Merge zizzer.eecs.umich.edu:/bk/m5Nathan Binkert
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest --HG-- extra : convert_revision : 47fe06540907f6810cd1bccfc96a8705fd38c4ba
2005-01-21Merge zizzer:/z/m5/Bitkeeper/m5Ron Dreslinski
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/new_config --HG-- extra : convert_revision : 8c87cd948d501b1fc58d57f1f505d1f72725ecde
2005-01-21Fix annoying bug that lead to dropped packets in the P4 systemRon Dreslinski
dev/pktfifo.cc: Make it so that we don't unserialize the size of the fifo, clobering the fact that we were trying to make it bigger, and leading to a misleading config.out that states the un-overwritten max_size. Perhaps this should instead be a panic if the size (amount that was serialized) is bigger than the maxsize that was assigned by the configuration file. --HG-- extra : convert_revision : d4b0527bfd7a584554ddc87c9b2103f7a3a72332
2005-01-21Add a couple statistics contexts.Nathan Binkert
arch/alpha/pseudo_inst.cc: rename the context for consistency. sim/pyconfig/m5config.py: Add a ParamContext class so that param contexts work with the new config stuff. --HG-- extra : convert_revision : 3a6b583a25c86237baca7a2b4eccc9d12f86a384
2005-01-19Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5Ali Saidi
--HG-- extra : convert_revision : d5e6f6e696d7607f89894856d940afc89ae8e37b
2005-01-19added total bytes/bandwidth/packets formulas to nicsAli Saidi
cleaned up stability code and wrote some better help for stats.py fixed sample bug in info.py dev/ns_gige.cc: dev/ns_gige.hh: dev/sinic.cc: dev/sinic.hh: add total bandwidth/packets/bytes stats util/stats/info.py: fixed samples bug util/stats/stats.py: cleaned up stability code and wrote a bit better help --HG-- extra : convert_revision : cae06f4fac744d7a51ee0909f21f03509151ea8f
2005-01-19Add a new aggregate trace flag that doesn't print gobs of ethernet raw data, ↵Lisa Hsu
but prints everything else. --HG-- extra : convert_revision : ddb0636f5d5f0c746bd121eaafc0c685b422b006