diff --git a/CMakeLists.txt b/CMakeLists.txt index c8e9c22..33f88bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ macro(compile_options target_name) sanitizers(${target_name}) endmacro() -project(blt-gp VERSION 0.3.18) +project(blt-gp VERSION 0.3.19) include(CTest) diff --git a/include/blt/gp/stack.h b/include/blt/gp/stack.h index 2bb8947..cc2620c 100644 --- a/include/blt/gp/stack.h +++ b/include/blt/gp/stack.h @@ -88,7 +88,7 @@ namespace blt::gp { const auto bytes = detail::aligned_size(sizeof(NO_REF_T)); if constexpr (blt::gp::detail::has_func_drop_v) - return bytes + sizeof(std::atomic_uint64_t*); + return bytes + detail::aligned_size(sizeof(std::atomic_uint64_t*)); return bytes; } @@ -168,11 +168,10 @@ namespace blt::gp const auto ptr = static_cast(allocate_bytes_for_size(aligned_size())); std::memcpy(ptr, &t, sizeof(NO_REF)); - // if constexpr (gp::detail::has_func_drop_ephemeral_v) - // { - // const auto* ref_counter_ptr = new std::atomic_uint64_t(1); // NOLINT - // std::memcpy(ptr + sizeof(NO_REF), &ref_counter_ptr, sizeof(std::atomic_uint64_t*)); - // } + if constexpr (gp::detail::has_func_drop_v) + { + new(ptr + sizeof(NO_REF)) mem::pointer_storage{nullptr}; + } } template > @@ -207,6 +206,30 @@ namespace blt::gp return *reinterpret_cast(from(aligned_size() + bytes)); } + [[nodiscard]] mem::pointer_storage& access_pointer(const size_t bytes, const size_t type_size) const + { + const auto type_ref = from(bytes); + return *std::launder( + reinterpret_cast*>(type_ref + (type_size - detail::aligned_size( + sizeof(std::atomic_uint64_t*))))); + } + + [[nodiscard]] mem::pointer_storage& access_pointer_forward(const size_t bytes, const size_t type_size) const + { + const auto type_ref = data_ + bytes; + return *std::launder( + reinterpret_cast*>(type_ref + (type_size - detail::aligned_size( + sizeof(std::atomic_uint64_t*))))); + } + + template + [[nodiscard]] mem::pointer_storage& access_pointer(const size_t bytes) const + { + auto& type_ref = from(bytes); + return *std::launder( + reinterpret_cast*>(reinterpret_cast(&type_ref) + detail::aligned_size(sizeof(T)))); + } + void pop_bytes(const size_t bytes) { #if BLT_DEBUG_LEVEL > 0 diff --git a/include/blt/gp/tree.h b/include/blt/gp/tree.h index 54c5b6d..8f8b086 100644 --- a/include/blt/gp/tree.h +++ b/include/blt/gp/tree.h @@ -213,44 +213,61 @@ namespace blt::gp auto copy_it = copy.operations.begin(); auto op_it = operations.begin(); + size_t total_op_bytes = 0; + size_t total_copy_bytes = 0; + for (; op_it != operations.end(); ++op_it) { - if (op_it->get_flags().is_ephemeral()) - { - if (op_it->has_ephemeral_drop()) - { - } - } if (copy_it == copy.operations.end()) break; - *op_it = *copy_it; - if (op_it->get_flags().is_ephemeral()) + if (op_it->is_value()) { - if (copy_it->has_ephemeral_drop()) + if (op_it->get_flags().is_ephemeral() && op_it->has_ephemeral_drop()) { + // BLT_TRACE("%lu %lu %lu", total_op_bytes, values.bytes_in_head(), values.bytes_in_head() - total_op_bytes); + auto& ptr = values.access_pointer_forward(total_op_bytes, op_it->type_size()); + --*ptr; + // if (*ptr == 0) + // delete *ptr; } + total_op_bytes += op_it->type_size(); + } + *op_it = *copy_it; + if (copy_it->is_value()) + { + if (copy_it->get_flags().is_ephemeral() && copy_it->has_ephemeral_drop()) + { + auto& ptr = copy.values.access_pointer_forward(total_copy_bytes, copy_it->type_size()); + ++*ptr; + } + total_copy_bytes += copy_it->type_size(); } ++copy_it; } const auto op_it_cpy = op_it; for (; op_it != operations.end(); ++op_it) { - if (op_it->get_flags().is_ephemeral()) + if (op_it->is_value()) { - if (op_it->has_ephemeral_drop()) + if (op_it->get_flags().is_ephemeral() && op_it->has_ephemeral_drop()) { + auto& ptr = values.access_pointer_forward(total_op_bytes, op_it->type_size()); + --*ptr; } + total_op_bytes += op_it->type_size(); } } operations.erase(op_it_cpy, operations.end()); for (; copy_it != copy.operations.end(); ++copy_it) { - if (copy_it->get_flags().is_ephemeral()) + if (copy_it->is_value()) { - if (copy_it->has_ephemeral_drop()) + if (copy_it->get_flags().is_ephemeral() && copy_it->has_ephemeral_drop()) { - + auto& ptr = copy.values.access_pointer_forward(total_copy_bytes, copy_it->type_size()); + ++*ptr; } + total_copy_bytes += copy_it->type_size(); } operations.emplace_back(*copy_it); } @@ -457,6 +474,11 @@ namespace blt::gp }; } + ~tree_t() + { + clear(*m_program); + } + private: void handle_operator_inserted(const op_container_t& op); diff --git a/lib/blt b/lib/blt index 1aa7f12..74c1010 160000 --- a/lib/blt +++ b/lib/blt @@ -1 +1 @@ -Subproject commit 1aa7f12c0f0b6d910d4baef51bb530a819663a3d +Subproject commit 74c1010118c3ae13f27499f564ce477b23ae0b0a diff --git a/src/tree.cpp b/src/tree.cpp index 03f30ca..a6487e2 100644 --- a/src/tree.cpp +++ b/src/tree.cpp @@ -278,6 +278,12 @@ namespace blt::gp { // Ephemeral values have corresponding insertions into the stack m_program->get_operator_info(op.id()).func(nullptr, values, values); + if (m_program->operator_has_ephemeral_drop(op.id())) + { + auto& ptr = values.access_pointer(op.type_size(), op.type_size()); + ptr = new std::atomic_uint64_t(1); + ptr.bit(0, true); + } } } @@ -372,11 +378,23 @@ namespace blt::gp auto* f = &program; if (&program != m_program) m_program = f; - for (const auto& op : operations) + size_t total_bytes = 0; + for (const auto& op : iterate(operations)) { - if (op.has_ephemeral_drop()) + if (op.is_value()) { - // TODO: + if (op.get_flags().is_ephemeral() && op.has_ephemeral_drop()) + { + auto& ptr = values.access_pointer_forward(total_bytes, op.type_size()); + --*ptr; + BLT_TRACE(ptr->load()); + if (*ptr == 0) + { + // BLT_TRACE("Deleting pointers!"); + delete ptr.get(); + } + } + total_bytes += op.type_size(); } } operations.clear(); diff --git a/tests/drop_test.cpp b/tests/drop_test.cpp index f8922e7..11046c9 100644 --- a/tests/drop_test.cpp +++ b/tests/drop_test.cpp @@ -76,7 +76,7 @@ prog_config_t config = prog_config_t() .set_reproduction_chance(0.1) .set_max_generations(50) .set_pop_size(50) - .set_thread_count(0); + .set_thread_count(1); example::symbolic_regression_t regression{691ul, config}; @@ -123,19 +123,6 @@ bool fitness_function(const tree_t& current_tree, fitness_t& fitness, size_t) int main() { - int silly = 53; - int* silly_ptr = &silly; - - blt::mem::print_bytes(std::cout, silly_ptr); - - for (blt::size_t i = 49; i < 64; i++) - { - silly_ptr = reinterpret_cast(reinterpret_cast(silly_ptr) | 1ul << i); - } - - blt::mem::print_bytes(std::cout, silly_ptr); - - return 0; operator_builder builder{}; builder.build(add, sub, mul, pro_div, op_sin, op_cos, op_exp, op_log, lit, op_x); regression.get_program().set_operations(builder.grab());