mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 16:47:28 +01:00
Let iterate have multiple assigns
wuffs_png_decode_19k_8bpp/clang9 92.2MB/s ± 0% 93.4MB/s ± 0% +1.33% (p=0.008 n=5+5) wuffs_png_decode_40k_24bpp/clang9 116MB/s ± 0% 115MB/s ± 0% ~ (p=1.000 n=5+5) wuffs_png_decode_77k_8bpp/clang9 347MB/s ± 0% 351MB/s ± 0% +1.19% (p=0.016 n=5+4) wuffs_png_decode_552k_32bpp/clang9 150MB/s ± 0% 156MB/s ± 0% +3.57% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/clang9 117MB/s ± 1% 118MB/s ± 0% +0.62% (p=0.008 n=5+5) wuffs_png_decode_filter_1_sub/clang9 1.34GB/s ± 0% 1.24GB/s ± 0% -7.30% (p=0.008 n=5+5) wuffs_png_decode_filter_2_up/clang9 13.3GB/s ± 0% 13.4GB/s ± 0% +0.96% (p=0.008 n=5+5) wuffs_png_decode_filter_3_average/clang9 754MB/s ± 0% 948MB/s ± 0% +25.62% (p=0.008 n=5+5) wuffs_png_decode_filter_4_paeth/clang9 127MB/s ± 0% 138MB/s ± 0% +9.01% (p=0.008 n=5+5) wuffs_png_decode_19k_8bpp/gcc10 100MB/s ± 1% 100MB/s ± 0% ~ (p=0.690 n=5+5) wuffs_png_decode_40k_24bpp/gcc10 114MB/s ± 0% 118MB/s ± 0% +3.21% (p=0.008 n=5+5) wuffs_png_decode_77k_8bpp/gcc10 323MB/s ± 2% 325MB/s ± 0% ~ (p=0.841 n=5+5) wuffs_png_decode_552k_32bpp/gcc10 159MB/s ± 0% 172MB/s ± 0% +8.38% (p=0.008 n=5+5) wuffs_png_decode_4002k_24bpp/gcc10 118MB/s ± 0% 118MB/s ± 0% ~ (p=0.056 n=5+5) wuffs_png_decode_filter_1_sub/gcc10 1.84GB/s ± 1% 1.85GB/s ± 0% +0.22% (p=0.008 n=5+5) wuffs_png_decode_filter_2_up/gcc10 10.5GB/s ± 0% 10.5GB/s ± 0% ~ (p=0.310 n=5+5) wuffs_png_decode_filter_3_average/gcc10 743MB/s ± 0% 1008MB/s ± 0% +35.66% (p=0.008 n=5+5) wuffs_png_decode_filter_4_paeth/gcc10 83.1MB/s ± 0% 94.1MB/s ± 0% +13.15% (p=0.008 n=5+5)
This commit is contained in:
1 parent
d842a20e43
commit
dcdd7928c1
4 files changed
+445
-41
No files matched your search
+27
-16
@@ -396,22 +396,26 @@ func (g *gen) writeStatementIterate(b *buffer, n *a.Iterate, depth uint32) error
|
||||
if len(assigns) == 0 {
|
||||
return nil
|
||||
}
|
||||
if len(assigns) != 1 {
|
||||
return fmt.Errorf("TODO: iterate over more than one assign")
|
||||
}
|
||||
o := assigns[0].AsAssign()
|
||||
name := o.LHS().Ident().Str(g.tm)
|
||||
name0 := assigns[0].AsAssign().LHS().Ident().Str(g.tm)
|
||||
b.writes("{\n")
|
||||
|
||||
// TODO: don't assume that the slice is a slice of base.u8. In
|
||||
// particular, the code gen can be subtle if the slice element type has
|
||||
// zero size, such as the empty struct.
|
||||
b.printf("wuffs_base__slice_u8 %sslice_%s = ", iPrefix, name)
|
||||
if err := g.writeExpr(b, o.RHS(), 0); err != nil {
|
||||
return err
|
||||
for i, o := range assigns {
|
||||
o := o.AsAssign()
|
||||
name := o.LHS().Ident().Str(g.tm)
|
||||
b.printf("wuffs_base__slice_u8 %sslice_%s = ", iPrefix, name)
|
||||
if err := g.writeExpr(b, o.RHS(), 0); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n")
|
||||
b.printf("%s%s = %sslice_%s;\n", vPrefix, name, iPrefix, name)
|
||||
if i > 0 {
|
||||
b.printf("%sslice_%s.len = wuffs_base__u64__min(%sslice_%s.len, %sslice_%s.len);\n",
|
||||
iPrefix, name0, iPrefix, name0, iPrefix, name)
|
||||
}
|
||||
}
|
||||
b.writes(";\n")
|
||||
b.printf("%s%s = %sslice_%s;\n", vPrefix, name, iPrefix, name)
|
||||
// TODO: look at n.HasContinue() and n.HasBreak().
|
||||
|
||||
round := uint32(0)
|
||||
@@ -425,7 +429,7 @@ func (g *gen) writeStatementIterate(b *buffer, n *a.Iterate, depth uint32) error
|
||||
return err
|
||||
}
|
||||
for {
|
||||
if err := g.writeIterateRound(b, name, n.Body(), round, depth, length, unroll); err != nil {
|
||||
if err := g.writeIterateRound(b, assigns, n.Body(), round, depth, length, unroll); err != nil {
|
||||
return err
|
||||
}
|
||||
round++
|
||||
@@ -566,18 +570,25 @@ func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeIterateRound(b *buffer, name string, body []*a.Node, round uint32, depth uint32, length int, unroll int) error {
|
||||
b.printf("%s%s.len = %d;\n", vPrefix, name, length)
|
||||
func (g *gen) writeIterateRound(b *buffer, assigns []*a.Node, body []*a.Node, round uint32, depth uint32, length int, unroll int) error {
|
||||
for _, o := range assigns {
|
||||
name := o.AsAssign().LHS().Ident().Str(g.tm)
|
||||
b.printf("%s%s.len = %d;\n", vPrefix, name, length)
|
||||
}
|
||||
name0 := assigns[0].AsAssign().LHS().Ident().Str(g.tm)
|
||||
b.printf("uint8_t* %send%d_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n",
|
||||
iPrefix, round, name, iPrefix, name, iPrefix, name, length*unroll, length*unroll)
|
||||
b.printf("while (%s%s.ptr < %send%d_%s) {\n", vPrefix, name, iPrefix, round, name)
|
||||
iPrefix, round, name0, iPrefix, name0, iPrefix, name0, length*unroll, length*unroll)
|
||||
b.printf("while (%s%s.ptr < %send%d_%s) {\n", vPrefix, name0, iPrefix, round, name0)
|
||||
for i := 0; i < unroll; i++ {
|
||||
for _, o := range body {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
b.printf("%s%s.ptr += %d;\n", vPrefix, name, length)
|
||||
for _, o := range assigns {
|
||||
name := o.AsAssign().LHS().Ident().Str(g.tm)
|
||||
b.printf("%s%s.ptr += %d;\n", vPrefix, name, length)
|
||||
}
|
||||
}
|
||||
b.writes("}\n")
|
||||
return nil
|
||||
|
||||
Reference in new issue
Block a user