std/jpeg: call slice.bulk_{load,save}_host_endian

Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=59540

name                                             old speed     new speed     delta

wuffs_jpeg_decode_30k_24bpp_progressive/clang11  131MB/s ± 0%  168MB/s ± 0%  +28.44%  (p=0.008 n=5+5)
wuffs_jpeg_decode_30k_24bpp_progressive/gcc10    167MB/s ± 0%  175MB/s ± 0%   +4.80%  (p=0.008 n=5+5)
This commit is contained in:
Nigel Tao committed 2023-06-05 12:51:50 +10:00
1 parent 4a164cda64
commit 2865c5bfbd
7 files changed
+162 -154

No files matched your search

+26
View File
@@ -214,6 +214,19 @@ wuffs_base__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst,
return len;
}
static inline wuffs_base__empty_struct //
wuffs_base__bulk_load_host_endian(void* ptr,
size_t len,
wuffs_base__slice_u8 src) {
if (len > src.len) {
len = src.len;
}
if (len) {
memmove(ptr, src.ptr, len);
}
return wuffs_base__make_empty_struct();
}
static inline wuffs_base__empty_struct //
wuffs_base__bulk_memset(void* ptr, size_t len, uint8_t byte_value) {
if (len) {
@@ -222,6 +235,19 @@ wuffs_base__bulk_memset(void* ptr, size_t len, uint8_t byte_value) {
return wuffs_base__make_empty_struct();
}
static inline wuffs_base__empty_struct //
wuffs_base__bulk_save_host_endian(void* ptr,
size_t len,
wuffs_base__slice_u8 dst) {
if (len > dst.len) {
len = dst.len;
}
if (len) {
memmove(dst.ptr, ptr, len);
}
return wuffs_base__make_empty_struct();
}
// --------
static inline wuffs_base__slice_u8 //
+77 -61
View File
@@ -872,68 +872,26 @@ func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*
func (g *gen) writeBuiltinSlice(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error {
switch method {
case t.IDBulkMemset:
if arrayOrSlice, lo, hi, ok := recv.IsSlice(); !ok {
return fmt.Errorf("TODO: bulk_memset for general expressions")
} else if hi == nil {
return fmt.Errorf("TODO: bulk_memset for general expressions")
} else if arrayOrSlice.MType().IsBulkNumType() {
b.writes("wuffs_base__bulk_memset(&")
if err := g.writeExpr(b, arrayOrSlice, false, depth); err != nil {
return err
}
if lo == nil {
b.writes("[0], ")
if err := g.writeExpr(b, hi, false, depth); err != nil {
return err
}
} else {
b.writes("[")
if err := g.writeExpr(b, lo, false, depth); err != nil {
return err
}
b.writes("], (")
if err := g.writeExpr(b, hi, false, depth); err != nil {
return err
}
b.writes(" - ")
if err := g.writeExpr(b, lo, false, depth); err != nil {
return err
}
b.writes(")")
}
if bs := arrayOrSlice.MType().Inner().BulkSize(); (bs != nil) && (bs.Cmp(one) != 0) {
b.writes(" * (size_t)")
b.writes(bs.String())
b.writes("u")
}
b.writes(", ")
return g.writeArgs(b, args, depth)
} else if arrayOrSlice.MType().IsContainerOfSpecificNumType(t.IDSlice, t.IDU8) {
b.writes("wuffs_base__bulk_memset(")
if err := g.writeExpr(b, recv, false, depth); err != nil {
return err
}
b.writes(".ptr, ")
if err := g.writeExpr(b, recv, false, depth); err != nil {
return err
}
b.writes(".len")
if bs := arrayOrSlice.MType().Inner().BulkSize(); (bs != nil) && (bs.Cmp(one) != 0) {
b.writes(" * (size_t)")
b.writes(bs.String())
b.writes("u")
}
b.writes(", ")
return g.writeArgs(b, args, depth)
} else {
return fmt.Errorf("TODO: bulk_memset for general expressions")
case t.IDBulkLoadHostEndian:
b.writes("wuffs_base__bulk_load_host_endian(")
if err := g.writeBuiltinSliceBulkMethodRecv(b, recv, depth); err != nil {
return err
}
return g.writeArgs(b, args, depth)
case t.IDBulkMemset:
b.writes("wuffs_base__bulk_memset(")
if err := g.writeBuiltinSliceBulkMethodRecv(b, recv, depth); err != nil {
return err
}
return g.writeArgs(b, args, depth)
case t.IDBulkSaveHostEndian:
b.writes("wuffs_base__bulk_save_host_endian(")
if err := g.writeBuiltinSliceBulkMethodRecv(b, recv, depth); err != nil {
return err
}
return g.writeArgs(b, args, depth)
case t.IDCopyFromSlice:
if err := g.writeBuiltinSliceCopyFromSlice8(b, recv, method, args, depth); err != errOptimizationNotApplicable {
@@ -1013,6 +971,64 @@ func (g *gen) writeBuiltinSlice(b *buffer, recv *a.Expr, method t.ID, args []*a.
return errNoSuchBuiltin
}
func (g *gen) writeBuiltinSliceBulkMethodRecv(b *buffer, recv *a.Expr, depth uint32) error {
if arrayOrSlice, lo, hi, ok := recv.IsSlice(); !ok || (hi == nil) {
// No-op.
} else if arrayOrSlice.MType().IsBulkNumType() {
b.writes("&")
if err := g.writeExpr(b, arrayOrSlice, false, depth); err != nil {
return err
}
if lo == nil {
b.writes("[0], ")
if err := g.writeExpr(b, hi, false, depth); err != nil {
return err
}
} else {
b.writes("[")
if err := g.writeExpr(b, lo, false, depth); err != nil {
return err
}
b.writes("], (")
if err := g.writeExpr(b, hi, false, depth); err != nil {
return err
}
b.writes(" - ")
if err := g.writeExpr(b, lo, false, depth); err != nil {
return err
}
b.writes(")")
}
if bs := arrayOrSlice.MType().Inner().BulkSize(); (bs != nil) && (bs.Cmp(one) != 0) {
b.writes(" * (size_t)")
b.writes(bs.String())
b.writes("u")
}
b.writes(", ")
return nil
} else if arrayOrSlice.MType().IsContainerOfSpecificNumType(t.IDSlice, t.IDU8) {
if err := g.writeExpr(b, recv, false, depth); err != nil {
return err
}
b.writes(".ptr, ")
if err := g.writeExpr(b, recv, false, depth); err != nil {
return err
}
b.writes(".len")
if bs := arrayOrSlice.MType().Inner().BulkSize(); (bs != nil) && (bs.Cmp(one) != 0) {
b.writes(" * (size_t)")
b.writes(bs.String())
b.writes("u")
}
b.writes(", ")
return nil
}
return fmt.Errorf("TODO: bulk_memset for general expressions")
}
// writeBuiltinSliceCopyFromSlice8 writes an optimized version of:
//
// foo[fIndex .. fIndex + 8].copy_from_slice!(s:bar[bIndex .. bIndex + 8])