Add slice base.u8 peek/poke methods

wuffs_png_decode_filter_1_sub/clang9  4.59GB/s ± 0%   4.59GB/s ± 0%      ~     (p=0.151 n=5+5)
wuffs_png_decode_filter_1_sub/gcc10   1.85GB/s ± 0%   4.11GB/s ± 0%  +122.24%  (p=0.016 n=5+4)
This commit is contained in:
Nigel Tao committed 2021-01-17 23:47:37 +11:00
1 parent 602b711ba6
commit 26a7280900
13 files changed
+204 -48

No files matched your search

+34
View File
@@ -608,6 +608,40 @@ var SliceFuncs = []string{
"GENERIC T1.suffix(up_to: u64) T1",
}
var SliceU8Funcs = []string{
"GENERIC T1.peek_u8() u8",
"GENERIC T1.peek_u16be() u16",
"GENERIC T1.peek_u16le() u16",
"GENERIC T1.peek_u24be() u32",
"GENERIC T1.peek_u24le() u32",
"GENERIC T1.peek_u32be() u32",
"GENERIC T1.peek_u32le() u32",
"GENERIC T1.peek_u40be() u64",
"GENERIC T1.peek_u40le() u64",
"GENERIC T1.peek_u48be() u64",
"GENERIC T1.peek_u48le() u64",
"GENERIC T1.peek_u56be() u64",
"GENERIC T1.peek_u56le() u64",
"GENERIC T1.peek_u64be() u64",
"GENERIC T1.peek_u64le() u64",
"GENERIC T1.poke_u8!(a: u8)",
"GENERIC T1.poke_u16be!(a: u16)",
"GENERIC T1.poke_u16le!(a: u16)",
"GENERIC T1.poke_u24be!(a: u32)",
"GENERIC T1.poke_u24le!(a: u32)",
"GENERIC T1.poke_u32be!(a: u32)",
"GENERIC T1.poke_u32le!(a: u32)",
"GENERIC T1.poke_u40be!(a: u64)",
"GENERIC T1.poke_u40le!(a: u64)",
"GENERIC T1.poke_u48be!(a: u64)",
"GENERIC T1.poke_u48le!(a: u64)",
"GENERIC T1.poke_u56be!(a: u64)",
"GENERIC T1.poke_u56le!(a: u64)",
"GENERIC T1.poke_u64be!(a: u64)",
"GENERIC T1.poke_u64le!(a: u64)",
}
var TableFuncs = []string{
"GENERIC T2.height() u64",
"GENERIC T2.stride() u64",
+39 -15
View File
@@ -1051,6 +1051,8 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
recv := lhs.LHS().AsExpr()
method := lhs.Ident()
advance, advanceExpr, update := (*big.Int)(nil), (*a.Expr)(nil), false
if recvTyp := recv.MType(); recvTyp == nil {
return bounds{}, errNotASpecialCase
@@ -1094,8 +1096,6 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
}
} else if recvTyp.IsIOTokenType() {
advance, advanceExpr, update := (*big.Int)(nil), (*a.Expr)(nil), false
if method == t.IDUndoByte {
if err := q.canUndoByte(recv); err != nil {
return bounds{}, err
@@ -1146,23 +1146,31 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
}
}
if (advance != nil) || (advanceExpr != nil) {
if ok, err := q.optimizeIOMethodAdvance(recv, advance, advanceExpr, update); err != nil {
return bounds{}, err
} else if !ok {
adv := ""
if advance != nil {
adv = advance.String()
} else {
adv = advanceExpr.Str(q.tm)
}
return bounds{}, fmt.Errorf("check: could not prove %s pre-condition: %s.length() >= %s",
method.Str(q.tm), recv.Str(q.tm), adv)
} else if recvTyp.Eq(typeExprSliceU8) {
if method >= t.IDPeekU8 {
if m := method - t.IDPeekU8; m < t.ID(len(ioMethodAdvances)) {
au := ioMethodAdvances[m]
advance, update = au.advance, au.update
}
// TODO: drop other recv-related facts?
}
}
if (advance != nil) || (advanceExpr != nil) {
if ok, err := q.optimizeIOMethodAdvance(recv, advance, advanceExpr, update); err != nil {
return bounds{}, err
} else if !ok {
adv := ""
if advance != nil {
adv = advance.String()
} else {
adv = advanceExpr.Str(q.tm)
}
return bounds{}, fmt.Errorf("check: could not prove %s pre-condition: %s.length() >= %s",
method.Str(q.tm), recv.Str(q.tm), adv)
}
// TODO: drop other recv-related facts?
}
return bounds{}, errNotASpecialCase
}
@@ -1319,6 +1327,22 @@ var ioMethodAdvances = [...]struct {
t.IDPeekU64BE - t.IDPeekU8: {eight, false},
t.IDPeekU64LE - t.IDPeekU8: {eight, false},
t.IDPokeU8 - t.IDPeekU8: {one, false},
t.IDPokeU16BE - t.IDPeekU8: {two, false},
t.IDPokeU16LE - t.IDPeekU8: {two, false},
t.IDPokeU24BE - t.IDPeekU8: {three, false},
t.IDPokeU24LE - t.IDPeekU8: {three, false},
t.IDPokeU32BE - t.IDPeekU8: {four, false},
t.IDPokeU32LE - t.IDPeekU8: {four, false},
t.IDPokeU40BE - t.IDPeekU8: {five, false},
t.IDPokeU40LE - t.IDPeekU8: {five, false},
t.IDPokeU48BE - t.IDPeekU8: {six, false},
t.IDPokeU48LE - t.IDPeekU8: {six, false},
t.IDPokeU56BE - t.IDPeekU8: {seven, false},
t.IDPokeU56LE - t.IDPeekU8: {seven, false},
t.IDPokeU64BE - t.IDPeekU8: {eight, false},
t.IDPokeU64LE - t.IDPeekU8: {eight, false},
t.IDWriteU8Fast - t.IDPeekU8: {one, true},
t.IDWriteU16BEFast - t.IDPeekU8: {two, true},
t.IDWriteU16LEFast - t.IDPeekU8: {two, true},
+9 -4
View File
@@ -91,8 +91,9 @@ func Check(tm *t.Map, files []*a.File, resolveUse func(usePath string) ([]byte,
funcs: map[t.QQID]*a.Func{},
localVars: map[t.QQID]typeMap{},
builtInSliceFuncs: map[t.QQID]*a.Func{},
builtInTableFuncs: map[t.QQID]*a.Func{},
builtInSliceFuncs: map[t.QQID]*a.Func{},
builtInSliceU8Funcs: map[t.QQID]*a.Func{},
builtInTableFuncs: map[t.QQID]*a.Func{},
builtInInterfaces: map[t.QID][]t.QQID{},
builtInInterfaceFuncs: map[t.QQID]*a.Func{},
@@ -105,6 +106,9 @@ func Check(tm *t.Map, files []*a.File, resolveUse func(usePath string) ([]byte,
if err := c.parseBuiltInFuncs(c.builtInSliceFuncs, builtin.SliceFuncs); err != nil {
return nil, err
}
if err := c.parseBuiltInFuncs(c.builtInSliceU8Funcs, builtin.SliceU8Funcs); err != nil {
return nil, err
}
if err := c.parseBuiltInFuncs(c.builtInTableFuncs, builtin.TableFuncs); err != nil {
return nil, err
}
@@ -221,8 +225,9 @@ type Checker struct {
funcs map[t.QQID]*a.Func
localVars map[t.QQID]typeMap
builtInSliceFuncs map[t.QQID]*a.Func
builtInTableFuncs map[t.QQID]*a.Func
builtInSliceFuncs map[t.QQID]*a.Func
builtInSliceU8Funcs map[t.QQID]*a.Func
builtInTableFuncs map[t.QQID]*a.Func
builtInInterfaces map[t.QID][]t.QQID
builtInInterfaceFuncs map[t.QQID]*a.Func
+3 -1
View File
@@ -58,7 +58,9 @@ func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, ad
// receiver.length(), even if they aren't an exact match.
op := x.Operator()
if op != t.IDXBinaryGreaterEq && op != t.IDXBinaryGreaterThan {
if (op != t.IDXBinaryGreaterEq) &&
(op != t.IDXBinaryGreaterThan) &&
(op != t.IDXBinaryEqEq) {
return x, nil
}
+5
View File
@@ -154,6 +154,11 @@ func (c *Checker) resolveFunc(typ *a.TypeExpr) (*a.Func, error) {
if f := c.builtInSliceFuncs[qqid]; f != nil {
return f, nil
}
if lTyp.Eq(typeExprSliceU8) {
if f := c.builtInSliceU8Funcs[qqid]; f != nil {
return f, nil
}
}
} else if lTyp.IsTableType() {
qqid[0] = t.IDBase
+9 -8
View File
@@ -665,20 +665,21 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error {
if lTyp.IsSliceType() {
qqid[0] = t.IDBase
qqid[1] = t.IDDagger1
if q.c.builtInSliceFuncs[qqid] == nil {
return fmt.Errorf("check: no slice method %q", n.Ident().Str(q.tm))
if (q.c.builtInSliceFuncs[qqid] != nil) ||
((q.c.builtInSliceU8Funcs[qqid] != nil) && lTyp.Eq(typeExprSliceU8)) {
n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.AsNode(), nil, nil))
return nil
}
n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.AsNode(), nil, nil))
return nil
return fmt.Errorf("check: no slice method %q", n.Ident().Str(q.tm))
} else if lTyp.IsTableType() {
qqid[0] = t.IDBase
qqid[1] = t.IDDagger2
if q.c.builtInTableFuncs[qqid] == nil {
return fmt.Errorf("check: no table method %q", n.Ident().Str(q.tm))
if q.c.builtInTableFuncs[qqid] != nil {
n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.AsNode(), nil, nil))
return nil
}
n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.AsNode(), nil, nil))
return nil
return fmt.Errorf("check: no table method %q", n.Ident().Str(q.tm))
} else if lTyp.Decorator() != 0 {
return fmt.Errorf("check: invalid type %q for dot-expression LHS %q", lTyp.Str(q.tm), lhs.Str(q.tm))
+36
View File
@@ -582,6 +582,24 @@ const (
// --------
IDPokeU8 = ID(0x1D1)
IDPokeU16BE = ID(0x1D2)
IDPokeU16LE = ID(0x1D3)
IDPokeU24BE = ID(0x1D4)
IDPokeU24LE = ID(0x1D5)
IDPokeU32BE = ID(0x1D6)
IDPokeU32LE = ID(0x1D7)
IDPokeU40BE = ID(0x1D8)
IDPokeU40LE = ID(0x1D9)
IDPokeU48BE = ID(0x1DA)
IDPokeU48LE = ID(0x1DB)
IDPokeU56BE = ID(0x1DC)
IDPokeU56LE = ID(0x1DD)
IDPokeU64BE = ID(0x1DE)
IDPokeU64LE = ID(0x1DF)
// --------
IDWriteU8Fast = ID(0x1E1)
IDWriteU16BEFast = ID(0x1E2)
IDWriteU16LEFast = ID(0x1E3)
@@ -969,6 +987,24 @@ var builtInsByID = [nBuiltInIDs]string{
// --------
IDPokeU8: "poke_u8",
IDPokeU16BE: "poke_u16be",
IDPokeU16LE: "poke_u16le",
IDPokeU24BE: "poke_u24be",
IDPokeU24LE: "poke_u24le",
IDPokeU32BE: "poke_u32be",
IDPokeU32LE: "poke_u32le",
IDPokeU40BE: "poke_u40be",
IDPokeU40LE: "poke_u40le",
IDPokeU48BE: "poke_u48be",
IDPokeU48LE: "poke_u48le",
IDPokeU56BE: "poke_u56be",
IDPokeU56LE: "poke_u56le",
IDPokeU64BE: "poke_u64be",
IDPokeU64LE: "poke_u64le",
// --------
IDWriteU8Fast: "write_u8_fast",
IDWriteU16BEFast: "write_u16be_fast",
IDWriteU16LEFast: "write_u16le_fast",