Skip to content

Commit 46d939a

Browse files
Abseil Teamsuertreus
Abseil Team
authored andcommitted
Export of internal Abseil changes
-- 30bbe72e8c32d8680bbe6c8473a884d485e9f684 by Laramie Leavitt <[email protected]>: Convert randen golden test to use byte arrays. PiperOrigin-RevId: 404948438 -- 4690d9ebd2c518708ad155e913b2140ebdf01234 by Laramie Leavitt <[email protected]>: Add golden tests for internal::ExplicitSeedSeeq against stable std:: random URBGs. PiperOrigin-RevId: 404912608 -- 52e9b24276ee3a21cc8a026f9d152ef8ced7f507 by Derek Mauro <[email protected]>: Internal change PiperOrigin-RevId: 404861043 -- 9e966a2a680970fd27d927cc6420e333b1378b1e by Abseil Team <[email protected]>: Roll back import of CCTZ from GitHub. PiperOrigin-RevId: 404343587 -- 9c4eedec00105b8288c0b91d96434aea08b8e3c3 by Abseil Team <[email protected]>: Import of CCTZ from GitHub. PiperOrigin-RevId: 404314597 -- f171375fd7bec35cc34815be8faf5e000828b7bb by Abseil Team <[email protected]>: Internal change PiperOrigin-RevId: 404098156 GitOrigin-RevId: 30bbe72e8c32d8680bbe6c8473a884d485e9f684 Change-Id: Ic7b5a3c0659e321e2f642800930a8de014253e2a
1 parent ddb842f commit 46d939a

File tree

4 files changed

+102
-71
lines changed

4 files changed

+102
-71
lines changed

Diff for: absl/BUILD.bazel

+8
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,11 @@ config_setting(
7070
},
7171
visibility = [":__subpackages__"],
7272
)
73+
74+
config_setting(
75+
name = "fuchsia",
76+
values = {
77+
"cpu": "fuchsia",
78+
},
79+
visibility = [":__subpackages__"],
80+
)

Diff for: absl/random/internal/explicit_seed_seq_test.cc

