dnomd343
/
klotski
mirror of https://github.com/dnomd343/klotski.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

update: split build process by type_id

master
Dnomd343 2 months ago
parent
73578fb04c
commit
5c221e7dda
1 changed files with 282 additions and 141 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 255
      src/core/group/internal/group_cases.cc

255
src/core/group/internal/group_cases.cc
View File

@ -87,7 +87,118 @@ KLSK_NOINLINE static void extend(const RawCode seed, const size_t reserve, MF ad
for (const auto code : mirrors) { release(code); } for (const auto code : mirrors) { release(code); }
} }
KLSK_NOINLINE static void extend_full_pattern(RawCode seed, size_t size, RangesUnion &a) { // KLSK_NOINLINE static void extend_full_pattern(RawCode seed, size_t size, RangesUnion &a) {
// const auto mirror_func = [](const RawCode code, auto spawn) {
// const auto m_vrt = code.to_vertical_mirror();
// spawn(m_vrt);
// if (const auto m_hor = code.to_horizontal_mirror(); m_hor != code) {
// spawn(m_hor);
// spawn(m_vrt.to_horizontal_mirror());
// }
// };
//
// extend(seed, size, mirror_func, [&a](const RawCode raw_code) {
// const auto code = raw_code.to_common_code().unwrap();
// a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
// });
//
// for (auto head : RangesUnion::Heads) {
// std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// }
//
// }
// KLSK_NOINLINE static void extend_hor_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &c) {
// const auto mirror_func = [](const RawCode code, auto spawn) {
// if (const auto m_hor = code.to_horizontal_mirror(); m_hor != code) {
// spawn(m_hor);
// }
// };
// extend(seed, size, mirror_func, [&a, &c](const RawCode raw_code) {
// const auto code = raw_code.to_common_code().unwrap();
// a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
//
// const auto code_ = raw_code.to_vertical_mirror().to_common_code().unwrap();
// c.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_));
// });
//
// for (auto head : RangesUnion::Heads) {
// std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// std::stable_sort(c.ranges(head).begin(), c.ranges(head).end());
// }
//
// }
// KLSK_NOINLINE static void extend_cen_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b) {
// const auto mirror_func = [](const RawCode code, auto spawn) {
// spawn(code.to_diagonal_mirror());
// };
// extend(seed, size, mirror_func, [&a, &b](const RawCode raw_code) {
// const auto code = raw_code.to_common_code().unwrap();
// a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
//
// const auto code_ = raw_code.to_horizontal_mirror().to_common_code().unwrap();
// b.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_));
// });
//
// for (auto head : RangesUnion::Heads) {
// std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
// }
// }
// KLSK_NOINLINE static void extend_ver_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b) {
// const auto mirror_func = [](const RawCode code, auto spawn) {
// spawn(code.to_vertical_mirror());
// };
// extend(seed, size, mirror_func, [&a, &b](const RawCode raw_code) {
// const auto code = raw_code.to_common_code().unwrap();
// a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
//
// const auto code_ = raw_code.to_horizontal_mirror().to_common_code().unwrap();
// b.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_));
// });
//
// for (auto head : RangesUnion::Heads) {
// std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
// }
// }
// KLSK_NOINLINE static void extend_ord_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b, RangesUnion &c, RangesUnion &d) {
// extend(seed, size, NO_MIRROR, [&a, &b, &c, &d](const RawCode raw_code) {
// const auto code = raw_code.to_common_code().unwrap();
// a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
//
// const auto code_1 = raw_code.to_horizontal_mirror().to_common_code().unwrap();
// b.ranges(code_1 >> 32).emplace_back(static_cast<uint32_t>(code_1));
//
// const auto code_2 = raw_code.to_vertical_mirror().to_common_code().unwrap();
// c.ranges(code_2 >> 32).emplace_back(static_cast<uint32_t>(code_2));
//
// const auto code_3 = raw_code.to_diagonal_mirror().to_common_code().unwrap();
// d.ranges(code_3 >> 32).emplace_back(static_cast<uint32_t>(code_3));
// });
//
// for (auto head : RangesUnion::Heads) {
// std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
// std::stable_sort(c.ranges(head).begin(), c.ranges(head).end());
// std::stable_sort(d.ranges(head).begin(), d.ranges(head).end());
// }
// }
template <Group::MirrorType TYPE>
// static void extend_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b, RangesUnion &c, RangesUnion &d) {
static void extend_pattern(RawCode seed, size_t size, RangesUnion *kk) {
RangesUnion &a = kk[0];
RangesUnion &b = kk[1];
RangesUnion &c = kk[2];
RangesUnion &d = kk[3];
if constexpr(TYPE == Group::MirrorType::Full) {
const auto mirror_func = [](const RawCode code, auto spawn) { const auto mirror_func = [](const RawCode code, auto spawn) {
const auto m_vrt = code.to_vertical_mirror(); const auto m_vrt = code.to_vertical_mirror();
spawn(m_vrt); spawn(m_vrt);
@ -97,23 +208,28 @@ KLSK_NOINLINE static void extend_full_pattern(RawCode seed, size_t size, RangesU
} }
}; };
// RangesUnion &a = kk[0];
extend(seed, size, mirror_func, [&a](const RawCode raw_code) { extend(seed, size, mirror_func, [&a](const RawCode raw_code) {
const auto code = raw_code.to_common_code().unwrap(); const auto code = raw_code.to_common_code().unwrap();
a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code)); a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
}); });
for (auto head : RangesUnion::Heads) { // for (auto head : RangesUnion::Heads) {
std::stable_sort(a.ranges(head).begin(), a.ranges(head).end()); // std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// }
} }
} if constexpr(TYPE == Group::MirrorType::Horizontal) {
KLSK_NOINLINE static void extend_hor_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &c) {
const auto mirror_func = [](const RawCode code, auto spawn) { const auto mirror_func = [](const RawCode code, auto spawn) {
if (const auto m_hor = code.to_horizontal_mirror(); m_hor != code) { if (const auto m_hor = code.to_horizontal_mirror(); m_hor != code) {
spawn(m_hor); spawn(m_hor);
} }
}; };
// RangesUnion &a = kk[0];
// RangesUnion &c = kk[2];
extend(seed, size, mirror_func, [&a, &c](const RawCode raw_code) { extend(seed, size, mirror_func, [&a, &c](const RawCode raw_code) {
const auto code = raw_code.to_common_code().unwrap(); const auto code = raw_code.to_common_code().unwrap();
a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code)); a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
@ -122,17 +238,20 @@ KLSK_NOINLINE static void extend_hor_pattern(RawCode seed, size_t size, RangesUn
c.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_)); c.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_));
}); });
for (auto head : RangesUnion::Heads) { // for (auto head : RangesUnion::Heads) {
std::stable_sort(a.ranges(head).begin(), a.ranges(head).end()); // std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
std::stable_sort(c.ranges(head).begin(), c.ranges(head).end()); // std::stable_sort(c.ranges(head).begin(), c.ranges(head).end());
// }
} }
} if constexpr(TYPE == Group::MirrorType::Centro) {
KLSK_NOINLINE static void extend_cen_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b) {
const auto mirror_func = [](const RawCode code, auto spawn) { const auto mirror_func = [](const RawCode code, auto spawn) {
spawn(code.to_diagonal_mirror()); spawn(code.to_diagonal_mirror());
}; };
// RangesUnion &a = kk[0];
// RangesUnion &b = kk[1];
extend(seed, size, mirror_func, [&a, &b](const RawCode raw_code) { extend(seed, size, mirror_func, [&a, &b](const RawCode raw_code) {
const auto code = raw_code.to_common_code().unwrap(); const auto code = raw_code.to_common_code().unwrap();
a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code)); a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
@ -141,16 +260,20 @@ KLSK_NOINLINE static void extend_cen_pattern(RawCode seed, size_t size, RangesUn
b.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_)); b.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_));
}); });
for (auto head : RangesUnion::Heads) { // for (auto head : RangesUnion::Heads) {
std::stable_sort(a.ranges(head).begin(), a.ranges(head).end()); // std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
std::stable_sort(b.ranges(head).begin(), b.ranges(head).end()); // std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
// }
} }
}
KLSK_NOINLINE static void extend_ver_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b) { if constexpr(TYPE == Group::MirrorType::Vertical) {
const auto mirror_func = [](const RawCode code, auto spawn) { const auto mirror_func = [](const RawCode code, auto spawn) {
spawn(code.to_vertical_mirror()); spawn(code.to_vertical_mirror());
}; };
// RangesUnion &a = kk[0];
// RangesUnion &b = kk[1];
extend(seed, size, mirror_func, [&a, &b](const RawCode raw_code) { extend(seed, size, mirror_func, [&a, &b](const RawCode raw_code) {
const auto code = raw_code.to_common_code().unwrap(); const auto code = raw_code.to_common_code().unwrap();
a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code)); a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
@ -159,13 +282,19 @@ KLSK_NOINLINE static void extend_ver_pattern(RawCode seed, size_t size, RangesUn
b.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_)); b.ranges(code_ >> 32).emplace_back(static_cast<uint32_t>(code_));
}); });
for (auto head : RangesUnion::Heads) { // for (auto head : RangesUnion::Heads) {
std::stable_sort(a.ranges(head).begin(), a.ranges(head).end()); // std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
std::stable_sort(b.ranges(head).begin(), b.ranges(head).end()); // std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
// }
} }
}
KLSK_NOINLINE static void extend_ord_pattern(RawCode seed, size_t size, RangesUnion &a, RangesUnion &b, RangesUnion &c, RangesUnion &d) { if constexpr(TYPE == Group::MirrorType::Ordinary) {
// RangesUnion &a = kk[0];
// RangesUnion &b = kk[1];
// RangesUnion &c = kk[2];
// RangesUnion &d = kk[3];
extend(seed, size, NO_MIRROR, [&a, &b, &c, &d](const RawCode raw_code) { extend(seed, size, NO_MIRROR, [&a, &b, &c, &d](const RawCode raw_code) {
const auto code = raw_code.to_common_code().unwrap(); const auto code = raw_code.to_common_code().unwrap();
a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code)); a.ranges(code >> 32).emplace_back(static_cast<uint32_t>(code));
@ -180,26 +309,41 @@ KLSK_NOINLINE static void extend_ord_pattern(RawCode seed, size_t size, RangesUn
d.ranges(code_3 >> 32).emplace_back(static_cast<uint32_t>(code_3)); d.ranges(code_3 >> 32).emplace_back(static_cast<uint32_t>(code_3));
}); });
// for (auto head : RangesUnion::Heads) {
// std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
// std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
// std::stable_sort(c.ranges(head).begin(), c.ranges(head).end());
// std::stable_sort(d.ranges(head).begin(), d.ranges(head).end());
// }
}
for (auto head : RangesUnion::Heads) { for (auto head : RangesUnion::Heads) {
std::stable_sort(a.ranges(head).begin(), a.ranges(head).end()); std::stable_sort(a.ranges(head).begin(), a.ranges(head).end());
if constexpr(TYPE == Group::MirrorType::Centro || TYPE == Group::MirrorType::Vertical || TYPE == Group::MirrorType::Ordinary) {
std::stable_sort(b.ranges(head).begin(), b.ranges(head).end()); std::stable_sort(b.ranges(head).begin(), b.ranges(head).end());
}
if constexpr(TYPE == Group::MirrorType::Horizontal || TYPE == Group::MirrorType::Ordinary) {
std::stable_sort(c.ranges(head).begin(), c.ranges(head).end()); std::stable_sort(c.ranges(head).begin(), c.ranges(head).end());
}
if constexpr(TYPE == Group::MirrorType::Ordinary) {
std::stable_sort(d.ranges(head).begin(), d.ranges(head).end()); std::stable_sort(d.ranges(head).begin(), d.ranges(head).end());
} }
}
} }
std::array<RangesUnion, ALL_PATTERN_NUM * 4> build_ru_array() {
std::array<RangesUnion, ALL_PATTERN_NUM * 4> data;
for (uint32_t type_id = 0; type_id < TYPE_ID_LIMIT; ++type_id) { static void build_ru_arr(uint8_t type_id, std::array<RangesUnion, ALL_PATTERN_NUM * 4> &data) {
auto group_union = GroupUnion::unsafe_create(type_id); auto group_union = GroupUnion::unsafe_create(type_id);
if (group_union.group_num() == 1) { // only single group if (group_union.group_num() == 1) { // only single group
// std::println("type_id = {}", type_id);
data[PATTERN_OFFSET[type_id] * 4] = group_union.cases(); data[PATTERN_OFFSET[type_id] * 4] = group_union.cases();
continue; return;
} }
uint32_t pattern_id_begin = 0; uint32_t pattern_id_begin = 0;
@ -208,17 +352,6 @@ std::array<RangesUnion, ALL_PATTERN_NUM * 4> build_ru_array() {
} }
for (uint32_t pattern_id = pattern_id_begin; pattern_id < group_union.pattern_num(); ++pattern_id) { for (uint32_t pattern_id = pattern_id_begin; pattern_id < group_union.pattern_num(); ++pattern_id) {
// std::vector<Group> groups;
// for (auto group : group_union.groups()) {
// if (group.pattern_id() == pattern_id) {
// groups.emplace_back(group);
// }
// }
//
// auto flat_id = PATTERN_OFFSET[type_id] + pattern_id;
// for (auto group : groups) {
// data[flat_id * 4 + (int)group.toward()] = Group_cases(group);
// }
const auto flat_id = PATTERN_OFFSET[type_id] + pattern_id; const auto flat_id = PATTERN_OFFSET[type_id] + pattern_id;
const auto mirror_type = static_cast<Group::MirrorType>(PATTERN_DATA[flat_id] & 0b111); const auto mirror_type = static_cast<Group::MirrorType>(PATTERN_DATA[flat_id] & 0b111);
@ -228,21 +361,35 @@ std::array<RangesUnion, ALL_PATTERN_NUM * 4> build_ru_array() {
const auto size = (PATTERN_DATA[flat_id] >> 3) & 0xFFFFF; const auto size = (PATTERN_DATA[flat_id] >> 3) & 0xFFFFF;
if (mirror_type == Group::MirrorType::Full) { if (mirror_type == Group::MirrorType::Full) {
extend_full_pattern(seed, size, data[flat_id * 4]); // extend_full_pattern(seed, size, data[flat_id * 4]);
// extend_pattern<Group::MirrorType::Full>(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]);
extend_pattern<Group::MirrorType::Full>(seed, size, &data[flat_id * 4]);
} else if (mirror_type == Group::MirrorType::Horizontal) { } else if (mirror_type == Group::MirrorType::Horizontal) {
extend_hor_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 2]); // extend_hor_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 2]);
// extend_pattern<Group::MirrorType::Horizontal>(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]);
extend_pattern<Group::MirrorType::Horizontal>(seed, size, &data[flat_id * 4]);
} else if (mirror_type == Group::MirrorType::Centro) { } else if (mirror_type == Group::MirrorType::Centro) {
extend_cen_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 1]); // extend_cen_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 1]);
// extend_pattern<Group::MirrorType::Centro>(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]);
extend_pattern<Group::MirrorType::Centro>(seed, size, &data[flat_id * 4]);
} else if (mirror_type == Group::MirrorType::Vertical) { } else if (mirror_type == Group::MirrorType::Vertical) {
extend_ver_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 1]); // extend_ver_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 1]);
// extend_pattern<Group::MirrorType::Vertical>(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]);
extend_pattern<Group::MirrorType::Vertical>(seed, size, &data[flat_id * 4]);
} else if (mirror_type == Group::MirrorType::Ordinary) { } else if (mirror_type == Group::MirrorType::Ordinary) {
extend_ord_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]); // extend_ord_pattern(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]);
// extend_pattern<Group::MirrorType::Ordinary>(seed, size, data[flat_id * 4], data[flat_id * 4 + 1], data[flat_id * 4 + 2], data[flat_id * 4 + 3]);
extend_pattern<Group::MirrorType::Ordinary>(seed, size, &data[flat_id * 4]);
} }
} }
if (pattern_id_begin == 1) { // first pattern is `x` if (pattern_id_begin == 1) { // first pattern is `x`
RangesUnion others; RangesUnion others;
size_t index_begin = (PATTERN_OFFSET[type_id] + 1) * 4; size_t index_begin = (PATTERN_OFFSET[type_id] + 1) * 4;
@ -257,13 +404,17 @@ std::array<RangesUnion, ALL_PATTERN_NUM * 4> build_ru_array() {
} }
data[PATTERN_OFFSET[type_id] * 4] = group_union.cases_without(others); data[PATTERN_OFFSET[type_id] * 4] = group_union.cases_without(others);
} }
}
} std::array<RangesUnion, ALL_PATTERN_NUM * 4> build_ru_array() {
std::array<RangesUnion, ALL_PATTERN_NUM * 4> data;
for (uint32_t type_id = 0; type_id < TYPE_ID_LIMIT; ++type_id) {
build_ru_arr(type_id, data);
}
// verify /// verify
// for (uint8_t type_id = 0; type_id < TYPE_ID_LIMIT; ++type_id) { // for (uint8_t type_id = 0; type_id < TYPE_ID_LIMIT; ++type_id) {
// const auto group_union = GroupUnion::unsafe_create(type_id); // const auto group_union = GroupUnion::unsafe_create(type_id);
// for (const auto group : group_union.groups()) { // for (const auto group : group_union.groups()) {
@ -278,7 +429,6 @@ std::array<RangesUnion, ALL_PATTERN_NUM * 4> build_ru_array() {
// } // }
// } // }
return data; return data;
} }
@ -340,18 +490,9 @@ CommonCode GroupCases::fast_obtain_code(CaseInfo info) {
auto flat_id = PATTERN_OFFSET[info.group().type_id()] + info.group().pattern_id(); auto flat_id = PATTERN_OFFSET[info.group().type_id()] + info.group().pattern_id();
// auto &cases = (*ru_data)[flat_id][(int)info.group().toward()];
// TODO: make offset table for perf // TODO: make offset table for perf
// auto &cases = (*ru_data_flat)[flat_id * 4 + (int)info.group().toward()];
// auto &cases = (*ru_data_map)[info.group()];
// auto &cases = (*ru_data_array)[flat_id][(int)info.group().toward()];
auto &cases = (*ru_data_array)[flat_id * 4 + (int)info.group().toward()]; auto &cases = (*ru_data_array)[flat_id * 4 + (int)info.group().toward()];
// auto &cases = (*ru_data_vector)[flat_id][(int)info.group().toward()];
uint64_t head = 0; uint64_t head = 0;
auto case_id = info.case_id(); auto case_id = info.case_id();

Write Preview
Loading…
Cancel
Save