AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "print 1/K floats as fractions"

Browse Source 
This reverts commit 346f82c1c3.

Reason for revert: *SAN bots

Original change's description:
> print 1/K floats as fractions
> 
> Change-Id: Id00cbd0950e77debb5ab5d45541dc0f8d13a3c42
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218338
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>

TBR=mtklein@google.com,brianosman@google.com

Change-Id: Ic35cec97d2dc2c1e19dbdf8ea7b505ad75072da1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218529
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-06-05 14:12:16 +00:00 committed by Skia Commit-Bot
parent c70ed90f59
commit c2d9a3145b
2 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/SkVMTest.expected
View File

@ -1,7 +1,7 @@
A8 over A8
3 registers, 15 instructions:
r0 = load8 arg(0)
r1 = splat 3B808081 (1/255)
r1 = splat 3B808081 (0.0039215689)
r0 = to_f32 r0
r0 = mul_f32 r1 r0
r2 = load8 arg(1)
@ -11,7 +11,7 @@ r1 = splat 3F800000 (1)
r1 = sub_f32 r1 r0
r1 = mad_f32 r2 r1 r0
r2 = splat 437F0000 (255)
r0 = splat 3F000000 (1/2)
r0 = splat 3F000000 (0.5)
r0 = mad_f32 r1 r2 r0
r0 = to_i32 r0
store8 arg(1) r0
@ -19,7 +19,7 @@ store8 arg(1) r0
A8 over G8
4 registers, 21 instructions:
r0 = load8 arg(0)
r1 = splat 3B808081 (1/255)
r1 = splat 3B808081 (0.0039215689)
r0 = to_f32 r0
r0 = mul_f32 r1 r0
r2 = load8 arg(1)
@ -35,7 +35,7 @@ r3 = mul_f32 r1 r3
r3 = mad_f32 r1 r0 r3
r3 = mad_f32 r1 r2 r3
r2 = splat 437F0000 (255)
r1 = splat 3F000000 (1/2)
r1 = splat 3F000000 (0.5)
r1 = mad_f32 r3 r2 r1
r1 = to_i32 r1
store8 arg(1) r1
@ -43,7 +43,7 @@ store8 arg(1) r1
A8 over RGBA_8888
6 registers, 37 instructions:
r0 = load8 arg(0)
r1 = splat 3B808081 (1/255)
r1 = splat 3B808081 (0.0039215689)
r0 = to_f32 r0
r0 = mul_f32 r1 r0
r2 = load32 arg(1)
@ -66,7 +66,7 @@ r4 = mul_f32 r4 r1
r5 = mul_f32 r5 r1
r1 = mad_f32 r2 r1 r0
r2 = splat 437F0000 (255)
r0 = splat 3F000000 (1/2)
r0 = splat 3F000000 (0.5)
r3 = mad_f32 r3 r2 r0
r3 = to_i32 r3
r4 = mad_f32 r4 r2 r0
@ -82,7 +82,7 @@ store32 arg(1) r0
G8 over A8
3 registers, 12 instructions:
r0 = splat 3B808081 (1/255)
r0 = splat 3B808081 (0.0039215689)
r1 = splat 3F800000 (1)
r2 = load8 arg(1)
r2 = to_f32 r2
@ -90,7 +90,7 @@ r2 = mul_f32 r0 r2
r0 = sub_f32 r1 r1
r0 = mad_f32 r2 r0 r1
r2 = splat 437F0000 (255)
r1 = splat 3F000000 (1/2)
r1 = splat 3F000000 (0.5)
r1 = mad_f32 r0 r2 r1
r1 = to_i32 r1
store8 arg(1) r1
@ -98,7 +98,7 @@ store8 arg(1) r1
G8 over G8
4 registers, 21 instructions:
r0 = load8 arg(0)
r1 = splat 3B808081 (1/255)
r1 = splat 3B808081 (0.0039215689)
r0 = to_f32 r0
r0 = mul_f32 r1 r0
r2 = splat 3F800000 (1)
@ -114,7 +114,7 @@ r1 = mul_f32 r2 r1
r1 = mad_f32 r2 r0 r1
r1 = mad_f32 r2 r3 r1
r3 = splat 437F0000 (255)
r2 = splat 3F000000 (1/2)
r2 = splat 3F000000 (0.5)
r2 = mad_f32 r1 r3 r2
r2 = to_i32 r2
store8 arg(1) r2
@ -122,7 +122,7 @@ store8 arg(1) r2
G8 over RGBA_8888
7 registers, 37 instructions:
r0 = load8 arg(0)
r1 = splat 3B808081 (1/255)
r1 = splat 3B808081 (0.0039215689)
r0 = to_f32 r0
r0 = mul_f32 r1 r0
r2 = splat 3F800000 (1)
@ -145,7 +145,7 @@ r5 = mad_f32 r5 r1 r0
r6 = mad_f32 r6 r1 r0
r1 = mad_f32 r3 r1 r2
r3 = splat 437F0000 (255)
r2 = splat 3F000000 (1/2)
r2 = splat 3F000000 (0.5)
r4 = mad_f32 r4 r3 r2
r4 = to_i32 r4
r5 = mad_f32 r5 r3 r2
@ -162,7 +162,7 @@ store32 arg(1) r2
RGBA_8888 over A8
3 registers, 16 instructions:
r0 = load32 arg(0)
r1 = splat 3B808081 (1/255)
r1 = splat 3B808081 (0.0039215689)
r0 = shr r0 24
r0 = to_f32 r0
r0 = mul_f32 r1 r0
@ -173,7 +173,7 @@ r1 = splat 3F800000 (1)
r1 = sub_f32 r1 r0
r1 = mad_f32 r2 r1 r0
r2 = splat 437F0000 (255)
r0 = splat 3F000000 (1/2)
r0 = splat 3F000000 (0.5)
r0 = mad_f32 r1 r2 r0
r0 = to_i32 r0
store8 arg(1) r0
@ -182,7 +182,7 @@ RGBA_8888 over G8
6 registers, 33 instructions:
r0 = load32 arg(0)
r1 = extract r0 FF
r2 = splat 3B808081 (1/255)
r2 = splat 3B808081 (0.0039215689)
r1 = to_f32 r1
r1 = mul_f32 r2 r1
r3 = extract r0 FF00
@ -209,7 +209,7 @@ r0 = mul_f32 r2 r0
r0 = mad_f32 r3 r4 r0
r0 = mad_f32 r1 r5 r0
r5 = splat 437F0000 (255)
r1 = splat 3F000000 (1/2)
r1 = splat 3F000000 (0.5)
r1 = mad_f32 r0 r5 r1
r1 = to_i32 r1
store8 arg(1) r1
@ -218,7 +218,7 @@ RGBA_8888 over RGBA_8888
9 registers, 47 instructions:
r0 = load32 arg(0)
r1 = extract r0 FF
r2 = splat 3B808081 (1/255)
r2 = splat 3B808081 (0.0039215689)
r1 = to_f32 r1
r1 = mul_f32 r2 r1
r3 = extract r0 FF00
@ -250,7 +250,7 @@ r7 = mad_f32 r7 r2 r3
r8 = mad_f32 r8 r2 r4
r2 = mad_f32 r5 r2 r0
r5 = splat 437F0000 (255)
r0 = splat 3F000000 (1/2)
r0 = splat 3F000000 (0.5)
r6 = mad_f32 r6 r5 r0
r6 = to_i32 r6
r7 = mad_f32 r7 r5 r0

16
src/core/SkVM.cpp
View File

@ -218,23 +218,11 @@ namespace skvm {
o->writeHexAsText(m.bits);
}
static void write(SkWStream* o, Splat s) {
o->writeHexAsText(s.bits);
float f;
memcpy(&f, &s.bits, 4);
o->writeHexAsText(s.bits);
write(o, " (");
// It's friendlier to print floats that represent 1/K as fractions.
const int d = (int)(1.0f/f);
if (f < 1.0f && f == 1.0f/d) {
write(o, "1/");
o->writeDecAsText(d);
} else if (f < 1.0f && f == 1.0f/(d+1)) {
write(o, "1/");
o->writeDecAsText(d+1);
} else {
o->writeScalarAsText(f);
}
o->writeScalarAsText(f);
write(o, ")");
}