+40-9
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
namespace {
2626

27+
using ::absl::random_internal::ExplicitSeedSeq;
28+
2729
template <typename Sseq>
2830
bool ConformsToInterface() {
2931
// Check that the SeedSequence can be default-constructed.
@@ -64,14 +66,14 @@ TEST(SeedSequences, CheckInterfaces) {
6466
EXPECT_TRUE(ConformsToInterface<std::seed_seq>());
6567

6668
// Abseil classes
67-
EXPECT_TRUE(ConformsToInterface<absl::random_internal::ExplicitSeedSeq>());
69+
EXPECT_TRUE(ConformsToInterface<ExplicitSeedSeq>());
6870
}
6971

7072
TEST(ExplicitSeedSeq, DefaultConstructorGeneratesZeros) {
7173
const size_t kNumBlocks = 128;
7274

7375
uint32_t outputs[kNumBlocks];
74-
absl::random_internal::ExplicitSeedSeq seq;
76+
ExplicitSeedSeq seq;
7577
seq.generate(outputs, &outputs[kNumBlocks]);
7678

7779
for (uint32_t& seed : outputs) {
@@ -87,8 +89,7 @@ TEST(ExplicitSeeqSeq, SeedMaterialIsForwardedIdentically) {
8789
for (uint32_t& seed : seed_material) {
8890
seed = urandom();
8991
}
90-
absl::random_internal::ExplicitSeedSeq seq(seed_material,
91-
&seed_material[kNumBlocks]);
92+
ExplicitSeedSeq seq(seed_material, &seed_material[kNumBlocks]);
9293

9394
// Check that output is same as seed-material provided to constructor.
9495
{
@@ -133,11 +134,10 @@ TEST(ExplicitSeedSeq, CopyAndMoveConstructors) {
133134
for (uint32_t& entry : entropy) {
134135
entry = urandom();
135136
}
136-
absl::random_internal::ExplicitSeedSeq seq_from_entropy(std::begin(entropy),
137-
std::end(entropy));
137+
ExplicitSeedSeq seq_from_entropy(std::begin(entropy), std::end(entropy));
138138
// Copy constructor.
139139
{
140-
absl::random_internal::ExplicitSeedSeq seq_copy(seq_from_entropy);
140+
ExplicitSeedSeq seq_copy(seq_from_entropy);
141141
EXPECT_EQ(seq_copy.size(), seq_from_entropy.size());
142142

143143
std::vector<uint32_t> seeds_1;
@@ -155,8 +155,7 @@ TEST(ExplicitSeedSeq, CopyAndMoveConstructors) {
155155
for (uint32_t& entry : entropy) {
156156
entry = urandom();
157157
}
158-
absl::random_internal::ExplicitSeedSeq another_seq(std::begin(entropy),
159-
std::end(entropy));
158+
ExplicitSeedSeq another_seq(std::begin(entropy), std::end(entropy));
160159

161160
std::vector<uint32_t> seeds_1;
162161
seeds_1.resize(1000, 0);
@@ -202,3 +201,35 @@ TEST(ExplicitSeedSeq, CopyAndMoveConstructors) {
202201
EXPECT_THAT(seeds_1, Each(Eq(0)));
203202
}
204203
}
204+
205+
TEST(ExplicitSeedSeq, StdURBGGoldenTests) {
206+
// Verify that for std::- URBG instances the results are stable across
207+
// platforms (these should have deterministic output).
208+
{
209+
ExplicitSeedSeq seed_sequence{12, 34, 56};
210+
std::minstd_rand rng(seed_sequence);
211+
212+
std::minstd_rand::result_type values[4] = {rng(), rng(), rng(), rng()};
213+
EXPECT_THAT(values,
214+
testing::ElementsAre(579252, 43785881, 464353103, 1501811174));
215+
}
216+
217+
{
218+
ExplicitSeedSeq seed_sequence{12, 34, 56};
219+
std::mt19937 rng(seed_sequence);
220+
221+
std::mt19937::result_type values[4] = {rng(), rng(), rng(), rng()};
222+
EXPECT_THAT(values, testing::ElementsAre(138416803, 151130212, 33817739,
223+
138416803));
224+
}
225+
226+
{
227+
ExplicitSeedSeq seed_sequence{12, 34, 56};
228+
std::mt19937_64 rng(seed_sequence);
229+
230+
std::mt19937_64::result_type values[4] = {rng(), rng(), rng(), rng()};
231+
EXPECT_THAT(values,
232+
testing::ElementsAre(19738651785169348, 1464811352364190456,
233+
18054685302720800, 19738651785169348));
234+
}
235+
}

Diff for: absl/random/internal/randen_hwaes_test.cc

+27-32
Original file line numberDiff line numberDiff line change
@@ -27,44 +27,39 @@ namespace {
2727
using absl::random_internal::RandenHwAes;
2828
using absl::random_internal::RandenTraits;
2929

30-
// Local state parameters.
31-
constexpr size_t kSeedBytes =
32-
RandenTraits::kStateBytes - RandenTraits::kCapacityBytes;
33-
constexpr size_t kStateSizeT = RandenTraits::kStateBytes / sizeof(uint64_t);
34-
constexpr size_t kSeedSizeT = kSeedBytes / sizeof(uint32_t);
35-
36-
struct alignas(16) randen {
37-
uint64_t state[kStateSizeT];
38-
uint32_t seed[kSeedSizeT];
39-
};
40-
4130
TEST(RandenHwAesTest, Default) {
4231
EXPECT_TRUE(absl::random_internal::CPUSupportsRandenHwAes());
4332

44-
constexpr uint64_t kGolden[] = {
45-
0x6c6534090ee6d3ee, 0x044e2b9b9d5333c6, 0xc3c14f134e433977,
46-
0xdda9f47cd90410ee, 0x887bf3087fd8ca10, 0xf0b780f545c72912,
47-
0x15dbb1d37696599f, 0x30ec63baff3c6d59, 0xb29f73606f7f20a6,
48-
0x02808a316f49a54c, 0x3b8feaf9d5c8e50e, 0x9cbf605e3fd9de8a,
49-
0xc970ae1a78183bbb, 0xd8b2ffd356301ed5, 0xf4b327fe0fc73c37,
50-
0xcdfd8d76eb8f9a19, 0xc3a506eb91420c9d, 0xd5af05dd3eff9556,
51-
0x48db1bb78f83c4a1, 0x7023920e0d6bfe8c, 0x58d3575834956d42,
52-
0xed1ef4c26b87b840, 0x8eef32a23e0b2df3, 0x497cabf3431154fc,
53-
0x4e24370570029a8b, 0xd88b5749f090e5ea, 0xc651a582a970692f,
54-
0x78fcec2cbb6342f5, 0x463cb745612f55db, 0x352ee4ad1816afe3,
55-
0x026ff374c101da7e, 0x811ef0821c3de851,
33+
constexpr uint8_t kGolden[] = {
34+
0xee, 0xd3, 0xe6, 0x0e, 0x09, 0x34, 0x65, 0x6c, 0xc6, 0x33, 0x53, 0x9d,
35+
0x9b, 0x2b, 0x4e, 0x04, 0x77, 0x39, 0x43, 0x4e, 0x13, 0x4f, 0xc1, 0xc3,
36+
0xee, 0x10, 0x04, 0xd9, 0x7c, 0xf4, 0xa9, 0xdd, 0x10, 0xca, 0xd8, 0x7f,
37+
0x08, 0xf3, 0x7b, 0x88, 0x12, 0x29, 0xc7, 0x45, 0xf5, 0x80, 0xb7, 0xf0,
38+
0x9f, 0x59, 0x96, 0x76, 0xd3, 0xb1, 0xdb, 0x15, 0x59, 0x6d, 0x3c, 0xff,
39+
0xba, 0x63, 0xec, 0x30, 0xa6, 0x20, 0x7f, 0x6f, 0x60, 0x73, 0x9f, 0xb2,
40+
0x4c, 0xa5, 0x49, 0x6f, 0x31, 0x8a, 0x80, 0x02, 0x0e, 0xe5, 0xc8, 0xd5,
41+
0xf9, 0xea, 0x8f, 0x3b, 0x8a, 0xde, 0xd9, 0x3f, 0x5e, 0x60, 0xbf, 0x9c,
42+
0xbb, 0x3b, 0x18, 0x78, 0x1a, 0xae, 0x70, 0xc9, 0xd5, 0x1e, 0x30, 0x56,
43+
0xd3, 0xff, 0xb2, 0xd8, 0x37, 0x3c, 0xc7, 0x0f, 0xfe, 0x27, 0xb3, 0xf4,
44+
0x19, 0x9a, 0x8f, 0xeb, 0x76, 0x8d, 0xfd, 0xcd, 0x9d, 0x0c, 0x42, 0x91,
45+
0xeb, 0x06, 0xa5, 0xc3, 0x56, 0x95, 0xff, 0x3e, 0xdd, 0x05, 0xaf, 0xd5,
46+
0xa1, 0xc4, 0x83, 0x8f, 0xb7, 0x1b, 0xdb, 0x48, 0x8c, 0xfe, 0x6b, 0x0d,
47+
0x0e, 0x92, 0x23, 0x70, 0x42, 0x6d, 0x95, 0x34, 0x58, 0x57, 0xd3, 0x58,
48+
0x40, 0xb8, 0x87, 0x6b, 0xc2, 0xf4, 0x1e, 0xed, 0xf3, 0x2d, 0x0b, 0x3e,
49+
0xa2, 0x32, 0xef, 0x8e, 0xfc, 0x54, 0x11, 0x43, 0xf3, 0xab, 0x7c, 0x49,
50+
0x8b, 0x9a, 0x02, 0x70, 0x05, 0x37, 0x24, 0x4e, 0xea, 0xe5, 0x90, 0xf0,
51+
0x49, 0x57, 0x8b, 0xd8, 0x2f, 0x69, 0x70, 0xa9, 0x82, 0xa5, 0x51, 0xc6,
52+
0xf5, 0x42, 0x63, 0xbb, 0x2c, 0xec, 0xfc, 0x78, 0xdb, 0x55, 0x2f, 0x61,
53+
0x45, 0xb7, 0x3c, 0x46, 0xe3, 0xaf, 0x16, 0x18, 0xad, 0xe4, 0x2e, 0x35,
54+
0x7e, 0xda, 0x01, 0xc1, 0x74, 0xf3, 0x6f, 0x02, 0x51, 0xe8, 0x3d, 0x1c,
55+
0x82, 0xf0, 0x1e, 0x81,
5656
};
5757

58-
alignas(16) randen d;
59-
memset(d.state, 0, sizeof(d.state));
60-
RandenHwAes::Generate(RandenHwAes::GetKeys(), d.state);
58+
alignas(16) uint8_t state[RandenTraits::kStateBytes];
59+
std::memset(state, 0, sizeof(state));
6160

62-
uint64_t* id = d.state;
63-
for (const auto& elem : kGolden) {
64-
auto a = absl::StrFormat("%#x", elem);
65-
auto b = absl::StrFormat("%#x", *id++);
66-
EXPECT_EQ(a, b);
67-
}
61+
RandenHwAes::Generate(RandenHwAes::GetKeys(), state);
62+
EXPECT_EQ(0, std::memcmp(state, kGolden, sizeof(state)));
6863
}
6964

7065
} // namespace

Diff for: absl/random/internal/randen_slow_test.cc

+27-30
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,37 @@ namespace {
2525
using absl::random_internal::RandenSlow;
2626
using absl::random_internal::RandenTraits;
2727

28-
// Local state parameters.
29-
constexpr size_t kSeedBytes =
30-
RandenTraits::kStateBytes - RandenTraits::kCapacityBytes;
31-
constexpr size_t kStateSizeT = RandenTraits::kStateBytes / sizeof(uint64_t);
32-
constexpr size_t kSeedSizeT = kSeedBytes / sizeof(uint32_t);
33-
34-
struct alignas(16) randen {
35-
uint64_t state[kStateSizeT];
36-
uint32_t seed[kSeedSizeT];
37-
};
38-
3928
TEST(RandenSlowTest, Default) {
40-
constexpr uint64_t kGolden[] = {
41-
0x6c6534090ee6d3ee, 0x044e2b9b9d5333c6, 0xc3c14f134e433977,
42-
0xdda9f47cd90410ee, 0x887bf3087fd8ca10, 0xf0b780f545c72912,
43-
0x15dbb1d37696599f, 0x30ec63baff3c6d59, 0xb29f73606f7f20a6,
44-
0x02808a316f49a54c, 0x3b8feaf9d5c8e50e, 0x9cbf605e3fd9de8a,
45-
0xc970ae1a78183bbb, 0xd8b2ffd356301ed5, 0xf4b327fe0fc73c37,
46-
0xcdfd8d76eb8f9a19, 0xc3a506eb91420c9d, 0xd5af05dd3eff9556,
47-
0x48db1bb78f83c4a1, 0x7023920e0d6bfe8c, 0x58d3575834956d42,
48-
0xed1ef4c26b87b840, 0x8eef32a23e0b2df3, 0x497cabf3431154fc,
49-
0x4e24370570029a8b, 0xd88b5749f090e5ea, 0xc651a582a970692f,
50-
0x78fcec2cbb6342f5, 0x463cb745612f55db, 0x352ee4ad1816afe3,
51-
0x026ff374c101da7e, 0x811ef0821c3de851,
29+
constexpr uint8_t kGolden[] = {
30+
0xee, 0xd3, 0xe6, 0x0e, 0x09, 0x34, 0x65, 0x6c, 0xc6, 0x33, 0x53, 0x9d,
31+
0x9b, 0x2b, 0x4e, 0x04, 0x77, 0x39, 0x43, 0x4e, 0x13, 0x4f, 0xc1, 0xc3,
32+
0xee, 0x10, 0x04, 0xd9, 0x7c, 0xf4, 0xa9, 0xdd, 0x10, 0xca, 0xd8, 0x7f,
33+
0x08, 0xf3, 0x7b, 0x88, 0x12, 0x29, 0xc7, 0x45, 0xf5, 0x80, 0xb7, 0xf0,
34+
0x9f, 0x59, 0x96, 0x76, 0xd3, 0xb1, 0xdb, 0x15, 0x59, 0x6d, 0x3c, 0xff,
35+
0xba, 0x63, 0xec, 0x30, 0xa6, 0x20, 0x7f, 0x6f, 0x60, 0x73, 0x9f, 0xb2,
36+
0x4c, 0xa5, 0x49, 0x6f, 0x31, 0x8a, 0x80, 0x02, 0x0e, 0xe5, 0xc8, 0xd5,
37+
0xf9, 0xea, 0x8f, 0x3b, 0x8a, 0xde, 0xd9, 0x3f, 0x5e, 0x60, 0xbf, 0x9c,
38+
0xbb, 0x3b, 0x18, 0x78, 0x1a, 0xae, 0x70, 0xc9, 0xd5, 0x1e, 0x30, 0x56,
39+
0xd3, 0xff, 0xb2, 0xd8, 0x37, 0x3c, 0xc7, 0x0f, 0xfe, 0x27, 0xb3, 0xf4,
40+
0x19, 0x9a, 0x8f, 0xeb, 0x76, 0x8d, 0xfd, 0xcd, 0x9d, 0x0c, 0x42, 0x91,
41+
0xeb, 0x06, 0xa5, 0xc3, 0x56, 0x95, 0xff, 0x3e, 0xdd, 0x05, 0xaf, 0xd5,
42+
0xa1, 0xc4, 0x83, 0x8f, 0xb7, 0x1b, 0xdb, 0x48, 0x8c, 0xfe, 0x6b, 0x0d,
43+
0x0e, 0x92, 0x23, 0x70, 0x42, 0x6d, 0x95, 0x34, 0x58, 0x57, 0xd3, 0x58,
44+
0x40, 0xb8, 0x87, 0x6b, 0xc2, 0xf4, 0x1e, 0xed, 0xf3, 0x2d, 0x0b, 0x3e,
45+
0xa2, 0x32, 0xef, 0x8e, 0xfc, 0x54, 0x11, 0x43, 0xf3, 0xab, 0x7c, 0x49,
46+
0x8b, 0x9a, 0x02, 0x70, 0x05, 0x37, 0x24, 0x4e, 0xea, 0xe5, 0x90, 0xf0,
47+
0x49, 0x57, 0x8b, 0xd8, 0x2f, 0x69, 0x70, 0xa9, 0x82, 0xa5, 0x51, 0xc6,
48+
0xf5, 0x42, 0x63, 0xbb, 0x2c, 0xec, 0xfc, 0x78, 0xdb, 0x55, 0x2f, 0x61,
49+
0x45, 0xb7, 0x3c, 0x46, 0xe3, 0xaf, 0x16, 0x18, 0xad, 0xe4, 0x2e, 0x35,
50+
0x7e, 0xda, 0x01, 0xc1, 0x74, 0xf3, 0x6f, 0x02, 0x51, 0xe8, 0x3d, 0x1c,
51+
0x82, 0xf0, 0x1e, 0x81,
5252
};
5353

54-
alignas(16) randen d;
55-
std::memset(d.state, 0, sizeof(d.state));
56-
RandenSlow::Generate(RandenSlow::GetKeys(), d.state);
54+
alignas(16) uint8_t state[RandenTraits::kStateBytes];
55+
std::memset(state, 0, sizeof(state));
5756

58-
uint64_t* id = d.state;
59-
for (const auto& elem : kGolden) {
60-
EXPECT_EQ(absl::little_endian::FromHost64(elem), *id++);
61-
}
57+
RandenSlow::Generate(RandenSlow::GetKeys(), state);
58+
EXPECT_EQ(0, std::memcmp(state, kGolden, sizeof(state)));
6259
}
6360

6461
} // namespace

0 commit comments

Comments
 (0)