summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2003-11-02Implement more m5 pseduo opcodes:Nathan Binkert
resetstats dumpstats dumpresetstats m5checkpoint Lots of cleanup of serialization and stats dumping/resetting to work with these new instructions arch/alpha/isa_desc: Implement more m5 pseduo opcodes: resetstats dumpstats dumpresetstats m5checkpoint All of these functions take two optional parameters, the first is a delay, and the second is a period. The delay tells the simulator to wait the specified number of nanoseconds before triggering the event, the period tells the simulator to repeat the event with a specified frequency base/statistics.cc: base/statistics.hh: regReset RegResetCallback dev/disk_image.cc: serializeFilename -> CheckpointFile() sim/debug.cc: Move this debugging statement to sim_stats.cc sim/eventq.cc: Don't AutoDelete an event if it is scheduled since the process() function could potentially schedule the event again. sim/main.cc: DumpStatsEvent is now Statistics::SetupEvent(Dump, curTick) sim/serialize.cc: Change the serialize event so that it's possible to cause the event to repeat. Also make the priority such that the event happens just before the simulator would exit if both events were scheduled for the same cycle. get rid of the serializeFilename variable and provide a CheckpointFile() function. This function takes a basename that is set in the configuration, and appends the current cycle to the name so that multiple checkpoints can be dumped from the same simulation. Also, don't exit the simulation when a checkpoint file is dumped. sim/serialize.hh: serializeFilename -> CheckpointFile() SetupCheckpoint function to tell the simulator to prepare to checkpoint at a certain time with a certain period sim/sim_events.cc: DumpStatsEvent stuff gets move to sim_stats.(cc|hh) The context stuff gets moved into the already existing stats context in stat_context.cc sim/sim_events.hh: DumpStatsEvent stuff gets move to sim_stats.(cc|hh) sim/universe.cc: Provide some simple functions for converting times into ticks. These use floating point math to get as close as possible to the real values. Multipliers are set up ahead of time --HG-- extra : convert_revision : d06ef26a9237529a1e5060cb1ac2dcc04d4ec252
2003-11-02Prevent make from being smart about sccsNathan Binkert
--HG-- extra : convert_revision : d9fdb32c87c8511aace91850867fc00d00855fe6
2003-11-02SimExit takes a time nowNathan Binkert
arch/alpha/isa_desc: regen --HG-- extra : convert_revision : a9da9d2a5fc8a0414491e437747cde48dfb61a20
2003-11-02If a filter isn't specified, don't try to do any filteringNathan Binkert
If pcap_lookupnet fails, just assume the netmask is 0xffffff00 that's all we really wanted from it anyway. --HG-- extra : convert_revision : ac0a390ddb7a6b0a4e4c6d2885bfa7bd059faf36
2003-11-02deprecate the m5exit instruction and rename it to m5exit_oldNathan Binkert
Implement a new m5exit instruction with an optional delay arch/alpha/isa_desc: move m5exit to m5exit old. The old version of the instruction is now deprecated Implement the new exit instruction with the optional delay sim/sim_events.cc: sim/sim_events.hh: Make SimExit take a cycle sim/universe.cc: provide ticksPerMS, ticksPerUS, and ticksPerNS so we don't have to do math during the cycle --HG-- extra : convert_revision : e2ed47a2e5cfcd57c82086c6fcb4a28bf801c214
2003-11-02Merge zizzer.eecs.umich.edu:/bk/m5Nathan Binkert
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest --HG-- extra : convert_revision : 7fd03e2b9f776bf035ad8c758aaf349c35cee47f
2003-11-02add several new functions that can be called from the guestNathan Binkert
to tell the simulator to do something. exit -> exit_old (deprecated exit now takes an optional parameter that tells it to execute at a specified time in the future The next four functions have two optional parameters. The first specifies a delay for how long to wait to issue the instruction. The second will tell the simulator to repeat that command at the specified interval. checkpoint will trigger a checkpoint dumpstats will cause the simulator to dump stats resetstats will cause all stats to be reset dumpreset will dump and reset stats all times are in nanoseconds util/m5/Makefile: Clean up to make it a bit easier to muck with util/m5/m5.c: Add a bunch of new commands and clean up the command parsing path Convert atoi to strtoul so that we can use 64bit numbers and even hex if we want to. (this runs on alpha, so a long is 64bit) util/m5/m5op.h: add prototypes for new m5 instructions use uint64_t since it's nicer --HG-- extra : convert_revision : 664ff00f0f0dfc5263c4e873d82fd9996a4521e9
2003-11-02iqueue.cc:Lisa Hsu
don't clear stat fullCount in the constructor for iq. it comes cleared. --HG-- extra : convert_revision : 80e09cfbdebd67615892cd1178bb0f8cfb5fc04f
2003-11-02Merge zizzer.eecs.umich.edu:/bk/m5Nathan Binkert
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest --HG-- extra : convert_revision : 8f2ced105b0a14bd4b0c0b52ed9c7b1c2ddc6e18
2003-11-02Add basic.ini which is a barebones system that has nothingNathan Binkert
disk1.ini provides #defines that can be set to configure a second disk --HG-- extra : convert_revision : 0997063cd97dd66aea36402712998f65e23714b3
2003-11-01Merge zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/cleanRon Dreslinski
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean --HG-- extra : convert_revision : 89cecb54210ad4ec1b5062f091d7355b18b324e6
2003-11-01Fix overwritting and ordering issues with serialization routinesRon Dreslinski
dev/disk_image.cc: seperate serialization output files for different cow images --HG-- extra : convert_revision : b62551f8e3f6315bb92ae3cb44e077d8084cbfe7
2003-11-01statistics.hh:Lisa Hsu
add enum to Bin::VectorBin base/statistics.hh: add enum to Bin::VectorBin --HG-- extra : convert_revision : a05aef30ca85bf5c0d1f5155e1dff3fb34fd7777
2003-11-01Factor out the client/server network part into its ownNathan Binkert
.ini file that we #include and add a DUMPFILE option for dumping a ethertrace --HG-- extra : convert_revision : 96fec0710a6f788890f3764e4ef078d53723c6dd
2003-11-01gah! how did this ever work? time uses Tick, not unsigned!Nathan Binkert
--HG-- extra : convert_revision : caf246d12be97988573d4775325a41ff94c9afe1
2003-11-01LicensesNathan Binkert
--HG-- extra : convert_revision : ce47fdfaa5c59480a1fb38d86eed7d16ab7b5fc1
2003-11-01Merge zizzer.eecs.umich.edu:/bk/m5Nathan Binkert
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest --HG-- extra : convert_revision : 3536754864ead5d7c95a2a8a1b6edd2fb70f5a88
2003-11-01.cvsignore files don't really do anything for us anymore, soNathan Binkert
let's make bitkeeper ignore the stuff. --HG-- extra : convert_revision : 8ea2a403c7ba2a3c9bd44269a2c0ede9294c92d4
2003-11-01Commit a command for use inside a simulated system for communicatingNathan Binkert
with the simulator. This program is generally compiled as the name m5 and installed in /usr/local/bin This command uses opcodes that are invalid on a normal system, so don't expect it to do anything on a real system. --HG-- extra : convert_revision : fcbae99d4b0d38ff4a9950f1ab53923baa1f667a
2003-10-31eventq.cc, eventq.hh:Andrew Schultz
Cleaned up serialization sim/eventq.hh: sim/eventq.cc: Cleaned up serialization --HG-- extra : convert_revision : b75696d75f1aee16ebca2076fdd3cd4913593762
2003-10-31Fix mistake, used readRequest.name twiceAndrew Schultz
--HG-- extra : convert_revision : 0f8fa5f5487223c78402af79b42cf18f7b5022c0
2003-10-31Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5Nathan Binkert
into zizzer.eecs.umich.edu:/.automount/zans/z/binkertn/research/m5/latest --HG-- extra : convert_revision : 3134761fa4c572a672558dfb6f9252aaef7b7062
2003-10-31Make the to_number function work better.Nathan Binkert
base/str.cc: Make some fixes for the to_number function. Fix overflow calculation for maximum decimal value. (Note: minimum decimal value for signed numbers does not work correctly, e.g. it will overflow on -128 for a signed char though -127 will work) Fix overflow calculation for hex values being converted into signed types Fix up the debugging stuff a little to make sure the values are always printed as numbers. test/strnumtest.cc: using namespace std for g++ 3 --HG-- extra : convert_revision : b00bb1296c85c3d64d8864283c9374e1563bfa31
2003-10-31Merge zizzer:/bk/m5Andrew Schultz
into ascender.eecs.umich.edu:/.automount/zizzer/z/alschult/sandbox/m5-change --HG-- extra : convert_revision : 1ce2a98c531502cbf0c8eb4b365f14a893dc0f5d
2003-10-31Serialization support for serializing between DmaHolder simobjects and DmaEngineAndrew Schultz
--HG-- extra : convert_revision : 85de62b4066595a3139029a6ccc1c1e84526a0be
2003-10-31Changed the naming of Serializeable derived objects. Serializeable no ↵Andrew Schultz
longer has objName as a member, instead it has the pure virtual function name(). SimObject now has a objName member, and all classes derived directly from Serializeable have to implement a name() function (which now makes them unique by pointer value) cpu/simple_cpu/simple_cpu.cc: Change initialization of Event to get rid of Serializeable naming dev/etherlink.cc: dev/etherlink.hh: Seralizeable derived naming changes sim/eventq.cc: Serializeable derived naming changes, also changed serialization process so it doesn't need to use nameChildren sim/eventq.hh: Serializeable derived naming changes, remove constructor for specifying event name sim/serialize.cc: Serializeable derived naming changes, remove setName function and the child naming pass for serialization sim/serialize.hh: Serializeable derived naming changes, removed nameChildren, setName sim/sim_object.cc: sim/sim_object.hh: Serializeable derived naming changes --HG-- extra : convert_revision : 67bcc275b6c210f7049f98a1ad0d22e8f5596a63
2003-10-31Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5Steve Reinhardt
--HG-- extra : convert_revision : 6a2131478dcc1965313d51436613cf48d85af524
2003-10-31New 'greprevs' script to grep through old revs of a file.Steve Reinhardt
util/greprevs: Add descriptive comment. --HG-- extra : convert_revision : 4fffef1327c04bdae7c7151db405920e2cc4eec8
2003-10-31I forgot - also to typedef the default type of bin choice given to every ↵Lisa Hsu
visible stat type (NoBin or BinType). this way a little #define does it all for you. statistics.hh: add #includes needed for CeilPow2 statistics.cc: rm unneeded #includes for CeilPow2 base/statistics.cc: rm unneeded #includes for CeilPow2 base/statistics.hh: add #includes needed for CeilPow2 --HG-- extra : convert_revision : 818028b276e97735a8b8d21d6514f41a80350514
2003-10-30statistics.hh:Lisa Hsu
oops - remove a debug printf base/statistics.hh: oops - remove a debug printf --HG-- extra : convert_revision : a6ecab93f79ce0a5cb6ff129750d8f6a2de8d38c
2003-10-30Make some general changes to stats package where things either could have ↵Lisa Hsu
been better or were just plain wrong. statistics.hh: fix a bug in binning that made bins a fixed size no matter what. add GenBin class that is public but not templatized. statistics.cc: change map to statMap so others can use the map<> token without needing ::. also, add a level of GenBin that is public base class for StatBin<>. base/statistics.cc: change map to statMap so others can use the map<> token without needing ::. also, add a level of GenBin that is public base class for StatBin<>. base/statistics.hh: fix a bug in binning that made bins a fixed size no matter what. add GenBin class that is public but not templatized. --HG-- extra : convert_revision : 6976a891e414c9515cc5a613157f7cb86ef89008
2003-10-30Fix initial state of dmaDoneCB and bufferCB for serializationRon Dreslinski
--HG-- extra : convert_revision : dbe5a98515c64f378cb52469a3121b6f51275646
2003-10-30Serialization support for cow imagesRon Dreslinski
dev/disk_image.cc: dev/disk_image.hh: Serialization of cow images --HG-- extra : convert_revision : 144179b8cad00b32df8c448a8556a465e24737aa
2003-10-30Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5Steve Raasch
into zizzer.eecs.umich.edu:/y/sraasch/serialize --HG-- extra : convert_revision : ebb65c27685394826efc265bcc674577395e0963
2003-10-30Add serialization (which Nate now says we probably don't need)Steve Raasch
--HG-- extra : convert_revision : e075fafdf6e72a424110a120e24ca71cb44cfb03
2003-10-30Add support for serializationSteve Raasch
--HG-- extra : convert_revision : ff6c93ee2f4e6aeb5a824958c52f62d6c2a1cdfd
2003-10-30Finish serializing ScsiDisk and DmaRequestErik Hallnor
--HG-- extra : convert_revision : 655e50d7ef9b25a054b8069f0a20076659457fea
2003-10-30runAddrLast and runDataLast shouldn't be statsErik Hallnor
--HG-- extra : convert_revision : 136673e6a4c0db57b2b0a12fe68e5a04eebfeadf
2003-10-30Add support for serializationSteve Raasch
base/pollevent.hh: Add queued() member function to indicate if this event has been queued --HG-- extra : convert_revision : bebb04dc8e10c1043e55e0036806bd1ca4fec167
2003-10-30Fix doxygen warnings from the change to Checkpoint.Erik Hallnor
--HG-- extra : convert_revision : 31120c27c42b34f62d2c0b7dde0e6d6bf9f04619
2003-10-30Merge previous changes with format changeSteve Raasch
--HG-- extra : convert_revision : 1c34c9a81311422085e5ba23edea08e3997e9419
2003-10-30Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5Steve Reinhardt
--HG-- extra : convert_revision : 0bd243f9c3d69d260ca25d0738e730e63c784878
2003-10-30Fix/finish serializationSteve Raasch
--HG-- extra : convert_revision : 43160ad0d3f5ea4dbf2a628a60db0ebe805b5203
2003-10-30Add some comments explaining ExecContext::Status enum.Steve Reinhardt
cpu/exec_context.hh: Add some comments explaining Status enum. --HG-- extra : convert_revision : 87fdb5d9c09d2a08ab0cff9fa38da2579a550477
2003-10-30Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk2/m5Steve Reinhardt
--HG-- extra : convert_revision : a4c2b6366b75f2561af672916e56c0c7fea14085
2003-10-30New tracediff script for invoking rundiff on two copies of the simulator.Steve Reinhardt
--HG-- extra : convert_revision : a399fd95fe57a3f9247a2675c363e6d3cc953a7e
2003-10-29Get rid of lots of obsolete mentions of stat_sdb_t.Steve Reinhardt
base/predictor.hh: base/sat_counter.hh: sim/param.hh: Get rid of spurious references to stat_sdb_t. --HG-- extra : convert_revision : 0018a940c69b6e31b85fd85354b9d5ce2fd0aa6f
2003-10-29Merge Steve & Erik's etherdev & scsi changes with mine (specificallySteve Reinhardt
new arg type for unserialize()). dev/etherpkt.hh: unserialize() takes Checkpoint* instead of IniFile* now. --HG-- extra : convert_revision : 21b9d97350a591b0f95d84f6c0cfcdfa0b28d714
2003-10-29Merge.Steve Reinhardt
--HG-- extra : convert_revision : 1552730090e0904fbc4e4c8f515b306355cb66f3
2003-10-29Support for Serializable non-SimObject things like events.Steve Reinhardt
Can now serialize & unserialize DmaRequestEvents and DmaTransferEvents. Also support serialize/unserialize of pointers to SimObjects and other Serializable objects. arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: arch/alpha/isa_traits.hh: cpu/exec_context.cc: cpu/exec_context.hh: cpu/simple_cpu/simple_cpu.hh: dev/alpha_access.h: dev/alpha_console.cc: dev/alpha_console.hh: dev/console.cc: dev/console.hh: unserialize() now takes a Checkpoint* instead of an IniFile*. cpu/simple_cpu/simple_cpu.cc: unserialize() now takes a Checkpoint* instead of an IniFile*. Put ExecContext in its own section so its _status fields doesn't conflict. sim/eventq.cc: sim/eventq.hh: unserialize() now takes a Checkpoint* instead of an IniFile*. Events get serialized by the event queue only if they're marked as AutoSerialize... others are assumed to be serialized by something else (e.g. an owning SimObject) or to not matter. sim/param.cc: Shift 'const' in case T is a ptr type. sim/serialize.cc: sim/serialize.hh: Define Checkpoint object to encapsulate everything you need to know about a checkpoint. Use it to allow lookups of named Serializable objects (and SimObjects) during unserialization. unserialize() now takes a Checkpoint* instead of an IniFile*. --HG-- extra : convert_revision : 8e6baab32405f8f548bb67a097b2f713296537a5