AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
688cb15faa
skia2/resources/sksl/folding/VectorScalarFolding.sksl

209 lines
5.3 KiB
Plaintext
Raw Normal View History

Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
uniform half4 colorRed, colorGreen;
uniform half unknownInput;
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
bool test_half() {
bool ok = true;
// Vector op scalar
half4 x = half4(half2(1), half2(2, 3)) + 5;
ok = ok && (x == half4(6, 6, 7, 8));
x = half4(8, half3(10)) - 1;
ok = ok && (x == half4(7, 9, 9, 9));
x = half4(half2(8), half2(9)) + 1;
ok = ok && (x == half4(9, 9, 10, 10));
x.xyz = half3(2) * 3;
ok = ok && (x == half4(6, 6, 6, 10));
x.xy = half2(12) / 4;
ok = ok && (x == half4(3, 3, 6, 10));
// (Vector op scalar).swizzle
x = (half4(12) / 2).yxwz;
ok = ok && (x == half4(6));
// Scalar op vector
x = 5 + half4(half2(1), half2(2, 3));
ok = ok && (x == half4(6, 6, 7, 8));
x = 1 - half4(8, half3(10));
ok = ok && (x == half4(-7, -9, -9, -9));
x = 1 + half4(half2(8), half2(9));
ok = ok && (x == half4(9, 9, 10, 10));
x.xyz = 3 * half3(2);
ok = ok && (x == half4(6, 6, 6, 10));
x.xy = 4 / half2(0.5);
ok = ok && (x == half4(8, 8, 6, 10));
x = 20 / half4(10, 20, 40, 80);
ok = ok && (x == half4(2, 1, 0.5, 0.25));
// (Scalar op vector).swizzle
x = (12 / half4(2)).yxwz;
ok = ok && (x == half4(6));
// Vector op unknown scalar
Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
half unknown = unknownInput;
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
x = half4(0) + unknown;
ok = ok && (x == half4(unknown));
x = half4(0) * unknown;
ok = ok && (x == half4(0));
x = half4(0) / unknown;
ok = ok && (x == half4(0));
x = half4(1) * unknown;
ok = ok && (x == half4(unknown));
// Unknown scalar op vector
x = unknown * half4(1);
ok = ok && (x == half4(unknown));
x = unknown + half4(0);
ok = ok && (x == half4(unknown));
x = unknown - half4(0);
ok = ok && (x == half4(unknown));
x = unknown / half4(1);
ok = ok && (x == half4(unknown));
// Scalar op unknown vector
x = 0 + half4(unknown);
ok = ok && (x == half4(unknown));
x = 0 * half4(unknown);
ok = ok && (x == half4(0));
Remove 0/x arithmetic simplification. If x is a known compile-time constant value, it can already be optimized to a final value. If x is not known, it could be zero, and 0/0 should result in a NaN. Change-Id: I643a7c6da0a43ec366235c4df39fc78d3b361de7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441580 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-24 18:13:16 +00:00
x = 0 / half4(unknown); // this should NOT optimize away
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
ok = ok && (x == half4(0));
x = 1 * half4(unknown);
ok = ok && (x == half4(unknown));
Add additional cases to folding tests. These cover new ground; when combined with some additional optimization work, they can cause crashes in the optimizer that we don't see from any existing test. Change-Id: I3958a5522cfe0929d0753e6e617d72e032c7f5a3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367063 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-06 00:12:27 +00:00
// X = Unknown op scalar
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
x = half4(unknown) + 0;
ok = ok && (x == half4(unknown));
x = half4(unknown) * 0;
ok = ok && (x == half4(0));
x = half4(unknown) * 1;
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
ok = ok && (x == half4(unknown));
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
x = half4(unknown) - 0;
ok = ok && (x == half4(unknown));
Add additional cases to folding tests. These cover new ground; when combined with some additional optimization work, they can cause crashes in the optimizer that we don't see from any existing test. Change-Id: I3958a5522cfe0929d0753e6e617d72e032c7f5a3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367063 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-06 00:12:27 +00:00
// X op= scalar.
x = half4(unknown);
x += 1;
x += 0;
x -= 1;
x -= 0;
x *= 1;
x /= 1;
ok = ok && (x == half4(unknown));
// X = X op scalar.
x = half4(unknown);
x = x + 1;
x = x + 0;
x = x - 1;
x = x - 0;
x = x * 1;
x = x / 1;
ok = ok && (x == half4(unknown));
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
return ok;
Migrate constant folding tests into a separate directory. This CL also adds tests for vector*scalar and scalar*vector folding. We currently do not constant-fold these, but support will be added in a followup CL. Change-Id: I68d7374ae15ab2f4d805a095803b645c92fb03d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352237 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 16:07:01 +00:00
}
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
bool test_int() {
bool ok = true;
// Vector op scalar
int4 x = int4(int2(1), int2(2, 3)) + 5;
ok = ok && (x == int4(6, 6, 7, 8));
x = int4(8, int3(10)) - 1;
ok = ok && (x == int4(7, 9, 9, 9));
x = int4(int2(8), int2(9)) + 1;
ok = ok && (x == int4(9, 9, 10, 10));
x.xyz = int3(2) * 3;
ok = ok && (x == int4(6, 6, 6, 10));
x.xy = int2(12) / 4;
ok = ok && (x == int4(3, 3, 6, 10));
// (Vector op scalar).swizzle
x = (int4(12) / 2).yxwz;
ok = ok && (x == int4(6));
// Scalar op vector
x = 5 + int4(int2(1), int2(2, 3));
ok = ok && (x == int4(6, 6, 7, 8));
x = 1 - int4(8, int3(10));
ok = ok && (x == int4(-7, -9, -9, -9));
x = 1 + int4(int2(8), int2(9));
ok = ok && (x == int4(9, 9, 10, 10));
x.xyz = 3 * int3(2);
ok = ok && (x == int4(6, 6, 6, 10));
x.xy = 16 / int2(2);
ok = ok && (x == int4(8, 8, 6, 10));
x = 2000 / int4(10, 20, 40, 80);
ok = ok && (x == int4(200, 100, 50, 25));
// (Scalar op vector).swizzle
x = (12 / int4(2)).yxwz;
ok = ok && (x == int4(6));
// Vector op unknown scalar
Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
int unknown = int(unknownInput);
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
x = int4(0) + unknown;
ok = ok && (x == int4(unknown));
x = int4(0) * unknown;
ok = ok && (x == int4(0));
x = int4(0) / unknown;
ok = ok && (x == int4(0));
x = int4(1) * unknown;
ok = ok && (x == int4(unknown));
// Unknown scalar op vector
x = unknown * int4(1);
ok = ok && (x == int4(unknown));
x = unknown + int4(0);
ok = ok && (x == int4(unknown));
x = unknown - int4(0);
ok = ok && (x == int4(unknown));
x = unknown / int4(1);
ok = ok && (x == int4(unknown));
// Scalar op unknown vector
x = 0 + int4(unknown);
ok = ok && (x == int4(unknown));
x = 0 * int4(unknown);
ok = ok && (x == int4(0));
x = 0 / int4(unknown);
ok = ok && (x == int4(0));
x = 1 * int4(unknown);
ok = ok && (x == int4(unknown));
// Unknown vector op scalar
x = int4(unknown) + 0;
ok = ok && (x == int4(unknown));
x = int4(unknown) * 0;
ok = ok && (x == int4(0));
x = int4(unknown) * 1;
Reland "Run unit tests to verify SkSL folding behavior." This is a reland of 4ecab92584557c1a08e6edced5b0fdd2496eb2f0 This reland folds in subsequent code cleanups and disables a test that failed on Android + Vulkan. Original change's description: > Run unit tests to verify SkSL folding behavior. > > The unit test loads SkSL source files from `resources/sksl`, compiles > the code, and uses SkRuntimeEffect to render a pixel using the effect. > If solid green is rendered, the test passes. > > Change-Id: I2ccb427a907975ae84aee19d8e68d774b2cb638c > Bug: skia:11009 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355983 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:11009 Change-Id: I09196c8ca3041e8957324a0cbb7f7d6963c6e4e7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358523 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-25 15:57:47 +00:00
ok = ok && (x == int4(unknown));
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
x = int4(unknown) - 0;
ok = ok && (x == int4(unknown));
Add additional cases to folding tests. These cover new ground; when combined with some additional optimization work, they can cause crashes in the optimizer that we don't see from any existing test. Change-Id: I3958a5522cfe0929d0753e6e617d72e032c7f5a3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367063 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-06 00:12:27 +00:00
// X op= scalar.
x = int4(unknown);
x += 1;
x += 0;
x -= 1;
x -= 0;
x *= 1;
x /= 1;
ok = ok && (x == int4(unknown));
// X = X op scalar.
x = int4(unknown);
x = x + 1;
x = x + 0;
x = x - 1;
x = x - 0;
x = x * 1;
x = x / 1;
ok = ok && (x == int4(unknown));
Update folding tests to return pass/fail status. A passing test returns solid green. Failing tests are written to return solid red, but drawing any other color than green can be interpreted as a test failure. Additionally, tests which cannot compile as RuntimeEffects (due to non-ES2-compatible features) have been split into an ES2-compatible part and an ES3 part. Change-Id: I3f53121d9de0ae4c4e7f1de3177d067811980b55 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356999 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 14:51:13 +00:00
return ok;
Migrate constant folding tests into a separate directory. This CL also adds tests for vector*scalar and scalar*vector folding. We currently do not constant-fold these, but support will be added in a followup CL. Change-Id: I68d7374ae15ab2f4d805a095803b645c92fb03d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352237 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 16:07:01 +00:00
}
Reland "Add coords parameter to all .sksl test files used as runtime effects" This is a reland of 22dcb5fd7e4ab2a7a1a827165899a54342d2ed53 Original change's description: > Add coords parameter to all .sksl test files used as runtime effects > > Convert to use the newer MakeForShader factory, which requires this. > > Change-Id: Ifaf6054054027c78f3f3fe15596e435e0f79b877 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399336 > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> Bug: skia:11919 Change-Id: I5f745c54b2bc3712f2281db6e067345903e81931 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/401836 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-21 18:27:08 +00:00
half4 main(float2 coords) {
Add helper uniforms to Runtime Effect tests. This lets us use descriptive names like `colorRed` and `colorGreen` instead of `half4(1,0,0,1)` and `half4(0,1,0,1)`. It also lets us use actual unknown values instead of synthesizing sorta-kinda-unknowns by calling sqrt. Change-Id: I61481c33b7ff42182955777b05cfa5fcc13e0efc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359567 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 21:28:12 +00:00
return test_half() && test_int() ? colorGreen : colorRed;
Migrate constant folding tests into a separate directory. This CL also adds tests for vector*scalar and scalar*vector folding. We currently do not constant-fold these, but support will be added in a followup CL. Change-Id: I68d7374ae15ab2f4d805a095803b645c92fb03d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352237 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 16:07:01 +00:00
}
Reference in New Issue Copy Permalink