Add more facts after "x = y.max(a: z)"

wuffs_png_decode_19k_8bpp/clang9          95.8MB/s ± 1%  95.7MB/s ± 1%     ~     (p=0.310 n=5+5)
wuffs_png_decode_40k_24bpp/clang9          112MB/s ± 0%   112MB/s ± 0%   +0.16%  (p=0.008 n=5+5)
wuffs_png_decode_77k_8bpp/clang9           358MB/s ± 0%   357MB/s ± 0%     ~     (p=0.905 n=4+5)
wuffs_png_decode_552k_32bpp/clang9         143MB/s ± 0%   119MB/s ± 1%  -17.27%  (p=0.008 n=5+5)
wuffs_png_decode_4002k_24bpp/clang9        114MB/s ± 0%   114MB/s ± 0%   +0.42%  (p=0.008 n=5+5)

wuffs_png_decode_filter_1_sub/clang9      1.02GB/s ± 0%  0.92GB/s ± 1%   -9.75%  (p=0.008 n=5+5)
wuffs_png_decode_filter_2_up/clang9       13.5GB/s ± 0%  13.3GB/s ± 1%   -1.25%  (p=0.008 n=5+5)
wuffs_png_decode_filter_3_average/clang9   491MB/s ± 0%   554MB/s ± 0%  +12.72%  (p=0.008 n=5+5)
wuffs_png_decode_filter_4_paeth/clang9    75.5MB/s ± 0%  61.9MB/s ± 1%  -17.95%  (p=0.008 n=5+5)

wuffs_png_decode_19k_8bpp/gcc10           99.4MB/s ± 0%  99.9MB/s ± 1%   +0.51%  (p=0.032 n=5+5)
wuffs_png_decode_40k_24bpp/gcc10           116MB/s ± 0%   114MB/s ± 0%   -2.27%  (p=0.008 n=5+5)
wuffs_png_decode_77k_8bpp/gcc10            321MB/s ± 0%   325MB/s ± 0%   +1.32%  (p=0.016 n=5+4)
wuffs_png_decode_552k_32bpp/gcc10          159MB/s ± 0%   160MB/s ± 0%     ~     (p=0.190 n=5+4)
wuffs_png_decode_4002k_24bpp/gcc10         117MB/s ± 0%   117MB/s ± 0%     ~     (p=0.310 n=5+5)

wuffs_png_decode_filter_1_sub/gcc10       1.12GB/s ± 0%  0.98GB/s ± 0%  -12.54%  (p=0.008 n=5+5)
wuffs_png_decode_filter_2_up/gcc10        11.3GB/s ± 0%  11.5GB/s ± 1%   +2.08%  (p=0.016 n=4+5)
wuffs_png_decode_filter_3_average/gcc10    644MB/s ± 0%   644MB/s ± 0%     ~     (p=0.151 n=5+5)
wuffs_png_decode_filter_4_paeth/gcc10     83.8MB/s ± 0%  84.3MB/s ± 1%     ~     (p=0.095 n=5+5)
This commit is contained in:
Nigel Tao committed 2021-01-02 22:35:54 +11:00
1 parent a98739bf90
commit b7b39e34d8
4 files changed
+81 -9

No files matched your search

