summaryrefslogtreecommitdiff
path: root/src/passes/MemoryPacking.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/passes/MemoryPacking.cpp')
-rw-r--r--src/passes/MemoryPacking.cpp87
1 files changed, 38 insertions, 49 deletions
diff --git a/src/passes/MemoryPacking.cpp b/src/passes/MemoryPacking.cpp
index 7beed9a16..608bc1af2 100644
--- a/src/passes/MemoryPacking.cpp
+++ b/src/passes/MemoryPacking.cpp
@@ -69,7 +69,7 @@ using Replacements = std::unordered_map<Expression*, Replacement>;
using Referrers = std::vector<Expression*>;
// Map segment indices to referrers.
-using ReferrersMap = std::unordered_map<Index, Referrers>;
+using ReferrersMap = std::unordered_map<Name, Referrers>;
// memory.init: 2 byte opcode + 1 byte segment index + 1 byte memory index +
// 3 x 2 byte operands
@@ -119,9 +119,9 @@ struct MemoryPacking : public Pass {
size_t segmentsRemaining);
void createReplacements(Module* module,
const std::vector<Range>& ranges,
+ const std::vector<Name>& segments,
const Referrers& referrers,
- Replacements& replacements,
- const Index segmentIndex);
+ Replacements& replacements);
void replaceSegmentOps(Module* module, Replacements& replacements);
};
@@ -155,9 +155,9 @@ void MemoryPacking::run(Module* module) {
Replacements replacements;
Builder builder(*module);
- for (size_t origIndex = 0; origIndex < segments.size(); ++origIndex) {
- auto& segment = segments[origIndex];
- auto& currReferrers = referrers[origIndex];
+ for (size_t index = 0; index < segments.size(); ++index) {
+ auto& segment = segments[index];
+ auto& currReferrers = referrers[segment->name];
std::vector<Range> ranges;
@@ -169,12 +169,16 @@ void MemoryPacking::run(Module* module) {
ranges.push_back({false, 0, segment->data.size()});
}
- Index firstNewIndex = packed.size();
- size_t segmentsRemaining = segments.size() - origIndex;
+ size_t segmentsRemaining = segments.size() - index;
+ size_t currSegmentsStart = packed.size();
createSplitSegments(
builder, segment.get(), ranges, packed, segmentsRemaining);
+ std::vector<Name> currSegmentNames;
+ for (size_t i = currSegmentsStart; i < packed.size(); ++i) {
+ currSegmentNames.push_back(packed[i]->name);
+ }
createReplacements(
- module, ranges, currReferrers, replacements, firstNewIndex);
+ module, ranges, currSegmentNames, currReferrers, replacements);
}
segments.swap(packed);
@@ -394,7 +398,7 @@ void MemoryPacking::optimizeSegmentOps(Module* module) {
void visitMemoryInit(MemoryInit* curr) {
Builder builder(*getModule());
- auto& segment = getModule()->dataSegments[curr->segment];
+ auto* segment = getModule()->getDataSegment(curr->segment);
size_t maxRuntimeSize = segment->isPassive ? segment->data.size() : 0;
bool mustNop = false;
bool mustTrap = false;
@@ -439,7 +443,7 @@ void MemoryPacking::optimizeSegmentOps(Module* module) {
}
}
void visitDataDrop(DataDrop* curr) {
- if (!getModule()->dataSegments[curr->segment]->isPassive) {
+ if (!getModule()->getDataSegment(curr->segment)->isPassive) {
ExpressionManipulator::nop(curr);
}
}
@@ -496,12 +500,11 @@ void MemoryPacking::dropUnusedSegments(
std::vector<std::unique_ptr<DataSegment>>& segments,
ReferrersMap& referrers) {
std::vector<std::unique_ptr<DataSegment>> usedSegments;
- ReferrersMap usedReferrers;
// Remove segments that are never used
// TODO: remove unused portions of partially used segments as well
for (size_t i = 0; i < segments.size(); ++i) {
bool used = false;
- auto referrersIt = referrers.find(i);
+ auto referrersIt = referrers.find(segments[i]->name);
bool hasReferrers = referrersIt != referrers.end();
if (segments[i]->isPassive) {
if (hasReferrers) {
@@ -518,9 +521,6 @@ void MemoryPacking::dropUnusedSegments(
}
if (used) {
usedSegments.push_back(std::move(segments[i]));
- if (hasReferrers) {
- usedReferrers[usedSegments.size() - 1] = std::move(referrersIt->second);
- }
} else if (hasReferrers) {
// All referrers are data.drops. Make them nops.
for (auto* referrer : referrersIt->second) {
@@ -530,7 +530,6 @@ void MemoryPacking::dropUnusedSegments(
}
std::swap(segments, usedSegments);
module->updateDataSegmentsMap();
- std::swap(referrers, usedReferrers);
}
void MemoryPacking::createSplitSegments(
@@ -596,25 +595,11 @@ void MemoryPacking::createSplitSegments(
void MemoryPacking::createReplacements(Module* module,
const std::vector<Range>& ranges,
+ const std::vector<Name>& segments,
const Referrers& referrers,
- Replacements& replacements,
- const Index segmentIndex) {
- // If there was no transformation, only update the indices
+ Replacements& replacements) {
+ // If there was no transformation, we do not need to do anything.
if (ranges.size() == 1 && !ranges.front().isZero) {
- for (auto referrer : referrers) {
- replacements[referrer] = [referrer, segmentIndex](Function*) {
- if (auto* curr = referrer->dynCast<MemoryInit>()) {
- curr->segment = segmentIndex;
- } else if (auto* curr = referrer->dynCast<DataDrop>()) {
- curr->segment = segmentIndex;
- } else if (auto* curr = referrer->dynCast<ArrayNewSeg>()) {
- curr->segment = segmentIndex;
- } else {
- WASM_UNREACHABLE("Unexpected segment operation");
- }
- return referrer;
- };
- }
return;
}
@@ -649,8 +634,9 @@ void MemoryPacking::createReplacements(Module* module,
size_t start = init->offset->cast<Const>()->value.geti32();
size_t end = start + init->size->cast<Const>()->value.geti32();
- // Segment index used in emitted memory.init instructions
- size_t initIndex = segmentIndex;
+ // Index in `segments` of the segment used in emitted memory.init
+ // instructions
+ size_t initIndex = 0;
// Index of the range from which this memory.init starts reading
size_t firstRangeIdx = 0;
@@ -742,8 +728,8 @@ void MemoryPacking::createReplacements(Module* module,
size_t offsetBytes = std::max(start, range.start) - range.start;
Expression* offset = builder.makeConst(int32_t(offsetBytes));
Expression* size = builder.makeConst(int32_t(bytes));
- appendResult(
- builder.makeMemoryInit(initIndex, dest, offset, size, init->memory));
+ appendResult(builder.makeMemoryInit(
+ segments[initIndex], dest, offset, size, init->memory));
initIndex++;
}
}
@@ -779,10 +765,10 @@ void MemoryPacking::createReplacements(Module* module,
appendResult(
builder.makeGlobalSet(dropStateGlobal, builder.makeConst(int32_t(1))));
}
- size_t dropIndex = segmentIndex;
+ size_t dropIndex = 0;
for (auto range : ranges) {
if (!range.isZero) {
- appendResult(builder.makeDataDrop(dropIndex++));
+ appendResult(builder.makeDataDrop(segments[dropIndex++]));
}
}
replacements[drop] = [result, module](Function*) {
@@ -807,22 +793,25 @@ void MemoryPacking::replaceSegmentOps(Module* module,
}
void visitMemoryInit(MemoryInit* curr) {
- auto replacement = replacements.find(curr);
- assert(replacement != replacements.end());
- replaceCurrent(replacement->second(getFunction()));
+ if (auto replacement = replacements.find(curr);
+ replacement != replacements.end()) {
+ replaceCurrent(replacement->second(getFunction()));
+ }
}
void visitDataDrop(DataDrop* curr) {
- auto replacement = replacements.find(curr);
- assert(replacement != replacements.end());
- replaceCurrent(replacement->second(getFunction()));
+ if (auto replacement = replacements.find(curr);
+ replacement != replacements.end()) {
+ replaceCurrent(replacement->second(getFunction()));
+ }
}
void visitArrayNewSeg(ArrayNewSeg* curr) {
if (curr->op == NewData) {
- auto replacement = replacements.find(curr);
- assert(replacement != replacements.end());
- replaceCurrent(replacement->second(getFunction()));
+ if (auto replacement = replacements.find(curr);
+ replacement != replacements.end()) {
+ replaceCurrent(replacement->second(getFunction()));
+ }
}
}
} replacer(replacements);
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-09 04:15:49 +0000