AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e49703faf2
skia2/tests/SkSLTest.cpp

271 lines
16 KiB
C++
Raw Normal View History

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
/*
* Copyright 2021 Google LLC
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "gm/gm.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkCanvas.h"
#include "include/core/SkData.h"
#include "include/core/SkFont.h"
#include "include/core/SkPaint.h"
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/core/SkSurface.h"
#include "include/effects/SkGradientShader.h"
#include "include/effects/SkImageFilters.h"
#include "include/effects/SkRuntimeEffect.h"
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
#include "include/private/SkSLDefines.h" // for kDefaultInlineThreshold
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
#include "include/utils/SkRandom.h"
#include "tests/Test.h"
#include "tools/Resources.h"
#include "tools/ToolUtils.h"
static const SkRect kRect = SkRect::MakeWH(1, 1);
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
template <typename T>
static void set_uniform(SkRuntimeShaderBuilder* builder, const char* name, const T& value) {
SkRuntimeShaderBuilder::BuilderUniform uniform = builder->uniform(name);
if (uniform.fVar) {
uniform = value;
}
}
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
static void test_one_permutation(skiatest::Reporter* r,
SkSurface* surface,
const char* testFile,
const char* permutationSuffix,
const SkRuntimeEffect::Options& options) {
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
SkString resourcePath = SkStringPrintf("sksl/%s", testFile);
sk_sp<SkData> shaderData = GetResourceAsData(resourcePath.c_str());
if (!shaderData) {
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
ERRORF(r, "%s%s: Unable to load file", testFile, permutationSuffix);
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
return;
}
SkString shaderString{reinterpret_cast<const char*>(shaderData->bytes()), shaderData->size()};
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
SkRuntimeEffect::Result result = SkRuntimeEffect::Make(shaderString, options);
if (!result.effect) {
ERRORF(r, "%s%s: %s", testFile, permutationSuffix, result.errorText.c_str());
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
return;
}
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
SkRuntimeShaderBuilder builder(result.effect);
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
set_uniform(&builder, "colorBlack", SkV4{0, 0, 0, 1});
set_uniform(&builder, "colorRed", SkV4{1, 0, 0, 1});
set_uniform(&builder, "colorGreen", SkV4{0, 1, 0, 1});
set_uniform(&builder, "colorBlue", SkV4{0, 0, 1, 1});
set_uniform(&builder, "colorWhite", SkV4{1, 1, 1, 1});
set_uniform(&builder, "testInputs", SkV4{-1.25, 0, 0.75, 2.25});
Reland "Add support for matrix == and != in Metal shaders." This reverts commit 4908a24d4b24ad34a3dce693d931654b872bff08. Reason for revert: test fails on Adreno 5xx/6xx, will land tests separately and disable on Adreno Original change's description: > Revert "Add support for matrix == and != in Metal shaders." > > This reverts commit c50185718830a6220b28be885cebd3959a0f0698. > > Reason for revert: breaking many bots > > Original change's description: > > Add support for matrix == and != in Metal shaders. > > > > We need to polyfill an operator== and != when these are first > > encountered in the code. > > > > Change-Id: I539c838ee1871bcb0c4b66abb8a4a0f91146cd4f > > Bug: skia:11306 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368496 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: Id583109a0d167c2c58a57644b14cd5f49d670737 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11306 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368801 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:11306 Change-Id: If7c628b8c7a2ce40d6c88599a7660ff91c4ac67a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368804 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 14:53:41 +00:00
set_uniform(&builder, "testMatrix2x2", std::array<float,4>{1, 2,
3, 4});
set_uniform(&builder, "testMatrix3x3", std::array<float,9>{1, 2, 3,
4, 5, 6,
7, 8, 9});
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
set_uniform(&builder, "unknownInput", 1.0f);
Add SkSL test for matrix equality/inequality operators. Disabled on Adreno 5xx/6xx as the tests do not pass on those GPUs: http://screen/3Dkgs9syj37cjBV Change-Id: Ib935d01e8f06dbfe7decd5cc4e52e0688b48be08 Bug: skia:11306, skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368805 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 17:21:51 +00:00
set_uniform(&builder, "testMatrix2x2", std::array<float,4>{1, 2,
3, 4});
set_uniform(&builder, "testMatrix3x3", std::array<float,9>{1, 2, 3,
4, 5, 6,
7, 8, 9});
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
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
sk_sp<SkShader> shader = builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
if (!shader) {
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
ERRORF(r, "%s%s: Unable to build shader", testFile, permutationSuffix);
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
return;
}
SkPaint paintShader;
paintShader.setShader(shader);
surface->getCanvas()->drawRect(kRect, paintShader);
SkBitmap bitmap;
REPORTER_ASSERT(r, bitmap.tryAllocPixels(surface->imageInfo()));
REPORTER_ASSERT(r, surface->readPixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(),
/*srcX=*/0, /*srcY=*/0));
SkColor color = bitmap.getColor(0, 0);
REPORTER_ASSERT(r, color == SkColorSetARGB(0xFF, 0x00, 0xFF, 0x00),
"Expected: solid green. Actual: A=%02X R=%02X G=%02X B=%02X.",
SkColorGetA(color), SkColorGetR(color), SkColorGetG(color), SkColorGetB(color));
}
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
static void test_permutations(skiatest::Reporter* r, SkSurface* surface, const char* testFile) {
SkRuntimeEffect::Options options;
Fix testing of Runtime Effects with inlining enabled and disabled. Previously, the act of painting a Runtime Effect was causing its helper functions to get inlined, even if inlining was disabled during the initial SkSL generation. This meant that the "NoInline" path was not actually very effective. Change-Id: If8e3933be61df4a49d2e11d916d7fff22876315e Bug: skia:11362 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388099 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 13:25:33 +00:00
options.forceNoInline = false;
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
test_one_permutation(r, surface, testFile, "", options);
Fix testing of Runtime Effects with inlining enabled and disabled. Previously, the act of painting a Runtime Effect was causing its helper functions to get inlined, even if inlining was disabled during the initial SkSL generation. This meant that the "NoInline" path was not actually very effective. Change-Id: If8e3933be61df4a49d2e11d916d7fff22876315e Bug: skia:11362 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388099 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 13:25:33 +00:00
options.forceNoInline = true;
test_one_permutation(r, surface, testFile, " (NoInline)", options);
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
}
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
static void test_cpu(skiatest::Reporter* r, const char* testFile) {
const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
sk_sp<SkSurface> surface(SkSurface::MakeRaster(info));
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
test_permutations(r, surface.get(), testFile);
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
}
static void test_gpu(skiatest::Reporter* r, GrDirectContext* ctx, const char* testFile) {
const SkImageInfo info = SkImageInfo::MakeN32Premul(kRect.width(), kRect.height());
sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
Run SkSL tests with and without inlining. Change-Id: Ie0f5485acf2a87321e881e98dc11115ab80dff95 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365484 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-03 16:42:32 +00:00
test_permutations(r, surface.get(), testFile);
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
}
Reland "Improve support for arrays in Metal." This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b. Reason for revert: updated ArrayTypes test for ES2 compatibility Original change's description: > Revert "Improve support for arrays in Metal." > > This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2. > > Reason for revert: breaks ANGLE > > Original change's description: > > Improve support for arrays in Metal. > > > > Arrays in Metal now use the `array<T, N>` type instead of the C-style > > `T[N]` type. This gives them semantics much more in line with GLSL, > > so they can be initialized and assigned like GLSL arrays. > > > > This allows the ArrayTypes and Assignment tests to pass, so they have > > been added to our dm SkSL tests. (ArrayConstructors also passes, but > > is not ES2-compliant so it is not enabled.) > > > > Change-Id: Id1028311963084befd0e044e11e223af6a064dda > > Bug: skia:10761, skia:10760, skia:11022, skia:10939 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10761 > Bug: skia:10760 > Bug: skia:11022 > Bug: skia:10939 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:10761 Bug: skia:10760 Bug: skia:11022 Bug: skia:10939 Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
#define SKSL_TEST_CPU(name, path) \
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
DEF_TEST(name ## _CPU, r) { \
test_cpu(r, path); \
Reland "Improve support for arrays in Metal." This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b. Reason for revert: updated ArrayTypes test for ES2 compatibility Original change's description: > Revert "Improve support for arrays in Metal." > > This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2. > > Reason for revert: breaks ANGLE > > Original change's description: > > Improve support for arrays in Metal. > > > > Arrays in Metal now use the `array<T, N>` type instead of the C-style > > `T[N]` type. This gives them semantics much more in line with GLSL, > > so they can be initialized and assigned like GLSL arrays. > > > > This allows the ArrayTypes and Assignment tests to pass, so they have > > been added to our dm SkSL tests. (ArrayConstructors also passes, but > > is not ES2-compliant so it is not enabled.) > > > > Change-Id: Id1028311963084befd0e044e11e223af6a064dda > > Bug: skia:10761, skia:10760, skia:11022, skia:10939 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10761 > Bug: skia:10760 > Bug: skia:11022 > Bug: skia:10939 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:10761 Bug: skia:10760 Bug: skia:11022 Bug: skia:10939 Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
}
#define SKSL_TEST_GPU(name, path) \
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
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name ## _GPU, r, ctxInfo) { \
test_gpu(r, ctxInfo.directContext(), path); \
}
Reland "Improve support for arrays in Metal." This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b. Reason for revert: updated ArrayTypes test for ES2 compatibility Original change's description: > Revert "Improve support for arrays in Metal." > > This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2. > > Reason for revert: breaks ANGLE > > Original change's description: > > Improve support for arrays in Metal. > > > > Arrays in Metal now use the `array<T, N>` type instead of the C-style > > `T[N]` type. This gives them semantics much more in line with GLSL, > > so they can be initialized and assigned like GLSL arrays. > > > > This allows the ArrayTypes and Assignment tests to pass, so they have > > been added to our dm SkSL tests. (ArrayConstructors also passes, but > > is not ES2-compliant so it is not enabled.) > > > > Change-Id: Id1028311963084befd0e044e11e223af6a064dda > > Bug: skia:10761, skia:10760, skia:11022, skia:10939 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10761 > Bug: skia:10760 > Bug: skia:11022 > Bug: skia:10939 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Bug: skia:10761 Bug: skia:10760 Bug: skia:11022 Bug: skia:10939 Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
#define SKSL_TEST(name, path) SKSL_TEST_CPU(name, path) SKSL_TEST_GPU(name, path)
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
Add SkSL test demonstrating missed optimization with +=. Currently, SkSL is able to constant-propagate `x = x + constant` into `x = constant` when the starting value of x is known. However, it is not able to do the same optimization for `x += constant`. This test demonstrates that once += is encountered, we lose track of x's value and can no longer propagate its value. (This is equally true of all the op-assignment operators, += -= *= /= etc.) Change-Id: I3523e96baf9a73982cf3b09f0d23b95adacf106b Bug: skia:11192 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368248 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-09 15:38:59 +00:00
SKSL_TEST(SkSLAssignmentOps, "folding/AssignmentOps.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLBoolFolding, "folding/BoolFolding.sksl")
SKSL_TEST(SkSLIntFoldingES2, "folding/IntFoldingES2.sksl")
SKSL_TEST(SkSLFloatFolding, "folding/FloatFolding.sksl")
SKSL_TEST(SkSLMatrixFoldingES2, "folding/MatrixFoldingES2.sksl")
Support structs in runtime effects Uses the pipeline-stage callback mechanism. It mangles the type name (with a test to verify that this works), and then calls defineStruct with the entire SkSL struct definition string. Bug: skia:10939 Change-Id: If14cf1b11faaa80ad8d4086cdacf68532bac43fc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368809 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-10 15:19:27 +00:00
SKSL_TEST(SkSLSelfAssignment, "folding/SelfAssignment.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLShortCircuitBoolFolding, "folding/ShortCircuitBoolFolding.sksl")
Revert "Disable control-flow analysis in SkSL. (Performance experiment)" This reverts commit 50b1b2b90d609c235c70692ac9b6e6450a7c3fb5. Reason for revert: ending experiment Original change's description: > Disable control-flow analysis in SkSL. (Performance experiment) > > This CL will be used to test for potential performance regressions (or > improvements?) that we might incur by disabling this optimization pass. > > It will be reverted in ~1 day. > > Change-Id: I775cdb0c95df81fa25ebbd66e4ff01f64c660f68 > Bug: skia:11319 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378456 > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: Ie385a82db237ff5651348d82b9651f8ba09375b9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:11319 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379581 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-04 15:19:48 +00:00
SKSL_TEST(SkSLVectorScalarFolding, "folding/VectorScalarFolding.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLVectorVectorFolding, "folding/VectorVectorFolding.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
SKSL_TEST(SkSLForBodyMustBeInlinedIntoAScope, "inliner/ForBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLForWithoutReturnInsideCanBeInlined, "inliner/ForWithoutReturnInsideCanBeInlined.sksl")
SKSL_TEST(SkSLForWithReturnInsideCannotBeInlined, "inliner/ForWithReturnInsideCannotBeInlined.sksl")
SKSL_TEST(SkSLIfBodyMustBeInlinedIntoAScope, "inliner/IfBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLIfElseBodyMustBeInlinedIntoAScope, "inliner/IfElseBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLIfElseChainWithReturnsCanBeInlined, "inliner/IfElseChainWithReturnsCanBeInlined.sksl")
SKSL_TEST(SkSLIfTestCanBeInlined, "inliner/IfTestCanBeInlined.sksl")
SKSL_TEST(SkSLIfWithReturnsCanBeInlined, "inliner/IfWithReturnsCanBeInlined.sksl")
SKSL_TEST(SkSLInlineKeywordOverridesThreshold, "inliner/InlineKeywordOverridesThreshold.sksl")
SKSL_TEST(SkSLInlinerAvoidsVariableNameOverlap, "inliner/InlinerAvoidsVariableNameOverlap.sksl")
SKSL_TEST(SkSLInlinerElidesTempVarForReturnsInsideBlock,
"inliner/InlinerElidesTempVarForReturnsInsideBlock.sksl")
SKSL_TEST(SkSLInlinerUsesTempVarForMultipleReturns,
"inliner/InlinerUsesTempVarForMultipleReturns.sksl")
SKSL_TEST(SkSLInlinerUsesTempVarForReturnsInsideBlockWithVar,
"inliner/InlinerUsesTempVarForReturnsInsideBlockWithVar.sksl")
SKSL_TEST(SkSLInlineThreshold, "inliner/InlineThreshold.sksl")
SKSL_TEST(SkSLInlineWithInoutArgument, "inliner/InlineWithInoutArgument.sksl")
SKSL_TEST(SkSLInlineWithModifiedArgument, "inliner/InlineWithModifiedArgument.sksl")
SKSL_TEST(SkSLInlineWithNestedBigCalls, "inliner/InlineWithNestedBigCalls.sksl")
SKSL_TEST(SkSLInlineWithUnmodifiedArgument, "inliner/InlineWithUnmodifiedArgument.sksl")
SKSL_TEST(SkSLInlineWithUnnecessaryBlocks, "inliner/InlineWithUnnecessaryBlocks.sksl")
SKSL_TEST(SkSLNoInline, "inliner/NoInline.sksl")
SKSL_TEST(SkSLShortCircuitEvaluationsCannotInlineRightHandSide,
"inliner/ShortCircuitEvaluationsCannotInlineRightHandSide.sksl")
SKSL_TEST(SkSLStructsCanBeInlinedSafely, "inliner/StructsCanBeInlinedSafely.sksl")
SKSL_TEST(SkSLSwizzleCanBeInlinedDirectly, "inliner/SwizzleCanBeInlinedDirectly.sksl")
SKSL_TEST(SkSLTernaryResultsCannotBeInlined, "inliner/TernaryResultsCannotBeInlined.sksl")
SKSL_TEST(SkSLTernaryTestCanBeInlined, "inliner/TernaryTestCanBeInlined.sksl")
SKSL_TEST(SkSLTrivialArgumentsInlineDirectly, "inliner/TrivialArgumentsInlineDirectly.sksl")
Disallow inlining a function with out-parameters. It is difficult to do this both efficiently and correctly while honoring GLSL semantics (which require the lvalues to be kept distinct, even when they point to the same variable). We could make it work by making copies of every out parameter in each direction (going in for inouts, and coming out for outs and inouts). However, this could be self-defeating if it makes it harder for the driver to track variable lifetimes. Simply opting out of inlining these functions entirely seems like the best tradeoff; let the driver optimize them if it can, and we can enjoy reduced complexity in the SkSL inliner. Change-Id: I62f7b4550cc181cfe789e4f2ff4e408ba1baf9cb Bug: skia:11326 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370257 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-17 17:20:10 +00:00
// TODO(skia:11052): SPIR-V does not yet honor `out` param semantics correctly
SKSL_TEST_CPU(SkSLInlinerHonorsGLSLOutParamSemantics,
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
"inliner/InlinerHonorsGLSLOutParamSemantics.sksl")
Disallow inlining a function with out-parameters. It is difficult to do this both efficiently and correctly while honoring GLSL semantics (which require the lvalues to be kept distinct, even when they point to the same variable). We could make it work by making copies of every out parameter in each direction (going in for inouts, and coming out for outs and inouts). However, this could be self-defeating if it makes it harder for the driver to track variable lifetimes. Simply opting out of inlining these functions entirely seems like the best tradeoff; let the driver optimize them if it can, and we can enjoy reduced complexity in the SkSL inliner. Change-Id: I62f7b4550cc181cfe789e4f2ff4e408ba1baf9cb Bug: skia:11326 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370257 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-17 17:20:10 +00:00
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntrinsicAbsFloat, "intrinsics/AbsFloat.sksl")
SKSL_TEST(SkSLIntrinsicCeil, "intrinsics/Ceil.sksl")
SKSL_TEST(SkSLIntrinsicClampFloat, "intrinsics/ClampFloat.sksl")
SKSL_TEST(SkSLIntrinsicMaxFloat, "intrinsics/MaxFloat.sksl")
SKSL_TEST(SkSLIntrinsicMinFloat, "intrinsics/MinFloat.sksl")
SKSL_TEST(SkSLIntrinsicMixFloat, "intrinsics/MixFloat.sksl")
SKSL_TEST(SkSLIntrinsicSignFloat, "intrinsics/SignFloat.sksl")
SKSL_TEST(SkSLArrayTypes, "shared/ArrayTypes.sksl")
SKSL_TEST(SkSLAssignment, "shared/Assignment.sksl")
SKSL_TEST(SkSLCastsRoundTowardZero, "shared/CastsRoundTowardZero.sksl")
SKSL_TEST(SkSLCommaMixedTypes, "shared/CommaMixedTypes.sksl")
Disable CommaSideEffects test on GPU. This test causes the Adreno 330 driver to crash, and does not pass on Quadro P400 in wasm. The CPU test confirms that we can get it right, even if not all drivers do. Change-Id: I5ffb72ac647a49dab7130ab2c6e94f587ded6cf9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386216 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-17 20:59:07 +00:00
// This test causes the Adreno 330 driver to crash, and does not pass on Quadro P400 in wasm.
// The CPU test confirms that we can get it right, even if not all drivers do.
SKSL_TEST_CPU(SkSLCommaSideEffects, "shared/CommaSideEffects.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLConstantIf, "shared/ConstantIf.sksl")
SKSL_TEST(SkSLConstVariableComparison, "shared/ConstVariableComparison.sksl")
SKSL_TEST(SkSLDeadIfStatement, "shared/DeadIfStatement.sksl")
SKSL_TEST(SkSLDeadStripFunctions, "shared/DeadStripFunctions.sksl")
SKSL_TEST(SkSLDependentInitializers, "shared/DependentInitializers.sksl")
SKSL_TEST(SkSLEmptyBlocksES2, "shared/EmptyBlocksES2.sksl")
SKSL_TEST(SkSLForLoopControlFlow, "shared/ForLoopControlFlow.sksl")
SKSL_TEST(SkSLFunctionArgTypeMatch, "shared/FunctionArgTypeMatch.sksl")
SKSL_TEST(SkSLFunctionReturnTypeMatch, "shared/FunctionReturnTypeMatch.sksl")
SKSL_TEST(SkSLFunctions, "shared/Functions.sksl")
SKSL_TEST(SkSLGeometricIntrinsics, "shared/GeometricIntrinsics.sksl")
SKSL_TEST(SkSLHelloWorld, "shared/HelloWorld.sksl")
SKSL_TEST(SkSLHex, "shared/Hex.sksl")
SKSL_TEST(SkSLMatrices, "shared/Matrices.sksl")
Add SkSL test for matrix equality/inequality operators. Disabled on Adreno 5xx/6xx as the tests do not pass on those GPUs: http://screen/3Dkgs9syj37cjBV Change-Id: Ib935d01e8f06dbfe7decd5cc4e52e0688b48be08 Bug: skia:11306, skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368805 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 17:21:51 +00:00
SKSL_TEST(SkSLMatrixEquality, "shared/MatrixEquality.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLMultipleAssignments, "shared/MultipleAssignments.sksl")
SKSL_TEST(SkSLNegatedVectorLiteral, "shared/NegatedVectorLiteral.sksl")
SKSL_TEST(SkSLNumberCasts, "shared/NumberCasts.sksl")
SKSL_TEST(SkSLOperatorsES2, "shared/OperatorsES2.sksl")
No longer passing the results of OpAccessChain to function calls It turns out it is not legal to pass the results of OpAccessChain as a function argument, for... reasons. This CL switches us over to passing the argument via a temp variable instead. Bug: skia:11748 Change-Id: Ib5e86c1d000655ebd7bb62ceea6a27b823808645 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385936 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-17 15:16:41 +00:00
SKSL_TEST(SkSLOutParams, "shared/OutParams.sksl")
SKSL_TEST(SkSLOutParamsNoInline, "shared/OutParamsNoInline.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLOutParamsTricky, "shared/OutParamsTricky.sksl")
SKSL_TEST(SkSLResizeMatrix, "shared/ResizeMatrix.sksl")
Detect functions that fail to return a value, without using CFG. This check now runs at function finalization time, before constant propagation has occurred; this affected the "DeadIfStatement" test. Our detection isn't smart enough to realize that a loop will run zero times, so it treats `for` and `while` loops as always running at least once. This isn't strictly correct, but it actually mirrors how the CFG implementation works anyway. The only downside is that we would not flag code like `for (i=0; i<0; ++i) { return x; }` as an error. Change-Id: I5e43a6ee3a3993045559f0fb0646d36112543a94 Bug: skia:11377 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379056 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 21:00:20 +00:00
SKSL_TEST(SkSLReturnsValueOnEveryPathES2, "shared/ReturnsValueOnEveryPathES2.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLScalarConversionConstructorsES2, "shared/ScalarConversionConstructorsES2.sksl")
SKSL_TEST(SkSLStackingVectorCasts, "shared/StackingVectorCasts.sksl")
SKSL_TEST(SkSLStaticIf, "shared/StaticIf.sksl")
Support structs in runtime effects Uses the pipeline-stage callback mechanism. It mangles the type name (with a test to verify that this works), and then calls defineStruct with the entire SkSL struct definition string. Bug: skia:10939 Change-Id: If14cf1b11faaa80ad8d4086cdacf68532bac43fc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368809 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-10 15:19:27 +00:00
SKSL_TEST(SkSLStructsInFunctions, "shared/StructsInFunctions.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLSwizzleBoolConstants, "shared/SwizzleBoolConstants.sksl")
Migrate some SkSL swizzle tests to dm. Change-Id: I2bd6bf9c368359a2b21861c1b6f621040d335111 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367056 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:24:03 +00:00
SKSL_TEST(SkSLSwizzleByConstantIndex, "shared/SwizzleByConstantIndex.sksl")
SKSL_TEST(SkSLSwizzleConstants, "shared/SwizzleConstants.sksl")
SKSL_TEST(SkSLSwizzleLTRB, "shared/SwizzleLTRB.sksl")
SKSL_TEST(SkSLSwizzleOpt, "shared/SwizzleOpt.sksl")
SKSL_TEST(SkSLSwizzleScalar, "shared/SwizzleScalar.sksl")
Migrate the last SkSL tests in shared/ to dm. The leftover tests in shared/ are not easily testable as Runtime Effects; they do things that ES2 doesn't support or use a feature not exposed directly by Runtime Effects. Change-Id: I7ebe170cf713c4a0d2dbef333c1fcbac2410c67f Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367059 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-08 19:20:28 +00:00
SKSL_TEST(SkSLTernaryAsLValueEntirelyFoldable, "shared/TernaryAsLValueEntirelyFoldable.sksl")
SKSL_TEST(SkSLTernaryAsLValueFoldableTest, "shared/TernaryAsLValueFoldableTest.sksl")
Optimize ternary tests that check a const variable. This enables the ternary to be optimized away in code like: const bool SHINY = true; color = SHINY ? add_shine(x) : x; // to --> `color = add_shine(x);` Without constant propagation. Also, I added a unit test for ternary expression simplification; I wasn't able to find an existing one. When the optimization flag is disabled, this CL actually removes the optimization of `true ? x : y` --> `x` entirely; previously, this substitution would be made regardless of optimization settings. Change-Id: I93a8b9d4027902d35f8a19cfd6417170b209d056 Bug: skia:11343 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379297 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-05 20:22:48 +00:00
SKSL_TEST(SkSLTernaryExpression, "shared/TernaryExpression.sksl")
Migrate the last SkSL tests in shared/ to dm. The leftover tests in shared/ are not easily testable as Runtime Effects; they do things that ES2 doesn't support or use a feature not exposed directly by Runtime Effects. Change-Id: I7ebe170cf713c4a0d2dbef333c1fcbac2410c67f Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367059 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-08 19:20:28 +00:00
SKSL_TEST(SkSLUnaryPositiveNegative, "shared/UnaryPositiveNegative.sksl")
SKSL_TEST(SkSLUnusedVariables, "shared/UnusedVariables.sksl")
SKSL_TEST(SkSLVectorConstructors, "shared/VectorConstructors.sksl")
Fix codegen for integer vector-scalar arithmetic in SPIR-V. Due to missing type-checks, we would emit `OpVectorTimesScalar` when multiplying an ivec with an int, or an `OpFDiv` when dividing an ivec against an int. Change-Id: Idc214dbe0ec208cb44f28b22e585584ac2ab7dae Bug: skia:11267, skia:11788 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388742 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 15:44:08 +00:00
SKSL_TEST(SkSLVectorScalarMath, "shared/VectorScalarMath.sksl")
Reland "Add SkSL for-loop control flow test to dm." This reverts commit 578f1acbe8a47178efb21df49561c365226f9d95. Reason for revert: updated test to pass on Mac Intel 5100/6000 Original change's description: > Revert "Add SkSL for-loop control flow test to dm." > > This reverts commit a0c266283a8ef230ad0436dbf885d2b616e7302b. > > Reason for revert: failing on Mac Intel > > Original change's description: > > Add SkSL for-loop control flow test to dm. > > > > While loops and do-while loops remain untested in dm, as they are not > > supported in ES2 (and therefore not available in Runtime Effects). > > > > Change-Id: I2f1bfccccd571cc4ced096bc18ebbb9ecc9f9b4a > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359556 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I45335d16a695644eaeb8a535298c0efcc616c1ce > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359840 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I2dc6e870393708a12286658001b723f25a6aec4a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359856 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-27 14:56:04 +00:00
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
/*
Migrate more SkSL tests to run in dm. - CastsRoundTowardZero - Functions - GeometricIntrinsics - HelloWorld - Hex Other test updates: - DeadLoopVariable (for-loop structure incompatible with ES2) - FunctionPrototype (RTE currently disallows calling undef'd functions) - HexUnsigned (unsigned types incompatible with ES2) Change-Id: I794bee24dfac55281c9b8b130529888ba2546290 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-03 22:44:47 +00:00
// Incompatible with Runtime Effects because calling a function before its definition is disallowed.
// (This was done to prevent recursion, as required by ES2.)
Reduce self-assignment expressions (`x = x`) into just `x`. Change-Id: I44356aa781f208f4941dbeb617a30318e36c1081 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367062 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 19:04:24 +00:00
SKSL_TEST(SkSLFunctionPrototype, "shared/FunctionPrototype.sksl")
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
*/
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
/*
TODO(skia:11209): enable these tests when Runtime Effects have support for ES3
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntFoldingES3, "folding/IntFoldingES3.sksl")
SKSL_TEST(SkSLMatrixFoldingES3, "folding/MatrixFoldingES3.sksl")
Run SkSL inliner tests as part of dm. Previously, these tests were never actually executed, only read during code review. They are now properly tested for correctness whenever dm is run. Non-ES2 compliant statements (do/while/switch) are unfortunately excluded here, as they are not compatible with Runtime Effects yet. Change-Id: I965c782baad6f8dd3961a400ae791fb2c1f844d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389296 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 21:04:36 +00:00
SKSL_TEST(SkSLDoWhileBodyMustBeInlinedIntoAScope, "inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLDoWhileTestCannotBeInlined, "inliner/DoWhileTestCannotBeInlined.sksl")
SKSL_TEST(SkSLEnumsCanBeInlinedSafely, "inliner/EnumsCanBeInlinedSafely.sksl")
SKSL_TEST(SkSLForInitializerExpressionsCanBeInlined,
"inliner/ForInitializerExpressionsCanBeInlined.sksl")
SKSL_TEST(SkSLStaticSwitch, "inliner/StaticSwitch.sksl")
SKSL_TEST(SkSLWhileBodyMustBeInlinedIntoAScope, "inliner/WhileBodyMustBeInlinedIntoAScope.sksl")
SKSL_TEST(SkSLWhileTestCannotBeInlined, "inliner/WhileTestCannotBeInlined.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLIntrinsicAbsInt, "intrinsics/AbsInt.sksl")
SKSL_TEST(SkSLIntrinsicClampInt, "intrinsics/ClampInt.sksl")
SKSL_TEST(SkSLIntrinsicMaxInt, "intrinsics/MaxInt.sksl")
SKSL_TEST(SkSLIntrinsicMinInt, "intrinsics/MinInt.sksl")
SKSL_TEST(SkSLIntrinsicMixBool, "intrinsics/MixBool.sksl")
SKSL_TEST(SkSLIntrinsicSignInt, "intrinsics/SignInt.sksl")
SKSL_TEST(SkSLArrayConstructors, "shared/ArrayConstructors.sksl")
SKSL_TEST(SkSLDeadLoopVariable, "shared/DeadLoopVariable.sksl")
SKSL_TEST(SkSLDoWhileControlFlow, "shared/DoWhileControlFlow.sksl")
SKSL_TEST(SkSLEmptyBlocksES3, "shared/EmptyBlocksES3.sksl")
SKSL_TEST(SkSLHexUnsigned, "shared/HexUnsigned.sksl")
SKSL_TEST(SkSLMatricesNonsquare, "shared/MatricesNonsquare.sksl")
SKSL_TEST(SkSLOperatorsES3, "shared/OperatorsES3.sksl")
SKSL_TEST(SkSLResizeMatrixNonsquare, "shared/ResizeMatrixNonsquare.sksl")
Detect functions that fail to return a value, without using CFG. This check now runs at function finalization time, before constant propagation has occurred; this affected the "DeadIfStatement" test. Our detection isn't smart enough to realize that a loop will run zero times, so it treats `for` and `while` loops as always running at least once. This isn't strictly correct, but it actually mirrors how the CFG implementation works anyway. The only downside is that we would not flag code like `for (i=0; i<0; ++i) { return x; }` as an error. Change-Id: I5e43a6ee3a3993045559f0fb0646d36112543a94 Bug: skia:11377 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379056 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 21:00:20 +00:00
SKSL_TEST(SkSLReturnsValueOnEveryPathES3, "shared/ReturnsValueOnEveryPathES3.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLScalarConversionConstructorsES3, "shared/ScalarConversionConstructorsES3.sksl")
Migrate some SkSL swizzle tests to dm. Change-Id: I2bd6bf9c368359a2b21861c1b6f621040d335111 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367056 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:24:03 +00:00
SKSL_TEST(SkSLSwizzleByIndex, "shared/SwizzleByIndex.sksl")
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
SKSL_TEST(SkSLWhileLoopControlFlow, "shared/WhileLoopControlFlow.sksl")
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
*/
Reference in New Issue Copy Permalink