Skip to content

Commit

Permalink
Final tweaks on the Hyper refactor
Browse files Browse the repository at this point in the history 
- now spectests clean when activated
- will run some timing tests tomorrow before activating in master
- expect to see between 1.5x and 4x faster metaops
  • Loading branch information
@lizmat
lizmat committed Nov 8, 2018
1 parent b0a2ce7 commit ec2848c
Showing 1 changed file with 75 additions and 42 deletions.
117 changes: 75 additions & 42 deletions src/core/Hyper.pm6
View file
@@ -1,14 +1,18 @@
# A class to perform hyper operations of the form left op right

class Hyper {
has &.operator;
has $.dwim-left;
has $.dwim-right;
has $.operator; # for some reason we can't make this a &.operator
has int8 $.dwim-left;
has int8 $.dwim-right;

method new(\op, Bool() :$dwim-left, Bool() :$dwim-right) {
self.bless( :operator(op), :$dwim-left, :$dwim-right)
}

proto method infix(|) {*}

# x >>op<< y
multi method infix(\left, \right) is raw { &!operator(left,right) }
multi method infix(\left, \right) is raw { $!operator(left,right) }

# %x >>op<< %y
multi method infix(
Expand All @@ -24,46 +28,50 @@ class Hyper {

# %x >>op<< ...
multi method infix(Associative:D \left, Iterable:D \right) {
die "{left.^name} {&!operator.name} {right.^name} can never work
die "{left.^name} {$!operator.name} {right.^name} can never work
reliably: the order of keys in {left.^name} is indeterminate"
}

# %x >>op<< y
multi method infix(Associative:D \left, \right --> Associative:D) {
my @keys = left.keys;
my \result := left.WHAT.new.STORE(
Rakudo::Iterator.RoundrobinIterablesFlat(
(@keys, self.infix(left{@keys}, right))
Seq.new(
Rakudo::Iterator.RoundrobinIterablesFlat(
(@keys, self.infix(left{@keys}, right))
)
)
);
nqp::iscont(left) ?? result.item !! result;
}

# ... >>op<< %y
multi method infix(Iterable:D \left, Associative:D \right) {
die "{left.^name} {&!operator.name} {right.^name} can never work
die "{left.^name} {$!operator.name} {right.^name} can never work
reliably: the order of keys in {right.^name} is indeterminate"
}

# x >>op<< %y
multi method infix(\left, Associative:D \right --> Associative:D) {
my @keys = right.keys;
my \result := right.WHAT.new.STORE(
Rakudo::Iterator.RoundrobinIterablesFlat(
(@keys, self.infix(left, right{@keys}))
Seq.new(
Rakudo::Iterator.RoundrobinIterablesFlat(
(@keys, self.infix(left, right{@keys}))
)
)
);
nqp::iscont(left) ?? result.item !! result;
}

# [x] >>op<< y
multi method infix(Positional:D \left, \right --> Positional:D) {
X::HyperOp::Infinite.new(:side<left>, :&!operator).throw
X::HyperOp::Infinite.new(:side<left>, :$!operator).throw
if left.is-lazy;

my int $left-elems = left.elems;
X::HyperOp::NonDWIM.new(
:&!operator, :$left-elems, :right-elems(1), :recursing
:$!operator, :$left-elems, :right-elems(1), :recursing
).throw
unless $left-elems == 1
or $left-elems > 1 and $!dwim-right
Expand All @@ -88,12 +96,12 @@ class Hyper {

# x >>op<< [y]
multi method infix(\left, Positional:D \right --> Positional:D) {
X::HyperOp::Infinite.new(:side<right>, :&!operator).throw
X::HyperOp::Infinite.new(:side<right>, :$!operator).throw
if right.is-lazy;

my int $right-elems = right.elems;
X::HyperOp::NonDWIM.new(
:&!operator, :left-elems(1), :$right-elems, :recursing
:$!operator, :left-elems(1), :$right-elems, :recursing
).throw
unless $right-elems == 1
or $right-elems > 1 and $!dwim-left
Expand All @@ -109,7 +117,7 @@ class Hyper {

my \result := nqp::p6bindattrinvres(
nqp::create(
nqp::istype(left,List) ?? left.WHAT !! List # keep subtype
nqp::istype(right,List) ?? right.WHAT !! List # keep subtype
),
List, '$!reified', values
);
Expand All @@ -127,33 +135,39 @@ class Hyper {

# Check whether any side is lazy. They must not be to proceed.
if left-iterator.is-lazy {
X::HyperOp::Infinite.new(:side<both>, :&!operator).throw
X::HyperOp::Infinite.new(:side<both>, :$!operator).throw
if right-iterator.is-lazy;
X::HyperOp::Infinite.new(:side<left>, :&!operator).throw
X::HyperOp::Infinite.new(:side<left>, :$!operator).throw
if nqp::not_i($!dwim-left) || $!dwim-right;
}
X::HyperOp::Infinite.new(:side<right>, :&!operator).throw
X::HyperOp::Infinite.new(:side<right>, :$!operator).throw
if right-iterator.is-lazy
and (nqp::not_i($!dwim-right) || $!dwim-left);

my \retval := (
my \values :=
$!dwim-left
?? $!dwim-right
?? self!iterables-left-right(left-iterator,right-iterator)
!! self!iterables-left(left-iterator,right-iterator)
!! $!dwim-right
?? self!iterables-right(left-iterator,right-iterator)
!! self!iterables(left-iterator,right-iterator)
).List;
nqp::iscont(left) ?? retval.item !! retval;
;
my \result := nqp::p6bindattrinvres(
nqp::create(
nqp::istype(left,List) ?? left.WHAT !! List # keep subtype
),
List, '$!reified', values
);
nqp::iscont(left) ?? result.item !! result;
}

# using an infix on a one element list in a meta op
multi method infix(\object) {
nqp::if(
nqp::can(&!operator,"nodal"),
nodemap(&!operator,object),
deepmap(&!operator,object)
nqp::can($!operator,"nodal"),
nodemap($!operator,object),
deepmap($!operator,object)
)
}

Expand Down Expand Up @@ -184,25 +198,39 @@ class Hyper {

# ... <<op<< ...
method !iterables-left(Iterator:D \left, Iterator:D \right) {
my \righti := Rakudo::Iterator.DWIM(right);
my \lefti := Rakudo::Iterator.DWIM(left);
my \result := nqp::create(IterationBuffer);

nqp::until(
nqp::eqaddr((my \leftv := left.pull-one),IterationEnd),
nqp::push(result, self.infix(leftv,righti.pull-one))
my \leftv := lefti.pull-one;
nqp::unless(
lefti.ended,
nqp::until(
nqp::eqaddr((my \rightv := right.pull-one),IterationEnd),
nqp::stmts(
nqp::push(result,self.infix(leftv,rightv)),
nqp::bind(leftv,lefti.pull-one)
)
)
);

result
}

# ... >>op>> ...
method !iterables-right(Iterator:D \left, Iterator:D \right) {
my \lefti := Rakudo::Iterator.DWIM(left);
my \righti := Rakudo::Iterator.DWIM(right);
my \result := nqp::create(IterationBuffer);

nqp::until(
nqp::eqaddr((my \rightv := right.pull-one),IterationEnd),
nqp::push(result, self.infix(lefti.pull-one,rightv))
my \rightv := righti.pull-one;
nqp::unless(
righti.ended,
nqp::until(
nqp::eqaddr((my \leftv := left.pull-one),IterationEnd),
nqp::stmts(
nqp::push(result, self.infix(leftv,rightv)),
nqp::bind(rightv,righti.pull-one)
)
)
);

result
Expand All @@ -216,12 +244,15 @@ class Hyper {

my \leftv := lefti.pull-one;
my \rightv := righti.pull-one;
nqp::until(
lefti.ended && righti.ended,
nqp::stmts(
nqp::push(result, self.infix(leftv,rightv)),
nqp::bind(leftv, lefti.pull-one),
nqp::bind(rightv,righti.pull-one)
nqp::unless(
lefti.ended || righti.ended,
nqp::until(
lefti.ended && righti.ended,
nqp::stmts(
nqp::push(result,self.infix(leftv,rightv)),
nqp::bind(leftv, lefti.pull-one),
nqp::bind(rightv,righti.pull-one)
)
)
);

Expand Down Expand Up @@ -275,8 +306,10 @@ class Hyper {

# run with the left/right values
my \result := left.WHAT.new.STORE(
Rakudo::Iterator.RoundrobinIterablesFlat(
(@keys, quietly self.infix(left{@keys}, right{$keys}))
Seq.new(
Rakudo::Iterator.RoundrobinIterablesFlat(
(@keys, quietly self.infix(left{@keys}, right{$keys}))
)
)
);
nqp::iscont(left) ?? result.item !! result;
Expand All @@ -290,7 +323,7 @@ class Hyper {
++$right-elems
);
X::HyperOp::NonDWIM.new(
:&!operator, :$left-elems, :$right-elems, :recursing
:$!operator, :$left-elems, :$right-elems, :recursing
).throw;
}

Expand All @@ -302,7 +335,7 @@ class Hyper {
++$left-elems
);
X::HyperOp::NonDWIM.new(
:&!operator, :$left-elems, :$right-elems, :recursing
:$!operator, :$left-elems, :$right-elems, :recursing
).throw;
}
}
Expand Down

0 comments on commit ec2848c

Please sign in to comment.