Don't suspend for read_u8 if data is available.

It's not obvious why the benchmarks get worse when the code looks
better, but the long term goal is for all of decode_huffman_fast to not
suspend, and this is one step along that path.

name                           old speed      new speed      delta

puffs_adler32_10k/clang        2.40GB/s ± 1%  2.40GB/s ± 1%     ~     (p=0.841 n=5+5)
puffs_adler32_100k/clang       2.40GB/s ± 1%  2.39GB/s ± 2%     ~     (p=0.421 n=5+5)
puffs_flate_decode_1k/clang     131MB/s ± 1%   128MB/s ± 0%   -2.51%  (p=0.008 n=5+5)
puffs_flate_decode_10k/clang    171MB/s ± 1%   167MB/s ± 2%   -2.86%  (p=0.008 n=5+5)
puffs_flate_decode_100k/clang   202MB/s ± 0%   193MB/s ± 2%   -4.64%  (p=0.016 n=4+5)
puffs_zlib_decode_10k/clang     159MB/s ± 1%   157MB/s ± 0%   -1.65%  (p=0.008 n=5+5)
puffs_zlib_decode_100k/clang    185MB/s ± 1%   180MB/s ± 1%   -3.11%  (p=0.008 n=5+5)

puffs_adler32_10k/gcc          3.26GB/s ± 0%  3.26GB/s ± 0%     ~     (p=0.421 n=5+5)
puffs_adler32_100k/gcc         3.27GB/s ± 0%  3.26GB/s ± 0%     ~     (p=0.151 n=5+5)
puffs_flate_decode_1k/gcc       132MB/s ± 0%   129MB/s ± 0%   -2.29%  (p=0.008 n=5+5)
puffs_flate_decode_10k/gcc      170MB/s ± 0%   164MB/s ± 0%   -3.13%  (p=0.008 n=5+5)
puffs_flate_decode_100k/gcc     207MB/s ± 0%   185MB/s ± 0%  -10.45%  (p=0.016 n=5+4)
puffs_zlib_decode_10k/gcc       162MB/s ± 0%   157MB/s ± 0%   -2.95%  (p=0.008 n=5+5)
puffs_zlib_decode_100k/gcc      194MB/s ± 0%   175MB/s ± 0%   -9.78%  (p=0.016 n=5+4)
This commit is contained in:
Nigel Tao committed 2017-11-05 08:03:21 +11:00
1 parent cf61ca11c3
commit 55e0bc513b
4 files changed
+107 -54

No files matched your search

+56 -4
View File
@@ -15,6 +15,7 @@
package cgen
import (
"errors"
"fmt"
"strings"
@@ -353,12 +354,58 @@ func (g *gen) writeSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
if !n.Suspendible() {
return nil
}
if err := g.writeCoroSuspPoint(b, false); err != nil {
err := g.mightActuallySuspend(n, depth)
if err != nil && err != errMightActuallySuspend {
return err
}
mightActuallySuspend := err != nil
if mightActuallySuspend {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
}
return g.writeCallSuspendibles(b, n, depth)
}
// errMightActuallySuspend is the absence of ProvenNotToSuspend.
//
// TODO: find better, less clumsy names for this concept.
var errMightActuallySuspend = errors.New("internal: might actually suspend")
// TODO: this would be simpler with a call keyword and an explicit "foo = call
// bar?()" syntax.
func (g *gen) mightActuallySuspend(n *a.Expr, depth uint32) error {
if depth > a.MaxExprDepth {
return fmt.Errorf("expression recursion depth too large")
}
depth++
// The evaluation order for suspendible calls (which can have side effects)
// is important here: LHS, MHS, RHS, Args and finally the node itself.
if !n.CallSuspendible() {
for _, o := range n.Node().Raw().SubNodes() {
if o != nil && o.Kind() == a.KExpr {
if err := g.mightActuallySuspend(o.Expr(), depth); err != nil {
return err
}
}
}
for _, o := range n.Args() {
if o != nil && o.Kind() == a.KExpr {
if err := g.mightActuallySuspend(o.Expr(), depth); err != nil {
return err
}
}
}
return nil
}
if n.ProvenNotToSuspend() {
return nil
}
return errMightActuallySuspend
}
func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
if depth > a.MaxExprDepth {
return fmt.Errorf("expression recursion depth too large")
@@ -399,9 +446,12 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
temp := g.currFunk.tempW
g.currFunk.tempW++
b.printf("if (PUFFS_BASE__UNLIKELY(%srptr_src == %srend_src)) { goto short_read_src; }",
bPrefix, bPrefix)
g.currFunk.shortReads = append(g.currFunk.shortReads, "src")
if !n.ProvenNotToSuspend() {
b.printf("if (PUFFS_BASE__UNLIKELY(%srptr_src == %srend_src)) { goto short_read_src; }",
bPrefix, bPrefix)
g.currFunk.shortReads = append(g.currFunk.shortReads, "src")
}
// TODO: watch for passing an array type to writeCTypeName? In C, an
// array type can decay into a pointer.
if err := g.writeCTypeName(b, n.MType(), tPrefix, fmt.Sprint(temp)); err != nil {
@@ -627,6 +677,8 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
return fmt.Errorf("internal error: bad writeReadUXX endianness %q", endianness)
}
// TODO: look at n.ProvenNotToSuspend().
if g.currFunk.tempW > maxTemp-1 {
return fmt.Errorf("too many temporary variables required")
}