summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-06-04Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5/cleanLisa Hsu
--HG-- extra : convert_revision : e3646dfd2f0844e4be7f5369032f9932eb378fdb
2005-06-04get rid of bad panic.Lisa Hsu
--HG-- extra : convert_revision : e4e6ab8f163b3c93ac7c29ab8ac50f369b190dbb
2005-06-04Get rid of broken "long help" option.Steve Reinhardt
--HG-- extra : convert_revision : 8b7c646ce416d2a2a4919acbb87c0b6d65920d42
2005-06-04Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : f12cecd1359770061b52e9f57f2aaa809e61115c
2005-06-04Clean up to work with recent python config changes.Steve Reinhardt
configs/splash2/run.py: parent is now Parent. Need to explicitly instantiate classes. --HG-- extra : convert_revision : c260fad00ca82cb1032e73af2e5caa2ad013067d
2005-06-04Merge zizzer.eecs.umich.edu:/bk/m5Nathan Binkert
into crampon.my.domain:/z/binkertn/research/m5/head --HG-- extra : convert_revision : 7e9a7c1abf90cc1545d63caf5d6a06351ece36b5
2005-06-04Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-cleanAli Saidi
--HG-- extra : convert_revision : cce752079ba1ae9d4043df959dc448d815e598b1
2005-06-04Fix monet configurationAli Saidi
--HG-- extra : convert_revision : fe053d8fe69cc8731161a875cbf8b78cda48e4b1
2005-06-04Remove the inorder CPUNathan Binkert
--HG-- extra : convert_revision : 626aad449df9370383becb8e14f4cbf406b5b376
2005-06-04Get rid of vestiges of .mpy file handling.Steve Reinhardt
--HG-- extra : convert_revision : 309b051be3473e2d42d3200c1af84227d01b5900
2005-06-04BaseSystem -> SystemNathan Binkert
Make System an object that can be instantiated. For operating systems that don't need any OS specific hacks. python/m5/objects/AlphaConsole.py: python/m5/objects/BaseCPU.py: python/m5/objects/Tsunami.py: BaseSystem -> System --HG-- rename : python/m5/objects/BaseSystem.py => python/m5/objects/System.py extra : convert_revision : e5d12db02abef1b0eda720b50dd2c09cb1ac5232
2005-06-04more portableNathan Binkert
arch/alpha/alpha_tru64_process.cc: Sort #includes Make code more portable. g++ doesn't seem to always like struct ::stat (and others). So, we typedef stat outside of the namespace as something else and use the typedef base/hostinfo.cc: use snprintf to quell warning base/inifile.cc: use strncpy to quell warning base/stats/events.cc: don't use strcpy cpu/beta_cpu/btb.cc: use FloorLog2 instead of log2 cpu/beta_cpu/comm.hh: cpu/beta_cpu/inst_queue.hh: cpu/beta_cpu/sat_counter.hh: use sim/host.hh instead of stdint.h --HG-- extra : convert_revision : 59bd9235dda74e72a8b6a70b3f3a981840384f3f
2005-06-03Make m5.fast workNathan Binkert
base/loader/elf_object.cc: elf_version is an odd function. Don't use assert since it has a necessary side effect. --HG-- extra : convert_revision : 8c48f91afe6c7ff5030ac1a534dcda7e2e0c5c57
2005-06-03Bug fix & cleanup in config code.Steve Reinhardt
python/m5/config.py: Bug fix: code was silently converting between incompatible SimObject types as an unintended side-effect of the object cloning support. --HG-- extra : convert_revision : 236f4fe5370f2eddf8af8fab68e2b83dccc34305
2005-06-03Additions/fixes for Tru64 syscall emulation.Steve Reinhardt
We can now run the SimpleScalar wupwise binary to completion on the test input. Didn't have time to do more testing, but I fixed a major problem w/getdirentries that should help a lot more programs run. arch/alpha/alpha_tru64_process.cc: Add truncate, ftruncate, statfs, and fstatfs. Add v4.x (pre-F64) stat, fstat, and lstat. Add setsysinfo (though all it does is provide more specific warning messages). Fix subtle but major bug in getdirentries. sim/syscall_emul.cc: sim/syscall_emul.hh: Add truncate, ftruncate, statfs, and fstatfs. --HG-- extra : convert_revision : 9037393d00dc49b0074a41603ea647587f5a9ec7
2005-06-03Make m5.fast work when there are no Trace.flagsNathan Binkert
--HG-- extra : convert_revision : 05eda14b86311013d3c32ee56f9f52ae94126fb4
2005-06-02Rename builds more descriptively:Steve Reinhardt
ALPHA -> ALPHA_SE (for Syscall Emulation) KERNEL -> ALPHA_FS KERN_TLASER -> ALPHA_FS_TL Also renamed configs/kernel dir to configs/fullsys. README: build/SConstruct: Rename builds more descriptively. --HG-- extra : convert_revision : f2bffb3ad0fc5068cc7fa20661ed9e4e7bc5b202
2005-06-02clean up command line stuffNathan Binkert
sim/main.cc: Clean uo usage output and print usage when no options are given Don't accept mpy files anymore since we don't use them. --HG-- extra : convert_revision : c3b16f602f301d2de12547285334c0037d829998
2005-06-02Fix-up some config issuesNathan Binkert
python/m5/config.py: Make NetworkBandwidth and MemoryBandwidth work python/m5/objects/Ethernet.py: Make 1Gbps default for ethernet --HG-- extra : convert_revision : 59e62f7e62624356ae8d7304598617f60667f040
2005-06-02update copyrights that are spit out on the console.Nathan Binkert
--HG-- extra : convert_revision : e927fd48d2cc82d20478baeb05f58dce07a800e7
2005-06-02More de-SimpleScalarization of cache code.Steve Reinhardt
--HG-- extra : convert_revision : b310a0e8a02487302d4861cfa08543b6047a0ff7
2005-06-02Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : 71d4611b6d9496d3237c4d0cd46912a108ec8653
2005-06-01Change lru/iic parameter checks for licensing.Erik Hallnor
--HG-- extra : convert_revision : 5d5ae086d5e7981d49c68a2283ad2c08e27b4399
2005-06-01Get rid of unused sim/int_stats.* files.Steve Reinhardt
--HG-- extra : convert_revision : 6b86e97fbadbd6f00c0bc52f0ab07fd7741f9818
2005-06-01Rename sim/universe.{cc,hh} to root.{cc,hh} (since theSteve Reinhardt
object defined there was renamed Root long ago). SConscript: arch/alpha/alpha_linux_process.cc: arch/alpha/alpha_tru64_process.cc: base/misc.cc: base/pollevent.cc: base/pollevent.hh: base/stats/events.cc: base/trace.hh: cpu/beta_cpu/fetch_impl.hh: cpu/beta_cpu/full_cpu.cc: cpu/beta_cpu/inst_queue_impl.hh: cpu/pc_event.cc: cpu/static_inst.cc: dev/etherbus.cc: dev/etherdump.cc: dev/etherlink.cc: dev/ide_disk.cc: dev/pcidev.cc: sim/builder.cc: sim/eventq.cc: sim/main.cc: sim/root.cc: sim/stat_control.cc: Rename sim/universe.{cc,hh} to root.{cc,hh}. --HG-- rename : sim/universe.cc => sim/root.cc extra : convert_revision : b8699e81e285253d66da75412e7bb2c251c0389a
2005-06-01Standardize clock parameter names to 'clock'.Steve Reinhardt
Fix description for Bus clock_ratio (no longer a ratio). Add Clock param type (generic Frequency or Latency). cpu/base_cpu.cc: cpu/base_cpu.hh: cpu/beta_cpu/alpha_full_cpu_builder.cc: cpu/simple_cpu/simple_cpu.cc: dev/ide_ctrl.cc: dev/ns_gige.cc: dev/ns_gige.hh: dev/pciconfigall.cc: dev/sinic.cc: dev/tsunami_cchip.cc: dev/tsunami_io.cc: dev/tsunami_pchip.cc: dev/uart.cc: python/m5/objects/BaseCPU.py: python/m5/objects/BaseCache.py: python/m5/objects/BaseSystem.py: python/m5/objects/Bus.py: python/m5/objects/Ethernet.py: python/m5/objects/Root.py: sim/universe.cc: Standardize clock parameter names to 'clock'. Fix description for Bus clock_ratio (no longer a ratio). python/m5/config.py: Minor tweaks on Frequency/Latency: - added new Clock param type to avoid ambiguities - factored out init code into getLatency() - made RootFrequency *not* a subclass of Frequency so it can't be directly assigned to a Frequency paremeter --HG-- extra : convert_revision : fc4bb8562df171b454bbf696314cda57e1ec8506
2005-06-01Get rid of obsolete simobj/SConscriptSteve Reinhardt
--HG-- extra : convert_revision : 2f2a5e1702a5ad09d80362e25a895e6181b2117c
2005-06-01A few more config updates. Works with regression now.Steve Reinhardt
configs/splash2/run.py: Update file for new config changes. python/m5/config.py: - isParamContext() not defined any more - fix bug with re-assigning vectors over scalars and vice versa --HG-- rename : configs/splash2/run.mpy => configs/splash2/run.py extra : convert_revision : 2eb28a92f8de327f6dfddd01467c61e759275f6b
2005-05-29Major cleanup of python config code.Steve Reinhardt
Special mpy importer is gone; everything is just plain Python now (funky, but straight-up). May not completely work yet... generates identical ini files for many configs/kernel settings, but I have yet to run it against regressions. This commit is for my own convenience and won't be pushed until more testing is done. python/m5/__init__.py: Get rid of mpy_importer and param_types. python/m5/config.py: Major cleanup. We now have separate classes and instances for SimObjects. Proxy handling and param conversion significantly reorganized. No explicit instantiation step anymore; we can dump an ini file straight from the original tree. Still needs more/better/truer comments. test/genini.py: Replace LoadMpyFile() with built-in execfile(). Export __main__.m5_build_env. python/m5/objects/AlphaConsole.py: python/m5/objects/AlphaFullCPU.py: python/m5/objects/AlphaTLB.py: python/m5/objects/BadDevice.py: python/m5/objects/BaseCPU.py: python/m5/objects/BaseCache.py: python/m5/objects/BaseSystem.py: python/m5/objects/Bus.py: python/m5/objects/CoherenceProtocol.py: python/m5/objects/Device.py: python/m5/objects/DiskImage.py: python/m5/objects/Ethernet.py: python/m5/objects/Ide.py: python/m5/objects/IntrControl.py: python/m5/objects/MemTest.py: python/m5/objects/Pci.py: python/m5/objects/PhysicalMemory.py: python/m5/objects/Platform.py: python/m5/objects/Process.py: python/m5/objects/Repl.py: python/m5/objects/Root.py: python/m5/objects/SimConsole.py: python/m5/objects/SimpleDisk.py: python/m5/objects/Tsunami.py: python/m5/objects/Uart.py: Fixes for eliminating mpy_importer, and modified handling of frequency/latency params. Also renamed parent to Parent. --HG-- rename : python/m5/objects/AlphaConsole.mpy => python/m5/objects/AlphaConsole.py rename : python/m5/objects/AlphaFullCPU.mpy => python/m5/objects/AlphaFullCPU.py rename : python/m5/objects/AlphaTLB.mpy => python/m5/objects/AlphaTLB.py rename : python/m5/objects/BadDevice.mpy => python/m5/objects/BadDevice.py rename : python/m5/objects/BaseCPU.mpy => python/m5/objects/BaseCPU.py rename : python/m5/objects/BaseCache.mpy => python/m5/objects/BaseCache.py rename : python/m5/objects/BaseSystem.mpy => python/m5/objects/BaseSystem.py rename : python/m5/objects/Bus.mpy => python/m5/objects/Bus.py rename : python/m5/objects/CoherenceProtocol.mpy => python/m5/objects/CoherenceProtocol.py rename : python/m5/objects/Device.mpy => python/m5/objects/Device.py rename : python/m5/objects/DiskImage.mpy => python/m5/objects/DiskImage.py rename : python/m5/objects/Ethernet.mpy => python/m5/objects/Ethernet.py rename : python/m5/objects/Ide.mpy => python/m5/objects/Ide.py rename : python/m5/objects/IntrControl.mpy => python/m5/objects/IntrControl.py rename : python/m5/objects/MemTest.mpy => python/m5/objects/MemTest.py rename : python/m5/objects/Pci.mpy => python/m5/objects/Pci.py rename : python/m5/objects/PhysicalMemory.mpy => python/m5/objects/PhysicalMemory.py rename : python/m5/objects/Platform.mpy => python/m5/objects/Platform.py rename : python/m5/objects/Process.mpy => python/m5/objects/Process.py rename : python/m5/objects/Repl.mpy => python/m5/objects/Repl.py rename : python/m5/objects/Root.mpy => python/m5/objects/Root.py rename : python/m5/objects/SimConsole.mpy => python/m5/objects/SimConsole.py rename : python/m5/objects/SimpleDisk.mpy => python/m5/objects/SimpleDisk.py rename : python/m5/objects/Tsunami.mpy => python/m5/objects/Tsunami.py rename : python/m5/objects/Uart.mpy => python/m5/objects/Uart.py extra : convert_revision : 9dc55103a6f5b40eada4ed181a71a96fae6b0b76
2005-05-28Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : 475f25967577aa47d84b476c07ce0ddfe05078d0
2005-05-28ns_gige_reg.h, ns_gige.cc:Lisa Hsu
clean up code to eliminate license issues. dev/ns_gige.cc: dev/ns_gige_reg.h: clean up code to eliminate license issues. --HG-- extra : convert_revision : 64adbd87faa5ce5ac6b9da4fd95b12796487c8f9
2005-05-26Added copyright.Kevin Lim
--HG-- extra : convert_revision : f6d53ac5130ea9f77f39f7c1aa35eeb1d5107599
2005-05-25Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : 13696a8e526f7ded7555d009d03bdc7551557571
2005-05-24Little debugging things.Steve Reinhardt
cpu/base_cpu.cc: Get rid of leftover debugging code. --HG-- extra : convert_revision : b33b2279499456b12a6242a9472ea5be724b37be
2005-05-20Update mem trace reader params.Steve Reinhardt
--HG-- extra : convert_revision : 03807971dacb23801895be45ea1582d2c345c021
2005-05-20Minor changes to get new cpu to compile with FULL_SYSTEM.Steve Reinhardt
cpu/beta_cpu/full_cpu.hh: Make cpu_id protected rather than private so derived classes can access it. cpu/beta_cpu/regfile.hh: Get rid of troublesome debugging statement. --HG-- extra : convert_revision : ae1f841697ea8d736579b8278eaf8fc6bdf3b6c5
2005-05-19Fix up code for initial release. The main bug that remains is properly ↵Kevin Lim
forwarding data from stores to loads, specifically when they are of differing sizes. cpu/base_dyn_inst.cc: Remove unused commented out code. cpu/base_dyn_inst.hh: Fix up comments. cpu/beta_cpu/2bit_local_pred.cc: Reorder code to match header file. cpu/beta_cpu/2bit_local_pred.hh: Update comments. cpu/beta_cpu/alpha_dyn_inst.hh: Remove useless comments. cpu/beta_cpu/alpha_dyn_inst_impl.hh: cpu/beta_cpu/alpha_full_cpu_impl.hh: cpu/beta_cpu/comm.hh: cpu/beta_cpu/iew_impl.hh: Remove unused commented code. cpu/beta_cpu/alpha_full_cpu.hh: Remove obsolete comment. cpu/beta_cpu/alpha_impl.hh: cpu/beta_cpu/full_cpu.hh: Alphabetize includes. cpu/beta_cpu/bpred_unit.hh: Remove unused global history code. cpu/beta_cpu/btb.hh: cpu/beta_cpu/free_list.hh: Use full path in #defines. cpu/beta_cpu/commit.hh: cpu/beta_cpu/decode.hh: Reorder functions. cpu/beta_cpu/commit_impl.hh: Remove obsolete commented code. cpu/beta_cpu/fetch.hh: Remove obsolete comments. cpu/beta_cpu/fetch_impl.hh: cpu/beta_cpu/rename_impl.hh: Remove commented code. cpu/beta_cpu/full_cpu.cc: Remove useless defines. cpu/beta_cpu/inst_queue.hh: Use full path for #defines. cpu/beta_cpu/inst_queue_impl.hh: Reorder functions to match header file. cpu/beta_cpu/mem_dep_unit.hh: Use full path name for #defines. cpu/beta_cpu/ras.hh: Use full path names for #defines. Remove mod operation. cpu/beta_cpu/regfile.hh: Remove unused commented code, fix up current comments. cpu/beta_cpu/tournament_pred.cc: cpu/beta_cpu/tournament_pred.hh: Update programming style. --HG-- extra : convert_revision : fb9d18a853f58a1108ff827e3c123d5b52a0608a
2005-05-17Merge ktlim@zizzer:/bk/m5 into zamp.eecs.umich.edu:/z/ktlim2/current/m5Kevin Lim
--HG-- extra : convert_revision : c403960153ed648e7da7251465ca9350ba10cd27
2005-05-15Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5Steve Reinhardt
into zizzer.eecs.umich.edu:/z/stever/bk/m5 --HG-- extra : convert_revision : 5437b6fde4c09b8890d2bfa0cfba3d7e509a0f92
2005-05-15Fix "no supplier" bug.Steve Reinhardt
--HG-- extra : convert_revision : 01549db31d2094c58c6875fbbf79d4e07e7e39f9
2005-05-14More cleanup of fetch code.Steve Reinhardt
--HG-- extra : convert_revision : a2279283be76341467e228ad1d56989a2be383eb
2005-05-13Add mem_trace parameter to BaseCache.Steve Reinhardt
python/m5/objects/BaseCache.mpy: Add mem_trace parameter. --HG-- extra : convert_revision : a0bab53fabd7426eee5ca9c845c02a6ac2e1722f
2005-05-13panic vs fatal fixes in bus.ccSteve Reinhardt
base/misc.hh: Add some comments explaining the difference between panic() and fatal(). --HG-- extra : convert_revision : 876f0c98276fa1060c0589dc179022a297a8ed2e
2005-05-12Force pipeline drain on first instruction of async interrupt handler.Steve Reinhardt
Done by marking DynInst as serializing... requires adding the ability to check both DynInst and StaticInst for serializing behavior. --HG-- extra : convert_revision : 00db3e16d3b13dd9663f5a9f1bd8f724ed499914
2005-05-12Get rid of unused SMT code from FullCPU.Steve Reinhardt
--HG-- extra : convert_revision : 7a047b36718a44a8f3a43e3c0f54ca796d19f10a
2005-05-09Add definitions for memory trace writers.Steve Reinhardt
--HG-- extra : convert_revision : bb27c2a2ba8f97f186b712165db9a25f3fe61dda
2005-05-04Merge ktlim@zizzer:/bk/m5 into zamp.eecs.umich.edu:/z/ktlim2/current/m5Kevin Lim
--HG-- extra : convert_revision : b868e7920eaa3682c6123651f0c598673ebb7f22
2005-05-03Add support for dedicated 1GHz Simple CPURon Dreslinski
New examples of test.py files in ~rdreslin/jobs/ancs0 and ~rdreslin/cpt/ancs0 --HG-- extra : convert_revision : c2337874199fae9cbd43da9dbc3b9bd85ea2c92e
2005-05-03Large update of several parts of my code. The most notable change is the ↵Kevin Lim
inclusion of a full-fledged load/store queue. At the moment it still has some issues running, but most of the code is hopefully close to the final version. SConscript: arch/isa_parser.py: cpu/base_dyn_inst.cc: Remove OOO CPU stuff. arch/alpha/faults.hh: Add fake memory fault. This will be removed eventually. arch/alpha/isa_desc: Change EA comp and Mem accessor to be const StaticInstPtrs. cpu/base_dyn_inst.hh: Update read/write calls to use load queue and store queue indices. cpu/beta_cpu/alpha_dyn_inst.hh: Change to const StaticInst in the register accessors. cpu/beta_cpu/alpha_dyn_inst_impl.hh: Update syscall code with thread numbers. cpu/beta_cpu/alpha_full_cpu.hh: Alter some of the full system code so it will compile without errors. cpu/beta_cpu/alpha_full_cpu_builder.cc: Created a DerivAlphaFullCPU class so I can instantiate different CPUs that have different template parameters. cpu/beta_cpu/alpha_full_cpu_impl.hh: Update some of the full system code so it compiles. cpu/beta_cpu/alpha_params.hh: cpu/beta_cpu/fetch_impl.hh: Remove asid. cpu/beta_cpu/comm.hh: Remove global history field. cpu/beta_cpu/commit.hh: Comment out rename map. cpu/beta_cpu/commit_impl.hh: Update some of the full system code so it compiles. Also change it so that it handles memory instructions properly. cpu/beta_cpu/cpu_policy.hh: Removed IQ from the IEW template parameter to make it more uniform. cpu/beta_cpu/decode.hh: Add debug function. cpu/beta_cpu/decode_impl.hh: Slight updates for decode in the case where it causes a squash. cpu/beta_cpu/fetch.hh: cpu/beta_cpu/rob.hh: Comment out unneccessary code. cpu/beta_cpu/full_cpu.cc: Changed some of the full system code so it compiles. Updated exec contexts and so forth to hopefully make multithreading easier. cpu/beta_cpu/full_cpu.hh: Updated some of the full system code to make it compile. cpu/beta_cpu/iew.cc: Removed IQ from template parameter to IEW. cpu/beta_cpu/iew.hh: Removed IQ from template parameter to IEW. Updated IEW to recognize the Load/Store queue. cpu/beta_cpu/iew_impl.hh: New handling of memory instructions through the Load/Store queue. cpu/beta_cpu/inst_queue.hh: Updated comment. cpu/beta_cpu/inst_queue_impl.hh: Slightly different handling of memory instructions due to Load/Store queue. cpu/beta_cpu/regfile.hh: Updated full system code so it compiles. cpu/beta_cpu/rob_impl.hh: Moved some code around; no major functional changes. cpu/ooo_cpu/ooo_cpu.hh: Slight updates to OOO CPU; still does not work. cpu/static_inst.hh: Remove OOO CPU stuff. Change ea comp and mem acc to return const StaticInst. kern/kernel_stats.hh: Extra forward declares added due to compile error. --HG-- extra : convert_revision : 594a7cdbe57f6c2bda7d08856fcd864604a6238e
2005-05-02Fix ethernet configurationNathan Binkert
--HG-- extra : convert_revision : 9ee6e620b722d39d234b15785852a6cc00ffe041