summaryrefslogtreecommitdiff
path: root/cpu
AgeCommit message (Collapse)Author
2004-03-05serialization for binning. it is WAAAAAAAY past my bedtime.Lisa Hsu
cpu/exec_context.cc: sim/system.cc: sim/system.hh: serialization for binning --HG-- extra : convert_revision : f8417794a3a5ec7f2addc9c2da0f48e851899112
2004-03-04AutomergedErik Hallnor
--HG-- extra : convert_revision : 7b56535ee32551f27db8d98172159f63e5099835
2004-03-04Copy implementationsErik Hallnor
arch/alpha/isa_desc: Need to return fault for copy operations. cpu/exec_context.hh: Add temporary storage to pass source address from copy load to copy store cpu/simple_cpu/simple_cpu.cc: Implement copy functions. cpu/simple_cpu/simple_cpu.hh: Return fault --HG-- extra : convert_revision : 98e5ce563449d6057ba45c70eece9235f1649a90
2004-02-29Fix the swichover code. It's only for FULL_SYSTEMNathan Binkert
cpu/base_cpu.cc: #ifdef FULL_SYSTEM --HG-- extra : convert_revision : 427ee93d545596da00d6c4688a7e32d584054948
2004-02-29fix switchover WRT interruptsNathan Binkert
cpu/base_cpu.cc: gah! copy the interrupt status on switchover --HG-- extra : convert_revision : d3199a7409a494b7687354c43ffca697f37e8456
2004-02-29Initial cleanup pass of lisa's function call trackingNathan Binkert
code. base/statistics.hh: We're getting rid of FS_MEASURE, but for now, we're going to still use a compile time flag to turn on and off binning of statistics. (The flag is STATS_BINNING) cpu/exec_context.cc: cpu/exec_context.hh: kern/tru64/tru64_system.cc: get rid of FS_MEASURE cpu/simple_cpu/simple_cpu.cc: yank the function call tracking code out of the cpu and move it into the software context class itself. kern/tru64/tru64_system.hh: get rid of FS_MEASURE move all of the tacking stuff to the same place. sim/system.hh: cleanup --HG-- extra : convert_revision : 73d3843afe1b3ba0d5445421c39c1148d3f4e7c0
2004-02-27Added copy instructions to the ISA. Well it didn't break anything yet...Erik Hallnor
arch/alpha/isa_desc: Add copy_load and copy_store insts (ldf and stf respectively) cpu/simple_cpu/simple_cpu.hh: Add copy functions to SimpleCPU as well --HG-- extra : convert_revision : 1fa041da582b418c47d4eefc22dabba978a50e2d
2004-02-27Initial copy support in the pipeline. Add copypal counting.Erik Hallnor
arch/alpha/osfpal.cc: Add a string for copypal. arch/alpha/osfpal.hh: Add a code for copypal. cpu/static_inst.hh: Add an IsCopy flag. --HG-- extra : convert_revision : 19e3d90368454806029ad492eace19cd0924fe9f
2004-02-26Make SW prefetch flag a parameter again, and add code to makeSteve Reinhardt
it actually do something on FullCPU. Still disabled, as it causes detailed-boot to hang when you turn it on. arch/alpha/isa_desc: Add EAComp and MemAcc pseudo-instructions to prefetch StaticInst. cpu/simple_cpu/simple_cpu.hh: Changed prefetch() return type from Fault to void. --HG-- extra : convert_revision : c7cb42682bfea6af117c87d4dfdb06176b6fe6b7
2004-02-24add in an init() callback for CPU's so that no stats are accessed prior to ↵Lisa Hsu
the end of the build process. (Done by doing the registerExecContext() calling sequence in the init() process rather than the create() process). cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: same thing for simple cpu's. --HG-- extra : convert_revision : aac9f91742866fb26f8cace622f9b88454a69662
2004-02-20make uncacheable stuff happen againNathan Binkert
cpu/simple_cpu/simple_cpu.cc: Allow requests to be uncacheable --HG-- extra : convert_revision : 7ab1442f2eec3763d5bc6a6f37b11f663851b12c
2004-02-17Add COW support to the IIC.Erik Hallnor
cpu/memtest/memtest.cc: Move the trace Addr to the end of the printouts --HG-- extra : convert_revision : 875f0a3f65e07f531a23fea6be07fbf3239ec2c4
2004-02-14Add full copy support.Erik Hallnor
cpu/memtest/memtest.cc: cpu/memtest/memtest.hh: Add 2 new parameters to control the percentage of unaligned copy sources and destinations. --HG-- extra : convert_revision : 2646ee2f195e9f3e76bc257b8716163ef63a9f40
2004-02-10Add support for multiple outstanding aligned copiesErik Hallnor
cpu/memtest/memtest.cc: Add traceBlockAddr to trace outputs. --HG-- extra : convert_revision : e4ebaf9647fb393448367f4f4af3bae566f51c24
2004-02-09Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5Erik Hallnor
--HG-- extra : convert_revision : 0c018b88d6ca80b1690ec99d795014848e375e44
2004-02-09Add LRU aligned copies to the hierarchy, with only one outstanding copy. ↵Erik Hallnor
Aligned copies now fully work in LRU (just need to write the IIC doCopy call). At the moment they are slow since a stalled copy stalls the entire cache. cpu/memtest/memtest.cc: cpu/memtest/memtest.hh: Add aligned copy tests, percent of copies is specified by percent_copies --HG-- extra : convert_revision : eaf1900fcb8832db98249e94e3472ebfb049eb48
2004-02-09Results of automatic (yet incomplete) merge.Steve Reinhardt
--HG-- extra : convert_revision : 3ad9a929051bfe111a1e10618c8595acbbade542
2004-02-04Add support for "serializing" instructions that flushSteve Reinhardt
execution pipeline (Alpha trapb & excb). Add support for write memory barriers (mostly impacts store buffer). Add StaticInst flag to indicate memory barriers, though this is not modeled in the pipeline yet. arch/alpha/isa_desc: Implement trapb, excb, mb, and wmb as insts with no execution effect (empty execute() function) but with flags that indicate their side effects. Also make sure every instruction that needs to go to the execute stage has a real opClass value, since we are now using No_OpClass to signal insts that can get dropped at dispatch. StaticInst::branchTarget() is now a const method. cpu/static_inst.hh: Add flags to indicate serializing insts (trapb, excb) and memory and write barriers. Also declare some StaticInst methods as const methods. dev/etherlink.hh: sim/eventq.hh: sim/serialize.cc: sim/serialize.hh: sim/sim_object.hh: Make name() return value const. --HG-- extra : convert_revision : 39520e71469fa20e0a7446b2e06b494eec17a02c
2004-02-04More reformatting of reference parameter declarations.Steve Reinhardt
The last change only caught the ones with types that started with capitals. This pass catches the rest (mostly STL and uint*_t types). base/cprintf_formats.hh: cpu/simple_cpu/simple_cpu.cc: sim/serialize.cc: sim/serialize.hh: Change "foo_t& foo" to "foo_t &foo". --HG-- extra : convert_revision : fc7f7425db2aef33e490f952b5ce74c8c36d0d41
2004-02-03Fix bug: forgot branchTarget() method on indirect branches.Steve Reinhardt
arch/alpha/isa_desc: Add missing branchTarget() method for indirect branches. cpu/static_inst.hh: Add comment clarifying when branchTarget() can be used on indirect branches. --HG-- extra : convert_revision : 0dcfb36a9792a338cefceb3d1501825abace7ac5
2004-02-02Get rid of LVQ-port function unit... only used for redundantSteve Reinhardt
multithreading, which has been gone for a long time. --HG-- extra : convert_revision : 717d13455483c3adc7b7cbbcc5f7493d51867974
2004-02-02insn->instSteve Reinhardt
--HG-- extra : convert_revision : fcc556fb7e65855ec3c04ef272177c8e7a38fff9
2004-02-02Change "Foo& foo" declarations to "Foo &foo".Steve Reinhardt
This primarily to be internally consistent (sometimes we used one, sometimes the other, even within the same line of code!). I picked the latter to be symmetric with "Foo *foo". base/cprintf_formats.hh: base/range.hh: base/refcnt.hh: base/res_list.hh: base/statistics.hh: base/str.hh: cpu/exec_context.hh: cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: sim/serialize.cc: sim/serialize.hh: sim/syscall_emul.hh: Change "Foo& foo" declarations to "Foo &foo". --HG-- extra : convert_revision : ca1b0e85a578b539214bda3b8d61ac23792f2e87
2004-02-02More conversions of ref-counted parameters to references:Steve Reinhardt
Statistics::NodePtr, StaticInstPtr, ethernet PacketPtr. base/statistics.hh: Change NodePtr parameters to Nodeptr &. cpu/exetrace.hh: Change StaticInstPtr parameters to StaticInstPtr &. dev/etherbus.cc: dev/etherbus.hh: dev/etherdump.cc: dev/etherdump.hh: dev/etherint.hh: dev/etherlink.cc: dev/etherlink.hh: dev/ethertap.cc: dev/ethertap.hh: change PacketPtr parameters to PacketPtr &. --HG-- extra : convert_revision : a778efdca33b0ec5beb76cf47db0e9e4728897ee
2004-02-02Change MemReqPtr parameters to references.Steve Reinhardt
This avoids incrementing and decrementing the MemReq reference counters on every call and return. arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: cpu/exec_context.hh: cpu/memtest/memtest.cc: cpu/memtest/memtest.hh: dev/alpha_console.cc: dev/alpha_console.hh: Change MemReqPtr parameters to references. --HG-- extra : convert_revision : 3ba18bdd9f996563988402576bfdd3430e1ab1e5
2004-01-25Change the way the hierarchy is separated. Now all virtual functions are in ↵Erik Hallnor
the interfaces. This allows new bus models to be used without major hassle. And I thought it was time to change it all again anyways. cpu/simple_cpu/simple_cpu.cc: Switch doEvents to doEvents() --HG-- extra : convert_revision : 14b9517017e76c7b941247004393bf260f397d9a
2003-12-19Minor cleanup of trace/output stuff (leftover from EINTR bug fix).Steve Reinhardt
base/cprintf.cc: Get rid of unnecessary stream state check. Bug is fixed now, and I'm not sure this did much anyway. cpu/exetrace.cc: Get rid of unnecessary flush() call. --HG-- extra : convert_revision : 107dcdc578b2b0ad1652ee52ea0a33b0f3cd4e39
2003-12-11Make memtest compile again.Steve Reinhardt
cpu/memtest/memtest.hh: Oops... make memtest compile with new event priorities too. --HG-- extra : convert_revision : 8143f2e078bb785991d351803fc3a6a50aa31ae5
2003-12-11- Switch events to use a priority enum instead of integers.Steve Reinhardt
This lets us centralize priorities so we can see what's going on. - Shift serialize & cpu-switch events to happen before CPU ticks (to be consistent with starting new CPU on same cycle instead of next cycle). - Get rid of unnecessary bus stats reset callback. cpu/simple_cpu/simple_cpu.cc: sim/debug.cc: sim/eventq.hh: sim/serialize.cc: sim/sim_events.cc: sim/sim_events.hh: Switch events to use a priority enum instead of integers. This lets us centralize priorities so we can see what's going on. --HG-- extra : convert_revision : 510d79b43c0a1c97a10eb65916f7335b1de8b956
2003-12-10Factor ExecContext::setStatus(), BaseCPU::execCtxStatusChange(),Steve Reinhardt
and SimpleCPU::setStatus() into separate functions. For example, setStatus(Active) is now activate(). --HG-- extra : convert_revision : 4392e07caf6c918db0b535f613175109681686fe
2003-12-09Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5Steve Reinhardt
--HG-- extra : convert_revision : c74b502bf44ac300e44c9aa7d6d6e3c55a511893
2003-12-09Minor tweaks to make a switchover at tick N matchSteve Reinhardt
restarting from a checkpoint at tick N. cpu/simple_cpu/simple_cpu.cc: On a CPU switchover, schedule the new CPU's first tick event for curTick+1 instead of curTick. --HG-- extra : convert_revision : f0757d6f028214d36c1cff992db688fd6e8a6fdc
2003-12-08Instead of keeping track of the fraction of time that we'reNathan Binkert
idle, keep track of the fraction of time we're not idle. This works better because the default processor state is idle, and the default stat value is 0. Keep the stat as idleFraction which is a formula that is equal to 1 - notIdleFraction --HG-- extra : convert_revision : 331c2e46f45ae0abda46988567ac2c4f7c42ccad
2003-12-08move setStatus into the .cc fileNathan Binkert
--HG-- extra : convert_revision : 9ccf885274d72ea3151a0db76b580dd51763edab
2003-12-06Various cleanup. Mostly forcing initialization of some fields...Steve Reinhardt
I noticed that checkpoints dumped from m5.debug and m5.opt had differences, which is no longer the case (other than addresses encoded in names). cpu/full_cpu/smt.hh: Get rid of unused SMT_MAX_CPUS. sim/debug.cc: Use AutoDelete for DebugBreakEvent. sim/serialize.cc: sim/serialize.hh: Move constructor & destructor to header so they can be inlined. --HG-- extra : convert_revision : bc68c2c9b053b1de0d655ed555734419fafd0b83
2003-12-01Restructuring of LiveProcess etc. to support multiple emulated OS syscallSteve Reinhardt
interfaces, and specific support for Alpha Linux. Split syscall emulation functions into several groups, based on whether they depend on the specific OS and/or architecture (and all combinations of above), including the use of template functions to support syscalls with slightly different constants or interface structs. arch/alpha/alpha_tru64_process.cc: Incorporate full Tru64 object definition here, including structure and constant definitions. This way we can wrap all of the functions inside the object, and not worry about namespace conflicts because no one outside this file will ever see it. base/loader/aout_object.cc: base/loader/aout_object.hh: base/loader/ecoff_object.cc: base/loader/ecoff_object.hh: base/loader/elf_object.cc: base/loader/elf_object.hh: base/loader/object_file.cc: base/loader/object_file.hh: Add enums to ObjectFile to indicate the object's architecture and operating system. cpu/exec_context.cc: prog.hh is now process.hh cpu/exec_context.hh: prog.hh is now process.hh move architecture-specific syscall arg accessors into ExecContext cpu/simple_cpu/simple_cpu.cc: No need to include prog.hh (which has been renamed) sim/process.cc: sim/process.hh: LiveProcess is now effectively an abstract base class. New LiveProcess::create() function takes an object file and dynamically picks the appropriate subclass of LiveProcess to handle the syscall interface that file expects (currently Tru64 or Linux). --HG-- rename : arch/alpha/fake_syscall.cc => arch/alpha/alpha_tru64_process.cc rename : sim/prog.cc => sim/process.cc rename : sim/prog.hh => sim/process.hh extra : convert_revision : 4a03ca7d94a34177cb672931f8aae83a6bad179a
2003-11-06Merge ehallnor@zizzer:/bk/m5Erik Hallnor
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5 --HG-- extra : convert_revision : de8422f1e91f1defabe3a021236c813504bd3cab
2003-11-06Various fixes to memory code.Erik Hallnor
cpu/memtest/memtest.cc: Disable probes until the work in all cases util/rundiff: Comment out Algorithm::Diff since its not needed. --HG-- extra : convert_revision : 40e76ae8926650986a170a0ba6ef331519aceb19
2003-11-06Little fixes to make more of the stats reset correctly.Nathan Binkert
base/statistics.cc: formatting cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: Make numInsts reset by adding a resetStats function sim/sim_object.cc: Register the reset callback in a slightly cleaner way to avoid potential static member constructor ordering issues --HG-- extra : convert_revision : 408073b4b0397fbf9dfd9c548a313f1c8c3fc031
2003-11-05Fix stats resetNathan Binkert
make SIGUSR2 dump and reset stats Make resetting time work base/statistics.cc: Fix statistics reset so that it works again, and correctly reset bins as well. (The old code wouldn't reset if you didn't have any bins, and then would actually only reset the first bin) cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: convert idleCycles/idleFraction into a single Average stat to make reset work more simply sim/main.cc: handle SIGUSR2 to dump and reset stats (SIGUSR1 only dumps them) sim/sim_time.cc: sim/sim_time.hh: Add support for resetting the time --HG-- extra : convert_revision : ea43e03c50c0a4bb826dc0842a8c4fa1a9289e0a
2003-11-04Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/cleanLisa Hsu
--HG-- extra : convert_revision : 0074df284e85bc2ebe6ccc2dbe765fabda9ab041
2003-11-04Add the ability to track stats in user defined sets of function calls. code ↵Lisa Hsu
can be generated via the base/instrum_codegen.pl script to easily change the functions being tracked. the only thing the user needs to do is add code in tru64System to change how the callerMap is populated. command line: m5.* <config file> <args> --server.system:bin=true to track function calls in the server m5.* <config file> <args> --client.system:bin=true to track function calls in the client base/statistics.cc: make an adjustment to the way stats are printed for FS_MEASURE base/statistics.hh: add a name() virtual function to GenBin. add a debug printf for activate(). add amake MainBin the default bin when FS_MEASURE. cpu/exec_context.cc: initialize swCtx to null upon creation of an xc cpu/exec_context.hh: add a SWContext pointer to every execution context. cpu/simple_cpu/simple_cpu.cc: process calls and returns for FS_MEASURE cpu/simple_cpu/simple_cpu.hh: add this so idleCycles will not be accessed before all stats are constructed kern/tru64/tru64_events.cc: add a FnEvent that fires whenever a function we're tracking is called. implement the process() virtual function for it. kern/tru64/tru64_events.hh: add FnEvent kern/tru64/tru64_system.cc: send bin parameter to System constructor. add bin parameter to Tru64System object. initialize all the FnEvent and MainBin members of Tru64system. also, populate the calling map that indicates whether a function call is on the path we're tracking. kern/tru64/tru64_system.hh: modify the Tru64System class to support FS_MEASURE sim/system.cc: add a bin parameter to System class. initialize a MainBin to hold the stats for nonPath. sim/system.hh: add a map of to match bins to function names. add a swCtx map to map pcb addresses to SWContext *s. Add some supporting functions. --HG-- extra : convert_revision : af3eadd798cb2d2aed9b54e1059dcedf244dd526
2003-11-03AutomergeSteve Reinhardt
--HG-- extra : convert_revision : 2ca18ecbf04a1de72391073d0a5309fdbbdfefda
2003-11-03Minor changes to instruction trace output.Steve Reinhardt
arch/alpha/isa_desc: A few disassembly changes to make it easier to compare with old machine.def traces: - Make lds prefetches print f31 instead of r31 as dest. - Don't print mode suffixes on FP if SS_COMPATIBLE_DISASSEMBLY cpu/exetrace.cc: Left-justify instruction in field, and increase width by 1. --HG-- extra : convert_revision : 9ffd56728f1bb772aa3ccda5f027b93d4c3a4135
2003-11-02General fixes for Sampling CPU in full system mode, and serialization of ↵Ron Dreslinski
sampling CPU cpu/intr_control.cc: Fix the reference to the cpu, to look up which cpu is being used In sampling mode can't use an absolute pointer to the cpu, use the exeContexts vector cpu/intr_control.hh: Add two new functions to simplify MP interrupts, fix it for sampling CPU model --HG-- extra : convert_revision : a69cdbb81e6aefa3fd5385416713c689300bbea8
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-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-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
2003-10-29Serialization support for Alpha TLBs, PhysicalMemory, and SimpleCPU.Steve Reinhardt
arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: Serialize TLB contents. cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: Complete serialization of SimpleCPU (including owned events). sim/eventq.cc: sim/eventq.hh: Basic serialization for events. Still need to handle dynamic events (not owned by a SimObject). sim/serialize.cc: sim/serialize.hh: Export serialization filename so PhysicalMemory can derive its filename from that. --HG-- extra : convert_revision : 4db851c5880f73f576ca092d5e5ad4256048eb51
2003-10-29Flesh out ExecContext serialize/unserialize (including RegFile).Steve Reinhardt
Add support for serializing enums. arch/alpha/isa_traits.hh: Add serialize/unserialize functions for RegFile (defined in new isa_traits.cc). cpu/exec_context.cc: Flesh out serialize/unserialize. sim/serialize.hh: Add {UN}SERIALIZE_ENUM(). --HG-- extra : convert_revision : 9e30c7e7b3b290dc8ea0888ba3636fc93ee89052