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

399 lines
18 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.
# Things are easiest for everyone if these source paths are absolute.
_tests = get_path_info("../tests", "abspath")
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_fp_error_tests = [
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/errors/GrBadIn.fp",
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
"$_tests/sksl/errors/GrBothExplicitReturnAndSkOutColor.fp",
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/errors/GrCannotReturnWithSkOutColor.fp",
Remove two uses of setModifiersHandle As a prelude to going back to sharing global data (safely), we want to eliminate as much mutation of shared state as possible. The special cases for global variable declaration were unnecessary, so just remove them. The editing of main's parameters immediately after they were created is also unnecessary - just hoist the logic up so we create the variables correctly in the first place. There is still one use, related to invocation ID. That's more complicated (?), so leaving it as a separate CL. Change-Id: Ia3dad78dd5a634273b2e2239368be7adaff65f38 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325661 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2020-10-12 18:40:24 +00:00
"$_tests/sksl/errors/GrMainParameterWrongType.fp",
"$_tests/sksl/errors/GrMainTooManyParameters.fp",
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/errors/GrNoFragmentProcessorConstruction.fp",
"$_tests/sksl/errors/GrNoFragmentProcessorExpressions.fp",
"$_tests/sksl/errors/GrNoFragmentProcessorLocals.fp",
"$_tests/sksl/errors/GrNoFragmentProcessorParams.fp",
"$_tests/sksl/errors/GrNoFragmentProcessorReturn.fp",
Add unit test demonstrating recursion codegen bug. The generated code does not assign to sk_OutColor correctly; it assigns into the `factorial` function name instead, which doesn't make sense. Change-Id: Ibad1d47f2f9c4fbb410b5277cea6e1022daf8b9d Bug: skia:10684 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329360 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-10-23 14:15:31 +00:00
"$_tests/sksl/errors/GrRecursion.fp",
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_fp_tests = [
Convert the remaining FP tests to golden outputs. (Removed one test, SkSLFPSwitchWithMultipleReturnsInside, because it was redundant with existing tests.) Change-Id: I1bfc069babdb5eb0cc515f195c3a2e307bb5871a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319029 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-09-23 15:46:29 +00:00
"$_tests/sksl/fp/GrChildProcessorAndGlobal.fp",
"$_tests/sksl/fp/GrChildProcessorFieldAccess.fp",
"$_tests/sksl/fp/GrChildProcessorInlineFieldAccess.fp",
"$_tests/sksl/fp/GrChildProcessorSampleCoords.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixAndCoords.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixConstant.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixConstantAndCoords.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixMultipleUniforms.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixSingleInUniform.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixSingleUniform.fp",
"$_tests/sksl/fp/GrChildProcessorSampleMatrixSingleUniformExpr.fp",
"$_tests/sksl/fp/GrChildProcessorWithInputExpression.fp",
"$_tests/sksl/fp/GrChildProcessors.fp",
"$_tests/sksl/fp/GrChildProcessorsWithInput.fp",
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/fp/GrConditionalInUniform.fp",
"$_tests/sksl/fp/GrFunction.fp",
Convert the remaining FP tests to golden outputs. (Removed one test, SkSLFPSwitchWithMultipleReturnsInside, because it was redundant with existing tests.) Change-Id: I1bfc069babdb5eb0cc515f195c3a2e307bb5871a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319029 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-09-23 15:46:29 +00:00
"$_tests/sksl/fp/GrGrSLTypesAreSupported.fp",
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
"$_tests/sksl/fp/GrHelloWorld.fp",
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/fp/GrInUniform.fp",
"$_tests/sksl/fp/GrInUniformCType.fp",
"$_tests/sksl/fp/GrInlinedFunction.fp",
"$_tests/sksl/fp/GrKeyIn.fp",
Convert the remaining FP tests to golden outputs. (Removed one test, SkSLFPSwitchWithMultipleReturnsInside, because it was redundant with existing tests.) Change-Id: I1bfc069babdb5eb0cc515f195c3a2e307bb5871a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319029 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-09-23 15:46:29 +00:00
"$_tests/sksl/fp/GrLayoutWhen.fp",
"$_tests/sksl/fp/GrMainCoords.fp",
Add unit test to demonstrate error with modulo in FP files. (This CL also adds modulo to the IntFolding shared test, since this was absent from the test. It's implemented and working properly already.) Change-Id: I24a947ab38754bff2624cd5b58cf7a39553ca888 Bug: skia:10870 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330596 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-10-29 19:50:58 +00:00
"$_tests/sksl/fp/GrModuloOp.fp",
Add unit test for nested function calls in FP files. `func1` and `func2` emit bad code, `return %s()`, and because they don't consume their `%s` format argument. This leaves the format argument list unbalanced and all future args are wrong. Another serious problem is that we don't actually know the names of the functions that they need to call, because we haven't emitted them yet. `func3` is not emitted at all. Sampling from a fragment processor apparently fails in this context. This is a more general case repro for skia:10684--it turns out that recursion in particular wasn't the issue, but nested function calls just don't work properly at all in FP files. This wasn't an issue in practice because we don't have any existing FP files which nest function calls, and the inliner also tends to aggressively flatten everything out if we don't explicitly disable it. Change-Id: Iff029c459c7d90be566f9b4c9be0e3150e459866 Bug: skia:10684 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329367 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-23 17:45:57 +00:00
"$_tests/sksl/fp/GrNestedCall.fp",
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/fp/GrNestedChildProcessors.fp",
"$_tests/sksl/fp/GrNonInlinedInUniform.fp",
"$_tests/sksl/fp/GrNullableChildProcessor.fp",
"$_tests/sksl/fp/GrSectionClass.fp",
"$_tests/sksl/fp/GrSectionConstructor.fp",
"$_tests/sksl/fp/GrSectionConstructorParams.fp",
"$_tests/sksl/fp/GrSectionCpp.fp",
"$_tests/sksl/fp/GrSectionDumpInfo.fp",
"$_tests/sksl/fp/GrSectionEmitCode.fp",
"$_tests/sksl/fp/GrSectionFields.fp",
"$_tests/sksl/fp/GrSectionHeader.fp",
"$_tests/sksl/fp/GrSectionInitializers.fp",
"$_tests/sksl/fp/GrSectionMake.fp",
"$_tests/sksl/fp/GrSectionSetData.fp",
"$_tests/sksl/fp/GrSectionTest.fp",
"$_tests/sksl/fp/GrTrackedInUniform.fp",
"$_tests/sksl/fp/GrUniform.fp",
Convert the remaining FP tests to golden outputs. (Removed one test, SkSLFPSwitchWithMultipleReturnsInside, because it was redundant with existing tests.) Change-Id: I1bfc069babdb5eb0cc515f195c3a2e307bb5871a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319029 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-09-23 15:46:29 +00:00
"$_tests/sksl/fp/GrUniformArrays.fp",
Migrate several SkSLFP tests to golden outputs. Change-Id: I83a38f2c953a560fea3483e95e31df532b90773e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 22:40:38 +00:00
"$_tests/sksl/fp/GrUseExplicitReturn.fp",
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
]
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
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 error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/ArgumentCountMismatch.sksl",
"$_tests/sksl/errors/ArgumentMismatch.sksl",
"$_tests/sksl/errors/ArgumentModifiers.sksl",
Add unit test for array with many dimensions. This addresses a sanitizer issue discovered in https://oss-fuzz.com/testcase-detail/4908118777266176 (it has not been assigned an oss-fuzz bug number yet; coming soon) A followup CL will limit array dimensionality to 8. This is an arbitrary choice which is hopefully larger than any reasonable program will need. Change-Id: I4cf05f40ec92c1c3444c71c45f759bb30d7da3c9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333135 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-10 15:01:39 +00:00
"$_tests/sksl/errors/ArrayTooManyDimensions.sksl",
Disallow unsized array dimensions on size fields past the frontmost. This was slightly complicated by the fact that this syntax indicates an array with a known size: float[] x = float[](1, 2, 3, 4); Of course, the size is 4; it's just never explicitly stated in the code. (The SkSL parser never actually deduces the size, but it doesn't apparently have a need to; we don't do much in the way of optimization for arrays.) However, this prevents us from simply failing whenever we parse "[]" in non-builtin code; we need to keep scanning and see if the variable is initialized. We already check this in the ArrayConstructors.sksl test file. Change-Id: I5b86958e81bd9bf5edf28a617cecf95c1875583e Bug: skia:10957 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335240 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-17 16:33:49 +00:00
"$_tests/sksl/errors/ArrayUnspecifiedDimensions.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/AssignmentTypeMismatch.sksl",
"$_tests/sksl/errors/BadCaps.sksl",
Add unit tests for assignment and invalid field access. Change-Id: I8b755ae0078d6353e24834cd15603091d681114c Bug: skia:10766 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319698 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-25 20:02:07 +00:00
"$_tests/sksl/errors/BadFieldAccess.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/BadIndex.sksl",
"$_tests/sksl/errors/BadModifiers.sksl",
"$_tests/sksl/errors/BinaryTypeCoercion.sksl",
"$_tests/sksl/errors/BinaryTypeMismatch.sksl",
SkSL: Only allow bitwise ops on integral types We were allowing these ops on floating point types. The resulting GLSL would fail to compile. We also allowed >>= and <<= on vectors (but not any of the other bitwise ops). The newly added unit tests were failing (eg, not catching errors). New results are correct. Bug: skia:10707 Change-Id: I97b769f1ce59261361109a71061b42dc8ef3c74b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317393 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-09-16 20:21:40 +00:00
"$_tests/sksl/errors/BitShiftFloat.sksl",
"$_tests/sksl/errors/BitShiftFloatMatrix.sksl",
"$_tests/sksl/errors/BitShiftFloatVector.sksl",
Fix crash with boolean vectors in is_constant<T>. Previously, we assumed that if a vector in `is_constant` was not made of floats, it must be made of integers. This ignores that boolean vectors also exist. The original code would abort when `getIVecComponent` was called on a bool vector. There is another bug here--arithmetic operators on bool types should be disallowed entirely. That will be addressed in later CLs. Change-Id: I78781d839abde9376917fd92f2fe6311a1a58b02 Bug: oss-fuzz:27808 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338055 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-24 17:04:47 +00:00
"$_tests/sksl/errors/BooleanArithmetic.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/BreakOutsideLoop.sksl",
"$_tests/sksl/errors/CallNonFunction.sksl",
"$_tests/sksl/errors/CanExitWithoutReturningValue.sksl",
"$_tests/sksl/errors/ConstructorArgumentCount.sksl",
"$_tests/sksl/errors/ConstructorTypeMismatch.sksl",
"$_tests/sksl/errors/ContinueOutsideLoop.sksl",
"$_tests/sksl/errors/DivideByZero.sksl",
"$_tests/sksl/errors/DoTypeMismatch.sksl",
"$_tests/sksl/errors/DuplicateFunction.sksl",
"$_tests/sksl/errors/DuplicateOutput.sksl",
"$_tests/sksl/errors/DuplicateSymbol.sksl",
"$_tests/sksl/errors/EnumValueMustBeConstInt.sksl",
"$_tests/sksl/errors/ErrorsInDeadCode.sksl",
"$_tests/sksl/errors/FieldAfterRuntimeArray.sksl",
"$_tests/sksl/errors/ForTypeMismatch.sksl",
"$_tests/sksl/errors/GenericArgumentMismatch.sksl",
"$_tests/sksl/errors/IfTypeMismatch.sksl",
Add unit test for fuzzer-detected error with in vars. `in` vars shouldn't support initializer expressions at all. The fuzzer noticed that dead-stripping interacts poorly with `in` var initializer expressions, which makes sense because it's an unsupported and untested path. In a followup CL, lines 1 and 3 will both become errors. Change-Id: Ibb64ca319a046b040eea976acb6798a1402451de Bug: oss-fuzz:27300 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333128 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-09 15:50:35 +00:00
"$_tests/sksl/errors/InVarWithInitializerExpression.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/InterfaceBlockScope.sksl",
"$_tests/sksl/errors/InterfaceBlockStorageModifiers.sksl",
Migrate CrbugOssfuzz21688 to a golden-output test. Change-Id: I2c077e723d123b01fbcc8fe841ee1f3d28dc152d Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/332037 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-04 19:52:50 +00:00
"$_tests/sksl/errors/InterfaceBlockWithNoMembers.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/InvalidAssignment.sksl",
Add new unit tests for SkSL. These cover: - Properly configured out-params - Invalid/non-lvalue out-params, which currently cause an SkSL crash - Interactions between the inliner and variable swizzles Change-Id: I4874101236084f273e704d8717149b431d813883 Bug: skia:10753 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319036 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-23 19:20:01 +00:00
"$_tests/sksl/errors/InvalidOutParams.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/InvalidUnary.sksl",
Reject struct vardecls with modifiers. These aren't allowed in GLSL, and typically don't make sense. Change-Id: I0afca0df638590466922a809e91ef0be35b13ca8 Bug: skia:10765 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324816 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-10-09 21:42:31 +00:00
"$_tests/sksl/errors/ModifiersInStruct.sksl",
Disallow opaque types in structs and interface blocks. This is a followup to http://review.skia.org/335196. This detects opaque types (samplers and textures) at parsing or IR generation time and reports an error regardless of backend. This check occurs before Metal or SPIR-V would have a chance to detect the error, so it changes their output to a slightly more focused error message. The Metal/SPIR-V fix in the prior CL is still a nice broad catch-all for preventing spurious ABORTs, though. Change-Id: I4cce92a8767d72b5d3d7277a8afde8ce5ce86db2 Bug: skia:10956 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335217 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-17 14:43:22 +00:00
"$_tests/sksl/errors/OpaqueTypeInInterfaceBlock.sksl",
"$_tests/sksl/errors/OpaqueTypeInStruct.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
"$_tests/sksl/errors/OpenArray.sksl",
Fix unknown-identifier issue discovered by fuzzer. This error was caused by an unbalanced symbol table push. This could occur when an interface block encountered an error while parsing its var-decls. Change-Id: I910a980ac92fac7c0786c48b8dc3003ee3e75e5b Bug: oss-fuzz:26700 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330896 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-10-30 18:24:24 +00:00
"$_tests/sksl/errors/Ossfuzz26700.sksl",
Add unit test for error discovered by fuzzer. Before http://review.skia.org/330743 was submitted, this caused an assertion during CFG generation: http://screen/95ZaTYzon4bMVtE Change-Id: Icf93472394de3d17425ad1258a68b263cab88eb1 Bug: oss-fuzz:26759 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330816 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-10-30 17:26:35 +00:00
"$_tests/sksl/errors/Ossfuzz26759.sksl",
Fix fuzzer crash when casting between int and float. The fix submitted at http://review.skia.org/335868 did not support casts. The fuzzer discovered this shortcoming right away. Change-Id: I2f5166528cee41367348564d4e664476fd5704ff Bug: oss-fuzz:27650 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/336656 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-19 22:36:17 +00:00
"$_tests/sksl/errors/Ossfuzz27650.sksl",
Fix double-negation of constant-value construcors. Previously, the code which calculated Constructor constant values assumed that a constant-value PrefixExpression would always have an operand of Constructor. It turns out that another valid case is multiple PrefixExpressions nested within each other (representing repeated negation). Updated the code to work regardless of the type of the prefix operand. Change-Id: Ic9bf54725ae59330ac817bc4ec7a64def384ab54 Bug: oss-fuzz:27663 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337177 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-20 18:27:04 +00:00
"$_tests/sksl/errors/Ossfuzz27663.sksl",
Add unit tests for overflowing int and uint literal limits. At present, we do not report any error; the values wrap silently. Change-Id: I8c435cfdd81f6c2e5fd87e9c39c708138bf4ec82 Bug: skia:10932 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333676 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-10 19:17:42 +00:00
"$_tests/sksl/errors/OverflowIntLiteral.sksl",
"$_tests/sksl/errors/OverflowUintLiteral.sksl",
Disallow usage of private types ($vec, etc) in non-builtin code. This fixes a fuzzer crash in Metal. Private types aren't meant to be used directly; we can't generate a valid MemoryLayout for them. We will now detect them during IR generation and report an error. (Note that unreferenced structs currently don't have any IR representation at all, so structs have to be used somewhere in the code to trigger the error.) Bug: oss-fuzz:27288 Change-Id: I432f0a69fbb54cd33ff5b90a9f3d4757a9370117 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334830 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 20:55:27 +00:00
"$_tests/sksl/errors/PrivateTypes.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/ReturnDifferentType.sksl",
"$_tests/sksl/errors/ReturnFromVoid.sksl",
"$_tests/sksl/errors/ReturnMissingValue.sksl",
"$_tests/sksl/errors/ReturnTypeMismatch.sksl",
Add unit test for self-referential initializer expressions. These don't compile in GLSL, so they shouldn't compile in SkSL either-- and fortunately, they do not. (In C++, and consequently in Metal, these expressions are considered legal by the grammar and do compile, but generate garbage output.) Change-Id: I6c7bea70b3d91677ccd8fcbad1eba123d655e856 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329359 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-23 13:58:56 +00:00
"$_tests/sksl/errors/SelfReferentialInitializerExpression.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/SpuriousFloat.sksl",
"$_tests/sksl/errors/StaticIfTest.sksl",
"$_tests/sksl/errors/StaticSwitchConditionalBreak.sksl",
"$_tests/sksl/errors/StaticSwitchTest.sksl",
Limit struct nesting depth to a maximum of eight levels. This addresses a sanitizer issue discovered in https://oss-fuzz.com/testcase-detail/4908118777266176 (it has not been assigned an oss-fuzz bug number yet; coming soon) This puts an upper bound on struct nesting, again to prevent memory- layout and other recursive type-handling code from overflowing the stack. Coincidentally, while researching GLSL behavior around this bug, I learned that WebGL has a similar limitation but caps nested structs to 4 deep. (I could not find any documented GLSL upper bound.) Note that both the GLSL and Metal outputs for StructMaxDepth are badly malformed. (Structs cannot be embedded within another struct in GLSL; structs SA7 and below are never declared in GLSL; the array list for SA7 is backwards in GLSL; Metal is missing structs SA1 through SA8; Metal puts the array list on the type instead of the variable name.) These issues will be addressed in separate CLs. Change-Id: I0f1059b6faa400cd0647dd7010ec839f73779a36 Bug: skia:10922, skia:10923, skia:10925, skia:10926 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333316 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-10 15:04:26 +00:00
"$_tests/sksl/errors/StructTooDeeplyNested.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/SwitchDuplicateCase.sksl",
"$_tests/sksl/errors/SwitchTypes.sksl",
"$_tests/sksl/errors/SwizzleConstantOutput.sksl",
"$_tests/sksl/errors/SwizzleMatrix.sksl",
"$_tests/sksl/errors/SwizzleOnlyLiterals.sksl",
"$_tests/sksl/errors/SwizzleOutOfBounds.sksl",
"$_tests/sksl/errors/SwizzleTooManyComponents.sksl",
"$_tests/sksl/errors/TernaryMismatch.sksl",
Add test cases to function-prototype golden outputs. - Prototypes for never-declared functions - Prototype before use - Prototype after use - A variety of inputs and outputs on the prototyped functions. - Calling declared-but-undefined functions Currently, the prototypes are not actually emitted in the generated GLSL or Metal output at all. This CL is demonstrates our baseline before proper prototype support is added. Change-Id: I6112e0a89ab9bbecefccaca9fba985bb8011fff1 Bug: skia:10872 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/331376 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-02 16:38:19 +00:00
"$_tests/sksl/errors/UndeclaredFunction.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/UndefinedFunction.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
"$_tests/sksl/errors/UndefinedSymbol.sksl",
Migrate SkSL error tests to golden outputs. Change-Id: Ic8f4730d035981c32b4ddb48e5e919b0396b6d93 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317578 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-17 22:20:26 +00:00
"$_tests/sksl/errors/Unreachable.sksl",
"$_tests/sksl/errors/UnsupportedGLSLIdentifiers.sksl",
"$_tests/sksl/errors/UseWithoutInitializeArrayIndex.sksl",
"$_tests/sksl/errors/UseWithoutInitializeBinaryExpr.sksl",
"$_tests/sksl/errors/UseWithoutInitializeDeadIf.sksl",
"$_tests/sksl/errors/UseWithoutInitializeDeadSwitch.sksl",
"$_tests/sksl/errors/UseWithoutInitializeReturnValue.sksl",
"$_tests/sksl/errors/UseWithoutInitializeVarDecl.sksl",
"$_tests/sksl/errors/UsingInvalidValue.sksl",
"$_tests/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 = [
Add support for #pragma settings comments in SkSL. This will allow us to write skslc-based golden tests that deviate from the standalone skslc settings. This CL provides six options; more will be added as necessary. - Default (caps) - UsesPrecisionModifiers (caps) - Version110 (caps) - Version450Core (caps) - ForceHighPrecision (settings flag bit) - Sharpen (settings flag bit) Change-Id: I9b779e039b2f0c0ccf43dca226fb4844aff3526b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317237 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-16 21:43:11 +00:00
"$_tests/sksl/glsl/ForceHighPrecision.sksl",
Migrate remaining SkSL GLSL tests to golden outputs. Change-Id: I72fd3083f75ca5bf74fb2c3b032465864a13aed5 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317771 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-09-18 18:42:58 +00:00
"$_tests/sksl/glsl/IncompleteShortIntPrecision.sksl",
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/sksl/glsl/LayoutQualifiers.sksl",
Migrate remaining SkSL GLSL tests to golden outputs. Change-Id: I72fd3083f75ca5bf74fb2c3b032465864a13aed5 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317771 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-09-18 18:42:58 +00:00
"$_tests/sksl/glsl/ShortIntPrecision.sksl",
Add support for #pragma settings comments in SkSL. This will allow us to write skslc-based golden tests that deviate from the standalone skslc settings. This CL provides six options; more will be added as necessary. - Default (caps) - UsesPrecisionModifiers (caps) - Version110 (caps) - Version450Core (caps) - ForceHighPrecision (settings flag bit) - Sharpen (settings flag bit) Change-Id: I9b779e039b2f0c0ccf43dca226fb4844aff3526b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317237 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-16 21:43:11 +00:00
"$_tests/sksl/glsl/TextureSharpenVersion110.sksl",
"$_tests/sksl/glsl/TextureVersion110.sksl",
"$_tests/sksl/glsl/UsesPrecisionModifiers.sksl",
"$_tests/sksl/glsl/Version110.sksl",
"$_tests/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 = [
"$_tests/sksl/metal/CastHalf4ToMat2x2.sksl",
"$_tests/sksl/metal/CastMat2x2ToMat3x3.sksl",
"$_tests/sksl/metal/CastMat2x3ToMat4x4.sksl",
"$_tests/sksl/metal/CastMat4x4ToMat3x4.sksl",
"$_tests/sksl/metal/CastMat4x4ToMat4x3.sksl",
"$_tests/sksl/metal/NumericGlobals.sksl",
Detect unsupported types for MemoryLayout and report errors. Previously, MemoryLayout would ABORT if it encountered any types that we can't layout in memory (e.g. opaque types like samplers). Instead of an abort, this case is now detected cleanly and an error is reported identifying the offending type. This should unwedge the fuzzer, which appears to be very enthusiatically generating interface blocks with nonsense types inside. (Note that code generators which don't actually try to compute a memory layout--that is, GLSL--will still accept these types. This should still be caught and reported as an error, since it's still illegal in GLSL, but that's for a future CL.) Change-Id: I88a9649bcd8c75dadc8cca679f3c5e94570742bc Bug: skia:10956, oss-fuzz:27525 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335196 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-16 18:32:18 +00:00
"$_tests/sksl/metal/OpaqueTypeInInterfaceBlock.sksl",
"$_tests/sksl/metal/OpaqueTypeInStruct.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
"$_tests/sksl/metal/SamplerGlobals.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
sksl_spirv_tests = [
"$_tests/sksl/spirv/LayoutMultipleOf4.sksl",
"$_tests/sksl/spirv/LayoutOutOfOrder.sksl",
Fix SPIR-V compilation error with arrays of samplers. This CL addresses the root cause of the fuzzer issue, by checking for LayoutIsSupported before getting the MemoryLayout of a type. However, this array ought to be detected as an error everywhere, as samplers are opaque types; at present, this code compiles without error in GLSL and Metal. This is an issue for followup CLs. GLSL's actual support for arrays of samplers is interesting and probably too nuanced for us to try to emulate: https://www.khronos.org/opengl/wiki/Data_Type_(GLSL)#Opaque_arrays "Under GLSL version 3.30, Sampler arrays (the only opaque type 3.30 provides) can be declared, but they can only be accessed by compile-time integral Constant Expressions. So you cannot loop over an array of samplers, no matter what the array initializer, offset and comparison expressions are. Under GLSL 4.00 and above, array indices leading to an opaque value can be accessed by non-compile-time constants, but these index values must be dynamically uniform. The value of those indices must be the same value, in the same execution order, regardless of any non-uniform parameter values, for all shader invocations in the invocation group." Change-Id: Ib382f5c3b563f996b3c8f1eb6b021b6d31fa9ce7 Bug: oss-fuzz:28107 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339159 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-30 14:57:59 +00:00
"$_tests/sksl/spirv/OpaqueTypeInArray.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 = [
"$_tests/sksl/shared/ArrayConstructors.sksl",
"$_tests/sksl/shared/ArrayIndexTypes.sksl",
Limit arrays to a maximum of eight dimensions. This addresses a sanitizer issue discovered in https://oss-fuzz.com/testcase-detail/4908118777266176 (it has not been assigned an oss-fuzz bug number yet; coming soon) We need to set some sort of limit here to avoid stack overflow. Eight array dimensions seems like more than enough for any sort of code that we might realistically need, but the limit is definitely flexible if we wanted to increase it. (The fuzzer needed to generate a several- hundred-dimensional array before encountering a crash.) Change-Id: I3630ab40e47cc58a2280ba200b485e1958371fdc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333160 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-10 15:03:50 +00:00
"$_tests/sksl/shared/ArrayMaxDimensions.sksl",
Add test for returning arrays from functions. Just filling in a gap in our tests. The output is a little strange as it exposes a missed opportunity to constant-fold array accesses, but it seems fine otherwise. Change-Id: I6df13e0f9a49455015ceb47d7802bb5e1bbdaa1a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339217 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-30 18:44:57 +00:00
"$_tests/sksl/shared/ArrayReturnTypes.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
"$_tests/sksl/shared/ArrayTypes.sksl",
Add unit tests for assignment and invalid field access. Change-Id: I8b755ae0078d6353e24834cd15603091d681114c Bug: skia:10766 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319698 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-25 20:02:07 +00:00
"$_tests/sksl/shared/Assignment.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
"$_tests/sksl/shared/BoolFolding.sksl",
"$_tests/sksl/shared/Caps.sksl",
"$_tests/sksl/shared/CastsRoundTowardZero.sksl",
"$_tests/sksl/shared/Clockwise.sksl",
"$_tests/sksl/shared/ComplexDelete.sksl",
"$_tests/sksl/shared/ConstArray.sksl",
"$_tests/sksl/shared/ConstVariableComparison.sksl",
"$_tests/sksl/shared/ConstantIf.sksl",
"$_tests/sksl/shared/Control.sksl",
"$_tests/sksl/shared/DeadDoWhileLoop.sksl",
Create test case for oss-fuzz:26942. Change-Id: I19a9564ac4d52b709b8fdd757b99222372c626f4 Bug: oss-fuzz:26942 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/331598 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-03 16:33:49 +00:00
"$_tests/sksl/shared/DeadIfStatement.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
"$_tests/sksl/shared/DeadLoopVariable.sksl",
Add unit test for function dead-stripping. This test verifies that dead-stripping works on both built-in and user functions, if their function call is optimized away. Change-Id: I3125a34640c69de43c383343cd00d97e5a32ac60 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338836 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-11-26 03:19:16 +00:00
"$_tests/sksl/shared/DeadStripFunctions.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
"$_tests/sksl/shared/DependentInitializers.sksl",
"$_tests/sksl/shared/DerivativesUnused.sksl",
"$_tests/sksl/shared/Discard.sksl",
Add support for enums in Metal code generator. Enums are an SkSL-only concept--when we output code, we emit plain IntLiterals--so the fix is simply to ignore the Enum program element when we encounter it. This is what GLSLCodeGen does as well. Also added a unit test to confirm that enums work normally, and that enums are subject to optimization and static-comparison checks just as ints would be. Change-Id: Ic4f8da7a27983add9eb41b936d46f6638d22bd4b Bug: skia:11003 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338800 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-26 03:25:43 +00:00
"$_tests/sksl/shared/Enum.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
"$_tests/sksl/shared/FloatFolding.sksl",
"$_tests/sksl/shared/FrExp.sksl",
"$_tests/sksl/shared/FragCoordsFlipY.sksl",
"$_tests/sksl/shared/FragCoordsNew.sksl",
"$_tests/sksl/shared/FragCoordsOld.sksl",
"$_tests/sksl/shared/FunctionArgumentMatch.sksl",
"$_tests/sksl/shared/FunctionPrototype.sksl",
"$_tests/sksl/shared/Functions.sksl",
Add unit test demonstrating output from Gaussian blur. Change-Id: I1be21b428939d17bbf3a9347a64db56c7cd69eb4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337638 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-23 19:46:55 +00:00
"$_tests/sksl/shared/GaussianBlur.sksl",
SkSL: Add test for scalar versions of geometric intrinsics Fix code generation for Metal and Vulkan with geometric intrinsics that have scalar versions in GLSL/SkSL, but no native support in MSL/SPIR-V. Change-Id: Id4538a00172e0d233ad9d5ed8d33db6436b83208 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338276 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2020-11-24 19:18:23 +00:00
"$_tests/sksl/shared/GeometricIntrinsics.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
"$_tests/sksl/shared/Geometry.geom",
"$_tests/sksl/shared/GeometryExtension.geom",
"$_tests/sksl/shared/GeometryGSInvocations.geom",
"$_tests/sksl/shared/GeometryNoGSInvocations.geom",
Add geometry shader test demonstrating max_vertices/invocations bug Declaring max_vertices before invocations fails to adjust max_vertices when invocation support is not present. (It should be 4, not 2 in this case). Bug: skia:10827 Change-Id: Ief7af97eabf5414ea8363808fc1ad2e9c480fe10 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325664 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2020-10-12 19:26:20 +00:00
"$_tests/sksl/shared/GeometryNoGSInvocationsReorder.geom",
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
"$_tests/sksl/shared/Height.sksl",
"$_tests/sksl/shared/HelloWorld.sksl",
"$_tests/sksl/shared/Hex.sksl",
"$_tests/sksl/shared/InstanceID.vert",
"$_tests/sksl/shared/IntFolding.sksl",
"$_tests/sksl/shared/InterfaceBlockAnonymous.sksl",
"$_tests/sksl/shared/InterfaceBlockArray.sksl",
"$_tests/sksl/shared/InterfaceBlockNamed.sksl",
"$_tests/sksl/shared/Matrices.sksl",
"$_tests/sksl/shared/MatrixFolding.sksl",
Replace SPIR-V assertion with mixed-types error message. This is very unlikely to occur in real-world code, as it's somewhat nonsense to use the comma operator in this way. However, it's better to fail cleanly than to assert. Change-Id: I76481cd8a993cb1a798ee16956400a512efd4c15 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337636 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-23 19:28:36 +00:00
"$_tests/sksl/shared/MixedTypeCommaOperator.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
"$_tests/sksl/shared/MultipleAssignments.sksl",
"$_tests/sksl/shared/NegatedVectorLiteral.sksl",
"$_tests/sksl/shared/NoFragCoordsPos.vert",
"$_tests/sksl/shared/NoFragCoordsPosRT.vert",
"$_tests/sksl/shared/NormalizationGeo.geom",
"$_tests/sksl/shared/NormalizationVert.vert",
"$_tests/sksl/shared/NumberConversions.sksl",
"$_tests/sksl/shared/Offset.sksl",
"$_tests/sksl/shared/Operators.sksl",
Fix use-after-free discovered by fuzzer. In cases where multiple variables were declared on a single line, it is legal for variable initialization-expressions to reference variables declared earlier in the var-decl statement. It is NOT legal for the inliner to move those references up to the previous statement, where the variable doesn't exist yet. This is mitigated by disabling the IRGenerator inliner for var-decls past the first one in a var-decls statement. (The optimizer will still pass over this code later and is able to inline it correctly, if it is worth doing.) Change-Id: I7a0d45eab20e30ed9f6b2f5c1251b6e0d8eeaea3 Bug: oss-fuzz:26167 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329357 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-10-23 13:46:11 +00:00
"$_tests/sksl/shared/Ossfuzz26167.sksl",
Add fix for fuzzer-discovered crash at oss-fuzz:27614. The fuzzer managed to create a test case which temporarily evaluates to expression `half2(half(0.2)) + 2` as it is optimized. This requires a bunch of temporary nonsense math as the IR Generator is attempting to simplify as it goes; various attempts to remove terms from the fuzzer test-case would cause it to stop reproducing the error. Constructor::getVecComponent assumed that any constructor with a single scalar argument would always implement `getConstantFloat` and `getConstantInt`; however, constructors themselves did not actually implement these methods. This meant that nesting a scalar constructor inside a non-scalar constructor would abort when it tried to deduce the value inside the inner constructor. This has been fixed by implementing `getConstantFloat` and `getConstantInt` for Constructors. These methods will assert if the constructor has more than one argument or is a non-scalar type. This should allow any number of nested constructors, e.g. `half4(half(half(half(1))))` should recursively evaluate properly, should we somehow generate this as an intermediate expression. Change-Id: Iaee4284cba03974443cd7b5dccfd7909c1a5f3a6 Bug: oss-fuzz:27614 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335868 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-18 20:18:40 +00:00
"$_tests/sksl/shared/Ossfuzz27614.sksl",
Fix ASAN error when inlining array constructor expressions. Constructors such as `float[2](0, 0)` add a type to the symbol table; this type needs to be copied into the new symbol table if the constructor is cloned by the inliner. Change-Id: Ifa8d2dec87103c6223ce493e2201a904c14c2137 Bug: oss-fuzz:28050 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339168 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-11-30 17:24:27 +00:00
"$_tests/sksl/shared/Ossfuzz28050.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
"$_tests/sksl/shared/OutParams.sksl",
Add 'tricky' OutParams golden output. This was adapted from a test in SkSLInterpreterOutParams and presents a challenging double swizzle. Change-Id: Icb7b3bbb18d4b3cfa0c26acb524c08812ba88096 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319920 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-09-26 04:18:55 +00:00
"$_tests/sksl/shared/OutParamsTricky.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
"$_tests/sksl/shared/RectangleTexture.sksl",
"$_tests/sksl/shared/ResizeMatrix.sksl",
"$_tests/sksl/shared/SampleMask.sksl",
"$_tests/sksl/shared/ScopedSymbol.sksl",
"$_tests/sksl/shared/ShortCircuitBoolFolding.sksl",
"$_tests/sksl/shared/StackingVectorCasts.sksl",
"$_tests/sksl/shared/StaticIf.sksl",
"$_tests/sksl/shared/StaticSwitch.sksl",
"$_tests/sksl/shared/StaticSwitchWithBreak.sksl",
"$_tests/sksl/shared/StaticSwitchWithBreakInsideBlock.sksl",
"$_tests/sksl/shared/StaticSwitchWithConditionalBreak.sksl",
"$_tests/sksl/shared/StaticSwitchWithConditionalBreakInsideBlock.sksl",
"$_tests/sksl/shared/StaticSwitchWithFallthroughA.sksl",
"$_tests/sksl/shared/StaticSwitchWithFallthroughB.sksl",
"$_tests/sksl/shared/StaticSwitchWithStaticConditionalBreak.sksl",
"$_tests/sksl/shared/StaticSwitchWithStaticConditionalBreakInsideBlock.sksl",
"$_tests/sksl/shared/Structs.sksl",
Limit struct nesting depth to a maximum of eight levels. This addresses a sanitizer issue discovered in https://oss-fuzz.com/testcase-detail/4908118777266176 (it has not been assigned an oss-fuzz bug number yet; coming soon) This puts an upper bound on struct nesting, again to prevent memory- layout and other recursive type-handling code from overflowing the stack. Coincidentally, while researching GLSL behavior around this bug, I learned that WebGL has a similar limitation but caps nested structs to 4 deep. (I could not find any documented GLSL upper bound.) Note that both the GLSL and Metal outputs for StructMaxDepth are badly malformed. (Structs cannot be embedded within another struct in GLSL; structs SA7 and below are never declared in GLSL; the array list for SA7 is backwards in GLSL; Metal is missing structs SA1 through SA8; Metal puts the array list on the type instead of the variable name.) These issues will be addressed in separate CLs. Change-Id: I0f1059b6faa400cd0647dd7010ec839f73779a36 Bug: skia:10922, skia:10923, skia:10925, skia:10926 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333316 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-10 15:04:26 +00:00
"$_tests/sksl/shared/StructMaxDepth.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
"$_tests/sksl/shared/Switch.sksl",
"$_tests/sksl/shared/SwitchContainingDeadCode.sksl",
"$_tests/sksl/shared/SwitchWithFallthrough.sksl",
"$_tests/sksl/shared/SwizzleBoolConstants.sksl",
"$_tests/sksl/shared/SwizzleConstants.sksl",
"$_tests/sksl/shared/SwizzleLTRB.sksl",
"$_tests/sksl/shared/SwizzleOpt.sksl",
"$_tests/sksl/shared/SwizzleScalar.sksl",
"$_tests/sksl/shared/TernaryAsLValueEntirelyFoldable.sksl",
"$_tests/sksl/shared/TernaryAsLValueFoldableTest.sksl",
Split Texture test into separate 1D and 2D tests. This improves the test output for Metal. Previously, the Metal output was just an error message, since 1D textures were unsupported. Now we have a valid golden output for the 2D case in Metal. (1D is still unsupported and is likely to remain unsupported; Skia currently has no use case for 1D textures.) Change-Id: I91977712030f08e371cc6bfb2afa578940ca00b7 Bug: skia:10797 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330940 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-10-30 19:58:49 +00:00
"$_tests/sksl/shared/Texture1D.sksl",
"$_tests/sksl/shared/Texture2D.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
"$_tests/sksl/shared/TextureSharpen.sksl",
"$_tests/sksl/shared/UnaryPositiveNegative.sksl",
"$_tests/sksl/shared/UnusedVariables.sksl",
"$_tests/sksl/shared/VectorConstructors.sksl",
"$_tests/sksl/shared/VectorFolding.sksl",
"$_tests/sksl/shared/VertexID.vert",
"$_tests/sksl/shared/Width.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_inliner_tests = [
Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
"$_tests/sksl/inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl",
"$_tests/sksl/inliner/DoWhileTestCannotBeInlined.sksl",
"$_tests/sksl/inliner/ForBodyMustBeInlinedIntoAScope.sksl",
"$_tests/sksl/inliner/ForInitializerExpressionsCanBeInlined.sksl",
"$_tests/sksl/inliner/ForWithReturnInsideCannotBeInlined.sksl",
"$_tests/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl",
"$_tests/sksl/inliner/IfBodyMustBeInlinedIntoAScope.sksl",
"$_tests/sksl/inliner/IfElseBodyMustBeInlinedIntoAScope.sksl",
"$_tests/sksl/inliner/IfElseChainWithReturnsCanBeInlined.sksl",
"$_tests/sksl/inliner/IfTestCanBeInlined.sksl",
"$_tests/sksl/inliner/IfWithReturnsCanBeInlined.sksl",
"$_tests/sksl/inliner/InlineKeywordOverridesThreshold.sksl",
"$_tests/sksl/inliner/InlineThreshold.sksl",
"$_tests/sksl/inliner/InlineWithInoutArgument.sksl",
"$_tests/sksl/inliner/InlineWithModifiedArgument.sksl",
"$_tests/sksl/inliner/InlineWithNestedBigCalls.sksl",
"$_tests/sksl/inliner/InlineWithNestedCalls.sksl",
"$_tests/sksl/inliner/InlineWithUnmodifiedArgument.sksl",
"$_tests/sksl/inliner/InlineWithUnnecessaryBlocks.sksl",
Demonstrate name reuse error in inliner. The following conditions lead to the error: - A pair of nested functions, both of which must be inlined. - Both inlined functions create a variable with the same name. - The outer function passes its variable to the inner function. - The initialization of the inner variable uses the value from the outer variable. - The inner function does not mutate the variable, use it as an out- parameter, or otherwise cause it to receive a temporary copy. When all these conditions are met, both variable declarations are inlined as-is without performing any name salting, because it's seemingly safe to do so. The name overlap issue is not considered in the safety checks. Inlined variable declarations are not subject to name salting but they should be; I suspect other adversarial examples could be crafted as well where unhandled name overlap leads to errors. Change-Id: Ia754bee8e45c8a5c7548436594bbf04abc7a8396 Bug: skia:10722 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316945 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-14 22:23:54 +00:00
"$_tests/sksl/inliner/InlinerAvoidsVariableNameOverlap.sksl",
Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
"$_tests/sksl/inliner/InlinerManglesNames.sksl",
"$_tests/sksl/inliner/ShortCircuitEvaluationsCannotInlineRightHandSide.sksl",
"$_tests/sksl/inliner/SwitchWithCastCanBeInlined.sksl",
"$_tests/sksl/inliner/SwitchWithReturnInsideCannotBeInlined.sksl",
"$_tests/sksl/inliner/SwitchWithoutReturnInsideCanBeInlined.sksl",
Add new unit tests for SkSL. These cover: - Properly configured out-params - Invalid/non-lvalue out-params, which currently cause an SkSL crash - Interactions between the inliner and variable swizzles Change-Id: I4874101236084f273e704d8717149b431d813883 Bug: skia:10753 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319036 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-23 19:20:01 +00:00
"$_tests/sksl/inliner/SwizzleCanBeInlinedDirectly.sksl",
Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
"$_tests/sksl/inliner/TernaryResultsCannotBeInlined.sksl",
"$_tests/sksl/inliner/TernaryTestCanBeInlined.sksl",
Add unit test for inlining trivial arguments. Change-Id: I71cefc1ffacd671ede810d9133dfce75cb9f42b4 Bug: skia:10786 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320958 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>
2020-09-30 14:37:23 +00:00
"$_tests/sksl/inliner/TrivialArgumentsInlineDirectly.sksl",
Migrate SkSL inliner tests to golden files. Our lack of proper caps-bits controls in skslc affects the outcome of one test: "InlinerWrapsEarlyReturnsWithDoWhileBlock" does not actually emit the do-while block because the standalone caps bits don't enable do-while support. This will be fixed in a followup CL that adds caps-bit support to our tests. A few tests were renamed for consistency, a few were simplified slightly and one test was removed because it was simply redundant (there was a second test that covered the exact same ground as `ForWithReturnInsideCannotBeInlined`). Change-Id: I2e3b97cb3aea331b6d806bdb865aa78c35c7a6b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316997 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-15 14:10:43 +00:00
"$_tests/sksl/inliner/WhileBodyMustBeInlinedIntoAScope.sksl",
"$_tests/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 = [
Create golden outputs for SkSL blend functions. Several blend functions generate a surprisingly large amount of code, and appear to have opportunities for further optimization. At any rate, if we make compiler changes that would affect the output of a blend function, I think we would want to see the changes reflected in our golden outputs. Change-Id: Iff612dcd4bad8824b5e6e97413ffce19e5ea1c0e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318336 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-21 21:01:22 +00:00
"$_tests/sksl/blend/BlendClear.sksl",
"$_tests/sksl/blend/BlendColor.sksl",
"$_tests/sksl/blend/BlendColorBurn.sksl",
"$_tests/sksl/blend/BlendColorDodge.sksl",
"$_tests/sksl/blend/BlendDarken.sksl",
"$_tests/sksl/blend/BlendDifference.sksl",
"$_tests/sksl/blend/BlendDst.sksl",
"$_tests/sksl/blend/BlendDstAtop.sksl",
"$_tests/sksl/blend/BlendDstIn.sksl",
"$_tests/sksl/blend/BlendDstOut.sksl",
"$_tests/sksl/blend/BlendDstOver.sksl",
Fix SPIR-V and Metal support for enum types. SPIR-V previously didn't know what to think when it encountered a Type with a typeKind of kEnum, and would abort. These are now treated as 32-bit signed integers. Metal previously emitted the SkSL enum typename, which is meaningless to Metal since we do not emit the enum itself anywhere. Metal now emits "int" for an enum-typed variable. (GLSL already correctly emits "int" for enum types.) Change-Id: I05975a2a399f9c4a22c00c90be0dccacd99d793b Bug: skia:11003 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338856 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-26 03:39:45 +00:00
"$_tests/sksl/blend/BlendEnum.sksl",
Create golden outputs for SkSL blend functions. Several blend functions generate a surprisingly large amount of code, and appear to have opportunities for further optimization. At any rate, if we make compiler changes that would affect the output of a blend function, I think we would want to see the changes reflected in our golden outputs. Change-Id: Iff612dcd4bad8824b5e6e97413ffce19e5ea1c0e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318336 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-21 21:01:22 +00:00
"$_tests/sksl/blend/BlendExclusion.sksl",
"$_tests/sksl/blend/BlendHardLight.sksl",
"$_tests/sksl/blend/BlendHue.sksl",
"$_tests/sksl/blend/BlendLighten.sksl",
"$_tests/sksl/blend/BlendLuminosity.sksl",
"$_tests/sksl/blend/BlendModulate.sksl",
"$_tests/sksl/blend/BlendMultiply.sksl",
Rename BlendOverlap to BlendOverlay. Just a typo fix. Change-Id: I2fe1f6ae1c99d7f20a4fa5f49eefea514e224652 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/321977 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-10-02 21:46:49 +00:00
"$_tests/sksl/blend/BlendOverlay.sksl",
Create golden outputs for SkSL blend functions. Several blend functions generate a surprisingly large amount of code, and appear to have opportunities for further optimization. At any rate, if we make compiler changes that would affect the output of a blend function, I think we would want to see the changes reflected in our golden outputs. Change-Id: Iff612dcd4bad8824b5e6e97413ffce19e5ea1c0e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/318336 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-21 21:01:22 +00:00
"$_tests/sksl/blend/BlendPlus.sksl",
"$_tests/sksl/blend/BlendSaturation.sksl",
"$_tests/sksl/blend/BlendScreen.sksl",
"$_tests/sksl/blend/BlendSoftLight.sksl",
"$_tests/sksl/blend/BlendSrc.sksl",
"$_tests/sksl/blend/BlendSrcAtop.sksl",
"$_tests/sksl/blend/BlendSrcIn.sksl",
"$_tests/sksl/blend/BlendSrcOut.sksl",
"$_tests/sksl/blend/BlendSrcOver.sksl",
"$_tests/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 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
"$_tests/sksl/glsl/TypePrecision.sksl",
Stop the inliner after it has inlined 2500 statements in a program. This prevents OOMing when given a pathological input, but is large enough that almost all inputs should continue to compile as-is. Change-Id: If5c46711b886ee08495bfd09af537e9dc7ea5649 Bug: skia:10945, oss-fuzz:27442 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334838 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-13 21:13:18 +00:00
"$_tests/sksl/inliner/ExponentialGrowth.sksl",
Add test for disabling the inliner. This golden verifies that when the inline threshold is zero, inlining is not performed. Change-Id: Icad6e1faed569dd1b2469874be3b9e635ad0b9ad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325656 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-10-12 16:33:27 +00:00
"$_tests/sksl/inliner/InlinerCanBeDisabled.sksl",
Fix unit test for InlinerWrapsEarlyReturnsWithDoWhileBlock. This resolves the following TODO block: TODO(johnstiles): the skslc standalone caps bits do not enable do-while support, so this test does not actually perform as described; the `returny` function is not inlined at all. This will be fixed when customizable caps-bit support is added to the golden tests. Change-Id: I3495e4813b9be37264a8fda978453594c1f5fa13 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317859 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-18 19:41:31 +00:00
"$_tests/sksl/inliner/InlinerWrapsEarlyReturnsWithDoWhileBlock.sksl",
Fix frexp support in Metal. Our Metal codegen assumes that out params are pointers, but Metal's built-in frexp actually takes a reference for the exponent, not a pointer. We now add in a helper function to translate. Change-Id: I24686347d07151dd99a1ff1c43aff2b35c3181e5 Bug: skia:10762 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328387 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-20 14:24:56 +00:00
"$_tests/sksl/shared/CrossIntrinsic.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
"$_tests/sksl/shared/Derivatives.sksl",
"$_tests/sksl/shared/DerivativesFlipY.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
"$_tests/sksl/workarounds/AbsInt.sksl",
Add test for sk_Caps.mustGuardDivisionEvenAfterExplicitZeroCheck. Change-Id: Ib1374e1dce1a654a83813dbe341774bd91729796 Bug: skia:10694, skia:10819 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324356 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-10-09 02:18:10 +00:00
"$_tests/sksl/workarounds/BlendGuardedDivide.sksl",
Add test for sk_Caps.inBlendModesFailRandomlyForAllZeroVec. This CL also alphabetizes the various factories in ShaderCapsFactory. Change-Id: I0378ceb821678173e72690d5563d2a9a92d90201 Bug: skia:10694, skia:10819 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324257 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-08 22:39:08 +00:00
"$_tests/sksl/workarounds/BlendModesAllZeroVec.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
"$_tests/sksl/workarounds/FractNegative.sksl",
Migrate remaining SkSL GLSL tests to golden outputs. Change-Id: I72fd3083f75ca5bf74fb2c3b032465864a13aed5 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317771 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-09-18 18:42:58 +00:00
"$_tests/sksl/workarounds/FragCoords.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
"$_tests/sksl/workarounds/LoopCondition.sksl",
"$_tests/sksl/workarounds/MinAndAbsTogether.sksl",
"$_tests/sksl/workarounds/NegatedAtan.sksl",
"$_tests/sksl/workarounds/PowWithConstantExponent.sksl",
Migrate remaining SkSL GLSL tests to golden outputs. Change-Id: I72fd3083f75ca5bf74fb2c3b032465864a13aed5 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317771 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-09-18 18:42:58 +00:00
"$_tests/sksl/workarounds/RewriteDoWhileLoops.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
"$_tests/sksl/workarounds/TernaryShortCircuit.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
# Tests in sksl_fp_tests_sources will be compiled with --settings on, and are expected to generate
# a .cpp and a .h output file.
sksl_fp_tests_sources = sksl_fp_error_tests + sksl_fp_tests
# 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 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_error_tests + sksl_glsl_tests + sksl_inliner_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
Reference in New Issue Copy Permalink