markers: drop the concept

graph.plot

@@ -22,9 +22,6 @@ set style line 2 linecolor rgb '#e41a1c' linetype 2 linewidth 2 dashtype 2
 # Style for the moving mean
 set style line 3 linecolor rgb '#4060a0' linetype 1 linewidth 2 dashtype 3
 
-# Style for the marker
-set style line 4 linecolor rgb '#a0a000' linetype 1 linewidth 2 dashtype 4
-
 set grid
 unset border
 
@@ -42,7 +39,6 @@ set format y "%.2s %c"
 
 set datafile separator ";"
 plot ARG1 using 1:6 with lines linestyle 3 title "25-round mean", \
-     ARG1 using 1:7 with lines linestyle 4 title "marker", \
      ARG1 using 1:8 with lines linestyle 2 title "mean", \
      ARG1 using 1:3 with lines linestyle 5 title "min", \
      ARG1 using 1:5 with lines linestyle 6 title "max", \

scan.pl

@@ -12,9 +12,6 @@
 # entries to store in each CSV
 my $roundspergraph = 100;
 
-# Show deltas at the top when mean is this many percent diff vs marker
-my $deltathreshold = 0.7;
-
 # Use these many values for the moving average
 my $movingaverage = 25;
 
@@ -296,26 +293,6 @@ sub storelttb {
     return $p_value;
 }
 
