roland/xo-gc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-gc: utest: move gcos_verify_gen0_fromspace_only_allocation -> *pp

Browse source
This commit is contained in:
Roland Conybeare 2026-04-18 00:18:54 -04:00
commit 3f3e77bf24
3 changed files with 74 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

66
utest/GCObjectStore.test.cpp
View file

@ -166,69 +166,6 @@ namespace ut {
namespace {
// aux functions specific to GCObjectStore-1 unit test below
void
gcos_verify_gen0_fromspace_only_allocated(const Testcase & tc,
const GCObjectStore & gcos,
uint32_t loop_index,
Generation upto,
const std::vector<Recd> & x1_v)
{
Generation g0{0};
Generation gn{tc.n_gen_};
for (Generation gi = g0; gi < gn; ++gi) {
if (gi < upto) {
// we're collecting generation gi.
// Before we begin, to-space had better be empty
// (everthing in gi is in from-space)
REQUIRE(gcos.to_space(gi)->allocated() == 0);
} else {
// we're not collecting generation gi.
// from-space must be empty.
// May have content in to-space
REQUIRE(gcos.from_space(gi)->allocated() == 0);
}
}
for (size_t i = 0, n = x1_v.size(); i < n; ++i) {
const auto & x1 = x1_v.at(i);
// x1 should be in gen g from-space (with g < upto)
// or in gen g to-space (with g >= upto)
Generation g_from = gcos.generation_of(Role::from_space(), x1.gco_.data());
Generation g_to = gcos.generation_of(Role::to_space(), x1.gco_.data());
if (g_to.is_sentinel()) {
// if not in to-space, must be in from-space
REQUIRE(!g_from.is_sentinel());
// + for some gen we're collecting
REQUIRE(g_from < upto);
REQUIRE(gcos.contains(Role::from_space(), x1.gco_.data()));
REQUIRE(gcos.contains_allocated(Role::from_space(), x1.gco_.data()));
} else {
// if in to-space, must not be in from-space
REQUIRE(g_from.is_sentinel());
// + for some gen we're not collecting
REQUIRE(g_to >= upto);
REQUIRE(gcos.contains(Role::to_space(), x1.gco_.data()));
REQUIRE(gcos.contains_allocated(Role::to_space(), x1.gco_.data()));
}
AllocInfo obj_info = gcos.alloc_info((std::byte *)x1.gco_.data());
REQUIRE(obj_info.size() >= x1.alloc_z_);
REQUIRE(obj_info.payload().first == (std::byte *)x1.gco_.data());
REQUIRE(obj_info.tseq() == x1.tseq_.seqno());
}
}
void
gcos_verify_forwarding(const GCObjectStore & gcos,
Generation upto,
@ -549,7 +486,8 @@ namespace ut {
// swap_roles [but only for generation < g1, i.e. g0
gcos.swap_roles(Generation::g1());
gcos_verify_gen0_fromspace_only_allocated(tc, gcos, loop_index, Generation::g1(), x1_v);
GcosTestutil::gcos_verify_gen0_fromspace_only_allocated(tc.n_gen_, gcos, loop_index,
Generation::g1(), x1_v);
gcos_move_roots_and_verify(tc, &gcos, Generation::g1(), x1_v, x2_v, tc.debug_flag_);

63
utest/GcosTestutil.cpp
View file

@ -441,6 +441,69 @@ namespace ut {
}
}
void
GcosTestutil::gcos_verify_gen0_fromspace_only_allocated(uint32_t n_gen,
const GCObjectStore & gcos,
uint32_t loop_index,
Generation upto,
const std::vector<Recd> & x1_v)
{
Generation g0{0};
Generation gn{n_gen};
for (Generation gi = g0; gi < gn; ++gi) {
if (gi < upto) {
// we're collecting generation gi.
// Before we begin, to-space had better be empty
// (everthing in gi is in from-space)
REQUIRE(gcos.to_space(gi)->allocated() == 0);
} else {
// we're not collecting generation gi.
// from-space must be empty.
// May have content in to-space
REQUIRE(gcos.from_space(gi)->allocated() == 0);
}
}
for (size_t i = 0, n = x1_v.size(); i < n; ++i) {
const auto & x1 = x1_v.at(i);
// x1 should be in gen g from-space (with g < upto)
// or in gen g to-space (with g >= upto)
Generation g_from = gcos.generation_of(Role::from_space(), x1.gco_.data());
Generation g_to = gcos.generation_of(Role::to_space(), x1.gco_.data());
if (g_to.is_sentinel()) {
// if not in to-space, must be in from-space
REQUIRE(!g_from.is_sentinel());
// + for some gen we're collecting
REQUIRE(g_from < upto);
REQUIRE(gcos.contains(Role::from_space(), x1.gco_.data()));
REQUIRE(gcos.contains_allocated(Role::from_space(), x1.gco_.data()));
} else {
// if in to-space, must not be in from-space
REQUIRE(g_from.is_sentinel());
// + for some gen we're not collecting
REQUIRE(g_to >= upto);
REQUIRE(gcos.contains(Role::to_space(), x1.gco_.data()));
REQUIRE(gcos.contains_allocated(Role::to_space(), x1.gco_.data()));
}
AllocInfo obj_info = gcos.alloc_info((std::byte *)x1.gco_.data());
REQUIRE(obj_info.size() >= x1.alloc_z_);
REQUIRE(obj_info.payload().first == (std::byte *)x1.gco_.data());
REQUIRE(obj_info.tseq() == x1.tseq_.seqno());
}
}
} /*namespace ut*/
/* end GcosTestutil.cpp */

9
utest/GcosTestutil.hpp
View file

@ -7,10 +7,12 @@
#include <xo/gc/GCObjectStore.hpp>
#include <xo/alloc2/GCObject.hpp>
#include <xo/alloc2/Generation.hpp>
#include <xo/arena/DArena.hpp>
#include <xo/randomgen/xoshiro256.hpp>
namespace ut {
using xo::mm::Generation;
using xo::facet::obj;
enum class TestGraphType {
@ -107,6 +109,13 @@ namespace ut {
const GCObjectStore & gcos,
uint32_t loop_index,
const std::vector<Recd> & x1_v);
static void
gcos_verify_gen0_fromspace_only_allocated(uint32_t n_gen,
const GCObjectStore & gcos,
uint32_t loop_index,
Generation upto,
const std::vector<Recd> & x1_v);
};
} /*namespace ut*/