diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:28:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:28:18 +0000 |
commit | 58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b (patch) | |
tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /equivalence_map_unittest.cc | |
parent | 919a460e14c48a672288254f67db3e0c28166e82 (diff) | |
parent | d9eed84a58f90af50d84b02ca6a38d805b425a95 (diff) | |
download | zucchini-58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b.tar.gz |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: I7de3d8374e868066777abb326d3e20c1e4b44803
Diffstat (limited to 'equivalence_map_unittest.cc')
-rw-r--r-- | equivalence_map_unittest.cc | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/equivalence_map_unittest.cc b/equivalence_map_unittest.cc index b3a4ea4..6b826d1 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; @@ -252,28 +252,28 @@ TEST(EquivalenceMapTest, ExtendEquivalenceBackward) { TEST(EquivalenceMapTest, PruneEquivalencesAndSortBySource) { auto PruneEquivalencesAndSortBySourceTest = - [](std::vector<Equivalence>&& equivalences) { + [](std::deque<Equivalence>&& equivalences) { OffsetMapper::PruneEquivalencesAndSortBySource(&equivalences); return std::move(equivalences); }; - EXPECT_EQ(std::vector<Equivalence>(), + EXPECT_EQ(std::deque<Equivalence>(), PruneEquivalencesAndSortBySourceTest({})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 1}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 1}}), PruneEquivalencesAndSortBySourceTest({{0, 10, 1}})); - EXPECT_EQ(std::vector<Equivalence>(), + EXPECT_EQ(std::deque<Equivalence>(), PruneEquivalencesAndSortBySourceTest({{0, 10, 0}})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 1}, {1, 11, 1}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 1}, {1, 11, 1}}), PruneEquivalencesAndSortBySourceTest({{0, 10, 1}, {1, 11, 1}})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 2}, {2, 13, 1}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 2}, {2, 13, 1}}), PruneEquivalencesAndSortBySourceTest({{0, 10, 2}, {1, 12, 2}})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 2}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 2}}), PruneEquivalencesAndSortBySourceTest({{0, 10, 2}, {1, 12, 1}})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 2}, {2, 14, 1}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 2}, {2, 14, 1}}), PruneEquivalencesAndSortBySourceTest({{0, 10, 2}, {1, 13, 2}})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 1}, {1, 12, 3}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 1}, {1, 12, 3}}), PruneEquivalencesAndSortBySourceTest({{0, 10, 2}, {1, 12, 3}})); - EXPECT_EQ(std::vector<Equivalence>({{0, 10, 3}, {3, 16, 2}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, 3}, {3, 16, 2}}), PruneEquivalencesAndSortBySourceTest( {{0, 10, 3}, {1, 13, 3}, {3, 16, 2}})); // Pruning is greedy @@ -288,9 +288,9 @@ TEST(EquivalenceMapTest, PruneEquivalencesAndSortBySource) { // *************** // This test case makes sure the function does not stall on a large instance // of this pattern. - EXPECT_EQ(std::vector<Equivalence>({{0, 10, +300000}, {300000, 30, +300000}}), + EXPECT_EQ(std::deque<Equivalence>({{0, 10, +300000}, {300000, 30, +300000}}), PruneEquivalencesAndSortBySourceTest([] { - std::vector<Equivalence> equivalenses; + std::deque<Equivalence> equivalenses; equivalenses.push_back({0, 10, +300000}); for (offset_t i = 0; i < 100000; ++i) equivalenses.push_back({200000 + i, 20, +200000 - 2 * i}); @@ -302,7 +302,7 @@ TEST(EquivalenceMapTest, PruneEquivalencesAndSortBySource) { TEST(EquivalenceMapTest, NaiveExtendedForwardProject) { constexpr size_t kOldImageSize = 1000U; constexpr size_t kNewImageSize = 1000U; - OffsetMapper offset_mapper(std::vector<Equivalence>(), kOldImageSize, + OffsetMapper offset_mapper(std::deque<Equivalence>(), kOldImageSize, kNewImageSize); // Convenience function to declutter. @@ -417,7 +417,7 @@ TEST(EquivalenceMapTest, ExtendedForwardProjectEncoding) { // - '.' are "new" offsets that appear as output. // - '(' and ')' surround a single "new" location that are repeated as output. int case_no = 0; - auto run_test = [&case_no](std::vector<Equivalence>&& equivalences, + auto run_test = [&case_no](std::deque<Equivalence>&& equivalences, const std::string& old_spec, const std::string& new_spec) { const size_t old_size = old_spec.length(); @@ -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})); } |