diff options
author | Etienne Pierre-doray <etiennep@chromium.org> | 2021-09-14 17:31:51 +0000 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2021-09-14 10:48:48 -0700 |
commit | aff408603b3db5b7974c522db2ad8c5ce2a0f3c1 (patch) | |
tree | 4366ce54a82c7aa38617942292f0a30b08a775cd /equivalence_map_unittest.cc | |
parent | 9ff43f558d334f100a92bf93d764f32293f9c5aa (diff) | |
download | zucchini-aff408603b3db5b7974c522db2ad8c5ce2a0f3c1.tar.gz |
[zucchini]: Convert TargetPool to deque.
shrink_to_fit with vector tends to cause high memory peak.
Changing deque is a simple change that reduces memory peak at the cost of
loss of guarantee (contiguous storage).
Similar to https://chromium-review.googlesource.com/c/chromium/src/+/2830864
which dramatically reduced crach rate
https://crash.corp.google.com/browse?q=product_name%3D%27Chrome%27+AND+EXISTS+%28SELECT+1+FROM+UNNEST%28CrashedStackTrace.StackFrame%29+WHERE+FunctionName%3D%27installer%3A%3AArchivePatchHelper%3A%3AZucchiniEnsemblePatch%27%29+AND+expanded_custom_data.ChromeCrashProto.magic_signature_1.name%3D%27%5BOut+of+Memory%5D+zucchini%3A%3ADisassemblerWin32%3Czucchini%3A%3AWin32X64Traits%3E%3A%3AParseAndStoreRel32%27
An alternative is to look ahead to determine vector size. The is hard to do
with SortAndUniquify, which performs in-place modifications.
Bug: 1247633
Change-Id: I624c360ee1f2bf18bd584d1aafdde0f0c2ffb61e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3149810
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/main@{#921292}
NOKEYCHECK=True
GitOrigin-RevId: 380557e6b592531eb360513791968dd7ab0ee77d
Diffstat (limited to 'equivalence_map_unittest.cc')
-rw-r--r-- | equivalence_map_unittest.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/equivalence_map_unittest.cc b/equivalence_map_unittest.cc index b3a4ea4..508bf23 100644 --- a/equivalence_map_unittest.cc +++ b/equivalence_map_unittest.cc @@ -22,7 +22,7 @@ namespace zucchini { namespace { -using OffsetVector = std::vector<offset_t>; +using OffsetDeque = std::deque<offset_t>; // Make all references 2 bytes long. constexpr offset_t kReferenceSize = 2; @@ -504,7 +504,7 @@ TEST(EquivalenceMapTest, ExtendedForwardProjectEncoding) { TEST(EquivalenceMapTest, ForwardProjectAll) { auto ForwardProjectAllTest = [](const OffsetMapper& offset_mapper, std::initializer_list<offset_t> offsets) { - OffsetVector offsets_vec(offsets); + std::deque<offset_t> offsets_vec(offsets); offset_mapper.ForwardProjectAll(&offsets_vec); return offsets_vec; }; @@ -512,29 +512,29 @@ TEST(EquivalenceMapTest, ForwardProjectAll) { // [0,2) --> [10,12), [2,3) --> [13,14), [4,6) --> [16,18). OffsetMapper offset_mapper1({{0, 10, +2}, {2, 13, +1}, {4, 16, +2}}, 100U, 100U); - EXPECT_EQ(OffsetVector({10}), ForwardProjectAllTest(offset_mapper1, {0})); - EXPECT_EQ(OffsetVector({13}), ForwardProjectAllTest(offset_mapper1, {2})); - EXPECT_EQ(OffsetVector({}), ForwardProjectAllTest(offset_mapper1, {3})); - EXPECT_EQ(OffsetVector({10, 13}), + EXPECT_EQ(OffsetDeque({10}), ForwardProjectAllTest(offset_mapper1, {0})); + EXPECT_EQ(OffsetDeque({13}), ForwardProjectAllTest(offset_mapper1, {2})); + EXPECT_EQ(OffsetDeque({}), ForwardProjectAllTest(offset_mapper1, {3})); + EXPECT_EQ(OffsetDeque({10, 13}), ForwardProjectAllTest(offset_mapper1, {0, 2})); - EXPECT_EQ(OffsetVector({11, 13, 17}), + EXPECT_EQ(OffsetDeque({11, 13, 17}), ForwardProjectAllTest(offset_mapper1, {1, 2, 5})); - EXPECT_EQ(OffsetVector({11, 17}), + EXPECT_EQ(OffsetDeque({11, 17}), ForwardProjectAllTest(offset_mapper1, {1, 3, 5})); - EXPECT_EQ(OffsetVector({10, 11, 13, 16, 17}), + EXPECT_EQ(OffsetDeque({10, 11, 13, 16, 17}), ForwardProjectAllTest(offset_mapper1, {0, 1, 2, 3, 4, 5, 6})); // [0,2) --> [10,12), [13,14) --> [2,3), [16,18) --> [4,6). OffsetMapper offset_mapper2({{0, 10, +2}, {13, 2, +1}, {16, 4, +2}}, 100U, 100U); - EXPECT_EQ(OffsetVector({2}), ForwardProjectAllTest(offset_mapper2, {13})); - EXPECT_EQ(OffsetVector({10, 2}), + EXPECT_EQ(OffsetDeque({2}), ForwardProjectAllTest(offset_mapper2, {13})); + EXPECT_EQ(OffsetDeque({10, 2}), ForwardProjectAllTest(offset_mapper2, {0, 13})); - EXPECT_EQ(OffsetVector({11, 2, 5}), + EXPECT_EQ(OffsetDeque({11, 2, 5}), ForwardProjectAllTest(offset_mapper2, {1, 13, 17})); - EXPECT_EQ(OffsetVector({11, 5}), + EXPECT_EQ(OffsetDeque({11, 5}), ForwardProjectAllTest(offset_mapper2, {1, 14, 17})); - EXPECT_EQ(OffsetVector({10, 11, 2, 4, 5}), + EXPECT_EQ(OffsetDeque({10, 11, 2, 4, 5}), ForwardProjectAllTest(offset_mapper2, {0, 1, 13, 14, 16, 17, 18})); } |