+4
View File
@@ -793,6 +793,10 @@ func (n *TypeExpr) IsArrayType() bool {
return n.id0 == t.IDArray
}
func (n *TypeExpr) IsFuncType() bool {
return n.id0 == t.IDFunc
}
func (n *TypeExpr) IsPointerType() bool {
return n.id0 == t.IDNptr || n.id0 == t.IDPtr
}
+41
View File
@@ -447,6 +447,17 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error {
if lhs.MType().IsNumType() && rhs.Effect().Pure() {
q.facts.appendBinaryOpFact(t.IDXBinaryEqEq, lhs, rhs)
if rhs.Operator() == t.IDOpenParen {
if lTyp := rhs.LHS().AsExpr().MType(); lTyp.IsFuncType() && lTyp.Receiver().IsNumType() {
switch fn := lTyp.FuncName(); fn {
case t.IDMax, t.IDMin:
if err := q.bcheckAssignmentMaxMin(lhs, fn, rhs); err != nil {
return err
}
}
}
}
}
} else {
@@ -541,6 +552,36 @@ func (q *checker) bcheckAssignment1(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs
return rb, nil
}
func (q *checker) bcheckAssignmentMaxMin(lhs *a.Expr, funcName t.ID, rhs *a.Expr) error {
if len(rhs.Args()) != 1 {
return fmt.Errorf("check: internal error: max/min has unexpected arguments")
}
op := t.ID(0)
switch funcName {
case t.IDMax:
op = t.IDXBinaryGreaterEq
case t.IDMin:
op = t.IDXBinaryLessEq
default:
return fmt.Errorf("check: internal error: max/min has unexpected function name")
}
operands := [2]*a.Expr{
rhs.LHS().AsExpr().LHS().AsExpr(),
rhs.Args()[0].AsArg().Value(),
}
for _, operand := range operands {
if operand.Mentions(lhs) {
continue
}
o := a.NewExpr(0, op, 0, lhs.AsNode(), nil, operand.AsNode(), nil)
o.SetMBounds(bounds{zero, one})
o.SetMType(typeExprBool)
q.facts.appendFact(o)
}
return nil
}
func snapshot(facts []*a.Expr) []*a.Expr {
return append([]*a.Expr(nil), facts...)
}
+9 -3
View File
@@ -30013,10 +30013,12 @@ wuffs_png__decoder__filter_2(
wuffs_png__decoder* self,
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev) {
uint64_t v_n = 0;
uint64_t v_i = 0;
v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len)));
v_i = 0;
while ((v_i < ((uint64_t)(a_curr.len))) && (v_i < ((uint64_t)(a_prev.len)))) {
while (v_i < v_n) {
a_curr.ptr[v_i] += a_prev.ptr[v_i];
v_i += 1;
}
@@ -30031,6 +30033,7 @@ wuffs_png__decoder__filter_3(
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev) {
uint64_t v_filter_distance = 0;
uint64_t v_n = 0;
uint64_t v_i = 0;
v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance));
@@ -30045,8 +30048,9 @@ wuffs_png__decoder__filter_3(
v_i += 1;
}
} else {
v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len)));
v_i = 0;
while ((v_i < ((uint64_t)(a_curr.len))) && (v_i < ((uint64_t)(a_prev.len)))) {
while (v_i < v_n) {
if (v_i >= v_filter_distance) {
if ((v_i - v_filter_distance) < ((uint64_t)(a_curr.len))) {
a_curr.ptr[v_i] += ((uint8_t)(((((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])) + ((uint32_t)(a_prev.ptr[v_i]))) / 2)));
@@ -30068,6 +30072,7 @@ wuffs_png__decoder__filter_4(
wuffs_base__slice_u8 a_curr,
wuffs_base__slice_u8 a_prev) {
uint64_t v_filter_distance = 0;
uint64_t v_n = 0;
uint64_t v_i = 0;
uint32_t v_fa = 0;
uint32_t v_fb = 0;
@@ -30078,8 +30083,9 @@ wuffs_png__decoder__filter_4(
uint32_t v_pc = 0;
v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance));
v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len)));
v_i = 0;
while ((v_i < ((uint64_t)(a_curr.len))) && (v_i < ((uint64_t)(a_prev.len)))) {
while (v_i < v_n) {
if (v_i < v_filter_distance) {
a_curr.ptr[v_i] += a_prev.ptr[v_i];
} else {
+27 -6
View File
@@ -36,11 +36,18 @@ pri func decoder.filter_1!(curr: slice base.u8) {
}
pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) {
var n : base.u64
var i : base.u64
n = args.curr.length().min(a: args.prev.length())
i = 0
while (i < args.curr.length()) and (i < args.prev.length()) {
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
while i < n,
inv n <= args.curr.length(),
inv n <= args.prev.length(),
{
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: n)
assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n)
assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n)
args.curr[i] ~mod+= args.prev[i]
i += 1
} endwhile
@@ -48,6 +55,7 @@ pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) {
pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) {
var filter_distance : base.u64[..= 8]
var n : base.u64
var i : base.u64
filter_distance = this.filter_distance as base.u64
@@ -63,9 +71,15 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) {
i += 1
} endwhile
} else {
n = args.curr.length().min(a: args.prev.length())
i = 0
while (i < args.curr.length()) and (i < args.prev.length()) {
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
while i < n,
inv n <= args.curr.length(),
inv n <= args.prev.length(),
{
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: n)
assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n)
assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n)
if i >= filter_distance {
if (i - filter_distance) < args.curr.length() {
args.curr[i] ~mod+= ((
@@ -82,6 +96,7 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) {
pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) {
var filter_distance : base.u64[..= 8]
var n : base.u64
var i : base.u64
var fa : base.u32
@@ -93,9 +108,15 @@ pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) {
var pc : base.u32
filter_distance = this.filter_distance as base.u64
n = args.curr.length().min(a: args.prev.length())
i = 0
while (i < args.curr.length()) and (i < args.prev.length()) {
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length())
while i < n,
inv n <= args.curr.length(),
inv n <= args.prev.length(),
{
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: n)
assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n)
assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n)
if i < filter_distance {
args.curr[i] ~mod+= args.prev[i]
} else {