diff options
author | Benjamin Barenblat <bbaren@google.com> | 2022-02-01 14:31:48 -0500 |
---|---|---|
committer | Benjamin Barenblat <bbaren@google.com> | 2022-02-01 15:59:24 -0500 |
commit | 84cb38373ecdf26edbf39429cc37e834d2a11447 (patch) | |
tree | b9d40dc2c9e3c291981389a29c49c868c10608c8 /debian/patches | |
parent | f16b667ef722b8f767c06e6d1b56179a8ed0f75a (diff) |
Fix Abseil hash tests on s390x
Backport some patches from upstream to make tests pass on big-endian
machines.
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/big-endian-hash.diff | 725 | ||||
-rw-r--r-- | debian/patches/big-endian-hash2.diff | 164 | ||||
-rw-r--r-- | debian/patches/series | 3 | ||||
-rw-r--r-- | debian/patches/std-hash.diff | 46 |
4 files changed, 891 insertions, 47 deletions
diff --git a/debian/patches/big-endian-hash.diff b/debian/patches/big-endian-hash.diff new file mode 100644 index 00000000..52888e74 --- /dev/null +++ b/debian/patches/big-endian-hash.diff @@ -0,0 +1,725 @@ +From: Benjamin Barenblat <bbaren@google.com> +Subject: Restructure wyhash_test.cc to separate golden values +Forwarded: yes +Origin: backport, https://github.com/abseil/abseil-cpp/commit/a05366d851c5cb88065272f951e03955197e7c11 + +This patch is a subset of the referenced commit, which originally also changed +the mix function on arm64. The original message is as follows: + + Alternative bit mixer for LowLevelHash on ARM + + LowLevelHash's bit-mixer is inefficient on ARM because it calculates + a 128-bit product of two 64-bit numbers. On ARM, this requires a + sequence of two instructions with a high combined latency and poor + throughput. This change provides alternative bit-mixing code for ARM + that uses only 64-bit arithmetic (multiplication, xor, and + left-shifts) and speeds things up considerably. + + The bit-mixing code for ARM was inspired by by Woothash[1] and + xxh3[1]. Once I landed on a sequence of operations that provided + good mixing, I used a test harness to search for the combination of + shift / rotate factors that provided the best mixing, as indicated + by SMHasher hash quality tests. The new mixing code passes 13 out of + 15 of the hash quality test suites in SMHasher, with the two + failures being in the noise range: e.g. 1 collision vs. zero + expected in a keyset of ~8m keys. + + [1]: https://github.com/tommyettinger/waterhash/blob/49f5cf0b63b9/woothash.h#L16-L20 + [2]: https://github.com/Cyan4973/xxHash/blob/6853ddc36e46/xxhash.h#L3240-L3265 + + PiperOrigin-RevId: 391833008 + +This restructuring is a prerequisite for big-endian-hash2.diff. + +--- a/absl/hash/internal/wyhash_test.cc ++++ b/absl/hash/internal/wyhash_test.cc +@@ -14,473 +14,469 @@ + + #include "absl/hash/internal/wyhash.h" + ++#include <cinttypes> ++ +-#include "absl/strings/escaping.h" + #include "gmock/gmock.h" + #include "gtest/gtest.h" ++#include "absl/strings/escaping.h" ++ ++#define UPDATE_GOLDEN 0 + + namespace { + +-static const uint64_t kCurrentSeed = 0; + static const uint64_t kSalt[5] = {0xa0761d6478bd642f, 0xe7037ed1a0b428dbl, + 0x8ebc6af09c88c6e3, 0x589965cc75374cc3l, + 0x1d8e4e27c47d124f}; + +-// Note: We don't account for endianness, so the values here are only correct if +-// you're also running on a little endian platform. +- +-TEST(WyhashTest, EmptyString) { +- const std::string s = ""; +- EXPECT_EQ( +- absl::hash_internal::Wyhash(s.c_str(), s.length(), kCurrentSeed, kSalt), +- 4808886099364463827); +-} +- +-TEST(WyhashTest, Spaces) { +- const std::string s = " "; +- EXPECT_EQ( +- absl::hash_internal::Wyhash(s.c_str(), s.length(), kCurrentSeed, kSalt), +- 1686201463024549249); +-} +- +-TEST(WyhashTest, RepeatingString) { +- const std::string s = "aaaa"; +- EXPECT_EQ( +- absl::hash_internal::Wyhash(s.c_str(), s.length(), kCurrentSeed, kSalt), +- 6646112255271966632); +-} +- +-TEST(WyhashTest, HexString) { +- const std::string small = "\x01\x02\x03"; +- const std::string med = "\x01\x02\x03\x04"; +- +- EXPECT_EQ(absl::hash_internal::Wyhash(small.c_str(), small.length(), +- kCurrentSeed, kSalt), +- 11989428023081740911ULL); +- EXPECT_EQ(absl::hash_internal::Wyhash(med.c_str(), med.length(), kCurrentSeed, +- kSalt), +- 9765997711188871556ULL); +-} +- +-TEST(WyhashTest, Words) { +- const std::string s = "third_party|wyhash|64"; +- EXPECT_EQ( +- absl::hash_internal::Wyhash(s.c_str(), s.length(), kCurrentSeed, kSalt), +- 3702018632387611330); +-} +- +-TEST(WyhashTest, LongString) { +- const std::string s = +- "AbCdEfGhIjKlMnOpQrStUvWxYz0123456789AbCdEfGhIjKlMnOpQrStUvWxYz" +- "0123456789AbCdEfGhIjKlMnOpQrStUvWxYz0123456789AbCdEfGhIjKlMnOp" +- "QrStUvWxYz0123456789AbCdEfGhIjKlMnOpQrStUvWxYz0123456789AbCdEf" +- "GhIjKlMnOpQrStUvWxYz0123456789AbCdEfGhIjKlMnOpQrStUvWxYz012345" +- "6789AbCdEfGhIjKlMnOpQrStUvWxYz0123456789"; +- +- EXPECT_EQ( +- absl::hash_internal::Wyhash(s.c_str(), s.length(), kCurrentSeed, kSalt), +- 9245411362605796064ULL); +-} +- +-TEST(WyhashTest, BigReference) { ++TEST(WyhashTest, VerifyGolden) { ++ constexpr size_t kNumGoldenOutputs = 134; +- struct ExpectedResult { ++ static struct { + absl::string_view base64_data; + uint64_t seed; +- uint64_t hash; +- } expected_results[] = { ++ } cases[] = { +- {"", uint64_t{0xec42b7ab404b8acb}, uint64_t{0xe5a40d39ab796423}}, ++ {"", uint64_t{0xec42b7ab404b8acb}}, ++ {"ICAg", uint64_t{0}}, ++ {"YWFhYQ==", uint64_t{0}}, ++ {"AQID", uint64_t{0}}, ++ {"AQIDBA==", uint64_t{0}}, ++ {"dGhpcmRfcGFydHl8d3loYXNofDY0", uint64_t{0}}, +- {"Zw==", uint64_t{0xeeee074043a3ee0f}, uint64_t{0xa6564b468248c683}}, ++ {"Zw==", uint64_t{0xeeee074043a3ee0f}}, +- {"xmk=", uint64_t{0x857902089c393de}, uint64_t{0xef192f401b116e1c}}, ++ {"xmk=", uint64_t{0x857902089c393de}}, +- {"c1H/", uint64_t{0x993df040024ca3af}, uint64_t{0xbe8dc0c54617639d}}, ++ {"c1H/", uint64_t{0x993df040024ca3af}}, +- {"SuwpzQ==", uint64_t{0xc4e4c2acea740e96}, uint64_t{0x93d7f665b5521c8e}}, ++ {"SuwpzQ==", uint64_t{0xc4e4c2acea740e96}}, +- {"uqvy++M=", uint64_t{0x6a214b3db872d0cf}, uint64_t{0x646d70bb42445f28}}, ++ {"uqvy++M=", uint64_t{0x6a214b3db872d0cf}}, +- {"RnzCVPgb", uint64_t{0x44343db6a89dba4d}, uint64_t{0x96a7b1e3cc9bd426}}, ++ {"RnzCVPgb", uint64_t{0x44343db6a89dba4d}}, +- {"6OeNdlouYw==", uint64_t{0x77b5d6d1ae1dd483}, +- uint64_t{0x76020289ab0790c4}}, ++ {"6OeNdlouYw==", uint64_t{0x77b5d6d1ae1dd483}}, +- {"M5/JmmYyDbc=", uint64_t{0x89ab8ecb44d221f1}, +- uint64_t{0x39f842e4133b9b44}}, ++ {"M5/JmmYyDbc=", uint64_t{0x89ab8ecb44d221f1}}, +- {"MVijWiVdBRdY", uint64_t{0x60244b17577ca81b}, +- uint64_t{0x2b8d7047be4bcaab}}, ++ {"MVijWiVdBRdY", uint64_t{0x60244b17577ca81b}}, +- {"6V7Uq7LNxpu0VA==", uint64_t{0x59a08dcee0717067}, +- uint64_t{0x99628abef6716a97}}, ++ {"6V7Uq7LNxpu0VA==", uint64_t{0x59a08dcee0717067}}, +- {"EQ6CdEEhPdyHcOk=", uint64_t{0xf5f20db3ade57396}, +- uint64_t{0x4432e02ba42b2740}}, ++ {"EQ6CdEEhPdyHcOk=", uint64_t{0xf5f20db3ade57396}}, +- {"PqFB4fxnPgF+l+rc", uint64_t{0xbf8dee0751ad3efb}, +- uint64_t{0x74d810efcad7918a}}, ++ {"PqFB4fxnPgF+l+rc", uint64_t{0xbf8dee0751ad3efb}}, +- {"a5aPOFwq7LA7+zKvPA==", uint64_t{0x6b7a06b268d63e30}, +- uint64_t{0x88c84e986002507f}}, ++ {"a5aPOFwq7LA7+zKvPA==", uint64_t{0x6b7a06b268d63e30}}, +- {"VOwY21wCGv5D+/qqOvs=", uint64_t{0xb8c37f0ae0f54c82}, +- uint64_t{0x4f99acf193cf39b9}}, ++ {"VOwY21wCGv5D+/qqOvs=", uint64_t{0xb8c37f0ae0f54c82}}, +- {"KdHmBTx8lHXYvmGJ+Vy7", uint64_t{0x9fcbed0c38e50eef}, +- uint64_t{0xd90e7a3655891e37}}, ++ {"KdHmBTx8lHXYvmGJ+Vy7", uint64_t{0x9fcbed0c38e50eef}}, +- {"qJkPlbHr8bMF7/cA6aE65Q==", uint64_t{0x2af4bade1d8e3a1d}, +- uint64_t{0x3bb378b1d4df8fcf}}, ++ {"qJkPlbHr8bMF7/cA6aE65Q==", uint64_t{0x2af4bade1d8e3a1d}}, +- {"ygvL0EhHZL0fIx6oHHtkxRQ=", uint64_t{0x714e3aa912da2f2c}, +- uint64_t{0xf78e94045c052d47}}, ++ {"ygvL0EhHZL0fIx6oHHtkxRQ=", uint64_t{0x714e3aa912da2f2c}}, +- {"c1rFXkt5YztwZCQRngncqtSs", uint64_t{0xf5ee75e3cbb82c1c}, +- uint64_t{0x26da0b2130da6b40}}, ++ {"c1rFXkt5YztwZCQRngncqtSs", uint64_t{0xf5ee75e3cbb82c1c}}, +- {"8hsQrzszzeNQSEcVXLtvIhm6mw==", uint64_t{0x620e7007321b93b9}, +- uint64_t{0x30b4d426af8c6986}}, ++ {"8hsQrzszzeNQSEcVXLtvIhm6mw==", uint64_t{0x620e7007321b93b9}}, +- {"ffUL4RocfyP4KfikGxO1yk7omDI=", uint64_t{0xc08528cac2e551fc}, +- uint64_t{0x5413b4aaf3baaeae}}, ++ {"ffUL4RocfyP4KfikGxO1yk7omDI=", uint64_t{0xc08528cac2e551fc}}, +- {"OOB5TT00vF9Od/rLbAWshiErqhpV", uint64_t{0x6a1debf9cc3ad39}, +- uint64_t{0x756ab265370a1597}}, ++ {"OOB5TT00vF9Od/rLbAWshiErqhpV", uint64_t{0x6a1debf9cc3ad39}}, +- {"or5wtXM7BFzTNpSzr+Lw5J5PMhVJ/Q==", uint64_t{0x7e0a3c88111fc226}, +- uint64_t{0xdaf5f4b7d09814fb}}, ++ {"or5wtXM7BFzTNpSzr+Lw5J5PMhVJ/Q==", uint64_t{0x7e0a3c88111fc226}}, +- {"gk6pCHDUsoopVEiaCrzVDhioRKxb844=", uint64_t{0x1301fef15df39edb}, +- uint64_t{0x8f874ae37742b75e}}, ++ {"gk6pCHDUsoopVEiaCrzVDhioRKxb844=", uint64_t{0x1301fef15df39edb}}, +- {"TNctmwlC5QbEM6/No4R/La3UdkfeMhzs", uint64_t{0x64e181f3d5817ab}, +- uint64_t{0x8fecd03956121ce8}}, ++ {"TNctmwlC5QbEM6/No4R/La3UdkfeMhzs", uint64_t{0x64e181f3d5817ab}}, +- {"SsQw9iAjhWz7sgcE9OwLuSC6hsM+BfHs2Q==", uint64_t{0xafafc44961078ecb}, +- uint64_t{0x229c292ea7a08285}}, ++ {"SsQw9iAjhWz7sgcE9OwLuSC6hsM+BfHs2Q==", uint64_t{0xafafc44961078ecb}}, +- {"ZzO3mVCj4xTT2TT3XqDyEKj2BZQBvrS8RHg=", uint64_t{0x4f7bb45549250094}, +- uint64_t{0xbb4bf0692d14bae}}, ++ {"ZzO3mVCj4xTT2TT3XqDyEKj2BZQBvrS8RHg=", uint64_t{0x4f7bb45549250094}}, +- {"+klp5iPQGtppan5MflEls0iEUzqU+zGZkDJX", uint64_t{0xa30061abaa2818c}, +- uint64_t{0x207b24ca3bdac1db}}, ++ {"+klp5iPQGtppan5MflEls0iEUzqU+zGZkDJX", uint64_t{0xa30061abaa2818c}}, +- {"RO6bvOnlJc8I9eniXlNgqtKy0IX6VNg16NRmgg==", uint64_t{0xd902ee3e44a5705f}, +- uint64_t{0x64f6cd6745d3825b}}, ++ {"RO6bvOnlJc8I9eniXlNgqtKy0IX6VNg16NRmgg==", ++ uint64_t{0xd902ee3e44a5705f}}, +- {"ZJjZqId1ZXBaij9igClE3nyliU5XWdNRrayGlYA=", uint64_t{0x316d36da516f583}, +- uint64_t{0xa2b2e1656b58df1e}}, ++ {"ZJjZqId1ZXBaij9igClE3nyliU5XWdNRrayGlYA=", uint64_t{0x316d36da516f583}}, +- {"7BfkhfGMDGbxfMB8uyL85GbaYQtjr2K8g7RpLzr/", uint64_t{0x402d83f9f834f616}, +- uint64_t{0xd01d30d9ee7a148}}, ++ {"7BfkhfGMDGbxfMB8uyL85GbaYQtjr2K8g7RpLzr/", ++ uint64_t{0x402d83f9f834f616}}, + {"rycWk6wHH7htETQtje9PidS2YzXBx+Qkg2fY7ZYS7A==", +- uint64_t{0x9c604164c016b72c}, uint64_t{0x1cb4cd00ab804e3b}}, ++ uint64_t{0x9c604164c016b72c}}, + {"RTkC2OUK+J13CdGllsH0H5WqgspsSa6QzRZouqx6pvI=", +- uint64_t{0x3f4507e01f9e73ba}, uint64_t{0x4697f2637fd90999}}, ++ uint64_t{0x3f4507e01f9e73ba}}, + {"tKjKmbLCNyrLCM9hycOAXm4DKNpM12oZ7dLTmUx5iwAi", +- uint64_t{0xc3fe0d5be8d2c7c7}, uint64_t{0x8383a756b5688c07}}, ++ uint64_t{0xc3fe0d5be8d2c7c7}}, + {"VprUGNH+5NnNRaORxgH/ySrZFQFDL+4VAodhfBNinmn8cg==", +- uint64_t{0x531858a40bfa7ea1}, uint64_t{0x695c29cb3696a975}}, ++ uint64_t{0x531858a40bfa7ea1}}, + {"gc1xZaY+q0nPcUvOOnWnT3bqfmT/geth/f7Dm2e/DemMfk4=", +- uint64_t{0x86689478a7a7e8fa}, uint64_t{0xda2e5a5a5e971521}}, ++ uint64_t{0x86689478a7a7e8fa}}, + {"Mr35fIxqx1ukPAL0su1yFuzzAU3wABCLZ8+ZUFsXn47UmAph", +- uint64_t{0x4ec948b8e7f27288}, uint64_t{0x7935d4befa056b2b}}, ++ uint64_t{0x4ec948b8e7f27288}}, + {"A9G8pw2+m7+rDtWYAdbl8tb2fT7FFo4hLi2vAsa5Y8mKH3CX3g==", +- uint64_t{0xce46c7213c10032}, uint64_t{0x38dd541ca95420fe}}, ++ uint64_t{0xce46c7213c10032}}, + {"DFaJGishGwEHDdj9ixbCoaTjz9KS0phLNWHVVdFsM93CvPft3hM=", +- uint64_t{0xf63e96ee6f32a8b6}, uint64_t{0xcc06c7a4963f967f}}, ++ uint64_t{0xf63e96ee6f32a8b6}}, + {"7+Ugx+Kr3aRNgYgcUxru62YkTDt5Hqis+2po81hGBkcrJg4N0uuy", +- uint64_t{0x1cfe85e65fc5225}, uint64_t{0xbf0f6f66e232fb20}}, ++ uint64_t{0x1cfe85e65fc5225}}, + {"H2w6O8BUKqu6Tvj2xxaecxEI2wRgIgqnTTG1WwOgDSINR13Nm4d4Vg==", +- uint64_t{0x45c474f1cee1d2e8}, uint64_t{0xf7efb32d373fe71a}}, ++ uint64_t{0x45c474f1cee1d2e8}}, + {"1XBMnIbqD5jy65xTDaf6WtiwtdtQwv1dCVoqpeKj+7cTR1SaMWMyI04=", +- uint64_t{0x6e024e14015f329c}, uint64_t{0xe2e64634b1c12660}}, ++ uint64_t{0x6e024e14015f329c}}, + {"znZbdXG2TSFrKHEuJc83gPncYpzXGbAebUpP0XxzH0rpe8BaMQ17nDbt", +- uint64_t{0x760c40502103ae1c}, uint64_t{0x285b8fd1638e306d}}, ++ uint64_t{0x760c40502103ae1c}}, + {"ylu8Atu13j1StlcC1MRMJJXIl7USgDDS22HgVv0WQ8hx/8pNtaiKB17hCQ==", +- uint64_t{0x17fd05c3c560c320}, uint64_t{0x658e8a4e3b714d6c}}, ++ uint64_t{0x17fd05c3c560c320}}, + {"M6ZVVzsd7vAvbiACSYHioH/440dp4xG2mLlBnxgiqEvI/aIEGpD0Sf4VS0g=", +- uint64_t{0x8b34200a6f8e90d9}, uint64_t{0xf391fb968e0eb398}}, ++ uint64_t{0x8b34200a6f8e90d9}}, + {"li3oFSXLXI+ubUVGJ4blP6mNinGKLHWkvGruun85AhVn6iuMtocbZPVhqxzn", +- uint64_t{0x6be89e50818bdf69}, uint64_t{0x744a9ea0cc144bf2}}, ++ uint64_t{0x6be89e50818bdf69}}, + {"kFuQHuUCqBF3Tc3hO4dgdIp223ShaCoog48d5Do5zMqUXOh5XpGK1t5XtxnfGA==", +- uint64_t{0xfb389773315b47d8}, uint64_t{0x12636f2be11012f1}}, ++ uint64_t{0xfb389773315b47d8}}, + {"jWmOad0v0QhXVJd1OdGuBZtDYYS8wBVHlvOeTQx9ZZnm8wLEItPMeihj72E0nWY=", +- uint64_t{0x4f2512a23f61efee}, uint64_t{0x29c57de825948f80}}, ++ uint64_t{0x4f2512a23f61efee}}, + {"z+DHU52HaOQdW4JrZwDQAebEA6rm13Zg/9lPYA3txt3NjTBqFZlOMvTRnVzRbl23", +- uint64_t{0x59ccd92fc16c6fda}, uint64_t{0x58c6f99ab0d1c021}}, ++ uint64_t{0x59ccd92fc16c6fda}}, + {"MmBiGDfYeTayyJa/tVycg+rN7f9mPDFaDc+23j0TlW9094er0ADigsl4QX7V3gG/qw==", +- uint64_t{0x25c5a7f5bd330919}, uint64_t{0x13e7b5a7b82fe3bb}}, ++ uint64_t{0x25c5a7f5bd330919}}, + {"774RK+9rOL4iFvs1q2qpo/JVc/I39buvNjqEFDtDvyoB0FXxPI2vXqOrk08VPfIHkmU=", +- uint64_t{0x51df4174d34c97d7}, uint64_t{0x10fbc87901e02b63}}, ++ uint64_t{0x51df4174d34c97d7}}, + {"+slatXiQ7/2lK0BkVUI1qzNxOOLP3I1iK6OfHaoxgqT63FpzbElwEXSwdsryq3UlHK0I", +- uint64_t{0x80ce6d76f89cb57}, uint64_t{0xa24c9184901b748b}}, ++ uint64_t{0x80ce6d76f89cb57}}, + {"64mVTbQ47dHjHlOHGS/hjJwr/" + "K2frCNpn87exOqMzNUVYiPKmhCbfS7vBUce5tO6Ec9osQ==", +- uint64_t{0x20961c911965f684}, uint64_t{0xcac4fd4c5080e581}}, ++ uint64_t{0x20961c911965f684}}, + {"fIsaG1r530SFrBqaDj1kqE0AJnvvK8MNEZbII2Yw1OK77v0V59xabIh0B5axaz/" + "+a2V5WpA=", +- uint64_t{0x4e5b926ec83868e7}, uint64_t{0xc38bdb7483ba68e1}}, ++ uint64_t{0x4e5b926ec83868e7}}, + {"PGih0zDEOWCYGxuHGDFu9Ivbff/" + "iE7BNUq65tycTR2R76TerrXALRosnzaNYO5fjFhTi+CiS", +- uint64_t{0x3927b30b922eecef}, uint64_t{0xdb2a8069b2ceaffa}}, ++ uint64_t{0x3927b30b922eecef}}, + {"RnpA/" + "zJnEnnLjmICORByRVb9bCOgxF44p3VMiW10G7PvW7IhwsWajlP9kIwNA9FjAD2GoQHk2Q=" + "=", +- uint64_t{0xbd0291284a49b61c}, uint64_t{0xdf9fe91d0d1c7887}}, ++ uint64_t{0xbd0291284a49b61c}}, + {"qFklMceaTHqJpy2qavJE+EVBiNFOi6OxjOA3LeIcBop1K7w8xQi3TrDk+" + "BrWPRIbfprszSaPfrI=", +- uint64_t{0x73a77c575bcc956}, uint64_t{0xe83f49e96e2e6a08}}, ++ uint64_t{0x73a77c575bcc956}}, + {"cLbfUtLl3EcQmITWoTskUR8da/VafRDYF/ylPYwk7/" + "zazk6ssyrzxMN3mmSyvrXR2yDGNZ3WDrTT", +- uint64_t{0x766a0e2ade6d09a6}, uint64_t{0xc69e61b62ca2b62}}, ++ uint64_t{0x766a0e2ade6d09a6}}, + {"s/" + "Jf1+" + "FbsbCpXWPTUSeWyMH6e4CvTFvPE5Fs6Z8hvFITGyr0dtukHzkI84oviVLxhM1xMxrMAy1db" + "w==", +- uint64_t{0x2599f4f905115869}, uint64_t{0xb4a4f3f85f8298fe}}, ++ uint64_t{0x2599f4f905115869}}, + {"FvyQ00+j7nmYZVQ8hI1Edxd0AWplhTfWuFGiu34AK5X8u2hLX1bE97sZM0CmeLe+" + "7LgoUT1fJ/axybE=", +- uint64_t{0xd8256e5444d21e53}, uint64_t{0x167a1b39e1e95f41}}, ++ uint64_t{0xd8256e5444d21e53}}, + {"L8ncxMaYLBH3g9buPu8hfpWZNlOF7nvWLNv9IozH07uQsIBWSKxoPy8+" + "LW4tTuzC6CIWbRGRRD1sQV/4", +- uint64_t{0xf664a91333fb8dfd}, uint64_t{0xf8a2a5649855ee41}}, ++ uint64_t{0xf664a91333fb8dfd}}, + {"CDK0meI07yrgV2kQlZZ+" + "wuVqhc2NmzqeLH7bmcA6kchsRWFPeVF5Wqjjaj556ABeUoUr3yBmfU3kWOakkg==", +- uint64_t{0x9625b859be372cd1}, uint64_t{0x27992565b595c498}}, ++ uint64_t{0x9625b859be372cd1}}, + {"d23/vc5ONh/" + "HkMiq+gYk4gaCNYyuFKwUkvn46t+dfVcKfBTYykr4kdvAPNXGYLjM4u1YkAEFpJP+" + "nX7eOvs=", +- uint64_t{0x7b99940782e29898}, uint64_t{0x3e08cca5b71f9346}}, ++ uint64_t{0x7b99940782e29898}}, + {"NUR3SRxBkxTSbtQORJpu/GdR6b/h6sSGfsMj/KFd99ahbh+9r7LSgSGmkGVB/" + "mGoT0pnMTQst7Lv2q6QN6Vm", +- uint64_t{0x4fe12fa5383b51a8}, uint64_t{0xad406b10c770a6d2}}, ++ uint64_t{0x4fe12fa5383b51a8}}, + {"2BOFlcI3Z0RYDtS9T9Ie9yJoXlOdigpPeeT+CRujb/" + "O39Ih5LPC9hP6RQk1kYESGyaLZZi3jtabHs7DiVx/VDg==", +- uint64_t{0xe2ccb09ac0f5b4b6}, uint64_t{0xd1713ce6e552bcf2}}, ++ uint64_t{0xe2ccb09ac0f5b4b6}}, + {"FF2HQE1FxEvWBpg6Z9zAMH+Zlqx8S1JD/" + "wIlViL6ZDZY63alMDrxB0GJQahmAtjlm26RGLnjW7jmgQ4Ie3I+014=", +- uint64_t{0x7d0a37adbd7b753b}, uint64_t{0x753b287194c73ad3}}, ++ uint64_t{0x7d0a37adbd7b753b}}, + {"tHmO7mqVL/PX11nZrz50Hc+M17Poj5lpnqHkEN+4bpMx/" + "YGbkrGOaYjoQjgmt1X2QyypK7xClFrjeWrCMdlVYtbW", +- uint64_t{0xd3ae96ef9f7185f2}, uint64_t{0x5ae41a95f600af1c}}, ++ uint64_t{0xd3ae96ef9f7185f2}}, + {"/WiHi9IQcxRImsudkA/KOTqGe8/" + "gXkhKIHkjddv5S9hi02M049dIK3EUyAEjkjpdGLUs+BN0QzPtZqjIYPOgwsYE9g==", +- uint64_t{0x4fb88ea63f79a0d8}, uint64_t{0x4a61163b86a8bb4c}}, ++ uint64_t{0x4fb88ea63f79a0d8}}, + {"qds+1ExSnU11L4fTSDz/QE90g4Jh6ioqSh3KDOTOAo2pQGL1k/" + "9CCC7J23YF27dUTzrWsCQA2m4epXoCc3yPHb3xElA=", +- uint64_t{0xed564e259bb5ebe9}, uint64_t{0x42eeaa79e760c7e4}}, ++ uint64_t{0xed564e259bb5ebe9}}, + {"8FVYHx40lSQPTHheh08Oq0/" + "pGm2OlG8BEf8ezvAxHuGGdgCkqpXIueJBF2mQJhTfDy5NncO8ntS7vaKs7sCNdDaNGOEi", +- uint64_t{0x3e3256b60c428000}, uint64_t{0x698df622ef465b0a}}, ++ uint64_t{0x3e3256b60c428000}}, + {"4ZoEIrJtstiCkeew3oRzmyJHVt/pAs2pj0HgHFrBPztbQ10NsQ/" + "lM6DM439QVxpznnBSiHMgMQJhER+70l72LqFTO1JiIQ==", +- uint64_t{0xfb05bad59ec8705}, uint64_t{0x157583111e1a6026}}, ++ uint64_t{0xfb05bad59ec8705}}, + {"hQPtaYI+wJyxXgwD5n8jGIKFKaFA/" + "P83KqCKZfPthnjwdOFysqEOYwAaZuaaiv4cDyi9TyS8hk5cEbNP/jrI7q6pYGBLbsM=", +- uint64_t{0xafdc251dbf97b5f8}, uint64_t{0xaa1388f078e793e0}}, ++ uint64_t{0xafdc251dbf97b5f8}}, + {"S4gpMSKzMD7CWPsSfLeYyhSpfWOntyuVZdX1xSBjiGvsspwOZcxNKCRIOqAA0moUfOh3I5+" + "juQV4rsqYElMD/gWfDGpsWZKQ", +- uint64_t{0x10ec9c92ddb5dcbc}, uint64_t{0xf10d68d0f3309360}}, ++ uint64_t{0x10ec9c92ddb5dcbc}}, + {"oswxop+" + "bthuDLT4j0PcoSKby4LhF47ZKg8K17xxHf74UsGCzTBbOz0MM8hQEGlyqDT1iUiAYnaPaUp" + "L2mRK0rcIUYA4qLt5uOw==", +- uint64_t{0x9a767d5822c7dac4}, uint64_t{0x2af056184457a3de}}, ++ uint64_t{0x9a767d5822c7dac4}}, + {"0II/" + "697p+" + "BtLSjxj5989OXI004TogEb94VUnDzOVSgMXie72cuYRvTFNIBgtXlKfkiUjeqVpd4a+" + "n5bxNOD1TGrjQtzKU5r7obo=", +- uint64_t{0xee46254080d6e2db}, uint64_t{0x6d0058e1590b2489}}, ++ uint64_t{0xee46254080d6e2db}}, + {"E84YZW2qipAlMPmctrg7TKlwLZ68l4L+c0xRDUfyyFrA4MAti0q9sHq3TDFviH0Y+" + "Kq3tEE5srWFA8LM9oomtmvm5PYxoaarWPLc", +- uint64_t{0xbbb669588d8bf398}, uint64_t{0x638f287f68817f12}}, ++ uint64_t{0xbbb669588d8bf398}}, + {"x3pa4HIElyZG0Nj7Vdy9IdJIR4izLmypXw5PCmZB5y68QQ4uRaVVi3UthsoJROvbjDJkP2D" + "Q6L/eN8pFeLFzNPKBYzcmuMOb5Ull7w==", +- uint64_t{0xdc2afaa529beef44}, uint64_t{0xc46b71fecefd5467}}, ++ uint64_t{0xdc2afaa529beef44}}, + {"jVDKGYIuWOP/" + "QKLdd2wi8B2VJA8Wh0c8PwrXJVM8FOGM3voPDVPyDJOU6QsBDPseoR8uuKd19OZ/" + "zAvSCB+zlf6upAsBlheUKgCfKww=", +- uint64_t{0xf1f67391d45013a8}, uint64_t{0x2c8e94679d964e0a}}, ++ uint64_t{0xf1f67391d45013a8}}, + {"mkquunhmYe1aR2wmUz4vcvLEcKBoe6H+kjUok9VUn2+eTSkWs4oDDtJvNCWtY5efJwg/" + "j4PgjRYWtqnrCkhaqJaEvkkOwVfgMIwF3e+d", +- uint64_t{0x16fce2b8c65a3429}, uint64_t{0x8612b797ce22503a}}, ++ uint64_t{0x16fce2b8c65a3429}}, + {"fRelvKYonTQ+s+rnnvQw+JzGfFoPixtna0vzcSjiDqX5s2Kg2//" + "UGrK+AVCyMUhO98WoB1DDbrsOYSw2QzrcPe0+3ck9sePvb+Q/IRaHbw==", +- uint64_t{0xf4b096699f49fe67}, uint64_t{0x59f929babfba7170}}, ++ uint64_t{0xf4b096699f49fe67}}, + {"DUwXFJzagljo44QeJ7/" + "6ZKw4QXV18lhkYT2jglMr8WB3CHUU4vdsytvw6AKv42ZcG6fRkZkq9fpnmXy6xG0aO3WPT1" + "eHuyFirAlkW+zKtwg=", +- uint64_t{0xca584c4bc8198682}, uint64_t{0x9527556923fb49a0}}, ++ uint64_t{0xca584c4bc8198682}}, + {"cYmZCrOOBBongNTr7e4nYn52uQUy2mfe48s50JXx2AZ6cRAt/" + "xRHJ5QbEoEJOeOHsJyM4nbzwFm++SlT6gFZZHJpkXJ92JkR86uS/eV1hJUR", +- uint64_t{0xed269fc3818b6aad}, uint64_t{0x1039ab644f5e150b}}, ++ uint64_t{0xed269fc3818b6aad}}, + {"EXeHBDfhwzAKFhsMcH9+2RHwV+mJaN01+9oacF6vgm8mCXRd6jeN9U2oAb0of5c5cO4i+" + "Vb/LlHZSMI490SnHU0bejhSCC2gsC5d2K30ER3iNA==", +- uint64_t{0x33f253cbb8fe66a8}, uint64_t{0x7816c83f3aa05e6d}}, ++ uint64_t{0x33f253cbb8fe66a8}}, + {"FzkzRYoNjkxFhZDso94IHRZaJUP61nFYrh5MwDwv9FNoJ5jyNCY/" + "eazPZk+tbmzDyJIGw2h3GxaWZ9bSlsol/vK98SbkMKCQ/wbfrXRLcDzdd/8=", +- uint64_t{0xd0b76b2c1523d99c}, uint64_t{0xf51d2f564518c619}}, ++ uint64_t{0xd0b76b2c1523d99c}}, + {"Re4aXISCMlYY/XsX7zkIFR04ta03u4zkL9dVbLXMa/q6hlY/CImVIIYRN3VKP4pnd0AUr/" + "ugkyt36JcstAInb4h9rpAGQ7GMVOgBniiMBZ/MGU7H", +- uint64_t{0xfd28f0811a2a237f}, uint64_t{0x67d494cff03ac004}}, ++ uint64_t{0xfd28f0811a2a237f}}, + {"ueLyMcqJXX+MhO4UApylCN9WlTQ+" + "ltJmItgG7vFUtqs2qNwBMjmAvr5u0sAKd8jpzV0dDPTwchbIeAW5zbtkA2NABJV6hFM48ib" + "4/J3A5mseA3cS8w==", +- uint64_t{0x6261fb136482e84}, uint64_t{0x2802d636ced1cfbb}}, ++ uint64_t{0x6261fb136482e84}}, + {"6Si7Yi11L+jZMkwaN+GUuzXMrlvEqviEkGOilNq0h8TdQyYKuFXzkYc/" + "q74gP3pVCyiwz9KpVGMM9vfnq36riMHRknkmhQutxLZs5fbmOgEO69HglCU=", +- uint64_t{0x458efc750bca7c3a}, uint64_t{0xf64e20bad771cb12}}, ++ uint64_t{0x458efc750bca7c3a}}, + {"Q6AbOofGuTJOegPh9Clm/" + "9crtUMQqylKrTc1fhfJo1tqvpXxhU4k08kntL1RG7woRnFrVh2UoMrL1kjin+s9CanT+" + "y4hHwLqRranl9FjvxfVKm3yvg68", +- uint64_t{0xa7e69ff84e5e7c27}, uint64_t{0xb9a6cf84a83e15e}}, ++ uint64_t{0xa7e69ff84e5e7c27}}, + {"ieQEbIPvqY2YfIjHnqfJiO1/MIVRk0RoaG/WWi3kFrfIGiNLCczYoklgaecHMm/" + "1sZ96AjO+a5stQfZbJQwS7Sc1ODABEdJKcTsxeW2hbh9A6CFzpowP1A==", +- uint64_t{0x3c59bfd0c29efe9e}, uint64_t{0x8da6630319609301}}, ++ uint64_t{0x3c59bfd0c29efe9e}}, + {"zQUv8hFB3zh2GGl3KTvCmnfzE+" + "SUgQPVaSVIELFX5H9cE3FuVFGmymkPQZJLAyzC90Cmi8GqYCvPqTuAAB//" + "XTJxy4bCcVArgZG9zJXpjowpNBfr3ngWrSE=", +- uint64_t{0x10befacc6afd298d}, uint64_t{0x40946a86e2a996f3}}, ++ uint64_t{0x10befacc6afd298d}}, + {"US4hcC1+op5JKGC7eIs8CUgInjKWKlvKQkapulxW262E/" + "B2ye79QxOexf188u2mFwwe3WTISJHRZzS61IwljqAWAWoBAqkUnW8SHmIDwHUP31J0p5sGd" + "P47L", +- uint64_t{0x41d5320b0a38efa7}, uint64_t{0xcab7f5997953fa76}}, ++ uint64_t{0x41d5320b0a38efa7}}, + {"9bHUWFna2LNaGF6fQLlkx1Hkt24nrkLE2CmFdWgTQV3FFbUe747SSqYw6ebpTa07MWSpWRP" + "sHesVo2B9tqHbe7eQmqYebPDFnNqrhSdZwFm9arLQVs+7a3Ic6A==", +- uint64_t{0x58db1c7450fe17f3}, uint64_t{0x39129ca0e04fc465}}, ++ uint64_t{0x58db1c7450fe17f3}}, + {"Kb3DpHRUPhtyqgs3RuXjzA08jGb59hjKTOeFt1qhoINfYyfTt2buKhD6YVffRCPsgK9SeqZ" + "qRPJSyaqsa0ovyq1WnWW8jI/NhvAkZTVHUrX2pC+cD3OPYT05Dag=", +- uint64_t{0x6098c055a335b7a6}, uint64_t{0x5238221fd685e1b8}}, ++ uint64_t{0x6098c055a335b7a6}}, + {"gzxyMJIPlU+bJBwhFUCHSofZ/" + "319LxqMoqnt3+L6h2U2+ZXJCSsYpE80xmR0Ta77Jq54o92SMH87HV8dGOaCTuAYF+" + "lDL42SY1P316Cl0sZTS2ow3ZqwGbcPNs/1", +- uint64_t{0x1bbacec67845a801}, uint64_t{0x175130c407dbcaab}}, ++ uint64_t{0x1bbacec67845a801}}, + {"uR7V0TW+FGVMpsifnaBAQ3IGlr1wx5sKd7TChuqRe6OvUXTlD4hKWy8S+" + "8yyOw8lQabism19vOQxfmocEOW/" + "vzY0pEa87qHrAZy4s9fH2Bltu8vaOIe+agYohhYORQ==", +- uint64_t{0xc419cfc7442190}, uint64_t{0x2f20e7536c0b0df}}, ++ uint64_t{0xc419cfc7442190}}, + {"1UR5eoo2aCwhacjZHaCh9bkOsITp6QunUxHQ2SfeHv0imHetzt/" + "Z70mhyWZBalv6eAx+YfWKCUib2SHDtz/" + "A2dc3hqUWX5VfAV7FQsghPUAtu6IiRatq4YSLpDvKZBQ=", +- uint64_t{0xc95e510d94ba270c}, uint64_t{0x2742cb488a04ad56}}, ++ uint64_t{0xc95e510d94ba270c}}, + {"opubR7H63BH7OtY+Avd7QyQ25UZ8kLBdFDsBTwZlY6gA/" + "u+x+" + "czC9AaZMgmQrUy15DH7YMGsvdXnviTtI4eVI4aF1H9Rl3NXMKZgwFOsdTfdcZeeHVRzBBKX" + "8jUfh1il", +- uint64_t{0xff1ae05c98089c3f}, uint64_t{0xd6afb593879ff93b}}, ++ uint64_t{0xff1ae05c98089c3f}}, + {"DC0kXcSXtfQ9FbSRwirIn5tgPri0sbzHSa78aDZVDUKCMaBGyFU6BmrulywYX8yzvwprdLs" + "oOwTWN2wMjHlPDqrvVHNEjnmufRDblW+nSS+xtKNs3N5xsxXdv6JXDrAB/Q==", +- uint64_t{0x90c02b8dceced493}, uint64_t{0xf50ad64caac0ca7f}}, ++ uint64_t{0x90c02b8dceced493}}, + {"BXRBk+3wEP3Lpm1y75wjoz+PgB0AMzLe8tQ1AYU2/" + "oqrQB2YMC6W+9QDbcOfkGbeH+b7IBkt/" + "gwCMw2HaQsRFEsurXtcQ3YwRuPz5XNaw5NAvrNa67Fm7eRzdE1+hWLKtA8=", +- uint64_t{0x9f8a76697ab1aa36}, uint64_t{0x2ade95c4261364ae}}, ++ uint64_t{0x9f8a76697ab1aa36}}, + {"RRBSvEGYnzR9E45Aps/+WSnpCo/X7gJLO4DRnUqFrJCV/kzWlusLE/" + "6ZU6RoUf2ROwcgEvUiXTGjLs7ts3t9SXnJHxC1KiOzxHdYLMhVvgNd3hVSAXODpKFSkVXND" + "55G2L1W", +- uint64_t{0x6ba1bf3d811a531d}, uint64_t{0x5c4f3299faacd07a}}, ++ uint64_t{0x6ba1bf3d811a531d}}, + {"jeh6Qazxmdi57pa9S3XSnnZFIRrnc6s8QLrah5OX3SB/V2ErSPoEAumavzQPkdKF1/" + "SfvmdL+qgF1C+Yawy562QaFqwVGq7+tW0yxP8FStb56ZRgNI4IOmI30s1Ei7iops9Uuw==", +- uint64_t{0x6a418974109c67b4}, uint64_t{0xfffe3bff0ae5e9bc}}, ++ uint64_t{0x6a418974109c67b4}}, + {"6QO5nnDrY2/" + "wrUXpltlKy2dSBcmK15fOY092CR7KxAjNfaY+" + "aAmtWbbzQk3MjBg03x39afSUN1fkrWACdyQKRaGxgwq6MGNxI6W+8DLWJBHzIXrntrE/" + "ml6fnNXEpxplWJ1vEs4=", +- uint64_t{0x8472f1c2b3d230a3}, uint64_t{0x1db785c0005166e4}}, ++ uint64_t{0x8472f1c2b3d230a3}}, + {"0oPxeEHhqhcFuwonNfLd5jF3RNATGZS6NPoS0WklnzyokbTqcl4BeBkMn07+fDQv83j/" + "BpGUwcWO05f3+DYzocfnizpFjLJemFGsls3gxcBYxcbqWYev51tG3lN9EvRE+X9+Pwww", +- uint64_t{0x5e06068f884e73a7}, uint64_t{0xea000d962ad18418}}, ++ uint64_t{0x5e06068f884e73a7}}, + {"naSBSjtOKgAOg8XVbR5cHAW3Y+QL4Pb/JO9/" + "oy6L08wvVRZqo0BrssMwhzBP401Um7A4ppAupbQeJFdMrysY34AuSSNvtNUy5VxjNECwiNt" + "gwYHw7yakDUv8WvonctmnoSPKENegQg==", +- uint64_t{0x55290b1a8f170f59}, uint64_t{0xe42aef38359362d9}}, ++ uint64_t{0x55290b1a8f170f59}}, + {"vPyl8DxVeRe1OpilKb9KNwpGkQRtA94UpAHetNh+" + "95V7nIW38v7PpzhnTWIml5kw3So1Si0TXtIUPIbsu32BNhoH7QwFvLM+" + "JACgSpc5e3RjsL6Qwxxi11npwxRmRUqATDeMUfRAjxg=", +- uint64_t{0x5501cfd83dfe706a}, uint64_t{0xc8e95657348a3891}}, ++ uint64_t{0x5501cfd83dfe706a}}, + {"QC9i2GjdTMuNC1xQJ74ngKfrlA4w3o58FhvNCltdIpuMhHP1YsDA78scQPLbZ3OCUgeQguY" + "f/vw6zAaVKSgwtaykqg5ka/4vhz4hYqWU5ficdXqClHl+zkWEY26slCNYOM5nnDlly8Cj", +- uint64_t{0xe43ed13d13a66990}, uint64_t{0xc162eca864f238c6}}, ++ uint64_t{0xe43ed13d13a66990}}, + {"7CNIgQhAHX27nxI0HeB5oUTnTdgKpRDYDKwRcXfSFGP1XeT9nQF6WKCMjL1tBV6x7KuJ91G" + "Zz11F4c+8s+MfqEAEpd4FHzamrMNjGcjCyrVtU6y+7HscMVzr7Q/" + "ODLcPEFztFnwjvCjmHw==", +- uint64_t{0xdf43bc375cf5283f}, uint64_t{0xbe1fb373e20579ad}}, ++ uint64_t{0xdf43bc375cf5283f}}, + {"Qa/hC2RPXhANSospe+gUaPfjdK/yhQvfm4cCV6/pdvCYWPv8p1kMtKOX3h5/" + "8oZ31fsmx4Axphu5qXJokuhZKkBUJueuMpxRyXpwSWz2wELx5glxF7CM0Fn+" + "OevnkhUn5jsPlG2r5jYlVn8=", +- uint64_t{0x8112b806d288d7b5}, uint64_t{0x628a1d4f40aa6ffd}}, ++ uint64_t{0x8112b806d288d7b5}}, + {"kUw/0z4l3a89jTwN5jpG0SHY5km/" + "IVhTjgM5xCiPRLncg40aqWrJ5vcF891AOq5hEpSq0bUCJUMFXgct7kvnys905HjerV7Vs1G" + "y84tgVJ70/2+pAZTsB/PzNOE/G6sOj4+GbTzkQu819OLB", +- uint64_t{0xd52a18abb001cb46}, uint64_t{0xa87bdb7456340f90}}, ++ uint64_t{0xd52a18abb001cb46}}, + {"VDdfSDbO8Tdj3T5W0XM3EI7iHh5xpIutiM6dvcJ/fhe23V/srFEkDy5iZf/" + "VnA9kfi2C79ENnFnbOReeuZW1b3MUXB9lgC6U4pOTuC+" + "jHK3Qnpyiqzj7h3ISJSuo2pob7vY6VHZo6Fn7exEqHg==", +- uint64_t{0xe12b76a2433a1236}, uint64_t{0x5960ef3ba982c801}}, ++ uint64_t{0xe12b76a2433a1236}}, + {"Ldfvy3ORdquM/R2fIkhH/ONi69mcP1AEJ6n/" + "oropwecAsLJzQSgezSY8bEiEs0VnFTBBsW+RtZY6tDj03fnb3amNUOq1b7jbqyQkL9hpl+" + "2Z2J8IaVSeownWl+bQcsR5/xRktIMckC5AtF4YHfU=", +- uint64_t{0x175bf7319cf1fa00}, uint64_t{0x5026586df9a431ec}}, ++ uint64_t{0x175bf7319cf1fa00}}, + {"BrbNpb42+" + "VzZAjJw6QLirXzhweCVRfwlczzZ0VX2xluskwBqyfnGovz5EuX79JJ31VNXa5hTkAyQat3l" + "YKRADTdAdwE5PqM1N7YaMqqsqoAAAeuYVXuk5eWCykYmClNdSspegwgCuT+403JigBzi", +- uint64_t{0xd63d57b3f67525ae}, uint64_t{0xfe4b8a20fdf0840b}}, ++ uint64_t{0xd63d57b3f67525ae}}, + {"gB3NGHJJvVcuPyF0ZSvHwnWSIfmaI7La24VMPQVoIIWF7Z74NltPZZpx2f+cocESM+" + "ILzQW9p+BC8x5IWz7N4Str2WLGKMdgmaBfNkEhSHQDU0IJEOnpUt0HmjhFaBlx0/" + "LTmhua+rQ6Wup8ezLwfg==", +- uint64_t{0x933faea858832b73}, uint64_t{0xdcb761867da7072f}}, ++ uint64_t{0x933faea858832b73}}, + {"hTKHlRxx6Pl4gjG+6ksvvj0CWFicUg3WrPdSJypDpq91LUWRni2KF6+" + "81ZoHBFhEBrCdogKqeK+hy9bLDnx7g6rAFUjtn1+cWzQ2YjiOpz4+" + "ROBB7lnwjyTGWzJD1rXtlso1g2qVH8XJVigC5M9AIxM=", +- uint64_t{0x53d061e5f8e7c04f}, uint64_t{0xc10d4653667275b7}}, ++ uint64_t{0x53d061e5f8e7c04f}}, + {"IWQBelSQnhrr0F3BhUpXUIDauhX6f95Qp+A0diFXiUK7irwPG1oqBiqHyK/SH/" + "9S+" + "rln9DlFROAmeFdH0OCJi2tFm4afxYzJTFR4HnR4cG4x12JqHaZLQx6iiu6CE3rtWBVz99oA" + "wCZUOEXIsLU24o2Y", +- uint64_t{0xdb4124556dd515e0}, uint64_t{0x727720deec13110b}}, ++ uint64_t{0xdb4124556dd515e0}}, + {"TKo+l+" + "1dOXdLvIrFqeLaHdm0HZnbcdEgOoLVcGRiCbAMR0j5pIFw8D36tefckAS1RCFOH5IgP8yiF" + "T0Gd0a2hI3+" + "fTKA7iK96NekxWeoeqzJyctc6QsoiyBlkZerRxs5RplrxoeNg29kKDTM0K94mnhD9g==", +- uint64_t{0x4fb31a0dd681ee71}, uint64_t{0x710b009662858dc9}}, ++ uint64_t{0x4fb31a0dd681ee71}}, + {"YU4e7G6EfQYvxCFoCrrT0EFgVLHFfOWRTJQJ5gxM3G2b+" + "1kJf9YPrpsxF6Xr6nYtS8reEEbDoZJYqnlk9lXSkVArm88Cqn6d25VCx3+" + "49MqC0trIlXtb7SXUUhwpJK16T0hJUfPH7s5cMZXc6YmmbFuBNPE=", +- uint64_t{0x27cc72eefa138e4c}, uint64_t{0xfbf8f7a3ecac1eb7}}, ++ uint64_t{0x27cc72eefa138e4c}}, + {"/I/" + "eImMwPo1U6wekNFD1Jxjk9XQVi1D+" + "FPdqcHifYXQuP5aScNQfxMAmaPR2XhuOQhADV5tTVbBKwCDCX4E3jcDNHzCiPvViZF1W27t" + "xaf2BbFQdwKrNCmrtzcluBFYu0XZfc7RU1RmxK/RtnF1qHsq/O4pp", +- uint64_t{0x44bc2dfba4bd3ced}, uint64_t{0xb6fc4fcd0722e3df}}, ++ uint64_t{0x44bc2dfba4bd3ced}}, + {"CJTT9WGcY2XykTdo8KodRIA29qsqY0iHzWZRjKHb9alwyJ7RZAE3V5Juv4MY3MeYEr1EPCC" + "MxO7yFXqT8XA8YTjaMp3bafRt17Pw8JC4iKJ1zN+WWKOESrj+" + "3aluGQqn8z1EzqY4PH7rLG575PYeWsP98BugdA==", +- uint64_t{0x242da1e3a439bed8}, uint64_t{0x7cb86dcc55104aac}}, ++ uint64_t{0x242da1e3a439bed8}}, + {"ZlhyQwLhXQyIUEnMH/" + "AEW27vh9xrbNKJxpWGtrEmKhd+nFqAfbeNBQjW0SfG1YI0xQkQMHXjuTt4P/" + "EpZRtA47ibZDVS8TtaxwyBjuIDwqcN09eCtpC+Ls+" + "vWDTLmBeDM3u4hmzz4DQAYsLiZYSJcldg9Q3wszw=", +- uint64_t{0xdc559c746e35c139}, uint64_t{0x19e71e9b45c3a51e}}, ++ uint64_t{0xdc559c746e35c139}}, + {"v2KU8y0sCrBghmnm8lzGJlwo6D6ObccAxCf10heoDtYLosk4ztTpLlpSFEyu23MLA1tJkcg" + "Rko04h19QMG0mOw/" + "wc93EXAweriBqXfvdaP85sZABwiKO+6rtS9pacRVpYYhHJeVTQ5NzrvBvi1huxAr+" + "xswhVMfL", +- uint64_t{0xd0b0350275b9989}, uint64_t{0x51de38573c2bea48}}, ++ uint64_t{0xd0b0350275b9989}}, + {"QhKlnIS6BuVCTQsnoE67E/" + "yrgogE8EwO7xLaEGei26m0gEU4OksefJgppDh3X0x0Cs78Dr9IHK5b977CmZlrTRmwhlP8p" + "M+UzXPNRNIZuN3ntOum/QhUWP8SGpirheXENWsXMQ/" + "nxtxakyEtrNkKk471Oov9juP8oQ==", +- uint64_t{0xb04489e41d17730c}, uint64_t{0xa73ab6996d6df158}}, ++ uint64_t{0xb04489e41d17730c}}, + {"/ZRMgnoRt+Uo6fUPr9FqQvKX7syhgVqWu+" + "WUSsiQ68UlN0efSP6Eced5gJZL6tg9gcYJIkhjuQNITU0Q3TjVAnAcobgbJikCn6qZ6pRxK" + "BY4MTiAlfGD3T7R7hwJwx554MAy++Zb/YUFlnCaCJiwQMnowF7aQzwYFCo=", +- uint64_t{0x2217285eb4572156}, uint64_t{0x55ef2b8c930817b2}}, ++ uint64_t{0x2217285eb4572156}}, + {"NB7tU5fNE8nI+SXGfipc7sRkhnSkUF1krjeo6k+8FITaAtdyz+" + "o7mONgXmGLulBPH9bEwyYhKNVY0L+njNQrZ9YC2aXsFD3PdZsxAFaBT3VXEzh+" + "NGBTjDASNL3mXyS8Yv1iThGfHoY7T4aR0NYGJ+k+pR6f+KrPC96M", +- uint64_t{0x12c2e8e68aede73b}, uint64_t{0xb2850bf5fae87157}}, ++ uint64_t{0x12c2e8e68aede73b}}, + {"8T6wrqCtEO6/rwxF6lvMeyuigVOLwPipX/FULvwyu+1wa5sQGav/" + "2FsLHUVn6cGSi0LlFwLewGHPFJDLR0u4t7ZUyM//" + "x6da0sWgOa5hzDqjsVGmjxEHXiaXKW3i4iSZNuxoNbMQkIbVML+" + "DkYu9ND0O2swg4itGeVSzXA==", +- uint64_t{0x4d612125bdc4fd00}, uint64_t{0xecf3de1acd04651f}}, ++ uint64_t{0x4d612125bdc4fd00}}, + {"Ntf1bMRdondtMv1CYr3G80iDJ4WSAlKy5H34XdGruQiCrnRGDBa+" + "eUi7vKp4gp3BBcVGl8eYSasVQQjn7MLvb3BjtXx6c/" + "bCL7JtpzQKaDnPr9GWRxpBXVxKREgMM7d8lm35EODv0w+" + "hQLfVSh8OGs7fsBb68nNWPLeeSOo=", +- uint64_t{0x81826b553954464e}, uint64_t{0xcc0a40552559ff32}}, ++ uint64_t{0x81826b553954464e}}, + {"VsSAw72Ro6xks02kaiLuiTEIWBC5bgqr4WDnmP8vglXzAhixk7td926rm9jNimL+" + "kroPSygZ9gl63aF5DCPOACXmsbmhDrAQuUzoh9ZKhWgElLQsrqo1KIjWoZT5b5QfVUXY9lS" + "IBg3U75SqORoTPq7HalxxoIT5diWOcJQi", +- uint64_t{0xc2e5d345dc0ddd2d}, uint64_t{0xc385c374f20315b1}}, ++ uint64_t{0xc2e5d345dc0ddd2d}}, + {"j+loZ+C87+" + "bJxNVebg94gU0mSLeDulcHs84tQT7BZM2rzDSLiCNxUedHr1ZWJ9ejTiBa0dqy2I2ABc++" + "xzOLcv+//YfibtjKtYggC6/3rv0XCc7xu6d/" + "O6xO+XOBhOWAQ+IHJVHf7wZnDxIXB8AUHsnjEISKj7823biqXjyP3g==", +- uint64_t{0x3da6830a9e32631e}, uint64_t{0xb90208a4c7234183}}, ++ uint64_t{0x3da6830a9e32631e}}, + {"f3LlpcPElMkspNtDq5xXyWU62erEaKn7RWKlo540gR6mZsNpK1czV/" + "sOmqaq8XAQLEn68LKj6/" + "cFkJukxRzCa4OF1a7cCAXYFp9+wZDu0bw4y63qbpjhdCl8GO6Z2lkcXy7KOzbPE01ukg7+" + "gN+7uKpoohgAhIwpAKQXmX5xtd0=", +- uint64_t{0xc9ae5c8759b4877a}, uint64_t{0x58aa1ca7a4c075d9}}, ++ uint64_t{0xc9ae5c8759b4877a}}, ++ }; ++ ++ constexpr uint64_t kGolden[kNumGoldenOutputs] = { ++ 0xe5a40d39ab796423, 0x1766974bf7527d81, 0x5c3bbbe230db17a8, ++ 0xa6630143a7e6aa6f, 0x8787cb2d04b0c984, 0x33603654ff574ac2, ++ 0xa6564b468248c683, 0xef192f401b116e1c, 0xbe8dc0c54617639d, ++ 0x93d7f665b5521c8e, 0x646d70bb42445f28, 0x96a7b1e3cc9bd426, ++ 0x76020289ab0790c4, 0x39f842e4133b9b44, 0x2b8d7047be4bcaab, ++ 0x99628abef6716a97, 0x4432e02ba42b2740, 0x74d810efcad7918a, ++ 0x88c84e986002507f, 0x4f99acf193cf39b9, 0xd90e7a3655891e37, ++ 0x3bb378b1d4df8fcf, 0xf78e94045c052d47, 0x26da0b2130da6b40, ++ 0x30b4d426af8c6986, 0x5413b4aaf3baaeae, 0x756ab265370a1597, ++ 0xdaf5f4b7d09814fb, 0x8f874ae37742b75e, 0x8fecd03956121ce8, ++ 0x229c292ea7a08285, 0x0bb4bf0692d14bae, 0x207b24ca3bdac1db, ++ 0x64f6cd6745d3825b, 0xa2b2e1656b58df1e, 0x0d01d30d9ee7a148, ++ 0x1cb4cd00ab804e3b, 0x4697f2637fd90999, 0x8383a756b5688c07, ++ 0x695c29cb3696a975, 0xda2e5a5a5e971521, 0x7935d4befa056b2b, ++ 0x38dd541ca95420fe, 0xcc06c7a4963f967f, 0xbf0f6f66e232fb20, ++ 0xf7efb32d373fe71a, 0xe2e64634b1c12660, 0x285b8fd1638e306d, ++ 0x658e8a4e3b714d6c, 0xf391fb968e0eb398, 0x744a9ea0cc144bf2, ++ 0x12636f2be11012f1, 0x29c57de825948f80, 0x58c6f99ab0d1c021, ++ 0x13e7b5a7b82fe3bb, 0x10fbc87901e02b63, 0xa24c9184901b748b, ++ 0xcac4fd4c5080e581, 0xc38bdb7483ba68e1, 0xdb2a8069b2ceaffa, ++ 0xdf9fe91d0d1c7887, 0xe83f49e96e2e6a08, 0x0c69e61b62ca2b62, ++ 0xb4a4f3f85f8298fe, 0x167a1b39e1e95f41, 0xf8a2a5649855ee41, ++ 0x27992565b595c498, 0x3e08cca5b71f9346, 0xad406b10c770a6d2, ++ 0xd1713ce6e552bcf2, 0x753b287194c73ad3, 0x5ae41a95f600af1c, ++ 0x4a61163b86a8bb4c, 0x42eeaa79e760c7e4, 0x698df622ef465b0a, ++ 0x157583111e1a6026, 0xaa1388f078e793e0, 0xf10d68d0f3309360, ++ 0x2af056184457a3de, 0x6d0058e1590b2489, 0x638f287f68817f12, ++ 0xc46b71fecefd5467, 0x2c8e94679d964e0a, 0x8612b797ce22503a, ++ 0x59f929babfba7170, 0x9527556923fb49a0, 0x1039ab644f5e150b, ++ 0x7816c83f3aa05e6d, 0xf51d2f564518c619, 0x67d494cff03ac004, ++ 0x2802d636ced1cfbb, 0xf64e20bad771cb12, 0x0b9a6cf84a83e15e, ++ 0x8da6630319609301, 0x40946a86e2a996f3, 0xcab7f5997953fa76, ++ 0x39129ca0e04fc465, 0x5238221fd685e1b8, 0x175130c407dbcaab, ++ 0x02f20e7536c0b0df, 0x2742cb488a04ad56, 0xd6afb593879ff93b, ++ 0xf50ad64caac0ca7f, 0x2ade95c4261364ae, 0x5c4f3299faacd07a, ++ 0xfffe3bff0ae5e9bc, 0x1db785c0005166e4, 0xea000d962ad18418, ++ 0xe42aef38359362d9, 0xc8e95657348a3891, 0xc162eca864f238c6, ++ 0xbe1fb373e20579ad, 0x628a1d4f40aa6ffd, 0xa87bdb7456340f90, ++ 0x5960ef3ba982c801, 0x5026586df9a431ec, 0xfe4b8a20fdf0840b, ++ 0xdcb761867da7072f, 0xc10d4653667275b7, 0x727720deec13110b, ++ 0x710b009662858dc9, 0xfbf8f7a3ecac1eb7, 0xb6fc4fcd0722e3df, ++ 0x7cb86dcc55104aac, 0x19e71e9b45c3a51e, 0x51de38573c2bea48, ++ 0xa73ab6996d6df158, 0x55ef2b8c930817b2, 0xb2850bf5fae87157, ++ 0xecf3de1acd04651f, 0xcc0a40552559ff32, 0xc385c374f20315b1, ++ 0xb90208a4c7234183, 0x58aa1ca7a4c075d9, + }; + +- for (const auto& expected_result : expected_results) { ++#if UPDATE_GOLDEN ++ (void)kGolden; // Silence warning. ++ for (size_t i = 0; i < kNumGoldenOutputs; ++i) { ++ std::string str; ++ ASSERT_TRUE(absl::Base64Unescape(cases[i].base64_data, &str)); ++ uint64_t h = absl::hash_internal::Wyhash(str.data(), str.size(), ++ cases[i].seed, kSalt); ++ printf("0x%016" PRIx64 ", ", h); ++ if (i % 3 == 2) { ++ printf("\n"); ++ } ++ } ++ printf("\n\n\n"); ++ EXPECT_FALSE(true); ++#else ++ for (size_t i = 0; i < kNumGoldenOutputs; ++i) { ++ SCOPED_TRACE(::testing::Message() ++ << "i = " << i << "; input = " << cases[i].base64_data); + std::string str; +- ASSERT_TRUE(absl::Base64Unescape(expected_result.base64_data, &str)); +- EXPECT_EQ(absl::hash_internal::Wyhash(str.data(), str.size(), +- expected_result.seed, kSalt), +- expected_result.hash); ++ ASSERT_TRUE(absl::Base64Unescape(cases[i].base64_data, &str)); ++ EXPECT_EQ(absl::hash_internal::Wyhash(str.data(), str.size(), cases[i].seed, ++ kSalt), ++ kGolden[i]); + } ++#endif + } + + } // namespace diff --git a/debian/patches/big-endian-hash2.diff b/debian/patches/big-endian-hash2.diff new file mode 100644 index 00000000..69ffa8a5 --- /dev/null +++ b/debian/patches/big-endian-hash2.diff @@ -0,0 +1,164 @@ +From: Milad Fa <46688537+miladfarca@users.noreply.github.com> +Subject: Fix hashing on big endian platforms (#1028) +Forwarded: https://github.com/abseil/abseil-cpp/pull/1028 +Origin: backport, https://github.com/abseil/abseil-cpp/commit/ae0f4c266095c9003786cd571bc1fb72544104a1 +Bug-Debian: https://bugs.debian.org/977638 + +Avoid using libstdc++'s implementation of std::hash<std::bitset> and +std::hash<std::vector> on big endian platforms in the implementation +of absl::Hash. + +This is a workaround for a buggy implementation that results in many +collisions. + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102531 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98731 + +--- a/absl/hash/internal/hash.h ++++ b/absl/hash/internal/hash.h +@@ -21,6 +21,7 @@ + + #include <algorithm> + #include <array> ++#include <bitset> + #include <cmath> + #include <cstring> + #include <deque> +@@ -489,8 +490,9 @@ + + // AbslHashValue for hashing std::vector + // +-// Do not use this for vector<bool>. It does not have a .data(), and a fallback +-// for std::hash<> is most likely faster. ++// Do not use this for vector<bool> on platforms that have a working ++// implementation of std::hash. It does not have a .data(), and a fallback for ++// std::hash<> is most likely faster. + template <typename H, typename T, typename Allocator> + typename std::enable_if<is_hashable<T>::value && !std::is_same<T, bool>::value, + H>::type +@@ -500,6 +502,27 @@ + vector.size()); + } + ++#if defined(ABSL_IS_BIG_ENDIAN) && \ ++ (defined(__GLIBCXX__) || defined(__GLIBCPP__)) ++// AbslHashValue for hashing std::vector<bool> ++// ++// std::hash in libstdc++ does not work correctly with vector<bool> on Big ++// Endian platforms therefore we need to implement a custom AbslHashValue for ++// it. More details on the bug: ++// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102531 ++template <typename H, typename T, typename Allocator> ++typename std::enable_if<is_hashable<T>::value && std::is_same<T, bool>::value, ++ H>::type ++AbslHashValue(H hash_state, const std::vector<T, Allocator>& vector) { ++ typename H::AbslInternalPiecewiseCombiner combiner; ++ for (const auto& i : vector) { ++ unsigned char c = static_cast<unsigned char>(i); ++ hash_state = combiner.add_buffer(std::move(hash_state), &c, sizeof(c)); ++ } ++ return H::combine(combiner.finalize(std::move(hash_state)), vector.size()); ++} ++#endif ++ + // ----------------------------------------------------------------------------- + // AbslHashValue for Ordered Associative Containers + // ----------------------------------------------------------------------------- +@@ -592,9 +615,28 @@ + // AbslHashValue for Other Types + // ----------------------------------------------------------------------------- + +-// AbslHashValue for hashing std::bitset is not defined, for the same reason as +-// for vector<bool> (see std::vector above): It does not expose the raw bytes, +-// and a fallback to std::hash<> is most likely faster. ++// AbslHashValue for hashing std::bitset is not defined on Little Endian ++// platforms, for the same reason as for vector<bool> (see std::vector above): ++// It does not expose the raw bytes, and a fallback to std::hash<> is most ++// likely faster. ++ ++#if defined(ABSL_IS_BIG_ENDIAN) && \ ++ (defined(__GLIBCXX__) || defined(__GLIBCPP__)) ++// AbslHashValue for hashing std::bitset ++// ++// std::hash in libstdc++ does not work correctly with std::bitset on Big Endian ++// platforms therefore we need to implement a custom AbslHashValue for it. More ++// details on the bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102531 ++template <typename H, size_t N> ++H AbslHashValue(H hash_state, const std::bitset<N>& set) { ++ typename H::AbslInternalPiecewiseCombiner combiner; ++ for (int i = 0; i < N; i++) { ++ unsigned char c = static_cast<unsigned char>(set[i]); ++ hash_state = combiner.add_buffer(std::move(hash_state), &c, sizeof(c)); ++ } ++ return H::combine(combiner.finalize(std::move(hash_state)), N); ++} ++#endif + + // ----------------------------------------------------------------------------- + +--- a/absl/hash/internal/wyhash_test.cc ++++ b/absl/hash/internal/wyhash_test.cc +@@ -404,6 +404,55 @@ + uint64_t{0xc9ae5c8759b4877a}}, + }; + ++#if defined(ABSL_IS_BIG_ENDIAN) ++ constexpr uint64_t kGolden[kNumGoldenOutputs] = { ++ 0xe5a40d39ab796423, 0x1766974bf7527d81, 0x5c3bbbe230db17a8, ++ 0xa6630143a7e6aa6f, 0x17645cb7318b86b, 0x218b175f30ba61f8, ++ 0xa6564b468248c683, 0xef192f401b116e1c, 0xbe8dc0c54617639d, ++ 0xe7b01610fc22dbb8, 0x99d9f694404af913, 0xf4eecd37464b45c5, ++ 0x7d2c653d63596d9b, 0x3f15c8544ec5393a, 0x6b9dc0c1704f796c, ++ 0xf1ded7a7eae5ed5a, 0x2db2fd7c6dd4641b, 0x151ca2d3d4cd33ab, ++ 0xa5af5994ac2ccd64, 0x2b2a4ca3191d2fce, 0xf89e68c9364e7c05, ++ 0x71724c70b799c21, 0x70536fabfd157369, 0xdee92794c3c3082b, ++ 0xac033a6743d3b3eb, 0xed2956b506cd5151, 0xbd669644755264b6, ++ 0x6ab1ff5d5f549a63, 0xf6bd551a2e3e04e, 0x7b5a8cef6875ea73, ++ 0x22bccf4d4db0a91c, 0x4f2bc07754c7c7eb, 0xfb6b8342a86725db, ++ 0x13a1a0d4c5854da, 0x5f6e44655f7dedac, 0x54a9198dff2bdf85, ++ 0xdb17e6915d4e4042, 0xa69926cf5c3b89f, 0xf77f031bfd74c096, ++ 0x1d6f916fdd50ec3c, 0x334ac76013ade393, 0x99370f899111de15, ++ 0x352457a03ada6de, 0x341974d4f42d854d, 0xda89ab02872aeb5, ++ 0x6ec2b74e143b10d9, 0x6f284c0b5cd60522, 0xf9670de353438f88, ++ 0xde920913adf0a2b4, 0xb7a07d7c0c17a8ec, 0x879a69f558ba3a98, ++ 0x360cf6d802df20f9, 0x53530f8046673738, 0xbd8f5f2bcf35e483, ++ 0x3f171f047144b983, 0x644d04e820823465, 0x50e44773a20b2702, ++ 0xe584ed4c05c745dd, 0x9a825c85b95ab6c0, 0xbce2931deb74e775, ++ 0x10468e9e705c7cfe, 0x12e01de3104141e2, 0x5c11ae2ee3713abd, ++ 0x6ac5ffb0860319e6, 0xc1e6da1849d30fc9, 0xa0e4d247a458b447, ++ 0x4530d4615c32b89b, 0x116aa09107a76505, 0xf941339d00d9bb73, ++ 0x573a0fc1615afb33, 0xa975c81dc868b258, 0x3ab2c5250ab54bda, ++ 0x37f99f208a3e3b11, 0x4b49b0ff706689d, 0x30bafa0b8f0a87fe, ++ 0xea6787a65cc20cdd, 0x55861729f1fc3ab8, 0xea38e009c5be9b72, ++ 0xcb8522cba33c3c66, 0x352e77653fe306f3, 0xe0bb760793bac064, ++ 0xf66ec59322662956, 0x637aa320455d56f8, 0x46ee546be5824a89, ++ 0x9e6842421e83d8a4, 0xf98ac2bc96b9fb8c, 0xf2c1002fd9a70b99, ++ 0x4c2b62b1e39e9405, 0x3248555fa3ade9c4, 0xd4d04c37f6417c21, ++ 0xf40cd506b1bf5653, 0x6c45d6005c760d2f, 0x61d88a7e61ff0d7e, ++ 0x131591e8a53cc967, 0xdae85cb9bc29bab6, 0xe98835334905e626, ++ 0x7cce50a2b66b8754, 0x5b0b3d0c5ac498ae, 0xd35a218c974d1756, ++ 0xfce436ddc1d003c, 0xd183901de90bb741, 0x9378f8f34974a66, ++ 0x21f11ae0a0402368, 0xf2fbd7c94ef89cb6, 0xc329c69d0f0d080b, ++ 0xf2841cba16216a61, 0x47aba97b44916df1, 0x724d4e00a8019fcf, ++ 0x2df9005c2a728d63, 0xc788892a1a5d7515, 0x9e993a65f9df0480, ++ 0x76876721ff49f969, 0xbe7a796cfba15bf5, 0xa4c8bd54586f5488, ++ 0xb390a325275501ab, 0x893f11317427ccf1, 0x92f2bb57da5695b9, ++ 0x30985b90da88269f, 0x2c690e268e086de8, 0x1c02df6097997196, ++ 0x1f9778f8bbdf6455, 0x7d57378c7bf8416d, 0xba8582a5f8d84d38, ++ 0xe8ca43b85050be4e, 0x5048cf6bed8a5d9f, 0xfbc5ba80917d0ea4, ++ 0x8011026525bf1691, 0x26b8dc6aed9fb50d, 0x191f5bfee77c1fe3, ++ 0xdd497891465a2cc1, 0x6f1fe8c57a33072e, 0x2c9f4ec078c460c0, ++ 0x9a725bde8f6a1437, 0x6ce545fa3ef61e4d, ++ }; ++#else + constexpr uint64_t kGolden[kNumGoldenOutputs] = { + 0xe5a40d39ab796423, 0x1766974bf7527d81, 0x5c3bbbe230db17a8, + 0xa6630143a7e6aa6f, 0x8787cb2d04b0c984, 0x33603654ff574ac2, +@@ -451,6 +500,7 @@ + 0xecf3de1acd04651f, 0xcc0a40552559ff32, 0xc385c374f20315b1, + 0xb90208a4c7234183, 0x58aa1ca7a4c075d9, + }; ++#endif + + #if UPDATE_GOLDEN + (void)kGolden; // Silence warning. diff --git a/debian/patches/series b/debian/patches/series index a954bf95..6c6ec7fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ configure.diff -std-hash.diff latomic.diff empty-flags-library.diff cordrepring-typo.diff @@ -8,3 +7,5 @@ float-rounding.diff DiscreteDistributionTest-irrelevant-destination-buckets.diff float-tests-disable-i386.diff missing-rint.diff +big-endian-hash.diff +big-endian-hash2.diff diff --git a/debian/patches/std-hash.diff b/debian/patches/std-hash.diff deleted file mode 100644 index 52096742..00000000 --- a/debian/patches/std-hash.diff +++ /dev/null @@ -1,46 +0,0 @@ -From: Benjamin Barenblat <bbaren@google.com> -Subject: Work around broken std::hash on s390x -Forwarded: no -Bug-Debian: https://bugs.debian.org/977638 - -On s390x, std::hash hashes large classes of data to the same value, which -violates assumptions made by the Abseil tests. #ifdef out the test code that -depends on those assumptions. - ---- a/absl/hash/hash_test.cc -+++ b/absl/hash/hash_test.cc -@@ -358,6 +358,8 @@ - TEST(HashValueTest, StdBitset) { - EXPECT_TRUE((is_hashable<std::bitset<257>>::value)); - -+ // The following assertions fail on s390x (https://bugs.debian.org/977638). -+#ifndef __s390x__ - EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly( - {std::bitset<2>("00"), std::bitset<2>("01"), std::bitset<2>("10"), - std::bitset<2>("11")})); -@@ -379,6 +381,7 @@ - std::bitset<kNumBits>(bit_strings[3].c_str()), - std::bitset<kNumBits>(bit_strings[4].c_str()), - std::bitset<kNumBits>(bit_strings[5].c_str())})); -+#endif - } // namespace - - template <typename T> -@@ -400,10 +403,15 @@ - } - - REGISTER_TYPED_TEST_CASE_P(HashValueSequenceTest, BasicUsage); -+// std::vector<bool> tests fail on s390x, so exclude them. See -+// https://bugs.debian.org/977638. - using IntSequenceTypes = - testing::Types<std::deque<int>, std::forward_list<int>, std::list<int>, -- std::vector<int>, std::vector<bool>, std::set<int>, -- std::multiset<int>>; -+ std::vector<int>, -+#ifndef __s390x__ -+ std::vector<bool>, -+#endif -+ std::set<int>, std::multiset<int>>; - INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueSequenceTest, IntSequenceTypes); - - // Private type that only supports AbslHashValue to make sure our chosen hash |