Skip to content

Commit

Permalink
Make .grep/.first on native arrays about 3.5x as fast
Browse files Browse the repository at this point in the history 
- searching for Str:D on a native str array
- searching for Int:D on a native int array
- searching for Num:D on a native num array
  • Loading branch information
@lizmat
lizmat committed Oct 23, 2020
1 parent 2999be3 commit 240bc9e
Show file tree
Hide file tree
Showing 2 changed files with 251 additions and 3 deletions.
192 changes: 189 additions & 3 deletions src/core.c/native_array.pm6
View file
Expand Up @@ -93,9 +93,71 @@ my class array does Iterable {

my role strarray[::T] does Positional[T] is array_type(T) {
#- start of generated part of strarray role -----------------------------------
#- Generated on 2020-06-02T19:28:53+02:00 by tools/build/makeNATIVE_ARRAY.raku
#- Generated on 2020-10-23T13:59:44+02:00 by tools/build/makeNATIVE_ARRAY.raku
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

multi method grep(strarray:D: Str:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);

if $k || $kv || $p {
my $result := nqp::create(IterationBuffer);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_s(nqp::atpos_s(self,$i),$needle),
nqp::push($result,$i)
)
);

if $kv || $p {
$i = -1;
$elems = nqp::elems($result);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::bindpos(
$result,
$i,nqp::if($kv,($i,$needle),Pair.new($i,$needle))
)
);
}

$result.Seq
}
else {
my int $found;
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_s(nqp::atpos_s(self,$i),$needle),
$found = nqp::add_i($found,1)
)
);
$needle xx $found
}
}

multi method first(strarray:D: Str:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);

nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems)
&& nqp::isne_s(nqp::atpos_s(self,$i),$needle),
nqp::null()
);

nqp::iseq_i($i,nqp::elems(self))
?? Nil
!! $k
?? $i
!! $kv
?? ($i,$needle)
!! $p
?? Pair.new($i,$needle)
!! $needle
}

multi method AT-POS(strarray:D: int $idx --> str) is raw {
nqp::islt_i($idx,0)
?? INDEX_OUT_OF_RANGE($idx)
Expand Down Expand Up @@ -557,9 +619,71 @@ my class array does Iterable {

my role intarray[::T] does Positional[T] is array_type(T) {
#- start of generated part of intarray role -----------------------------------
#- Generated on 2020-06-02T19:28:53+02:00 by tools/build/makeNATIVE_ARRAY.raku
#- Generated on 2020-10-23T13:59:44+02:00 by tools/build/makeNATIVE_ARRAY.raku
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

multi method grep(intarray:D: Int:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);

if $k || $kv || $p {
my $result := nqp::create(IterationBuffer);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_i(nqp::atpos_i(self,$i),$needle),
nqp::push($result,$i)
)
);

if $kv || $p {
$i = -1;
$elems = nqp::elems($result);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::bindpos(
$result,
$i,nqp::if($kv,($i,$needle),Pair.new($i,$needle))
)
);
}

$result.Seq
}
else {
my int $found;
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_i(nqp::atpos_i(self,$i),$needle),
$found = nqp::add_i($found,1)
)
);
$needle xx $found
}
}

multi method first(intarray:D: Int:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);

nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems)
&& nqp::isne_i(nqp::atpos_i(self,$i),$needle),
nqp::null()
);

nqp::iseq_i($i,nqp::elems(self))
?? Nil
!! $k
?? $i
!! $kv
?? ($i,$needle)
!! $p
?? Pair.new($i,$needle)
!! $needle
}

multi method AT-POS(intarray:D: int $idx --> int) is raw {
nqp::islt_i($idx,0)
?? INDEX_OUT_OF_RANGE($idx)
Expand Down Expand Up @@ -1073,9 +1197,71 @@ my class array does Iterable {

my role numarray[::T] does Positional[T] is array_type(T) {
#- start of generated part of numarray role -----------------------------------
#- Generated on 2020-06-02T19:28:53+02:00 by tools/build/makeNATIVE_ARRAY.raku
#- Generated on 2020-10-23T13:59:44+02:00 by tools/build/makeNATIVE_ARRAY.raku
#- PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE

multi method grep(numarray:D: Num:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);

if $k || $kv || $p {
my $result := nqp::create(IterationBuffer);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_n(nqp::atpos_n(self,$i),$needle),
nqp::push($result,$i)
)
);

if $kv || $p {
$i = -1;
$elems = nqp::elems($result);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::bindpos(
$result,
$i,nqp::if($kv,($i,$needle),Pair.new($i,$needle))
)
);
}

$result.Seq
}
else {
my int $found;
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_n(nqp::atpos_n(self,$i),$needle),
$found = nqp::add_i($found,1)
)
);
$needle xx $found
}
}

multi method first(numarray:D: Num:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);

nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems)
&& nqp::isne_n(nqp::atpos_n(self,$i),$needle),
nqp::null()
);

nqp::iseq_i($i,nqp::elems(self))
?? Nil
!! $k
?? $i
!! $kv
?? ($i,$needle)
!! $p
?? Pair.new($i,$needle)
!! $needle
}

multi method AT-POS(numarray:D: int $idx --> num) is raw {
nqp::islt_i($idx,0)
?? INDEX_OUT_OF_RANGE($idx)
Expand Down
62 changes: 62 additions & 0 deletions tools/build/makeNATIVE_ARRAY.raku
View file
Expand Up @@ -50,6 +50,68 @@ for $*IN.lines -> $line {
# spurt the role
say Q:to/SOURCE/.subst(/ '#' (\w+) '#' /, -> $/ { %mapper{$0} }, :g).chomp;
multi method grep(#type#array:D: #Type#:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);
if $k || $kv || $p {
my $result := nqp::create(IterationBuffer);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_#postfix#(nqp::atpos_#postfix#(self,$i),$needle),
nqp::push($result,$i)
)
);
if $kv || $p {
$i = -1;
$elems = nqp::elems($result);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::bindpos(
$result,
$i,nqp::if($kv,($i,$needle),Pair.new($i,$needle))
)
);
}
$result.Seq
}
else {
my int $found;
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems),
nqp::if(
nqp::iseq_#postfix#(nqp::atpos_#postfix#(self,$i),$needle),
$found = nqp::add_i($found,1)
)
);
$needle xx $found
}
}
multi method first(#type#array:D: #Type#:D $needle, :$k, :$kv, :$p, :$v) {
my int $i = -1;
my int $elems = nqp::elems(self);
nqp::while(
nqp::islt_i(($i = nqp::add_i($i,1)),$elems)
&& nqp::isne_#postfix#(nqp::atpos_#postfix#(self,$i),$needle),
nqp::null()
);
nqp::iseq_i($i,nqp::elems(self))
?? Nil
!! $k
?? $i
!! $kv
?? ($i,$needle)
!! $p
?? Pair.new($i,$needle)
!! $needle
}
multi method AT-POS(#type#array:D: int $idx --> #type#) is raw {
nqp::islt_i($idx,0)
?? INDEX_OUT_OF_RANGE($idx)
Expand Down

0 comments on commit 240bc9e

Please sign in to comment.