Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UnitTest: Make BlockAllocator run in about a second

Browse Source 
Validating after every churn step was quadratic in the block count. Check
every 64 steps and at the end, and do fewer iterations.

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-09-29 09:35:17 -06:00
1 parent a9c782bfcf
commit 056fd05231
1 file changed
+14 -6
Download Patch File Download Diff File Expand all files Collapse all files
unittest/UnitTest.cpp
+14 -6
View File
@@ -1168,6 +1168,12 @@ bool TestBlockAllocator() {
EXPECT_TRUE(ValidateAllocator(a, kStart, oddSize));
}
// Validating is quadratic in the block count, so the churn loops below only do it periodically.
// A broken tiling or free count doesn't repair itself, so it's still caught, just a few steps late.
auto validateEvery = [](int i, int count) {
return (i & 63) == 63 || i == count - 1;
};
// Churn again, this time mixing in aligned allocations and AllocAt so the block list gets into
// shapes the plain alloc/free loop never produces.
{
@@ -1177,7 +1183,8 @@ bool TestBlockAllocator() {
u32 rng = 987654321;
auto next = [&rng]() { rng = rng * 1103515245u + 12345u; return (rng >> 16) & 0x7FFF; };
for (int i = 0; i < 4000; ++i) {
const int kIterations = 3000;
for (int i = 0; i < kIterations; ++i) {
const int op = next() % 100;
if (op < 30 && !live.empty()) {
const size_t idx = next() % live.size();
@@ -1206,8 +1213,8 @@ bool TestBlockAllocator() {
if (addr != (u32)-1)
live.push_back(addr);
}
if (!ValidateAllocator(a, kStart, kSize)) {
printf("BlockAllocator invariant broken at iteration %d (op %d)\n", i, op);
if (validateEvery(i, kIterations) && !ValidateAllocator(a, kStart, kSize)) {
printf("BlockAllocator invariant broken by iteration %d\n", i);
return false;
}
}
@@ -1228,7 +1235,8 @@ bool TestBlockAllocator() {
u32 rng = 12345;
auto next = [&rng]() { rng = rng * 1103515245u + 12345u; return (rng >> 16) & 0x7FFF; };
for (int i = 0; i < 3000; ++i) {
const int kIterations = 2000;
for (int i = 0; i < kIterations; ++i) {
const bool doAlloc = live.empty() || (next() % 100) < 55;
if (doAlloc) {
u32 size = ((next() % 64) + 1) * kGrain;
@@ -1247,8 +1255,8 @@ bool TestBlockAllocator() {
EXPECT_TRUE(a.Free(live[idx].first));
live.erase(live.begin() + idx);
}
if (!ValidateAllocator(a, kStart, kSize)) {
printf("BlockAllocator invariant broken at iteration %d\n", i);
if (validateEvery(i, kIterations) && !ValidateAllocator(a, kStart, kSize)) {
printf("BlockAllocator invariant broken by iteration %d\n", i);
return false;
}
}