]> git.sesse.net Git - remoteglot/blobdiff - remoteglot.pl
Unbreak find_nonstupid_moves.
[remoteglot] / remoteglot.pl
index 3d636a2981a4e3c7a4b0a4eca516922dd0445eca..675573def081eabb2c1c6ee204456abfaf067d42 100755 (executable)
@@ -13,6 +13,7 @@ use Net::Telnet;
 use FileHandle;
 use IPC::Open2;
 use Time::HiRes;
+use JSON::XS;
 use strict;
 use warnings;
 
@@ -20,9 +21,11 @@ use warnings;
 my $server = "freechess.org";
 my $target = "GMCarlsen";
 my $engine_cmdline = "'./Deep Rybka 4 SSE42 x64'";
+my $engine2_cmdline = "./stockfish_13111119_x64_modern_sse42";
 my $telltarget = undef;   # undef to be silent
 my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
 my $uci_assume_full_compliance = 0;                    # dangerous :-)
+my $update_max_interval = 1.0;
 my @masters = (
        'Sesse',
        'Sessse',
@@ -32,7 +35,8 @@ my @masters = (
 );
 
 # Program starts here
-$SIG{ALRM} = sub { output_screen(); };
+$SIG{ALRM} = sub { output(); };
+my $latest_update = undef;
 
 $| = 1;
 
@@ -50,13 +54,12 @@ $| = 1;
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline);
-my %uciinfo = ();
-my %uciid = ();
+my $engine = open_engine($engine_cmdline, 'E1');
+my $engine2 = open_engine($engine2_cmdline, 'E2');
 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';
-my ($pos_waiting, $pos_calculating);
+my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
 
 uciprint($engine, "setoption name UCI_AnalyseMode value true");
 # uciprint($engine, "setoption name NalimovPath value /srv/tablebase");
@@ -65,6 +68,14 @@ uciprint($engine, "setoption name Hash value 1024");
 # uciprint($engine, "setoption name MultiPV value 2");
 uciprint($engine, "ucinewgame");
 
+uciprint($engine2, "setoption name UCI_AnalyseMode value true");
+# uciprint($engine2, "setoption name NalimovPath value /srv/tablebase");
+uciprint($engine2, "setoption name NalimovUsage value Rarely");
+uciprint($engine2, "setoption name Hash value 1024");
+uciprint($engine2, "setoption name Threads value 8");
+uciprint($engine2, "setoption name MultiPV value 500");
+uciprint($engine2, "ucinewgame");
+
 print "Chess engine ready.\n";
 
 # now talk to FICS
