AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
fa088a665c
skia2/gn/sksl_tests.gni

588 lines
23 KiB
Plaintext
Raw Normal View History

Generate SkSL golden output files from test inputs during the build. Golden SkSL outputs are intended to eventually replace the majority of our unit tests, since they can automatically update themselves when we change implementation details of the compiler. If you change the compiler output without updating the Golden files, the CheckGeneratedFiles housekeeper will be triggered. Set `skia_compile_processors` or `skia_compile_sksl_tests` to true in your GN args to regenerate them. Almost all of the tests from SkSLFPTests.cpp and SkSLGLSLTests.cpp can be migrated into separate unit-test .fp/.sksl files in a followup CL. hcm@ has signed off on removing the copyright boilerplate preamble from our unit test files. Change-Id: I9e24a944bbac8f8efd62c92481b022a0b1ecdd0b Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316336 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-14 14:21:44 +00:00
# Copyright 2020 Google LLC
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
sksl_error_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ArgumentCountMismatch.sksl",
"/sksl/errors/ArgumentMismatch.sksl",
"/sksl/errors/ArgumentModifiers.sksl",
Reject array constructors with the wrong number of elements. We now catch this error at IR generation time; previously we'd send it to the driver (where it would fail to compile). Change-Id: I45890214ffa164be1c0f359320f942bc4dc479ca Bug: skia:11265 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365697 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-03 20:11:18 +00:00
"/sksl/errors/ArrayConstructorElementCount.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ArrayIndexOutOfRange.sksl",
Fix assertion when arrays are double-declared. Multi-dimensional arrays aren't legal in GLSL/SkSL, so this should be caught and flagged as an error. The parser now verifies that a variable's type isn't an array-type before accepting a `[` token to open an array on the variable name. This CL also refactors the IR generator's `convertArraySize` method to make sure that various checks are made for all callers. Originally this restructuring was used to verify array multi-dimensionality, but that didn't detect errors inside struct declarations (which get no error checking inside the IR generator) so the IR generator updates no longer need to check the array dimensions. Bug: skia:11322 Change-Id: Id33f4bdfb544019ddf995a8196c3c09cfe5a4525 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369916 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-12 22:07:51 +00:00
"/sksl/errors/ArrayOfVoid.sksl",
"/sksl/errors/ArrayOfVoidInStruct.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ArrayReturnTypes.sksl",
Fix assertion when arrays are double-declared. Multi-dimensional arrays aren't legal in GLSL/SkSL, so this should be caught and flagged as an error. The parser now verifies that a variable's type isn't an array-type before accepting a `[` token to open an array on the variable name. This CL also refactors the IR generator's `convertArraySize` method to make sure that various checks are made for all callers. Originally this restructuring was used to verify array multi-dimensionality, but that didn't detect errors inside struct declarations (which get no error checking inside the IR generator) so the IR generator updates no longer need to check the array dimensions. Bug: skia:11322 Change-Id: Id33f4bdfb544019ddf995a8196c3c09cfe5a4525 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369916 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-12 22:07:51 +00:00
"/sksl/errors/ArraySplitDimensions.sksl",
"/sksl/errors/ArraySplitDimensionsInFuncBody.sksl",
"/sksl/errors/ArraySplitDimensionsInFuncDecl.sksl",
"/sksl/errors/ArraySplitDimensionsInStruct.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ArrayTooManyDimensions.sksl",
Fix assertion when arrays are double-declared. Multi-dimensional arrays aren't legal in GLSL/SkSL, so this should be caught and flagged as an error. The parser now verifies that a variable's type isn't an array-type before accepting a `[` token to open an array on the variable name. This CL also refactors the IR generator's `convertArraySize` method to make sure that various checks are made for all callers. Originally this restructuring was used to verify array multi-dimensionality, but that didn't detect errors inside struct declarations (which get no error checking inside the IR generator) so the IR generator updates no longer need to check the array dimensions. Bug: skia:11322 Change-Id: Id33f4bdfb544019ddf995a8196c3c09cfe5a4525 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369916 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-12 22:07:51 +00:00
"/sksl/errors/ArrayTooManyDimensionsInFuncBody.sksl",
"/sksl/errors/ArrayTooManyDimensionsInFuncDecl.sksl",
"/sksl/errors/ArrayTooManyDimensionsInStruct.sksl",
"/sksl/errors/ArrayTypeTooManyDimensions.sksl",
"/sksl/errors/ArrayTypeTooManyDimensionsInFuncBody.sksl",
"/sksl/errors/ArrayTypeTooManyDimensionsInFuncDecl.sksl",
"/sksl/errors/ArrayTypeTooManyDimensionsInStruct.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ArrayUnspecifiedDimensions.sksl",
"/sksl/errors/AssignmentTypeMismatch.sksl",
"/sksl/errors/BadCaps.sksl",
Align SkSL const rules more closely with GLSL This adds Analysis::IsConstantExpression, to determine if an expression is a constant-expression. It now expands to cover 'const' local and global variables, because we also enforce that the initializer on those variables is - in turn - a constant expression. This fixes 10837 - previously you could initialize a const variable with a non-constant expression, and we'd emit GLSL that contained that same pattern, which would fail to compile at the driver level. That should not be possible any longer. Bug: skia:10679 Bug: skia:10837 Change-Id: I517820ef4da57fff45768c0b04c55aebc18d3272 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375856 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-25 16:25:30 +00:00
"/sksl/errors/BadConstInitializers.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/BadFieldAccess.sksl",
"/sksl/errors/BadIndex.sksl",
"/sksl/errors/BadModifiers.sksl",
"/sksl/errors/BinaryInvalidType.sksl",
"/sksl/errors/BinaryTypeCoercion.sksl",
"/sksl/errors/BinaryTypeMismatch.sksl",
"/sksl/errors/BitShiftFloat.sksl",
"/sksl/errors/BitShiftFloatMatrix.sksl",
"/sksl/errors/BitShiftFloatVector.sksl",
"/sksl/errors/BooleanArithmetic.sksl",
"/sksl/errors/BreakOutsideLoop.sksl",
"/sksl/errors/CallNonFunction.sksl",
"/sksl/errors/CanExitWithoutReturningValue.sksl",
"/sksl/errors/ConstructorArgumentCount.sksl",
"/sksl/errors/ConstructorTypeMismatch.sksl",
"/sksl/errors/ContinueOutsideLoop.sksl",
"/sksl/errors/DivideByZero.sksl",
"/sksl/errors/DoTypeMismatch.sksl",
"/sksl/errors/DuplicateFunction.sksl",
"/sksl/errors/DuplicateOutput.sksl",
"/sksl/errors/DuplicateSymbol.sksl",
Add unit test for array of zero or negative size. Change-Id: Icc710e414388e4026a5e9819a53b8dac8ee0a2d1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/394896 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-09 13:56:40 +00:00
"/sksl/errors/EmptyArray.sksl",
SkSL: Ensure struct declarations contain at least one member Bug: skia:11314 Change-Id: I66476543462ae378a5bfb6cbd902dfa2f5fc45f5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369917 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-12 18:09:58 +00:00
"/sksl/errors/EmptyStruct.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ErrorsInDeadCode.sksl",
"/sksl/errors/FloatRemainder.sksl",
Simplify for init-stmts at the IR level. Most backends don't like init-stmts with multiple VarDeclarations inside them, so we no longer emit IR that does this. This lets us avoid doing backend-level fixups. Change-Id: Ide839de18953a73e0f9c7a690df59a7bc3523f89 Bug: skia:11860 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398221 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-04-19 18:56:49 +00:00
"/sksl/errors/ForInitStmt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ForTypeMismatch.sksl",
Allow function declarations to take (void). This is allowed by GLSL, so we allow it too. GLSL ES 1.0, Section 6.1: "The idiom “(void)” as a parameter list is provided for convenience." Change-Id: I551c505d3de518a75acd5e306f09f0f0767e43f2 Bug: skia:12025 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411300 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-21 18:11:38 +00:00
"/sksl/errors/FunctionParameterOfVoid.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/GenericArgumentMismatch.sksl",
Honor lowp/mediump/highp precision qualifiers in IRGenerator. This CL does not update the DSLParser to honor these precision qualifiers; that will be done in a followup. Change-Id: Ib629bc99c0e6c7afb550a381d4e3b6ccc26aa64e Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436337 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-04 20:26:47 +00:00
"/sksl/errors/PrecisionQualifiersDisallowed.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/IfTypeMismatch.sksl",
"/sksl/errors/InVarWithInitializerExpression.sksl",
"/sksl/errors/InterfaceBlockScope.sksl",
"/sksl/errors/InterfaceBlockStorageModifiers.sksl",
"/sksl/errors/InterfaceBlockWithNoMembers.sksl",
"/sksl/errors/InvalidAssignment.sksl",
"/sksl/errors/InvalidOutParams.sksl",
"/sksl/errors/InvalidToken.sksl",
"/sksl/errors/InvalidUnary.sksl",
Add permittedLayoutFlags to checkModifiers For now, just use this to prevent *any* layout qualifiers from appearing on functions, or their parameters. Bug: skia:11301 Change-Id: I05d8118c7121048c6ef49695a54e3714a8f8687e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376796 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-26 16:52:59 +00:00
"/sksl/errors/LayoutInFunctions.sksl",
Add flags for all layout qualifiers, check for duplicates Now, even if a qualifier has a default value, we will know that it appeared in the text. We can use that to check for redundant qualifiers (as is being done here), and in the IR generator to prevent any use of certain qualifiers, depending on context. (eg, runtime effects, wrong shader stage, on a parameter declaration, etc.) Bug: skia:11301 Change-Id: I2cd6ad35c2b4c4d6f87ade97e80aea84dc16ee4b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374616 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-23 17:54:22 +00:00
"/sksl/errors/LayoutMultiplePrimitiveTypes.sksl",
"/sksl/errors/LayoutRepeatedQualifiers.sksl",
Add support for matrix-to-vector conversions in SkSL. GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have equivalent support. This CL allows the Compound constructor to take a matrix as input, and fixes up backends to do the right thing when a matrix shows up in the compound-constructor path. Change-Id: I13289ad0a27ba59bddc3706093820594efebc693 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426003 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-09 16:41:55 +00:00
"/sksl/errors/MatrixToVectorCast3x3.sksl",
Shore up matrix/vector conversion tests. The tests now check bool4-mat2 conversions, which fortunately do work, and the vector-to-matrix tests include int and bool conversions as well. Change-Id: I971271838a93081b9258deb7c1d13b7732fb2440 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426757 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-07-10 16:48:51 +00:00
"/sksl/errors/MatrixToVectorCastBoolean.sksl",
Add support for mat2-to-ivec4 conversions in SkSL. The fuzzer quickly discovered that the newly introduced mat2-to-vec4 conversion code did not account for integer vectors. We now handle `ivec4(mat2)` casts properly. This required some non-trivial restructuring of the logic, but in the vast majority of cases, the types will match and the end result will be identical. Change-Id: If07c2fe4b4345bd767384b1802374910f65cd3f0 Bug: oss-fuzz:35998 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426756 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-10 15:45:29 +00:00
"/sksl/errors/MatrixToVectorCastInteger.sksl",
Add support for matrix-to-vector conversions in SkSL. GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have equivalent support. This CL allows the Compound constructor to take a matrix as input, and fixes up backends to do the right thing when a matrix shows up in the compound-constructor path. Change-Id: I13289ad0a27ba59bddc3706093820594efebc693 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426003 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-09 16:41:55 +00:00
"/sksl/errors/MatrixToVectorCastTooSmall.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/MismatchedNumbers.sksl",
"/sksl/errors/ModifiersInStruct.sksl",
Add $es3 modifier to SkSL. This modifier is currently allowed on built-in functions only. The presence of this modifier will be used to indicate intrinsics which are ES3-specific (and therefore, not allowed in user code under typical circumstances). Change-Id: Ice6be8d9d1b2bf0c8f07f2a89f335bb2f90f6681 Bug: skia:12202 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439057 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-13 03:06:24 +00:00
"/sksl/errors/NoES3ModifierInUserCode.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/OpaqueTypeAssignment.sksl",
"/sksl/errors/OpaqueTypeConstruction.sksl",
"/sksl/errors/OpaqueTypeInArray.sksl",
"/sksl/errors/OpaqueTypeInInterfaceBlock.sksl",
"/sksl/errors/OpaqueTypeInStruct.sksl",
"/sksl/errors/OpenArray.sksl",
"/sksl/errors/Ossfuzz26700.sksl",
Fix fuzzer-discovered error with ~ prefix on literals. The expression `~123` was making a PrefixExpression of type $intLiteral. It should be converted to type `int` when the ~ prefix is applied. This change also changes the output from oss-fuzz:27614. Both programs are essentially nonsense expressions with no real behavior, so this is fine. Change-Id: I586be149ce95136fabee72fdd3473814d54948cf Bug: oss-fuzz:31410 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376620 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-26 16:32:06 +00:00
"/sksl/errors/Ossfuzz27614.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/Ossfuzz27650.sksl",
"/sksl/errors/Ossfuzz27663.sksl",
Fix various fuzzer-generated tests. Two of the tests are now (correctly) detected as invalid code, but were previously checked into /shared/ because they compiled when the fuzzer first reported them (that is, after the crash was fixed). These have been moved into the /errors/ test folder. One of the tests was only generating an error because its main function was named `a` instead of `main`, so I renamed it to `main`. Change-Id: I1a2346fb16e304b0c66ff377a3f9bf7e7ee89ba9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/394899 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-09 21:20:35 +00:00
"/sksl/errors/Ossfuzz28050.sksl",
"/sksl/errors/Ossfuzz29444.sksl",
Fix fuzzer-discovered errors in SkSL parser. The previous change caused varDeclarations() to sometimes return an expression-statement. This only made sense in the context of being called from Parser::statement(). Other places which called varDeclarations() expect vardecls and nothing else. Change-Id: I562657cadfa20dcd77b527f2dc43dca0c6bf389f Bug: oss-fuzz:29845 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358528 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-25 18:49:05 +00:00
"/sksl/errors/Ossfuzz29845.sksl",
Fix fuzzer-discovered error with variable scoping. In GLSL and SkSL, control statements don't require explicit braces around single-statement children. That is, the `match = true` child statement here doesn't need to be braced. if (condition) match = true; Because there are no braces, we never create a Block or a dedicated SymbolTable here. This is normally not a problem, but the fuzzer discovered that it can dump things into the symbol table inside a child statement: if (condition) int newSymbol; This becomes problematic because the symbol name now outlives its block. This means `newSymbol` can be referred to later, which should be illegal (and can cause the optimizer to blow up since the structure is bogus). There doesn't seem to be any reason to allow this code to compile; the user can add an explicit scope here to make it reasonable, and it's (almost) meaningless to declare a symbol that's instantly going to fall out of scope. This code is now rejected with an error message. Change-Id: I44778e5b59652d345b10eecd4c88efbf7d86a5e0 Bug: oss-fuzz:29849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358960 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 15:13:58 +00:00
"/sksl/errors/Ossfuzz29849.sksl",
Fix fuzzer-discovered error with ~ prefix on literals. The expression `~123` was making a PrefixExpression of type $intLiteral. It should be converted to type `int` when the ~ prefix is applied. This change also changes the output from oss-fuzz:27614. Both programs are essentially nonsense expressions with no real behavior, so this is fine. Change-Id: I586be149ce95136fabee72fdd3473814d54948cf Bug: oss-fuzz:31410 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376620 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-26 16:32:06 +00:00
"/sksl/errors/Ossfuzz31410.sksl",
Fix fuzzer-discovered error with inlining. In http://review.skia.org/375776, an optimization was added to the Inliner, causing it to skip generation of unnecessary temporary variables. The fuzzer immediately discovered a flaw in this logic: the "unnecessary" variable was actually used in the rare case that a function failed to actually return a value. The inliner didn't detect this case. Of course, this isn't a valid program either, so now we report the error and cleanly fail. Change-Id: I1f201cfd33f45cace3be93765a4e214e43a46e69 Bug: oss-fuzz:31469, oss-fuzz:31525 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377101 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-01 15:08:08 +00:00
"/sksl/errors/Ossfuzz31469.sksl",
Add regression test for oss-fuzz:32156. The fuzzer found that it could overflow an int via a properly-crafted constant-fold expression, leading to a UBSAN error. Constant-fold expressions now guard against overflow (http://review.skia.org/413138) and UBSAN is no longer triggered. Change-Id: I07dba41e87bb9ceed37b84ec6b8922defbdc6550 Bug: oss-fuzz:32156, skia:12050 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/413836 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-29 15:23:07 +00:00
"/sksl/errors/Ossfuzz32156.sksl",
Fix fuzzer-discovered error with variable declarations. As soon as a single VarDeclaration is successfully created, its Variable is added to the current symbol table. However, if a variable-declaration line declared several variables in a row, we would stop if ANY of the declarations contained an error and discard the entire statement, but would continue processing the rest of the program. This left us in a position where some Variables existed in the SymbolTable with valid, reachable names, but their corresponding VarDeclaration statement had been thrown away as erroneous. Since Variables point back to VarDeclarations for their initialValues, this gave us a stale pointer. Any future reference to that variable name which could trigger an access to its initialValue would read from this dead pointer. This CL fixes the conversion of VarDeclarations so that we no longer throw away any VarDeclarations associated with a successfully-parsed Variable. Change-Id: If8ec3c160933e48a0e1f36414234b3a849d8978c Bug: oss-fuzz:32587 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389636 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-29 13:38:59 +00:00
"/sksl/errors/Ossfuzz32587.sksl",
Add regression test for oss-fuzz finding. The actual fix happened at prior CL http://review.skia.org/392197, which reworked how vector-cast constructors function. Change-Id: Ifb71ec913b349e65d38458dc615441e7a73efddc Bug: oss-fuzz:32851 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392841 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-04-05 18:45:14 +00:00
"/sksl/errors/Ossfuzz32851.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/OverflowFloatLiteral.sksl",
"/sksl/errors/OverflowIntLiteral.sksl",
Add test for literals that overflow int64. This was handled properly, but lacked a test. Change-Id: I84adc7cb3d37ab85eef945c1e38fc43c6cd8aa01 Bug: skia:10932 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/414437 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-06-01 15:16:34 +00:00
"/sksl/errors/OverflowInt64Literal.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/OverflowParamArraySize.sksl",
"/sksl/errors/OverflowUintLiteral.sksl",
Improve error reporting for invalid var-decls. We now interpret any statement of the form `Type identifier...` as a var-declaration and report errors as such. Previously, if a var-decl statement generated an error during parse, we'd report errors as if it were an expression-statement, which meant that slightly-invalid code could return out-of-context, misleading errors. Bug: skia:11287 Change-Id: I2c6cf2984760eb34593c80cb30f8c4e007d42027 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370036 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> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-12 21:05:00 +00:00
"/sksl/errors/PrototypeInFuncBody.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/PrivateTypes.sksl",
"/sksl/errors/RedeclareBasicType.sksl",
"/sksl/errors/RedeclareSamplerType.sksl",
"/sksl/errors/RedeclareStruct.sksl",
"/sksl/errors/RedeclareStructTypeWithName.sksl",
"/sksl/errors/RedeclareUserType.sksl",
"/sksl/errors/RedeclareVariable.sksl",
"/sksl/errors/ReturnDifferentType.sksl",
"/sksl/errors/ReturnFromVoid.sksl",
"/sksl/errors/ReturnMissingValue.sksl",
"/sksl/errors/ReturnTypeMismatch.sksl",
"/sksl/errors/SelfReferentialInitializerExpression.sksl",
"/sksl/errors/SpuriousFloat.sksl",
"/sksl/errors/StaticIfTest.sksl",
"/sksl/errors/StaticSwitchConditionalBreak.sksl",
"/sksl/errors/StaticSwitchTest.sksl",
Fix switch optimization pass. The optimizer now properly recognizes all types of exits from a switch statement. Break, continue and return are all potential exits and need to be considered when determining the exit path from the switch. Previously, dead code elimination was hiding the effects of this bug from us, but it meant that an optimized switch had the potential to generate lots of worthless IR nodes which then needed to be detected and eliminated by the CFG. In particular, this affected the enum form of blend, causing a catastrophic amount of extra work to be done. Change-Id: If857e38cadfc016884624ea4db25a273ad3dce5b Bug: skia:11352 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372958 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-23 14:58:04 +00:00
"/sksl/errors/StaticSwitchWithConditionalBreak.sksl",
"/sksl/errors/StaticSwitchWithConditionalContinue.sksl",
"/sksl/errors/StaticSwitchWithConditionalReturn.sksl",
Remove ASTNode::TypeData Pre-cleanup as I start looking at how structs are parsed and handled in the IR. Bug: skia:11228 Change-Id: I6334d1073211cbbdf69ddffa8df420c45fd59fcc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361059 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-01-28 14:46:30 +00:00
"/sksl/errors/StructNameWithoutIdentifier.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/StructTooDeeplyNested.sksl",
"/sksl/errors/SwitchDuplicateCase.sksl",
Add test for duplicate `default` switch-case. Surprisingly, this error is actually caught by our parser, which interprets the default label in a unique way. From the parser comments: "Requiring default: to be last (in defiance of C and GLSL) was a deliberate decision. Other parts of the compiler may rely upon this assumption." The comment is true--we don't check for duplicate default switch-case labels anywhere else in the code, just here in the parser. We rely on this, so we should have a test for it. Change-Id: I6df5c565aca4d4b8565b96638dce9504efc39ccc Bug: skia:11340 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372617 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-19 20:13:46 +00:00
"/sksl/errors/SwitchDuplicateDefault.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/SwitchTypes.sksl",
"/sksl/errors/SwizzleConstantOutput.sksl",
Enforce consistency in swizzle domains. GLSL disallows mixing swizzle domains within a single swizzle: http://screen/93eHNQDbx35hMdk SkSL now disallows it as well. Change-Id: Ied2e11ee04285b143a864e28cac30335f01aad0e Bug: skia:10621 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426458 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-09 19:29:10 +00:00
"/sksl/errors/SwizzleDomain.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/SwizzleMatrix.sksl",
"/sksl/errors/SwizzleOnlyLiterals.sksl",
"/sksl/errors/SwizzleOutOfBounds.sksl",
"/sksl/errors/SwizzleTooManyComponents.sksl",
"/sksl/errors/TernaryMismatch.sksl",
"/sksl/errors/UndeclaredFunction.sksl",
"/sksl/errors/UndefinedFunction.sksl",
"/sksl/errors/UndefinedSymbol.sksl",
Disallow initializers on uniform variables Bug: skia:11335 Change-Id: I88c952cbfe2d2c5920e17675da1674928f37b982 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/371480 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-17 21:24:04 +00:00
"/sksl/errors/UniformVarWithInitializerExpression.sksl",
Added detection for non-constant-folded divide by zero errors in SkSL. It would previously catch 1 / 0, but fail to detect x / 0. Bug: skia:11051 Change-Id: I3adb5942cce03a7ad40a13a8ca5d5a7f2029d6ad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366720 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:21:10 +00:00
"/sksl/errors/UnknownDivideByZero.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UnsupportedGLSLIdentifiers.sksl",
Fix fuzzer-discovered error with variable scoping. In GLSL and SkSL, control statements don't require explicit braces around single-statement children. That is, the `match = true` child statement here doesn't need to be braced. if (condition) match = true; Because there are no braces, we never create a Block or a dedicated SymbolTable here. This is normally not a problem, but the fuzzer discovered that it can dump things into the symbol table inside a child statement: if (condition) int newSymbol; This becomes problematic because the symbol name now outlives its block. This means `newSymbol` can be referred to later, which should be illegal (and can cause the optimizer to blow up since the structure is bogus). There doesn't seem to be any reason to allow this code to compile; the user can add an explicit scope here to make it reasonable, and it's (almost) meaningless to declare a symbol that's instantly going to fall out of scope. This code is now rejected with an error message. Change-Id: I44778e5b59652d345b10eecd4c88efbf7d86a5e0 Bug: oss-fuzz:29849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358960 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 15:13:58 +00:00
"/sksl/errors/UnscopedVariableInDoWhile.sksl",
"/sksl/errors/UnscopedVariableInElse.sksl",
Disallow unscoped for blocks which declare a variable. This should be legal, and we support this, but some versions of Android do not: http://screen/3bkQewHF3xUMn5v There's no point in allowing these shaders to exist; they can't compile on real-world clients, and these vardecls are borderline meaningless (as the variables being declared aren't reachable by any other statements). Change-Id: Ie1351933c90caee9124eeab8983364ec030b2653 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379584 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-04 15:46:39 +00:00
"/sksl/errors/UnscopedVariableInFor.sksl",
Fix fuzzer-discovered error with variable scoping. In GLSL and SkSL, control statements don't require explicit braces around single-statement children. That is, the `match = true` child statement here doesn't need to be braced. if (condition) match = true; Because there are no braces, we never create a Block or a dedicated SymbolTable here. This is normally not a problem, but the fuzzer discovered that it can dump things into the symbol table inside a child statement: if (condition) int newSymbol; This becomes problematic because the symbol name now outlives its block. This means `newSymbol` can be referred to later, which should be illegal (and can cause the optimizer to blow up since the structure is bogus). There doesn't seem to be any reason to allow this code to compile; the user can add an explicit scope here to make it reasonable, and it's (almost) meaningless to declare a symbol that's instantly going to fall out of scope. This code is now rejected with an error message. Change-Id: I44778e5b59652d345b10eecd4c88efbf7d86a5e0 Bug: oss-fuzz:29849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358960 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 15:13:58 +00:00
"/sksl/errors/UnscopedVariableInIf.sksl",
"/sksl/errors/UnscopedVariableInWhile.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UsingInvalidValue.sksl",
Add test for SkSL vector-slice constructors. SkSL does not support shrinking a vector via casting. Use a swizzle instead. Change-Id: Ieba78a05dad9c55f44c765924e28f0c7e1667a67 Bug: skia:12193 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/427198 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-07-12 19:48:27 +00:00
"/sksl/errors/VectorSlice.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/WhileTypeMismatch.sksl",
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
]
Migrate most SkSL tests currently in /glsl/ to /shared/. These tests will also be used for Metal and SPIR-V testing. A small handful of GLSL-specific stragglers (#version-specific or type-precision related) will remain in /glsl/. Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff Bug: skia:10649 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 21:22:42 +00:00
sksl_glsl_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/glsl/ForceHighPrecision.sksl",
"/sksl/glsl/IncompleteShortIntPrecision.sksl",
"/sksl/glsl/LayoutQualifiers.sksl",
"/sksl/glsl/ShortIntPrecision.sksl",
"/sksl/glsl/TextureSharpenVersion110.sksl",
"/sksl/glsl/TextureVersion110.sksl",
"/sksl/glsl/UsesPrecisionModifiers.sksl",
"/sksl/glsl/Version110.sksl",
"/sksl/glsl/Version450Core.sksl",
Migrate most SkSL tests currently in /glsl/ to /shared/. These tests will also be used for Metal and SPIR-V testing. A small handful of GLSL-specific stragglers (#version-specific or type-precision related) will remain in /glsl/. Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff Bug: skia:10649 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 21:22:42 +00:00
]
Convert remaining Metal tests to golden outputs. Metal-specific tests are pretty thin on the ground here, and some of the remaining tests no longer added value as they were already covered pretty well by existing tests in Shared. The majority of remaining tests were specific to Metal's lack of flexible matrix casting (and SkSL's ability to paper over this with helper functions). Change-Id: I7b3c445268b95320e7f46ec88d793c315d43ee8a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 23:14:11 +00:00
sksl_metal_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/metal/CastHalf4ToMat2x2.sksl",
"/sksl/metal/CastMat2x2ToMat3x3.sksl",
"/sksl/metal/CastMat2x3ToMat4x4.sksl",
"/sksl/metal/CastMat4x4ToMat3x4.sksl",
"/sksl/metal/CastMat4x4ToMat4x3.sksl",
"/sksl/metal/NumericGlobals.sksl",
"/sksl/metal/OpaqueTypeInInterfaceBlock.sksl",
"/sksl/metal/OpaqueTypeInStruct.sksl",
"/sksl/metal/OutParams.sksl",
"/sksl/metal/OutVarsRequireLocation.sksl",
"/sksl/metal/SamplerGlobals.sksl",
"/sksl/metal/SwizzleHelper.sksl",
Convert remaining Metal tests to golden outputs. Metal-specific tests are pretty thin on the ground here, and some of the remaining tests no longer added value as they were already covered pretty well by existing tests in Shared. The majority of remaining tests were specific to Metal's lack of flexible matrix casting (and SkSL's ability to paper over this with helper functions). Change-Id: I7b3c445268b95320e7f46ec88d793c315d43ee8a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 23:14:11 +00:00
]
Migrate dedicated SPIR-V tests to golden outputs. There were a surprisingly small number of dedicated SPIR-V tests. SkSLSPIRVBadOffset was the only test that didn't already exist in the golden outputs, although it actually contained two tests. The SPIRVTest.cpp file has been converted to SPIRVTestbed.cpp, which can be used for local debugging of SPIR-V issues via dm (like GLSLTestbed and MetalTestbed). Change-Id: I978d8a7cf5735af7f537113d2b9411ce42cfcf88 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338756 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-25 21:55:37 +00:00
sksl_spirv_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/spirv/ConstantVectorFromVector.sksl",
Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
"/sksl/spirv/InterfaceBlockPushConstant.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/spirv/LayoutMultipleOf4.sksl",
"/sksl/spirv/LayoutOutOfOrder.sksl",
"/sksl/spirv/OpaqueTypeInArray.sksl",
Add caps bit for RewriteMatrixVectorMultiply. On ARM GPUs, the Vulkan driver does not honor relaxed precision when evaluating SpvOpMatrixTimesVector. This leads to reduced performance (compared to GLSL, where mediump matrices and floats do evaluate all intermediate values at mediump). This caps bit will be enabled on ARM GPUs and, in a followup CL, will be used to toggle a workaround where `m*v` is rewritten as the sum of (m[0]*v[0] + m[1]*v[1] + ... + m[N]*v[N]). Change-Id: I310fa73639b6498552c9672e76860f2eded15d0a Bug: skia:11769 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388459 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-23 21:12:03 +00:00
"/sksl/workarounds/RewriteMatrixVectorMultiply.sksl",
Fix fuzzer-discovered error with SPIR-V interface arrays. OSSFuzz discovered a minor variation of oss-fuzz:36770 which tickled a different bug in SPIR-V RTFlip handling; we did not properly handle the case where the InterfaceBlock is an array. SPIR-V does not support this at all, but the IRGenerator allows it, and we don't detect it an an error until later in the compilation process. Change-Id: I80bd67a13dad878717dc122462132a2ed675532d Bug: oss-fuzz:36850 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437018 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 16:19:35 +00:00
"/sksl/errors/Ossfuzz36850.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UndefinedFunction.sksl",
Fix for fuzzer-discovered error in SPIR-V compilation. Unused InterfaceBlocks were not added to the ProgramUsage map. The ProgramUsageVisitor now makes sure to account for them during its initial scan. Change-Id: If3afac8e954c5b685ddc6b63b0f771d8c0b8f207 Bug: oss-fuzz:33405 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398016 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-19 13:35:38 +00:00
"/sksl/errors/UnusedInterfaceBlock.sksl",
Migrate dedicated SPIR-V tests to golden outputs. There were a surprisingly small number of dedicated SPIR-V tests. SkSLSPIRVBadOffset was the only test that didn't already exist in the golden outputs, although it actually contained two tests. The SPIRVTest.cpp file has been converted to SPIRVTestbed.cpp, which can be used for local debugging of SPIR-V issues via dm (like GLSLTestbed and MetalTestbed). Change-Id: I978d8a7cf5735af7f537113d2b9411ce42cfcf88 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338756 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-25 21:55:37 +00:00
]
Migrate most SkSL tests currently in /glsl/ to /shared/. These tests will also be used for Metal and SPIR-V testing. A small handful of GLSL-specific stragglers (#version-specific or type-precision related) will remain in /glsl/. Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff Bug: skia:10649 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 21:22:42 +00:00
sksl_shared_tests = [
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
"/sksl/intrinsics/AbsFloat.sksl",
"/sksl/intrinsics/AbsInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Acos.sksl",
"/sksl/intrinsics/Acosh.sksl",
"/sksl/intrinsics/All.sksl",
"/sksl/intrinsics/Any.sksl",
"/sksl/intrinsics/Asin.sksl",
"/sksl/intrinsics/Asinh.sksl",
"/sksl/intrinsics/Atan.sksl",
"/sksl/intrinsics/Atanh.sksl",
"/sksl/intrinsics/BitCount.sksl",
"/sksl/intrinsics/Ceil.sksl",
Implement additional Runtime Effect intrinsic tests. Tested in dm: - max(halfN, halfN) - max(halfN, half) - min(halfN, halfN) - min(halfN, half) - clamp(halfN, halfN, halfN) - clamp(halfN, half, half) - mix(halfN, halfN, halfN) - mix(halfN, halfN, half) Compiled outputs only (not in ES2): - max(intN, intN) - max(intN, int) - min(intN, intN) - min(intN, int) - clamp(intN, intN, intN) - clamp(intN, int, int) - mix(halfN, halfN, boolN) - broken in Metal/SPIR-V (skia:11222) - mix(intN, intN, boolN) - broken in Metal/SPIR-V (skia:11222) Change-Id: Iaafc5429b16d2a8710b9d171ae281c268c0fd70d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361438 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:51:47 +00:00
"/sksl/intrinsics/ClampFloat.sksl",
"/sksl/intrinsics/ClampInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Cos.sksl",
"/sksl/intrinsics/Cosh.sksl",
"/sksl/intrinsics/Cross.sksl",
Mangle function names in GLSL. This will be implemented in Metal and SPIR-V in followup CLs. Change-Id: I397b4db40b15dd54cf1d8a17f414c3fe184b48d2 Bug: skia:10851 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387638 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-22 15:43:11 +00:00
"/sksl/intrinsics/CrossNoInline.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Degrees.sksl",
"/sksl/intrinsics/Determinant.sksl",
"/sksl/intrinsics/DFdx.sksl",
"/sksl/intrinsics/DFdy.sksl",
"/sksl/intrinsics/Distance.sksl",
"/sksl/intrinsics/Dot.sksl",
"/sksl/intrinsics/Equal.sksl",
"/sksl/intrinsics/Exp.sksl",
"/sksl/intrinsics/Exp2.sksl",
"/sksl/intrinsics/FaceForward.sksl",
"/sksl/intrinsics/FindLSB.sksl",
"/sksl/intrinsics/FindMSB.sksl",
"/sksl/intrinsics/FloatBitsToInt.sksl",
"/sksl/intrinsics/FloatBitsToUint.sksl",
"/sksl/intrinsics/Floor.sksl",
"/sksl/intrinsics/Fma.sksl",
"/sksl/intrinsics/Fract.sksl",
"/sksl/intrinsics/Frexp.sksl",
"/sksl/intrinsics/Fwidth.sksl",
"/sksl/intrinsics/GreaterThan.sksl",
"/sksl/intrinsics/GreaterThanEqual.sksl",
"/sksl/intrinsics/IntBitsToFloat.sksl",
"/sksl/intrinsics/Inverse.sksl",
"/sksl/intrinsics/Inversesqrt.sksl",
"/sksl/intrinsics/IsInf.sksl",
"/sksl/intrinsics/IsNan.sksl",
"/sksl/intrinsics/Ldexp.sksl",
"/sksl/intrinsics/Length.sksl",
"/sksl/intrinsics/LessThan.sksl",
"/sksl/intrinsics/LessThanEqual.sksl",
"/sksl/intrinsics/Log.sksl",
"/sksl/intrinsics/Log2.sksl",
"/sksl/intrinsics/MatrixCompMult.sksl",
Implement additional Runtime Effect intrinsic tests. Tested in dm: - max(halfN, halfN) - max(halfN, half) - min(halfN, halfN) - min(halfN, half) - clamp(halfN, halfN, halfN) - clamp(halfN, half, half) - mix(halfN, halfN, halfN) - mix(halfN, halfN, half) Compiled outputs only (not in ES2): - max(intN, intN) - max(intN, int) - min(intN, intN) - min(intN, int) - clamp(intN, intN, intN) - clamp(intN, int, int) - mix(halfN, halfN, boolN) - broken in Metal/SPIR-V (skia:11222) - mix(intN, intN, boolN) - broken in Metal/SPIR-V (skia:11222) Change-Id: Iaafc5429b16d2a8710b9d171ae281c268c0fd70d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361438 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:51:47 +00:00
"/sksl/intrinsics/MaxFloat.sksl",
"/sksl/intrinsics/MaxInt.sksl",
"/sksl/intrinsics/MinFloat.sksl",
"/sksl/intrinsics/MinInt.sksl",
"/sksl/intrinsics/MixFloat.sksl",
"/sksl/intrinsics/MixBool.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Mod.sksl",
"/sksl/intrinsics/Modf.sksl",
"/sksl/intrinsics/Normalize.sksl",
"/sksl/intrinsics/Not.sksl",
"/sksl/intrinsics/NotEqual.sksl",
"/sksl/intrinsics/OuterProduct.sksl",
"/sksl/intrinsics/Pack.sksl",
"/sksl/intrinsics/Pow.sksl",
"/sksl/intrinsics/Radians.sksl",
"/sksl/intrinsics/Reflect.sksl",
"/sksl/intrinsics/Refract.sksl",
"/sksl/intrinsics/Round.sksl",
"/sksl/intrinsics/RoundEven.sksl",
"/sksl/intrinsics/Saturate.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
"/sksl/intrinsics/SignFloat.sksl",
"/sksl/intrinsics/SignInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Sin.sksl",
"/sksl/intrinsics/Sinh.sksl",
"/sksl/intrinsics/Smoothstep.sksl",
"/sksl/intrinsics/Sqrt.sksl",
"/sksl/intrinsics/Step.sksl",
"/sksl/intrinsics/Tan.sksl",
"/sksl/intrinsics/Tanh.sksl",
"/sksl/intrinsics/Transpose.sksl",
"/sksl/intrinsics/Trunc.sksl",
"/sksl/intrinsics/UintBitsToFloat.sksl",
"/sksl/intrinsics/Unpack.sksl",
Add support for array-cast syntax in SkSL. Compiling a program with "allow narrowing conversions" actually fixes up narrowing casts in the program by inserting casts wherever they would be needed for type-correctness. For instance, compiling the statement `half h = myFloat;` inserts an appropriate narrowing cast: `half h = half(myFloat);`. The Pipeline stage code generator relies on this behavior, as when it re-emits a runtime effect into a complete SkSL program, the narrowing- conversions flag will no longer be set, but that is okay, because the emitted code now contains typecasts anywhere they would be necessary. Logically, this implies that anything which supports narrowing conversions must be castable between high and low precision. In GLSL and SPIR-V, such a cast is trivial, because the types are the same and the precision qualifiers are treated as individual hints on each variable. In Metal, we dodge the issue by only emitting full-precision types. But we also need to emit raw SkSL from an SkSL program (that is what the Pipeline stage generator does). SkSL already supported every typical cast, but GLSL lacked any syntax for casting an array to a different type. This meant SkSL had no array casting syntax as well. SkSL now has array-cast syntax, but it is only allowed for casting low/high-precision arrays to the same base type. (You can't cast an int array to float, or a signed array to unsigned.) Change-Id: Ia20933541c3bd4a946c1ea38209f93008acdb9cb Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437687 Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-10 20:03:44 +00:00
"/sksl/shared/ArrayCast.sksl",
Implement array == and != on SPIR-V. GLSL (post-ES2) allows array comparison: http://screen/8gryPvb9T7gndyb Unfortunately, because ES2 does not support array comparisons, we can't add this test to the dm test suite. Change-Id: I06b71683e49b2631669cff801dc647951a81a299 Bug: skia:11849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/394162 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-09 03:30:51 +00:00
"/sksl/shared/ArrayComparison.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ArrayConstructors.sksl",
"/sksl/shared/ArrayIndexTypes.sksl",
Write test demonstrating bug with array narrowing conversions. We don't currently support this. There's no explicit syntax to cast an array's type, but it can be implicitly required in some situations, like `halfArray == floatArray` (when fAllowNarrowingConversions is on). Change-Id: I00fe0ddd4f2682b2950e828dd78bb941d5f0430e Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436560 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-08-04 17:27:05 +00:00
"/sksl/shared/ArrayNarrowingConversions.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ArrayTypes.sksl",
"/sksl/shared/Assignment.sksl",
"/sksl/shared/Caps.sksl",
"/sksl/shared/CastsRoundTowardZero.sksl",
"/sksl/shared/Clockwise.sksl",
Add more dm tests for the comma operator. Change-Id: I37a95fd95c23a91c3510f922bab0569093e612a5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364604 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-02 18:58:42 +00:00
"/sksl/shared/CommaMixedTypes.sksl",
Add test to verify side effects from the comma operator. SkVMCodeGenerator was lacking support for the comma operator entirely; this has now been implemented. Change-Id: I9350f54e6ee52764c620116e6dbfe4ca3e9cd47e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363096 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-01-30 16:06:18 +00:00
"/sksl/shared/CommaSideEffects.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ComplexDelete.sksl",
"/sksl/shared/ConstArray.sksl",
"/sksl/shared/ConstVariableComparison.sksl",
"/sksl/shared/ConstantIf.sksl",
"/sksl/shared/Control.sksl",
"/sksl/shared/DeadDoWhileLoop.sksl",
"/sksl/shared/DeadIfStatement.sksl",
"/sksl/shared/DeadLoopVariable.sksl",
Fix SPIR-V code generation of dead return statements. If we encounter code like `return 1; return 2;` we need to synthesize a label, even though the second return statement isn't actually reachable. This is harmless and satisfies the SPIR-V validator. Ideally we'd eliminate the dead code entirely, but this case is rare and isn't likely to cause any problems as-is. Change-Id: I2d6219dff6868011353e19a662301bec44a015d6 Bug: skia:12009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409402 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-17 18:46:05 +00:00
"/sksl/shared/DeadReturn.sksl",
Reland "Eliminate unreachable code during optimization." This is a reland of c6260f974261ee9fb5dc9573669559d728a856e8 Problematic DeadReturn.sksl test cases have been moved to DeadReturnES3. Original change's description: > Eliminate unreachable code during optimization. > > The Adreno 5xx and 6xx previously failed the SkSLStaticSwitchInline > test; the driver struggled to interpret code with multiple return > statements in a row. We now detect unreachable statements and eliminate > them. > > Change-Id: I344d632f2488ca65b0635b37bebffe6e4fb607c5 > Bug: skia:12012 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410256 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12012 Change-Id: I748e8761cbc71c811b5ad8fe49186f980261d8b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410793 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-05-20 18:38:40 +00:00
"/sksl/shared/DeadReturnES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/DeadStripFunctions.sksl",
"/sksl/shared/DependentInitializers.sksl",
"/sksl/shared/DerivativesUnused.sksl",
"/sksl/shared/Discard.sksl",
Add unit test for control statements in do-while loop. Change-Id: I8309940f8e40d0e84847ae272830896d010c39de Bug: skia:11219 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359138 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-01-26 15:37:41 +00:00
"/sksl/shared/DoWhileControlFlow.sksl",
Update various shared/ tests to run in dm. These tests have updated to return green on success, or red on failure. Some tests were modified slightly to conform to ES2 limitations, or split into separate ES2 and ES3 parts. Change-Id: Ib47aeca217aef33f3c4b5999d93afed5d42a1e62 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363876 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-01 16:52:10 +00:00
"/sksl/shared/EmptyBlocksES2.sksl",
"/sksl/shared/EmptyBlocksES3.sksl",
Add unit test for control statements in for loops. Change-Id: I94094be7163a04bf48e86406230156a5433469b6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359140 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>
2021-01-26 16:06:42 +00:00
"/sksl/shared/ForLoopControlFlow.sksl",
Add unit test for for-loop with multiple variables. We lacked test coverage for this case, and this was broken when compound VarDeclarations were split from one Statement into several. Change-Id: I561b4d8acc0bfa01161d873a0c022ec58e316903 Bug: skia:11860 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396817 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-04-14 19:05:49 +00:00
"/sksl/shared/ForLoopMultipleInit.sksl",
Reland "Don't key progams/pipelines on origin."" Reland works around Adreno issue with this formulation of sk_Clockwise: (sk_RTFlip.y < 0.0 ? !gl_FrontFacing : gl_FrontFacing) and instead adds this to the top of the function: bool sk_Clockwise = gl_FrontFacing; if (sk_RTFlip.y < 0.0) { sk_Clockwise = !sk_Clockwise; } Original description: SkSL language features that are origin sensitive now use a uniform to conditionally flip their result rather than generating different code. Previously we would insert a "rt height" uniform if sk_FragCoord needed to be flipped. sk_FragCoord,y was implemented as "realFragCoord.y" or "rtHeight - realFragCoord.y" depending on SkSL::ProgramSettings::fFlipY. Now we instead use a two component vector rtFlip and sk_FragCoord.y is always "rtFlip.x + rtFlip.y*realFragCoord.y". We configure rtFlip as either (0, 1) or (rtHeight, -1). sk_Clockwise and dFdy simiarly use rtFlip.y to emit code that always works with either origin. Bug: skia:12037 Change-Id: I3a2ad6f5667eb4dcd823b939abd5698f89b58929 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425178 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2021-07-07 13:41:17 +00:00
"/sksl/shared/FragCoords.sksl",
Update function-type-matching tests to work as Runtime Effects. Previously, our only test was invoking `sin(1)` which is a pretty ineffective test. Now, we test args and return types for all the basic scalars/vectors/matrices. Change-Id: I7d335303eef8b9c9c6cfef2265a15bbd9bd73e0c Bug: skia:11246 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363943 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-01 21:36:13 +00:00
"/sksl/shared/FunctionArgTypeMatch.sksl",
"/sksl/shared/FunctionReturnTypeMatch.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/FunctionPrototype.sksl",
"/sksl/shared/Functions.sksl",
"/sksl/shared/GaussianBlur.sksl",
"/sksl/shared/GeometricIntrinsics.sksl",
"/sksl/shared/Geometry.geom",
"/sksl/shared/GeometryExtension.geom",
"/sksl/shared/GeometryGSInvocations.geom",
"/sksl/shared/GeometryNoGSInvocations.geom",
"/sksl/shared/GeometryNoGSInvocationsReorder.geom",
"/sksl/shared/HelloWorld.sksl",
"/sksl/shared/Hex.sksl",
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
"/sksl/shared/HexUnsigned.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/InstanceID.vert",
"/sksl/shared/InterfaceBlockNamed.sksl",
Add default uniform binding value for Metal/SPIR-V. This allows interface blocks in Metal to compile even if `layout(binding=...)` is not specified. It will also be used in SPIR-V in the followup CL, when an interface block is automatically synthesized for top-level uniforms. This CL also reorganizes the unit tests around uniforms a bit. Change-Id: Ia898c536b454dda6f51677e232a8f6e6c3606022 Bug: skia:11225 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360778 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-28 16:47:29 +00:00
"/sksl/shared/InterfaceBlockNamedArray.sksl",
Migrate matrix SkSL test to dm. This uncovered a bug in Metal code generation of `matX *= matY` which is now fixed. (It was emitting the helper function more than once.) Change-Id: I0aeb0efe7ab5fbf5592a8ca6f4f5b50354d3d7f4 Bug: skia:11262 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365489 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-02-03 18:03:29 +00:00
"/sksl/shared/Matrices.sksl",
"/sksl/shared/MatricesNonsquare.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/shared/MatrixEquality.sksl",
Enable proper testing of matrix-scalar ops. Now that the various Metal and SPIR-V bugs have been shaken out, we can enable these tests. Knock on wood. Change-Id: If4b4e302cfdd91464aaf00bc9639989de5e49aac Bug: skia:11985 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/408640 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-15 00:03:01 +00:00
"/sksl/shared/MatrixScalarSplat.sksl",
Reland "Add tests for matrix-vector conversions." This reverts commit f009db5b854b350e9f884fd5268e80271537578b. Reason for revert: test disabled on Win10 + Intel 4400/6100 Original change's description: > Revert "Add tests for matrix-vector conversions." > > This reverts commit a89781215a8182beb0893a004654fef157313259. > > Reason for revert: breakage on Windows > > Original change's description: > > Add tests for matrix-vector conversions. > > > > GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have > > equivalent support. Adding tests as a starting point. > > > > Change-Id: If8bcbf99afcec94d948d5da9e6205cb4a232af18 > > Bug: skia:12067 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425837 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I2563041f538b1b20074385f1b61af5fc506ffad5 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12067 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426057 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:12067 Change-Id: I1379914ee39ce340f09b11b3754820db9c645378 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426058 Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-08 22:20:21 +00:00
"/sksl/shared/MatrixToVectorCast.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/MultipleAssignments.sksl",
"/sksl/shared/NegatedVectorLiteral.sksl",
"/sksl/shared/NoFragCoordsPos.vert",
"/sksl/shared/NoFragCoordsPosRT.vert",
"/sksl/shared/NormalizationGeo.geom",
"/sksl/shared/NormalizationVert.vert",
"/sksl/shared/NumberCasts.sksl",
"/sksl/shared/NumberConversions.sksl",
"/sksl/shared/Offset.sksl",
Run the SkSL Operators test as a Runtime Effect. The test has been split into an ES2 version and ES3 version; the ES2 side omits unsupported integer ops like << >> & | ^ %. Change-Id: Iba16d469a477809b17a823b1c68ae8937624c68e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362616 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-01-30 16:08:13 +00:00
"/sksl/shared/OperatorsES2.sksl",
"/sksl/shared/OperatorsES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Ossfuzz26167.sksl",
Fix up outdated tests. Removed error tests which no longer test anything: - UseWithoutInitialize...: we no longer track variable use-before-init. - InlineDivideByZero: we no longer constant-fold the result of an inlined function call into its parent statement. - Unreachable: we no longer report unreachable statements. And fixed some minor test-case issues: - StaticSwitchConditionalBreak: we still check this, but the function was being dead-stripped before this check could run. Renamed to main. - OssFuzzXxxxx: these cases no longer report errors, but they are still valuable as regression tests; moved to `shared/`. Change-Id: Iade3cff821dc998cacfd02f62d3ac4625e48904c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387820 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-03-22 19:42:16 +00:00
"/sksl/shared/Ossfuzz26759.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Ossfuzz28794.sksl",
"/sksl/shared/Ossfuzz28904.sksl",
Fix up outdated tests. Removed error tests which no longer test anything: - UseWithoutInitialize...: we no longer track variable use-before-init. - InlineDivideByZero: we no longer constant-fold the result of an inlined function call into its parent statement. - Unreachable: we no longer report unreachable statements. And fixed some minor test-case issues: - StaticSwitchConditionalBreak: we still check this, but the function was being dead-stripped before this check could run. Renamed to main. - OssFuzzXxxxx: these cases no longer report errors, but they are still valuable as regression tests; moved to `shared/`. Change-Id: Iade3cff821dc998cacfd02f62d3ac4625e48904c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387820 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-03-22 19:42:16 +00:00
"/sksl/shared/Ossfuzz29085.sksl",
Use unsigned values when constant-folding integer vectors We already had this trick for scalar integers, this extends it to integer vectors. As with prior work in this area, it would be better to detect this case and produce an error, but now we at least produce consistent and well-defined results (rather than undefined signed integer overflow). Bug: skia:10932 Bug: oss-fuzz:29494 Change-Id: I45526fe96b6ea42c0e88b9862f6961b316810321 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363962 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-01 18:48:50 +00:00
"/sksl/shared/Ossfuzz29494.sksl",
Fix for fuzzer-discovered error in SPIR-V with RTFlip. SPIR-V code generation synthesizes some extra variables that don't actually exist in the Program. Checking the ProgramUsage of these variables would fail; ProgramUsage::get doesn't know about these variables, so it asserts (and would consider them as dead even if it didn't assert). We now track our SPIR-V bonus variables in a separate set, and always report them as live. Change-Id: If2f681470654025abf7ca4b3ec8126de2eb01297 Bug: oss-fuzz:36770 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/435625 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-08-02 15:56:16 +00:00
"/sksl/shared/Ossfuzz36770.sksl",
Fix fuzzer-discovered error with swizzling matrices. The optimization logic for swizzling a constructor assumed that every argument to the constructor was a scalar or vector. When it was written, this assumption was true. However, we recently added support for casting mat2x2 to float4 which violates the assumption. We now check every argument and do not attempt to optimize if a non-scalar, non-vector arg is found. Change-Id: Ia2b297bd62dfdf4af56712164fbc80c29c9611eb Bug: oss-fuzz:36852 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437017 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 15:49:05 +00:00
"/sksl/shared/Ossfuzz36852.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/OutParams.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/shared/OutParamsNoInline.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/OutParamsTricky.sksl",
Add test demonstrating overflow error in SkSL. Change-Id: Ic6a3ce722c607d4d3c47d37e5749a01ae5fb193f Bug: skia:12050 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/412668 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-05-26 20:43:19 +00:00
"/sksl/shared/Overflow.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/RectangleTexture.sksl",
"/sksl/shared/ResizeMatrix.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/shared/ResizeMatrixNonsquare.sksl",
Support half4 return values from main() in the SPIR-V code generator. This creates a helper function, _entrypoint, which invokes main() and assigns its result into sk_FragColor. We also make sure to prevent sk_FragColor from being dead-stripped from the code during IR generation. At present this is useful for allowing our SkSL test shaders to compile. Change-Id: I2d7fab0e1959a77778ffdb18ca569e869bcaeece Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358525 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-27 00:58:22 +00:00
"/sksl/shared/ReturnBadTypeFromMain.sksl",
"/sksl/shared/ReturnColorFromMain.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/shared/ReturnsValueOnEveryPathES2.sksl",
"/sksl/shared/ReturnsValueOnEveryPathES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/SampleLocations.vert",
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/shared/ScalarConversionConstructorsES2.sksl",
"/sksl/shared/ScalarConversionConstructorsES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ScopedSymbol.sksl",
"/sksl/shared/StackingVectorCasts.sksl",
"/sksl/shared/StaticIf.sksl",
"/sksl/shared/StaticSwitch.sksl",
"/sksl/shared/StaticSwitchWithBreak.sksl",
"/sksl/shared/StaticSwitchWithBreakInsideBlock.sksl",
"/sksl/shared/StaticSwitchWithConditionalBreak.sksl",
"/sksl/shared/StaticSwitchWithConditionalBreakInsideBlock.sksl",
Fix switch optimization pass. The optimizer now properly recognizes all types of exits from a switch statement. Break, continue and return are all potential exits and need to be considered when determining the exit path from the switch. Previously, dead code elimination was hiding the effects of this bug from us, but it meant that an optimized switch had the potential to generate lots of worthless IR nodes which then needed to be detected and eliminated by the CFG. In particular, this affected the enum form of blend, causing a catastrophic amount of extra work to be done. Change-Id: If857e38cadfc016884624ea4db25a273ad3dce5b Bug: skia:11352 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372958 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-23 14:58:04 +00:00
"/sksl/shared/StaticSwitchWithContinue.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/StaticSwitchWithFallthroughA.sksl",
"/sksl/shared/StaticSwitchWithFallthroughB.sksl",
"/sksl/shared/StaticSwitchWithStaticConditionalBreak.sksl",
"/sksl/shared/StaticSwitchWithStaticConditionalBreakInsideBlock.sksl",
"/sksl/shared/Structs.sksl",
Add SkSL test for functions that operate on structs This is a known deficiency of runtime effects, next step is to fix how they manage function signatures to solve the problem. Bug: skia:10939 Change-Id: Id934e0acdf774b03bd6edce78d7b2c077bdeae00 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360603 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-01-27 18:53:43 +00:00
"/sksl/shared/StructsInFunctions.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/StructMaxDepth.sksl",
"/sksl/shared/Switch.sksl",
"/sksl/shared/SwitchContainingDeadCode.sksl",
"/sksl/shared/SwitchWithFallthrough.sksl",
"/sksl/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/shared/SwizzleByConstantIndex.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/SwizzleByIndex.sksl",
"/sksl/shared/SwizzleConstants.sksl",
"/sksl/shared/SwizzleLTRB.sksl",
"/sksl/shared/SwizzleOpt.sksl",
"/sksl/shared/SwizzleScalar.sksl",
Add scalar-swizzling tests for int and bool types. Boolean scalar-swizzling is currently not working. Change-Id: Icd965e4b64a12311d098168f65622110d5fb3437 Bug: skia:12195 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/427038 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>
2021-07-12 18:59:19 +00:00
"/sksl/shared/SwizzleScalarBool.sksl",
"/sksl/shared/SwizzleScalarInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/TernaryAsLValueEntirelyFoldable.sksl",
"/sksl/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/shared/TernaryExpression.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Texture1D.sksl",
"/sksl/shared/Texture2D.sksl",
"/sksl/shared/TextureSharpen.sksl",
"/sksl/shared/UnaryPositiveNegative.sksl",
"/sksl/shared/UniformArray.sksl",
Add default uniform binding value for Metal/SPIR-V. This allows interface blocks in Metal to compile even if `layout(binding=...)` is not specified. It will also be used in SPIR-V in the followup CL, when an interface block is automatically synthesized for top-level uniforms. This CL also reorganizes the unit tests around uniforms a bit. Change-Id: Ia898c536b454dda6f51677e232a8f6e6c3606022 Bug: skia:11225 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360778 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-28 16:47:29 +00:00
"/sksl/shared/UniformBuffers.sksl",
"/sksl/shared/Uniforms.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/UnusedVariables.sksl",
"/sksl/shared/VectorConstructors.sksl",
Add SkSL test for vector-scalar math. We had constant-folding tests for vector-scalar arithmetic, but didn't have an equivalent SkSL unit test for vector-scalar arithmetic that actually needs to be computed at runtime. This exposes two SPIR-V bugs: one was previously known, but the other is a new discovery. Change-Id: I28737128f20b445797c6c29872335d05f94cc95c Bug: skia:11267, skia:11788 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388739 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 15:43:40 +00:00
"/sksl/shared/VectorScalarMath.sksl",
Reland "Add tests for matrix-vector conversions." This reverts commit f009db5b854b350e9f884fd5268e80271537578b. Reason for revert: test disabled on Win10 + Intel 4400/6100 Original change's description: > Revert "Add tests for matrix-vector conversions." > > This reverts commit a89781215a8182beb0893a004654fef157313259. > > Reason for revert: breakage on Windows > > Original change's description: > > Add tests for matrix-vector conversions. > > > > GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have > > equivalent support. Adding tests as a starting point. > > > > Change-Id: If8bcbf99afcec94d948d5da9e6205cb4a232af18 > > Bug: skia:12067 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425837 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I2563041f538b1b20074385f1b61af5fc506ffad5 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12067 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426057 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:12067 Change-Id: I1379914ee39ce340f09b11b3754820db9c645378 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426058 Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-08 22:20:21 +00:00
"/sksl/shared/VectorToMatrixCast.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/VertexEarlyReturn.vert",
"/sksl/shared/VertexID.vert",
Add unit test for control statements in while loops. Change-Id: I924ac75b5f8a397f7af7a06925ef0c9deba5c509 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359141 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>
2021-01-26 16:16:34 +00:00
"/sksl/shared/WhileLoopControlFlow.sksl",
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
]
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
sksl_folding_tests = [
Add test for folding of == and != for arrays. We don't directly support this today at all. In practice, though, simple constant arrays are detected as equal in the constant-folding pass because they hit the `x == x` self-equality check (using `IsSameExpressionTree`). This does not work for our inequality tests, though, so those do not fold. Change-Id: I6730a9a2d1da9ac613ee58889d651f3ff65b1d2d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/391057 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-31 14:38:45 +00:00
"/sksl/folding/ArrayFolding.sksl",
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/folding/AssignmentOps.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/BoolFolding.sksl",
Add test demonstrating missed opportunities with casts. A cast like `float(five)` or `int4(colorGreen)` should detect const variables and replace the expression with its compile-time constant equivalent value. At present, this replacement is missed, which inhibits further optimization opportunities on the expression. (This CL is very similar in spirit to http://review.skia.org/404676) Change-Id: I04b5c435a30d2afcdbdb3d020adc15e9c651cc31 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/405682 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-05-07 15:16:26 +00:00
"/sksl/folding/CastFolding.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/FloatFolding.sksl",
"/sksl/folding/IntFoldingES2.sksl",
"/sksl/folding/IntFoldingES3.sksl",
"/sksl/folding/MatrixFoldingES2.sksl",
"/sksl/folding/MatrixFoldingES3.sksl",
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/folding/SelfAssignment.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/ShortCircuitBoolFolding.sksl",
Add test demonstrating swizzled constant folding. At present, this is a missed optimization opportunity. These will be optimized in a followup CL. Change-Id: I8882058900cdc12c8ab0df03e36ebfb9d8022f01 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402580 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>
2021-04-29 15:14:38 +00:00
"/sksl/folding/SwizzleFolding.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/VectorScalarFolding.sksl",
"/sksl/folding/VectorVectorFolding.sksl",
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
]
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
sksl_inliner_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/DoWhileTestCannotBeInlined.sksl",
"/sksl/inliner/ForBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/ForInitializerExpressionsCanBeInlined.sksl",
"/sksl/inliner/ForWithReturnInsideCannotBeInlined.sksl",
"/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl",
"/sksl/inliner/IfBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/IfElseBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/IfElseChainWithReturnsCanBeInlined.sksl",
"/sksl/inliner/IfTestCanBeInlined.sksl",
"/sksl/inliner/IfWithReturnsCanBeInlined.sksl",
"/sksl/inliner/InlineKeywordOverridesThreshold.sksl",
"/sksl/inliner/InlineThreshold.sksl",
"/sksl/inliner/InlinerElidesTempVarForReturnsInsideBlock.sksl",
"/sksl/inliner/InlinerUsesTempVarForMultipleReturns.sksl",
"/sksl/inliner/InlinerUsesTempVarForReturnsInsideBlockWithVar.sksl",
"/sksl/inliner/InlineWithInoutArgument.sksl",
"/sksl/inliner/InlineWithModifiedArgument.sksl",
"/sksl/inliner/InlineWithNestedBigCalls.sksl",
"/sksl/inliner/InlineWithNestedCalls.sksl",
"/sksl/inliner/InlineWithUnmodifiedArgument.sksl",
"/sksl/inliner/InlineWithUnnecessaryBlocks.sksl",
"/sksl/inliner/InlinerAvoidsVariableNameOverlap.sksl",
Add test to demonstrate out-param semantics violation. GLSL ES2 documentation on out parameters: "Evaluation of an out parameter results in an l-value that is used to copy out a value when the function returns." The inliner does not do any alias checking when inlining an `out` param. That is, passing the same variable to two separate `out` parameters would not generate two distinct lvalues in the inlined code; it reuses the same variable for each out-params in the inlined code. (Amusingly, our CFG can fully optimize away this test code so it just returns "red".) Change-Id: Ib781d2cfdac54f01b6abe159af0c84ff24ff6976 Bug: skia:11326 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370256 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-13 16:25:51 +00:00
"/sksl/inliner/InlinerHonorsGLSLOutParamSemantics.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/InlinerManglesNames.sksl",
Add noinline keyword to SkSL. As you might expect, a function tagged with `noinline` will never be considered as a candidate for inlining. Change-Id: Ia098f8974e6de251d78bb2a76cd71db8a86bc19c Bug: skia:11362 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/382337 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-10 03:14:27 +00:00
"/sksl/inliner/NoInline.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/ShortCircuitEvaluationsCannotInlineRightHandSide.sksl",
Demonstrate a bug with inlined static switches. When we detect a static switch, the optimizer finds the matching switch- case and eliminates all the other switch-cases. It handles case fall-through by scanning forward and looking for an unconditional break. However, the inliner has an interesting quirk--it can replace `return` statements inside of a switch with `continue` statements, since the body of the inlined function has been wrapped with a for-loop to allow for early exits. The optimizer does not recognize these continue statements as exits from the switch (although they certainly qualify), so it treats continues as fallen-through and keeps emitting switch-cases. The dead-code elimination pass was actually doing us a favor here and eliminating the excess code later. A flag was added to disable DCE in order to reveal the problem in a test. Change-Id: I8ff19fde5e32d0ab73d7c5411da40cb953a446f5 Bug: skia:11352 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-20 13:00:43 +00:00
"/sksl/inliner/StaticSwitch.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/StructsCanBeInlinedSafely.sksl",
"/sksl/inliner/SwitchWithCastCanBeInlined.sksl",
"/sksl/inliner/SwitchWithoutReturnInsideCanBeInlined.sksl",
"/sksl/inliner/SwizzleCanBeInlinedDirectly.sksl",
"/sksl/inliner/TernaryResultsCannotBeInlined.sksl",
"/sksl/inliner/TernaryTestCanBeInlined.sksl",
"/sksl/inliner/TrivialArgumentsInlineDirectly.sksl",
"/sksl/inliner/WhileBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/WhileTestCannotBeInlined.sksl",
Support testing error cases in our SkSL unit test goldens. Change-Id: I56e19153597e2c4393c5821314b82937828c0d50 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316569 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-14 20:46:40 +00:00
]
Migrate several GLSL workaround unit tests to golden files. We now support building an SkSL golden output twice, once honoring the custom #pragma settings, and once more ignoring the settings. This allows us to see the output of the workaround technique, alongside the "default-settings" output which should not contain a workaround. To implement this, skslc now supports a flag: --[no]settings. When it's set, /*#pragma settings*/ comments are honored. When it's not set, skslc ignores the comments. compile_sksl_tests.py passes this flag along to skslc. This approach is not strictly limited to workarounds; the "TypePrecision" GLSL test was also updated to use this technique. Change-Id: I79204df047b024533ed6bc1f4c088e0e878d5bb1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317246 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 21:46:37 +00:00
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
sksl_blend_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/blend/BlendClear.sksl",
"/sksl/blend/BlendColor.sksl",
"/sksl/blend/BlendColorBurn.sksl",
"/sksl/blend/BlendColorDodge.sksl",
"/sksl/blend/BlendDarken.sksl",
"/sksl/blend/BlendDifference.sksl",
"/sksl/blend/BlendDst.sksl",
"/sksl/blend/BlendDstAtop.sksl",
"/sksl/blend/BlendDstIn.sksl",
"/sksl/blend/BlendDstOut.sksl",
"/sksl/blend/BlendDstOver.sksl",
"/sksl/blend/BlendExclusion.sksl",
"/sksl/blend/BlendHardLight.sksl",
"/sksl/blend/BlendHue.sksl",
"/sksl/blend/BlendLighten.sksl",
"/sksl/blend/BlendLuminosity.sksl",
"/sksl/blend/BlendModulate.sksl",
"/sksl/blend/BlendMultiply.sksl",
"/sksl/blend/BlendOverlay.sksl",
"/sksl/blend/BlendPlus.sksl",
"/sksl/blend/BlendSaturation.sksl",
"/sksl/blend/BlendScreen.sksl",
"/sksl/blend/BlendSoftLight.sksl",
"/sksl/blend/BlendSrc.sksl",
"/sksl/blend/BlendSrcAtop.sksl",
"/sksl/blend/BlendSrcIn.sksl",
"/sksl/blend/BlendSrcOut.sksl",
"/sksl/blend/BlendSrcOver.sksl",
"/sksl/blend/BlendXor.sksl",
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
]
sksl_settings_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/glsl/TypePrecision.sksl",
"/sksl/inliner/ExponentialGrowth.sksl",
"/sksl/inliner/InlinerCanBeDisabled.sksl",
"/sksl/shared/Derivatives.sksl",
"/sksl/workarounds/AbsInt.sksl",
"/sksl/workarounds/BlendGuardedDivide.sksl",
"/sksl/workarounds/BlendModesAllZeroVec.sksl",
"/sksl/workarounds/FractNegative.sksl",
"/sksl/workarounds/FragCoords.sksl",
"/sksl/workarounds/LoopCondition.sksl",
"/sksl/workarounds/MinAndAbsTogether.sksl",
"/sksl/workarounds/NegatedAtan.sksl",
Add a workaround for "ldexp(..., -x)" on Mac/Radeon/GLSL Bug: skia:12076 Change-Id: Ia7aabe2e048a05475d25811af657228ea39d75ba Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416561 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-06-08 00:51:42 +00:00
"/sksl/workarounds/NegatedLdexp.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/workarounds/PowWithConstantExponent.sksl",
"/sksl/workarounds/RewriteDoWhileLoops.sksl",
Rename caps bit for matrix comparison rewrites. This was originally designated for 2x2 matrices only, but this was not right--all matrix comparisons actually need to be rewritten to fully work around the bug. Change-Id: I743d16a65bc55e93361a3dd8753653384583f063 Bug: skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411416 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-05-21 21:27:57 +00:00
"/sksl/workarounds/RewriteMatrixComparisons.sksl",
Add caps bit for RewriteMatrixVectorMultiply. On ARM GPUs, the Vulkan driver does not honor relaxed precision when evaluating SpvOpMatrixTimesVector. This leads to reduced performance (compared to GLSL, where mediump matrices and floats do evaluate all intermediate values at mediump). This caps bit will be enabled on ARM GPUs and, in a followup CL, will be used to toggle a workaround where `m*v` is rewritten as the sum of (m[0]*v[0] + m[1]*v[1] + ... + m[N]*v[N]). Change-Id: I310fa73639b6498552c9672e76860f2eded15d0a Bug: skia:11769 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388459 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-23 21:12:03 +00:00
"/sksl/workarounds/RewriteMatrixVectorMultiply.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/workarounds/TernaryShortCircuit.sksl",
Migrate several GLSL workaround unit tests to golden files. We now support building an SkSL golden output twice, once honoring the custom #pragma settings, and once more ignoring the settings. This allows us to see the output of the workaround technique, alongside the "default-settings" output which should not contain a workaround. To implement this, skslc now supports a flag: --[no]settings. When it's set, /*#pragma settings*/ comments are honored. When it's not set, skslc ignores the comments. compile_sksl_tests.py passes this flag along to skslc. This approach is not strictly limited to workarounds; the "TypePrecision" GLSL test was also updated to use this technique. Change-Id: I79204df047b024533ed6bc1f4c088e0e878d5bb1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317246 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 21:46:37 +00:00
]
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
sksl_rte_tests = [
Add test for Runtime Effects and narrowing conversions. This code intentionally mixes half4s and float4s everywhere. Before http://review.skia.org/435916 landed, this resulted in a compile error. Change-Id: I852fef6ee99a8b78623e0e9ddeee2ad84a8c0504 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436058 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-08-03 15:16:48 +00:00
"/sksl/runtime/AllowNarrowingConversions.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/ArrayIndexing.rts",
Add unit test for array narrowing conversions. Change-Id: Ibadda2a10e19984c7a0efb66fd3187f280666445 Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436996 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 14:55:03 +00:00
"/sksl/runtime/ArrayNarrowingConversions.rts",
Add dest-color support to the Pipeline stage. Previously, when converting a program, the pipeline stage could assume that an input to main() of type half4/float4 was always the input color. This was a good assumption since the only possible inputs were coordinates, or the input color. This CL now recognizes that when a second float4 is passed to the main() function, it should be a SK_DEST_COLOR_BUILTIN. This will let blend functions pass in two colors. ProgramToSkVM now takes a dest-color argument as well, but existing call sites won't reference it (since they aren't for blend functions). I've just passed the input-color a second time, since the value will never actually be accessed. Change-Id: I4214586bda605c6d287aa25b1b099e6ef5ba15a4 Bug: skia:12080 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/417261 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-06-09 21:24:31 +00:00
"/sksl/runtime/Blend.rtb",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/ConstPreservation.rts",
"/sksl/runtime/ConversionConstructors.rts",
"/sksl/runtime/GLSLTypeNames.rts",
"/sksl/runtime/GlobalVariables.rts",
"/sksl/runtime/LoopInt.rts",
"/sksl/runtime/LoopFloat.rts",
Add parser support for highp/mediump Tokens in vardecls. These parse into new modifier bits; the IR generator does not yet support these bits. That's coming in a followup CL. Change-Id: I362e9227694f9b862eaad100f6afca45a9b62a01 Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436336 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-04 20:03:12 +00:00
"/sksl/runtime/PrecisionQualifiers.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/SampleWithExplicitCoord.rts",
"/sksl/runtime/VectorIndexing.rts",
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
]
sksl_rte_error_tests = [
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/FirstClassArrays.rts",
"/sksl/runtime_errors/IllegalArrayOps.rts",
"/sksl/runtime_errors/IllegalIndexing.rts",
"/sksl/runtime_errors/IllegalOperators.rts",
Honor lowp/mediump/highp precision qualifiers in IRGenerator. This CL does not update the DSLParser to honor these precision qualifiers; that will be done in a followup. Change-Id: Ib629bc99c0e6c7afb550a381d4e3b6ccc26aa64e Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436337 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-04 20:26:47 +00:00
"/sksl/runtime_errors/IllegalPrecisionQualifiers.rts",
Explicitly detect static recursion in SkSL This relaxes our rules to allow calls to declared (but not yet defined) functions. With that rule change, we have to specifically detect static recursion and produce an error. Bug: skia:12137 Change-Id: I39cc281fcd73fb30014bc7b43043552623727e03 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431537 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-07-21 19:19:34 +00:00
"/sksl/runtime_errors/IllegalRecursionComplex.rts",
"/sksl/runtime_errors/IllegalRecursionMutual.rts",
"/sksl/runtime_errors/IllegalRecursionSimple.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/IllegalShaderUse.rts",
"/sksl/runtime_errors/IllegalStatements.rts",
Add ProgramKind::kRuntimeBlend for Runtime Blend functions. Runtime Blend effects always take two input colors--source and destination--instead of one. This CL adds a new ProgramKind for blend effects, a new program module (empty for now), and adds a test to confirm that the signature for blend functions is checked. Currently these are only accessible via skslc; there's no Runtime Effect API to create one and the dest color isn't hooked up to anything. Change-Id: I5272a811d2d76b878cfdf3429efa78c9c8b3fd97 Bug: skia:12080 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416798 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-06-08 18:06:22 +00:00
"/sksl/runtime_errors/InvalidBlendMain.rtb",
Add runtime color filter and shader modes to the SkSL compiler These enforce stricter rules about the signature of main, and each one uses a separate pre-include module. That prevents color filters from being able to reference sk_FragCoord (or coords passed to main) at all. It also limits the versions of sample() that are exposed. In the new world, an effect created for a specific stage of the Skia pipeline can only be used to create instances of that stage (SkShader or SkColorFilter). For now, SkRuntimeEffect::Make uses kRuntimeEffect, which continues to be more lenient and allow creation of either shaders or color filters from a single effect. After we migrate all clients, we can deprecate and then delete that mode. Bug: skia:11813 Change-Id: I0afd79a72beeec84da42c86146e8fcd8d0e4c09f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395716 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-12 13:49:20 +00:00
"/sksl/runtime_errors/InvalidColorFilterFeatures.rtcf",
"/sksl/runtime_errors/InvalidColorFilterMain.rtcf",
"/sksl/runtime_errors/InvalidShaderMain.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/LoopConditionErrors.rts",
"/sksl/runtime_errors/LoopExpressionErrors.rts",
"/sksl/runtime_errors/LoopInitializerErrors.rts",
"/sksl/runtime_errors/LoopStructureErrors.rts",
Add improved regression test for oss-fuzz:36655. Most of the code generated by the fuzzer is nonsense, but there is a method to its madness. The crash is only triggered under specific conditions: - The runtime effect has enough helper functions to mostly fill up the call graph hash-map. It won't rehash until it gets close to capacity. - There must be several calls to built-in functions, in order to add elements to the call graph to force a rehash. The fuzzer-generated code manages to satisfy both these requirements. Change-Id: I9a1d7535557fedd4e9bfece3930ac86ede291ffe Bug: oss-fuzz:36655 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437118 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-08-05 20:50:56 +00:00
"/sksl/runtime_errors/Ossfuzz36655.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts",
"/sksl/runtime_errors/UnsupportedTypeSampler.rts",
"/sksl/runtime_errors/UnsupportedTypeTexture.rts",
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
]
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
# Tests in sksl_glsl_tests_sources will be compiled with --settings on, and are expected to generate
# a .glsl output file.
sksl_glsl_tests_sources =
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
sksl_error_tests + sksl_glsl_tests + sksl_inliner_tests +
sksl_folding_tests + sksl_shared_tests
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
# Tests in sksl_glsl_settings_tests_sources will be compiled twice, once with --settings and once
# using --nosettings. In the latter mode, StandaloneSettings is appended to the output filename.
sksl_glsl_settings_tests_sources = sksl_blend_tests + sksl_settings_tests
Add golden outputs for the Metal backend. This CL also updates the blend tests to use sk_FragColor instead of returning a half4, as the Metal backend assumes that a fragment processor's `main` will return void and always synthesizes a `return *_out;` at the end. (context link: https://osscs.corp.google.com/android/platform/superproject/+/master:external/skqp/src/sksl/SkSLMetalCodeGenerator.cpp;l=803;drc=842d31b14159626054e01dd32826563a8f4214bf ) BYPASS_INCLUSIVE_LANGUAGE_REASON=see http://b/168134166 Change-Id: I330a456bf25ee72d3a29c59cd624625378ae80a0 Bug: skia:10649, skia:10757, skia:10758, skia:10759, skia:10760, skia:10761, skia:10762 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319409 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-25 17:35:58 +00:00
# Tests in sksl_metal_tests_sources will be compiled with --settings on, and are expected to
# generate a .metal output file.
Convert remaining Metal tests to golden outputs. Metal-specific tests are pretty thin on the ground here, and some of the remaining tests no longer added value as they were already covered pretty well by existing tests in Shared. The majority of remaining tests were specific to Metal's lack of flexible matrix casting (and SkSL's ability to paper over this with helper functions). Change-Id: I7b3c445268b95320e7f46ec88d793c315d43ee8a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 23:14:11 +00:00
sksl_metal_tests_sources =
sksl_metal_tests + sksl_blend_tests + sksl_shared_tests
Enable SPIR-V disassembly output from skslc. We now have SPIR-V golden outputs for `blend` and `shared` tests. This exposes a handful of SPIR-V limitations for us to address. Change-Id: Ie5278889b8a61432403d06231b17765885bee0ac Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337182 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>
2020-11-20 21:28:50 +00:00
# Tests in sksl_spirv_tests_sources will be compiled with --settings on, and are expected to
# generate a .asm.(frag|vert|geom) output file.
Migrate dedicated SPIR-V tests to golden outputs. There were a surprisingly small number of dedicated SPIR-V tests. SkSLSPIRVBadOffset was the only test that didn't already exist in the golden outputs, although it actually contained two tests. The SPIRVTest.cpp file has been converted to SPIRVTestbed.cpp, which can be used for local debugging of SPIR-V issues via dm (like GLSLTestbed and MetalTestbed). Change-Id: I978d8a7cf5735af7f537113d2b9411ce42cfcf88 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338756 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-25 21:55:37 +00:00
sksl_spirv_tests_sources =
sksl_blend_tests + sksl_shared_tests + sksl_spirv_tests
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
## Tests in sksl_skvm_tests_sources will be compiled with --settings on, and are expected to
## generate a .skvm output file.
sksl_skvm_tests_sources = sksl_rte_tests + sksl_rte_error_tests
Add .stage output to skslc for runtime effects This emits SkSL that is more-or-less what the compiler re-ingests when a runtime effect is used to create a GrFragmentProcessor. Change-Id: I0926be44fc4493e722a5edc18198e161e4192cde Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367883 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-08 18:49:53 +00:00
## Tests in sksl_stage_tests_sources will be compiled with --settings on, and are expected to
## generate a .stage output file.
sksl_stage_tests_sources = sksl_rte_tests
Reference in New Issue Copy Permalink