sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mem: Merge interleaved ranges when creating backing store

Browse source 
This patch adds merging of interleaved ranges before creating the
backing stores. The backing stores are always a contigous chunk of the
address space, and with this patch it is possible to have interleaved
memories in the system.
This commit is contained in:
Andreas Hansson 2013-03-01 13:20:21 -05:00
parent cafd38f36c
commit 1a58362e25
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mem/physical.cc
View file

@ -99,19 +99,40 @@ PhysicalMemory::PhysicalMemory(const string& _name,
// space to be mapped to backing store, also remember what // space to be mapped to backing store, also remember what
// memories constitute the range so we can go and find out if we // memories constitute the range so we can go and find out if we
// have to init their parts to zero // have to init their parts to zero
vector<AddrRange> intlv_ranges;
vector<AbstractMemory*> curr_memories; vector<AbstractMemory*> curr_memories;
for (AddrRangeMap<AbstractMemory*>::const_iterator r = addrMap.begin(); for (AddrRangeMap<AbstractMemory*>::const_iterator r = addrMap.begin();
r != addrMap.end(); ++r) { r != addrMap.end(); ++r) {
// simply skip past all memories that are null and hence do // simply skip past all memories that are null and hence do
// not need any backing store // not need any backing store
if (!r->second->isNull()) { if (!r->second->isNull()) {
// this will eventually be extended to support merging of // if the range is interleaved then save it for now
// interleaved address ranges, and although it might seem if (r->first.interleaved()) {
// overly complicated at this point it will all be used // if we already got interleaved ranges that are not
curr_memories.push_back(r->second); // part of the same range, then first do a merge
createBackingStore(r->first, curr_memories); // before we add the new one
if (!intlv_ranges.empty() &&
!intlv_ranges.back().mergesWith(r->first)) {
AddrRange merged_range(intlv_ranges);
createBackingStore(merged_range, curr_memories);
intlv_ranges.clear();
curr_memories.clear(); curr_memories.clear();
} }
intlv_ranges.push_back(r->first);
curr_memories.push_back(r->second);
} else {
vector<AbstractMemory*> single_memory;
single_memory.push_back(r->second);
createBackingStore(r->first, single_memory);
}
}
}
// if there is still interleaved ranges waiting to be merged, go
// ahead and do it
if (!intlv_ranges.empty()) {
AddrRange merged_range(intlv_ranges);
createBackingStore(merged_range, curr_memories);
} }
} }