Factor out a writeIterateRound method

This commit is contained in:
Nigel Tao committed 2018-05-04 14:19:58 +10:00
1 parent 7bd37588b1
commit 5c25b0e1d1
3 files changed
+29 -43

No files matched your search

+26 -40
View File
@@ -376,57 +376,43 @@ func (g *gen) writeIterate(b *buffer, n *a.Iterate, depth uint32) error {
b.printf("wuffs_base__slice_u8 %s%s = %sslice_%s;\n", vPrefix, name, iPrefix, name)
// TODO: look at n.HasContinue() and n.HasBreak().
unroll := n.Unroll().SmallPowerOf2Value()
block := n.Body()
step := n.Step().SmallPowerOf2Value()
unroll := n.Unroll().SmallPowerOf2Value()
if unroll > 1 || step > 1 {
b.printf("%s%s.len = %d;\n", vPrefix, name, step)
b.printf("uint8_t* %send0_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n",
iPrefix, name, iPrefix, name, iPrefix, name, unroll*step, unroll*step)
b.printf("while (%s%s.ptr < %send0_%s) {\n", vPrefix, name, iPrefix, name)
for i := 0; i < unroll; i++ {
for _, o := range n.Body() {
if err := g.writeStatement(b, o, depth); err != nil {
return err
}
}
b.printf("%s%s.ptr += %d;\n", vPrefix, name, step)
if err := g.writeIterateRound(b, name, block, 0, depth, step, unroll); err != nil {
return err
}
}
if unroll > 1 {
if err := g.writeIterateRound(b, name, block, 1, depth, step, 1); err != nil {
return err
}
}
if step > 1 {
block = n.Tail()
if err := g.writeIterateRound(b, name, block, 2, depth, 1, 1); err != nil {
return err
}
b.writes("}\n")
}
if unroll > 1 && step > 1 {
b.printf("%s%s.len = %d;\n", vPrefix, name, step)
b.printf("uint8_t* %send1_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n",
iPrefix, name, iPrefix, name, iPrefix, name, step, step)
b.printf("while (%s%s.ptr < %send1_%s) {\n", vPrefix, name, iPrefix, name)
for _, o := range n.Body() {
b.writes("}\n")
return nil
}
func (g *gen) writeIterateRound(b *buffer, name string, block []*a.Node, round uint32, depth uint32, step int, unroll int) error {
b.printf("%s%s.len = %d;\n", vPrefix, name, step)
b.printf("uint8_t* %send%d_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n",
iPrefix, round, name, iPrefix, name, iPrefix, name, step*unroll, step*unroll)
b.printf("while (%s%s.ptr < %send%d_%s) {\n", vPrefix, name, iPrefix, round, name)
for i := 0; i < unroll; i++ {
for _, o := range block {
if err := g.writeStatement(b, o, depth); err != nil {
return err
}
}
b.printf("%s%s.ptr += %d;\n", vPrefix, name, step)
b.writes("}\n")
}
{
b.printf("%s%s.len = %d;\n", vPrefix, name, 1)
b.printf("uint8_t* %send2_%s = %sslice_%s.ptr + %sslice_%s.len;\n",
iPrefix, name, iPrefix, name, iPrefix, name)
b.printf("while (%s%s.ptr < %send2_%s) {\n", vPrefix, name, iPrefix, name)
tail := n.Tail()
if step == 1 {
tail = n.Body()
}
for _, o := range tail {
if err := g.writeStatement(b, o, depth); err != nil {
return err
}
}
b.printf("%s%s.ptr += 1;\n", vPrefix, name)
b.writes("}\n")
}
b.writes("}\n")
return nil
}
+2 -2
View File
@@ -1693,8 +1693,8 @@ uint32_t wuffs_adler32__hasher__update(wuffs_adler32__hasher* self,
v_p.ptr += 1;
}
v_p.len = 1;
uint8_t* i_end2_p = i_slice_p.ptr + i_slice_p.len;
while (v_p.ptr < i_end2_p) {
uint8_t* i_end1_p = i_slice_p.ptr + (i_slice_p.len / 1) * 1;
while (v_p.ptr < i_end1_p) {
v_s1 += ((uint32_t)(v_p.ptr[0]));
v_s2 += v_s1;
v_p.ptr += 1;
+1 -1
View File
@@ -2133,7 +2133,7 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
v_p.ptr += 8;
}
v_p.len = 1;
uint8_t* i_end2_p = i_slice_p.ptr + i_slice_p.len;
uint8_t* i_end2_p = i_slice_p.ptr + (i_slice_p.len / 1) * 1;
while (v_p.ptr < i_end2_p) {
v_s = (wuffs_crc32__ieee_table[0][((uint8_t)((v_s & 255))) ^ v_p.ptr[0]] ^
(v_s >> 8));