-# Figure out the median marker per round (commit)
-sub markerpercommit {
-    my ($filename, $aref) = @_;
-    my %sta;
-    my %med;
-    for my $key (sort keys %$aref) {
-        my $commit = $git{$key};
-        my $bar;
-        if($marker{$key, $filename, 'val'}) {
-            # there is a specific marker for this test in this build
-            $bar = $marker{$key, $filename, 'val'};
-        }
-        $sta{$commit} .= "$bar " if($bar);
-    }
-    for my $c(keys %sta) {
-        $med{$c} = median(split(/ /, $sta{$c}));
-    }
-    return %med;
-}
-
 sub gencsv {
     my ($filename, $aref) = @_;
     my $index = 0;
@@ -324,11 +301,8 @@ sub gencsv {
     my @allv;
     my $prevc = "";
     my @vals;
-    my $bar = "";
     my @o;
 
-    my %markers = markerpercommit($filename, $aref);
-
     for my $key (sort keys %$aref) {
         my $commit = $git{$key};
         my $v;
@@ -364,17 +338,9 @@ sub gencsv {
         }
         $movingav = mean(@movingav);
 
-        # there is a specific marker for this test in this build
-        $bar = $markers{$prevc};
-
-        if(($bar > 1.2 * $v) || ($bar < 0.8 * $v)) {
-            # bad bar, ignore
-            $bar = "";
-        }
-
         push @o,
             sprintf "%u;%s;%s;%s;%s;%s;%s;%.2f\n", $index++, $gitalias{$prevc},
-            $min, $v, $max, $movingav, $bar, mean(@allv);
+            $min, $v, $max, $movingav, "", mean(@allv);
         $prevc = $commit;
     }
 
@@ -386,15 +352,9 @@ sub gencsv {
         shift @movingav;
     }
     $movingav = mean(@movingav);
-    # there is a specific marker for this test in this build
-    $bar = $markers{$prevc};
 
-    if(($bar > 1.2 * $v) || ($bar < 0.8 * $v)) {
-        # bad bar, ignore
-        $bar = "";
-    }
     push @o, sprintf "%u;%s;%s;%s;%s;%s;%s;%.2f\n", $index++, $gitalias{$prevc},
-        $min, $v, $max, $movingav, $bar, mean(@allv);
+        $min, $v, $max, $movingav, "", mean(@allv);
     return @o;
 }
 
@@ -593,7 +553,6 @@ sub show {
     my ($p0, $p25, $p50, $p75, $p100);
     my $mean;
     my $decimals = $unit2dec{$unit};
-    my $bar = $marker{"default", $filename, 'val'};
     my @out;
     push @out, "<h2>$name <a name=\"$filename\" href=\"#$filename\">($filename)</a></h2>";
     push @out, "$which is better, $unit\n";
@@ -638,25 +597,6 @@ sub show {
         push @out, sprintf ", %.2f%% of mean", ($p100 - $p0)/2 * 100 / $mean;
     }
     push @out, "\n";
-    if($bar) {
-        my $avdelta;
-        my $p50delta;
-        push @out, sprintf "\nMarker:  %s %s ('marker' is a set typical value for this test)\n",
-            $marker{"default", $filename, 'date'},
-            $marker{"default", $filename, 'desc'};
-        push @out, sprintf "         %s\n", showval($bar, $decimals);
-        $avdelta = $bar - $mean;
-        push @out, sprintf "         %s from mean, (%.2f%%) %s\n",
-            showval($avdelta, $decimals),
-            ($avdelta * 100) / $mean,
-            deltaopinion($avdelta, $which);
-        $p50delta = $bar - $p50;
-        push @out, sprintf "         %s from P50, (%.2f%%) %s\n",
-            showval($p50delta, $decimals),
-            ($p50delta * 100) / $p50,
-            deltaopinion($p50delta, $which);
-    }
-
     push @out, "</pre>\n";
 
     my $suffix = int(rand(100000000));
@@ -798,39 +738,6 @@ sub scorecard_limitrate {
     return (0+$speed, 0+$cpu);
 }
 
-sub loadmarkers {
-    my ($file) = @_;
-    my $name;
-    my $date;
-    my $desc;
-    my $val;
-    open(S, "<$file") ||
-        die "found no $file";
-    my @all = <S>;
-    close(S);
-    storemarkers("default", @all);
-}
-
-sub storemarkers {
-    my ($build, @all) = @_;
-    for(@all) {
-        if(/^ *#/) {
-            # comment, skip
-            next;
-        }
-        if(/^\[([^ ]*)]/) {
-            $name = $1;
-        }
-        elsif(/^ *([a-z-]*): (.*)/) {
-            my ($key, $val) = ($1, $2);
-            if($key !~ /^(val|date|desc)/) {
-                die "illegal keyword in $build: $key";
-            }
-            $marker{$build, $name, $key} = $val;
-        }
-    }
-}
-
 sub builddetails {
     my ($numrounds) = @_;
     open(G, "<$outdir/git-hashes") || return;
@@ -909,7 +816,6 @@ sub single {
     my @h1puj;
     my @h2puj;
     my @h3puj;
-    my @markers;
     my @h1rate;
     my $git = "";
     my $scan = "";
@@ -1004,9 +910,6 @@ sub single {
         elsif(/^confopts: (.*)/) {
             push @confopts, $1;
         }
-        elsif(/^stakes: (.*)/) {
-            push @markers, $1;
-        }
         elsif(/^structs: (.*)\t(\d+)\t\d*/) {
             my ($struct, $size) = ($1,$2);
             if($struct eq "Curl_easy") {
@@ -1022,10 +925,6 @@ sub single {
     }
     close(F);
 
-    if($markers[0]) {
-        storemarkers($scan, @markers);
-    }
-
     # Downloads
     if($h1pj[0]) {
         my ($speed, $mem, $cpu) = scorecard_dldata(@h1pj);
@@ -1113,9 +1012,6 @@ sub single {
     }
 }
 
-# Load the current markers. Each build has its own set.
-loadmarkers("stakes.conf");
-
 for my $l (sort @logs) {
     single("$logdir/$l");
 }

single.sh

@@ -123,6 +123,4 @@ date "$PREF ----- date parser -----"
 date "$PREF ----- number parser -----"
 ./tests/perf/perf numparser | sed 's/^/numparser: /'
 
-# Remember the markers when this ran
-cat $PERFDIR/stakes.conf | sed 's/^/stakes: /'
 date "$PREF done"