Skip to content

Commit

Permalink
fixed bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@DenisYaroshevskiy
DenisYaroshevskiy committed Dec 27, 2024
1 parent 56d779b commit 114ba84
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 47 deletions.
80 changes: 35 additions & 45 deletions include/eve/module/algo/algo/for_each_iteration_with_expensive_optional_part.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,73 +18,61 @@ namespace detail
{
struct for_each_iteration_with_expensive_optional_part_common
{
template <typename Traits, typename I, typename S>
auto unroll_l(Traits, I f, S l){
return eve::unalign(f) + (l - f - get_unrolling<Traits>() * iterator_cardinal_v<I>);
}

template<typename Traits, typename I, typename S, typename Delegate>
EVE_FORCEINLINE bool main_loop(Traits, I& f, S l, Delegate& delegate) const
requires (get_unrolling<Traits>() == 1)
EVE_FORCEINLINE bool no_unrolling_loop(Traits, I& f, S l, Delegate& delegate) const
{
while (f != l) {
while( f != l )
{
bool check = delegate.step(f, eve::ignore_none);
f += iterator_cardinal_v<I>;
if (check) return true;
if (check) return check;
}
return false;
}

template<typename I, typename S, typename Delegate> struct small_steps_lambda
template<typename Traits, typename I, typename S, typename Delegate>
EVE_FORCEINLINE bool main_loop(Traits tr, I& f, auto unroll_l, S l, Delegate& delegate) const
requires(get_unrolling<Traits>() == 1)
{
I& f;
S& l;
bool& delegate_reply;
Delegate& delegate;

template<int i> EVE_FORCEINLINE bool operator()(std::integral_constant<int, i>)
{
delegate_reply = delegate.step(f, eve::ignore_none);
f += iterator_cardinal_v<I>;

if( delegate_reply ) return true;
return f == l;
}
};
(void)unroll_l;
return no_unrolling_loop(tr, f, l, delegate);
}

template<typename I, typename S, typename Delegate> struct unrolled_steps_lambda
{
I& f;
S& l;
Delegate& delegate;

template<int i> EVE_FORCEINLINE bool operator()(std::integral_constant<int, i>)
{
bool test = delegate.step(f, eve::ignore_none);
f += iterator_cardinal_v<I>;
return test;
if( delegate.step(f + i * iterator_cardinal_v<I>, eve::ignore_none) )
{
f += i * iterator_cardinal_v<I>;
return true;
}
return false;
}
};

template<typename Traits, typename I, typename S, typename Delegate>
EVE_FORCEINLINE bool main_loop(Traits, I& f, S l, Delegate& delegate) const
EVE_FORCEINLINE bool main_loop(Traits tr, I& f, auto unroll_l, S l, Delegate& delegate) const
{
auto delegate_reply = false;
if( f == l ) return delegate_reply;

while( true )
while( f <= unroll_l )
{
if( eve::detail::for_until_<0, 1, get_unrolling<Traits>()>(
small_steps_lambda<I, S, Delegate> {f, l, delegate_reply, delegate}) )
unrolled_steps_lambda<I, S, Delegate> {f, delegate}) )
{
return delegate_reply;
}

std::ptrdiff_t n = (l - f) / (iterator_cardinal_v<I> * get_unrolling<Traits>());

while (n--) {
if( eve::detail::for_until_<0, 1, get_unrolling<Traits>()>(
unrolled_steps_lambda<I, S, Delegate> {f, l, delegate}) )
{
return true;
}
return true;
}
f += get_unrolling<Traits>() * iterator_cardinal_v<I>;
}

return no_unrolling_loop(tr, f, l, delegate);
}
};

Expand All @@ -111,9 +99,10 @@ namespace detail

template<typename Delegate> EVE_FORCEINLINE void operator()(Delegate& delegate)
{
auto unroll_l = this->unroll_l(traits, f, l);
while( true )
{
if( !this->main_loop(traits, f, l, delegate) ) return;
if( !this->main_loop(traits, f, unroll_l, l, delegate) ) return;
if( delegate.expensive_part() ) return;
}
}
Expand All @@ -138,9 +127,10 @@ namespace detail
template<typename Delegate> EVE_FORCEINLINE void operator()(Delegate& delegate)
{
I precise_l = f + (((l - f) / iterator_cardinal_v<I>)*iterator_cardinal_v<I>);
auto unroll_l = this->unroll_l(traits, f, l);

main_loop:
if( this->main_loop(traits, f, precise_l, delegate) ) { goto expensive_part; }
if( this->main_loop(traits, f, unroll_l, precise_l, delegate) ) { goto expensive_part; }

if( precise_l == l ) return;
{
Expand Down Expand Up @@ -177,6 +167,7 @@ namespace detail
{
auto aligned_f = base;
auto aligned_l = (f + (l - f)).previous_partially_aligned();
auto unroll_l = this->unroll_l(traits, f, l);

eve::ignore_first ignore_first {f - aligned_f};

Expand All @@ -185,14 +176,13 @@ namespace detail
{
bool first_step_res = delegate.step(aligned_f, ignore_first);
ignore_first = eve::ignore_first {0};
aligned_f += iterator_cardinal_v<I>;
if( first_step_res ) goto expensive_part;
}

aligned_f += iterator_cardinal_v<I>;

main_loop:
// handles aligned_f == aligned_l
if( this->main_loop(traits, aligned_f, aligned_l, delegate) ) goto expensive_part;
if( this->main_loop(traits, aligned_f, unroll_l, aligned_l, delegate) ) goto expensive_part;
}

if( aligned_f == l ) return;
Expand Down
6 changes: 4 additions & 2 deletions test/unit/module/algo/for_each_iteration_with_expensive_optional_part.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

namespace {

constexpr std::size_t kMaxTestDataSize = 100;

struct fixture
{
fixture()
Expand All @@ -36,7 +38,7 @@ struct fixture

std::string_view res() { return data.data(); }

alignas(64) std::array<char, 100> data;
alignas(64) std::array<char, kMaxTestDataSize> data;
};

struct test_delegate {
Expand All @@ -62,6 +64,7 @@ struct test_delegate {

std::ptrdiff_t it_idx = it.ptr - data;
std::cerr << "step: it idx: " << it_idx << " ignore: " << ignore << std::endl;
TTS_LESS_EQUAL(it_idx, (std::ptrdiff_t)kMaxTestDataSize, REQUIRED) << "sanity check";

for( std::ptrdiff_t i = ignore.offset(tgt); i; --i ) { *ptr++ = 'i'; }
for( std::ptrdiff_t i = ignore.count(tgt); i; --i ) {
Expand Down Expand Up @@ -97,7 +100,6 @@ struct run_test_impl {
std::vector<std::ptrdiff_t> where_to_expensive;
int expensive_returns_true_at;


template <bool divisible>
std::string run_impl(
auto& fix,
Expand Down

0 comments on commit 114ba84

Please sign in to comment.