@@ -87,6 +98,7 @@ while (1) {
        my $rin = '';
        my $rout;
        vec($rin, fileno($engine->{'read'}), 1) = 1;
+       vec($rin, fileno($engine2->{'read'}), 1) = 1;
        vec($rin, fileno($t), 1) = 1;
 
        my ($nfound, $timeleft) = select($rout=$rin, undef, undef, 5.0);
@@ -131,7 +143,16 @@ while (1) {
                                $pos_calculating = $pos;
                        }
 
-                       %uciinfo = ();
+                       if (defined($pos_calculating_second_engine)) {
+                               uciprint($engine2, "stop");
+                       } else {
+                               uciprint($engine2, "position fen " . $pos->{'fen'});
+                               uciprint($engine2, "go infinite");
+                               $pos_calculating_second_engine = $pos;
+                       }
+
+                       $engine->{'info'} = {};
+                       $engine2->{'info'} = {};
                        $last_move = time;
 
                        # 
@@ -164,82 +185,114 @@ while (1) {
        
        # any fun on the UCI channel?
        if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-               my $line = read_line($engine->{'read'});
-               handle_uci($line);
+               my @lines = read_lines($engine);
+               for my $line (@lines) {
+                       next if $line =~ /(upper|lower)bound/;
+                       handle_uci($engine, $line, 1);
+               }
                $sleep = 0;
 
-               # don't update too often
-               Time::HiRes::alarm(0.2);
+               output();
+       }
+       if ($nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
+               my @lines = read_lines($engine2);
+               for my $line (@lines) {
+                       next if $line =~ /(upper|lower)bound/;
+                       handle_uci($engine2, $line, 0);
+               }
+               $sleep = 0;
+
+               output();
        }
 
        sleep $sleep;
 }
 
 sub handle_uci {
-       my ($line) = @_;
+       my ($engine, $line, $primary) = @_;
 
        chomp $line;
        $line =~ tr/\r//d;
        $line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
-       print UCILOG localtime() . " <= $line\n";
+       print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
        if ($line =~ /^info/) {
                my (@infos) = split / /, $line;
                shift @infos;
 
-               parse_infos(@infos);
+               parse_infos($engine, @infos);
        }
        if ($line =~ /^id/) {
                my (@ids) = split / /, $line;
                shift @ids;
 
-               parse_ids(@ids);
+               parse_ids($engine, @ids);
        }
-       if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
-               if (defined($pos_waiting)) {
-                       uciprint($engine, "position fen " . $pos_waiting->{'fen'});
-                       uciprint($engine, "go infinite");
+       if ($line =~ /^bestmove/) {
+               if ($primary) {
+                       return if (!$uci_assume_full_compliance);
+                       if (defined($pos_waiting)) {
+                               uciprint($engine, "position fen " . $pos_waiting->{'fen'});
+                               uciprint($engine, "go infinite");
 
-                       $pos_calculating = $pos_waiting;
-                       $pos_waiting = undef;
+                               $pos_calculating = $pos_waiting;
+                               $pos_waiting = undef;
+                       }
+               } else {
+                       $engine2->{'info'} = {};
+                       my $pos = $pos_waiting // $pos_calculating;
+                       uciprint($engine2, "position fen " . $pos->{'fen'});
+                       uciprint($engine2, "go infinite");
+                       $pos_calculating_second_engine = $pos;
                }
        }
 }
 
 sub parse_infos {
-       my (@x) = @_;
+       my ($engine, @x) = @_;
        my $mpv = '';
 
+       my $info = $engine->{'info'};
+
+       # Search for "multipv" first of all, since e.g. Stockfish doesn't put it first.
+       for my $i (0..$#x - 1) {
+               if ($x[$i] =~ 'multipv') {
+                       $mpv = $x[$i + 1];
+                       next;
+               }
+       }
+
        while (scalar @x > 0) {
                if ($x[0] =~ 'multipv') {
+                       # Dealt with above
+                       shift @x;
                        shift @x;
-                       $mpv = shift @x;
                        next;
                }
                if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
                        my $key = shift @x;
                        my $value = shift @x;
-                       $uciinfo{$key} = $value;
+                       $info->{$key} = $value;
                        next;
                }
                if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
                        my $key = shift @x;
                        my $value = shift @x;
-                       $uciinfo{$key . $mpv} = $value;
+                       $info->{$key . $mpv} = $value;
                        next;
                }
                if ($x[0] eq 'score') {
                        shift @x;
 
-                       delete $uciinfo{'score_cp' . $mpv};
-                       delete $uciinfo{'score_mate' . $mpv};
+                       delete $info->{'score_cp' . $mpv};
+                       delete $info->{'score_mate' . $mpv};
 
                        while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
                                if ($x[0] eq 'cp') {
                                        shift @x;
-                                       $uciinfo{'score_cp' . $mpv} = shift @x;
+                                       $info->{'score_cp' . $mpv} = shift @x;
                                } elsif ($x[0] eq 'mate') {
                                        shift @x;
-                                       $uciinfo{'score_mate' . $mpv} = shift @x;
+                                       $info->{'score_mate' . $mpv} = shift @x;
                                } else {
                                        shift @x;
                                }
@@ -247,7 +300,7 @@ sub parse_infos {
                        next;
                }
                if ($x[0] eq 'pv') {
-                       $uciinfo{'pv' . $mpv} = [ @x[1..$#x] ];
+                       $info->{'pv' . $mpv} = [ @x[1..$#x] ];
                        last;
                }
                if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
@@ -262,13 +315,13 @@ sub parse_infos {
 }
 
 sub parse_ids {
-       my (@x) = @_;
+       my ($engine, @x) = @_;
 
        while (scalar @x > 0) {
                if ($x[0] =~ /^(name|author)$/) {
                        my $key = shift @x;
                        my $value = join(' ', @x);
-                       $uciid{$key} = $value;
+                       $engine->{'id'}{$key} = $value;
                        last;
                }
 
@@ -291,6 +344,11 @@ sub style12_to_pos {
        $pos{'black_castle_q'} = $x[14];
        $pos{'time_to_100move_rule'} = $x[15];
        $pos{'move_num'} = $x[26];
+       if ($x[27] =~ /([a-h][1-8])-([a-h][1-8])/) {
+               $pos{'last_move_uci'} = $1 . $2;
+       } else {
+               $pos{'last_move_uci'} = undef;
+       }
        $pos{'last_move'} = $x[29];
        $pos{'fen'} = make_fen(\%pos);
 
@@ -571,11 +629,33 @@ sub prettyprint_pv {
        return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
-sub output_screen {
+sub output {
        #return;
-       
+
        return if (!defined($pos_calculating));
 
+       # Don't update too often.
+       my $age = Time::HiRes::tv_interval($latest_update);
+       if ($age < $update_max_interval) {
+               Time::HiRes::alarm($update_max_interval + 0.01 - $age);
+               return;
+       }
+       
+       my $info = $engine->{'info'};
+       
+       #
+       # Some programs _always_ report MultiPV, even with only one PV.
+       # In this case, we simply use that data as if MultiPV was never
+       # specified.
+       #
+       if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) {
+               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+                       if (exists($info->{$key . '1'})) {
+                               $info->{$key} = $info->{$key . '1'};
+                       }
+               }
+       }
+       
        #
        # Check the PVs first. if they're invalid, just wait, as our data
        # is most likely out of sync. This isn't a very good solution, as
@@ -583,21 +663,30 @@ sub output_screen {
        #
        eval {
                my $dummy;
-               if (exists($uciinfo{'pv'})) {
-                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});
+               if (exists($info->{'pv'})) {
+                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}});
                }
        
                my $mpv = 1;
-               while (exists($uciinfo{'pv' . $mpv})) {
-                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});
+               while (exists($info->{'pv' . $mpv})) {
+                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}});
                        ++$mpv;
                }
        };
        if ($@) {
-               %uciinfo = ();
+               $engine->{'info'} = {};
                return;
        }
 
+       output_screen();
+       output_json();
+       $latest_update = [Time::HiRes::gettimeofday];
+}
+
+sub output_screen {
+       my $info = $engine->{'info'};
+       my $id = $engine->{'id'};
+
        my $text = 'Analysis';
        if ($pos_calculating->{'last_move'} ne 'none') {
                if ($pos_calculating->{'toplay'} eq 'W') {
@@ -605,85 +694,103 @@ sub output_screen {
                } else {
                        $text .= sprintf ' after %u. %s', $pos_calculating->{'move_num'}, $pos_calculating->{'last_move'};
                }
-               if (exists($uciid{'name'})) {
+               if (exists($id->{'name'})) {
                        $text .= ',';
                }
        }
 
-       if (exists($uciid{'name'})) {
-               $text .= " by $uciid{'name'}:\n\n";
+       if (exists($id->{'name'})) {
+               $text .= " by $id->{'name'}:\n\n";
        } else {
                $text .= ":\n\n";
        }
 
        return unless (exists($pos_calculating->{'board'}));
                
-       #
-       # Some programs _always_ report MultiPV, even with only one PV.
-       # In this case, we simply use that data as if MultiPV was never
-       # specified.
-       #
-       if (exists($uciinfo{'pv1'}) && !exists($uciinfo{'pv2'})) {
-               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
-                       if (exists($uciinfo{$key . '1'}) && !exists($uciinfo{$key})) {
-                               $uciinfo{$key} = $uciinfo{$key . '1'};
-                       }
-               }
-       }
-
-       if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+       if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
                # multi-PV
                my $mpv = 1;
-               while (exists($uciinfo{'pv' . $mpv})) {
+               while (exists($info->{'pv' . $mpv})) {
                        $text .= sprintf "  PV%2u", $mpv;
-                       my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
+                       my $score = short_score($info, $pos_calculating, $mpv);
                        $text .= "  ($score)" if (defined($score));
 
                        my $tbhits = '';
-                       if (exists($uciinfo{'tbhits' . $mpv}) && $uciinfo{'tbhits' . $mpv} > 0) {
-                               if ($uciinfo{'tbhits' . $mpv} == 1) {
+                       if (exists($info->{'tbhits' . $mpv}) && $info->{'tbhits' . $mpv} > 0) {
+                               if ($info->{'tbhits' . $mpv} == 1) {
                                        $tbhits = ", 1 tbhit";
                                } else {
-                                       $tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+                                       $tbhits = sprintf ", %u tbhits", $info->{'tbhits' . $mpv};
                                }
                        }
 
-                       if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
+                       if (exists($info->{'nodes' . $mpv}) && exists($info->{'nps' . $mpv}) && exists($info->{'depth' . $mpv})) {
                                $text .= sprintf " (%5u kn, %3u kn/s, %2u ply$tbhits)",
-                                       $uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
+                                       $info->{'nodes' . $mpv} / 1000, $info->{'nps' . $mpv} / 1000, $info->{'depth' . $mpv};
                        }
 
                        $text .= ":\n";
-                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
+                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}})) . "\n";
                        $text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV
-               my $score = long_score(\%uciinfo, $pos_calculating, '');
+               my $score = long_score($info, $pos_calculating, '');
                $text .= "  $score\n" if defined($score);
-               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
+               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
                $text .=  "\n";
 
-               if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
+               if (exists($info->{'nodes'}) && exists($info->{'nps'}) && exists($info->{'depth'})) {
                        $text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
-                               $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+                               $info->{'nodes'}, $info->{'nps'}, $info->{'depth'};
+               }
+               if (exists($info->{'seldepth'})) {
+                       $text .= sprintf " (%u selective)", $info->{'seldepth'};
                }
-               if (exists($uciinfo{'tbhits'}) && $uciinfo{'tbhits'} > 0) {
-                       if ($uciinfo{'tbhits'} == 1) {
+               if (exists($info->{'tbhits'}) && $info->{'tbhits'} > 0) {
+                       if ($info->{'tbhits'} == 1) {
                                $text .= ", one Nalimov hit";
                        } else {
-                               $text .= sprintf ", %u Nalimov hits", $uciinfo{'tbhits'};
+                               $text .= sprintf ", %u Nalimov hits", $info->{'tbhits'};
                        }
                }
-               if (exists($uciinfo{'seldepth'})) {
-                       $text .= sprintf " (%u selective)", $uciinfo{'seldepth'};
-               }
-               $text .=  "\n\n";
+               $text .= "\n\n";
        }
 
        #$text .= book_info($pos_calculating->{'fen'}, $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
 
+       my @refutation_lines = ();
+       for (my $mpv = 1; $mpv < 500; ++$mpv) {
+               my $info = $engine2->{'info'};
+               last if (!exists($info->{'pv' . $mpv}));
+               eval {
+                       my $pv = $info->{'pv' . $mpv};
+
+                       my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine->{'board'}, $pv->[0]));
+                       my @pretty_pv = prettyprint_pv($pos_calculating_second_engine->{'board'}, @$pv);
+                       if (scalar @pretty_pv > 5) {
+                               @pretty_pv = @pretty_pv[0..4];
+                               push @pretty_pv, "...";
+                       }
+                       my $key = $pretty_move;
+                       my $line = sprintf("  %-6s %6s %3s  %s",
+                               $pretty_move,
+                               short_score($info, $pos_calculating_second_engine, $mpv, 0),
+                               "d" . $info->{'depth' . $mpv},
+                               join(', ', @pretty_pv));
+                       push @refutation_lines, [ $key, $line ];
+               };
+       }
+
+       if ($#refutation_lines >= 0) {
+               $text .= "Shallow search of all legal moves:\n\n";
+               for my $line (sort { $a->[0] cmp $b->[0] } @refutation_lines) {
+                       $text .= $line->[1] . "\n";
+               }
+               $text .= "\n\n";        
+       }       
+
        if ($last_text ne $text) {
                print "\e[H\e[2J"; # clear the screen
                print $text;
@@ -695,36 +802,36 @@ sub output_screen {
 
        my $tell_text = '';
 
-       if (exists($uciid{'name'})) {
-               $tell_text .= "Analysis by $uciid{'name'} -- see http://analysis.sesse.net/ for more information\n";
+       if (exists($id->{'name'})) {
+               $tell_text .= "Analysis by $id->{'name'} -- see http://analysis.sesse.net/ for more information\n";
        } else {
                $tell_text .= "Computer analysis -- http://analysis.sesse.net/ for more information\n";
        }
 
-       if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+       if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
                # multi-PV
                my $mpv = 1;
-               while (exists($uciinfo{'pv' . $mpv})) {
+               while (exists($info->{'pv' . $mpv})) {
                        $tell_text .= sprintf "  PV%2u", $mpv;
-                       my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
+                       my $score = short_score($info, $pos_calculating, $mpv);
                        $tell_text .= "  ($score)" if (defined($score));
 
-                       if (exists($uciinfo{'depth' . $mpv})) {
-                               $tell_text .= sprintf " (%2u ply)", $uciinfo{'depth' . $mpv};
+                       if (exists($info->{'depth' . $mpv})) {
+                               $tell_text .= sprintf " (%2u ply)", $info->{'depth' . $mpv};
                        }
 
                        $tell_text .= ": ";
-                       $tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));
+                       $tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}}));
                        $tell_text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV
-               my $score = long_score(\%uciinfo, $pos_calculating, '');
+               my $score = long_score($info, $pos_calculating, '');
                $tell_text .= "  $score\n" if defined($score);
-               $tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
-               if (exists($uciinfo{'depth'})) {
-                       $tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
+               $tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
+               if (exists($info->{'depth'})) {
+                       $tell_text .= sprintf " (depth %u ply)", $info->{'depth'};
                }
                $tell_text .=  "\n";
        }
@@ -749,6 +856,56 @@ sub output_screen {
        }
 }
 
+sub output_json {
+       my $info = $engine->{'info'};
+
+       my $json = {};
+       $json->{'position'} = $pos_calculating;
+       $json->{'id'} = $engine->{'id'};
+       $json->{'score'} = long_score($info, $pos_calculating, '');
+
+       $json->{'nodes'} = $info->{'nodes'};
+       $json->{'nps'} = $info->{'nps'};
+       $json->{'depth'} = $info->{'depth'};
+       $json->{'tbhits'} = $info->{'tbhits'};
+       $json->{'seldepth'} = $info->{'seldepth'};
+
+       # single-PV only for now
+       $json->{'pv_uci'} = $info->{'pv'};
+       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}) ];
+
+       my %refutation_lines = ();
+       my @refutation_lines = ();
+       for (my $mpv = 1; $mpv < 500; ++$mpv) {
+               my $info = $engine2->{'info'};
+               my $pretty_move = "";
+               my @pretty_pv = ();
+               last if (!exists($info->{'pv' . $mpv}));
+
+               eval {
+                       my $pv = $info->{'pv' . $mpv};
+                       my $pretty_move = join('', prettyprint_pv($pos_calculating->{'board'}, $pv->[0]));
+                       my @pretty_pv = prettyprint_pv($pos_calculating->{'board'}, @$pv);
+                       $refutation_lines{$pv->[0]} = {
+                               sort_key => $pretty_move,
+                               depth => $info->{'depth' . $mpv},
+                               score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
+                               pretty_score => short_score($info, $pos_calculating, $mpv, 0),
+                               pretty_move => $pretty_move,
+                               pv_pretty => \@pretty_pv,
+                       };
+                       $refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
+               };
+       }
+       $json->{'refutation_lines'} = \%refutation_lines;
+
+       open my $fh, ">analysis.json.tmp"
+               or return;
+       print $fh JSON::XS::encode_json($json);
+       close $fh;
+       rename("analysis.json.tmp", "analysis.json");   
+}
+
 sub find_kings {
        my $board = shift;
        my ($wkr, $wkc, $bkr, $bkc);
@@ -949,18 +1106,30 @@ sub can_reach {
 sub uciprint {
        my ($engine, $msg) = @_;
        print { $engine->{'write'} } "$msg\n";
-       print UCILOG localtime() . " => $msg\n";
+       print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
 sub short_score {
-       my ($uciinfo, $pos, $mpv) = @_;
+       my ($info, $pos, $mpv, $invert) = @_;
 
-       if (defined($uciinfo{'score_mate' . $mpv})) {
-               return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
+       $invert //= 0;
+       if ($pos->{'toplay'} eq 'B') {
+               $invert = !$invert;
+       }
+
+       if (defined($info->{'score_mate' . $mpv})) {
+               if ($invert) {
+                       return sprintf "M%3d", -$info->{'score_mate' . $mpv};
+               } else {
+                       return sprintf "M%3d", $info->{'score_mate' . $mpv};
+               }
        } else {
-               if (exists($uciinfo{'score_cp' . $mpv})) {
-                       my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
-                       if ($pos->{'toplay'} eq 'B') {
+               if (exists($info->{'score_cp' . $mpv})) {
+                       my $score = $info->{'score_cp' . $mpv} * 0.01;
+                       if ($score == 0) {
+                               return " 0.00";
+                       }
+                       if ($invert) {
                                $score = -$score;
                        }
                        return sprintf "%+5.2f", $score;
@@ -970,11 +1139,33 @@ sub short_score {
        return undef;
 }
 
+sub score_sort_key {
+       my ($info, $pos, $mpv, $invert) = @_;
+
+       if (defined($info->{'score_mate' . $mpv})) {
+               if ($invert) {
+                       return 99999 - $info->{'score_mate' . $mpv};
+               } else {
+                       return -(99999 - $info->{'score_mate' . $mpv});
+               }
+       } else {
+               if (exists($info->{'score_cp' . $mpv})) {
+                       my $score = $info->{'score_cp' . $mpv};
+                       if ($invert) {
+                               $score = -$score;
+                       }
+                       return $score;
+               }
+       }
+
+       return undef;
+}
+
 sub long_score {
-       my ($uciinfo, $pos, $mpv) = @_;
+       my ($info, $pos, $mpv) = @_;
 
-       if (defined($uciinfo{'score_mate' . $mpv})) {
-               my $mate = $uciinfo{'score_mate' . $mpv};
+       if (defined($info->{'score_mate' . $mpv})) {
+               my $mate = $info->{'score_mate' . $mpv};
                if ($pos->{'toplay'} eq 'B') {
                        $mate = -$mate;
                }
@@ -984,8 +1175,11 @@ sub long_score {
                        return sprintf "Black mates in %u", -$mate;
                }
        } else {
-               if (exists($uciinfo{'score_cp' . $mpv})) {
-                       my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+               if (exists($info->{'score_cp' . $mpv})) {
+                       my $score = $info->{'score_cp' . $mpv} * 0.01;
+                       if ($score == 0) {
+                               return " 0.00";
+                       }
                        if ($pos->{'toplay'} eq 'B') {
                                $score = -$score;
                        }
@@ -1049,14 +1243,18 @@ sub book_info {
 }
 
 sub open_engine {
-       my $cmdline = shift;
+       my ($cmdline, $tag) = @_;
        my ($uciread, $uciwrite);
        my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
 
        my $engine = {
                pid => $pid,
                read => $uciread,
-               write => $uciwrite
+               readbuf => '',
+               write => $uciwrite,
+               info => {},
+               ids => {},
+               tag => $tag,
        };
 
        uciprint($engine, "uci");
@@ -1064,24 +1262,23 @@ sub open_engine {
        # gobble the options
        while (<$uciread>) {
                /uciok/ && last;
-               handle_uci($_);
+               handle_uci($engine, $_);
        }
        
        return $engine;
 }
 
-sub read_line {
-       my $fh = shift;
+sub read_lines {
+       my $engine = shift;
 
        # 
        # Read until we've got a full line -- if the engine sends part of
        # a line and then stops we're pretty much hosed, but that should
        # never happen.
        #
-       my $line = '';
-       while ($line !~ /\n/) {
+       while ($engine->{'readbuf'} !~ /\n/) {
                my $tmp;
-               my $ret = sysread $engine->{'read'}, $tmp, 1;
+               my $ret = sysread $engine->{'read'}, $tmp, 4096;
 
                if (!defined($ret)) {
                        next if ($!{EINTR});
@@ -1090,11 +1287,17 @@ sub read_line {
                        die "EOF from UCI engine";
                }
 
-               $line .= $tmp;
+               $engine->{'readbuf'} .= $tmp;
        }
 
-       $line =~ tr/\r\n//d;
-       return $line;
+       # Blah.
+       my @lines = ();
+       while ($engine->{'readbuf'} =~ s/^([^\n]*)\n//) {
+               my $line = $1;
+               $line =~ tr/\r\n//d;
+               push @lines, $line;
+       }
+       return @lines;
 }
 
 sub col_letter_to_num {