AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
539db2ff3c
skia2/tests/sksl/shared/OutParams.metal

116 lines
2.9 KiB
Metal
Raw Normal View History

Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
struct Uniforms {
float4 colorGreen;
float4 colorRed;
float4 colorWhite;
};
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
struct Inputs {
};
struct Outputs {
float4 sk_FragColor [[color(0)]];
};
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Remove unnecessary _out pointer in Metal. Like _globals, it's not actually necessary to indirect through a separate pointer at all. The output struct is now passed by reference and the additional pointer variable is removed. (Additionally, renamed _skGlobals back to _globals.) Change-Id: Id089a20cb751cdaedc48462a52da78ee43783611 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355632 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-19 18:07:55 +00:00
Outputs _out;
Squelch Metal warnings about unused _globals/_out. Change-Id: I84e546184d1ce8261602346d2c91c580b30e9b6d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357001 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Adlai Holler <adlai@google.com> Reviewed-by: Adlai Holler <adlai@google.com>
2021-01-22 03:24:28 +00:00
(void)_out;
Performance experiment: disable control-flow analysis. This CL will be used to test for potential performance regressions (or improvements) that we might cause by disabling this optimization pass. It will be reverted in ~1 day. Change-Id: I26b7687c341eb6d81231406381c39869cfccf6d6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381259 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-08 18:29:15 +00:00
float4 result;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
float h;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h = _uniforms.colorWhite.x;
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
float2 h2;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h2 = float2(_uniforms.colorWhite.y);
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
float3 h3;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h3 = float3(_uniforms.colorWhite.z);
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
float4 h4;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h4 = float4(_uniforms.colorWhite.w);
false;
h3.y = _uniforms.colorWhite.x;
false;
h3.xz = float2(_uniforms.colorWhite.y);
false;
h4.zwxy = float4(_uniforms.colorWhite.w);
false;
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
float2x2 h2x2;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h2x2 = float2x2(_uniforms.colorWhite.x);
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
float3x3 h3x3;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h3x3 = float3x3(_uniforms.colorWhite.y);
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
float4x4 h4x4;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
h4x4 = float4x4(_uniforms.colorWhite.z);
false;
h3x3[1] = float3(_uniforms.colorWhite.z);
false;
h4x4[3].w = _uniforms.colorWhite.x;
false;
h2x2[0].x = _uniforms.colorWhite.x;
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
int i;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
i = int(_uniforms.colorWhite.x);
false;
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
int2 i2;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
i2 = int2(int(_uniforms.colorWhite.y));
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
int3 i3;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
i3 = int3(int(_uniforms.colorWhite.z));
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
int4 i4;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
i4 = int4(int(_uniforms.colorWhite.w));
false;
i4.xyz = int3(int(_uniforms.colorWhite.z));
false;
i2.y = int(_uniforms.colorWhite.x);
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
float f;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f = _uniforms.colorWhite.x;
false;
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
float2 f2;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f2 = float2(_uniforms.colorWhite.y);
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
float3 f3;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f3 = float3(_uniforms.colorWhite.z);
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
float4 f4;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f4 = float4(_uniforms.colorWhite.w);
false;
f3.xy = float2(_uniforms.colorWhite.y);
false;
f2.x = _uniforms.colorWhite.x;
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
float2x2 f2x2;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f2x2 = float2x2(_uniforms.colorWhite.x);
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
float3x3 f3x3;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f3x3 = float3x3(_uniforms.colorWhite.y);
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
float4x4 f4x4;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
f4x4 = float4x4(_uniforms.colorWhite.z);
false;
f2x2[0].x = _uniforms.colorWhite.x;
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
bool b;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
b = bool(_uniforms.colorWhite.x);
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
bool2 b2;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
b2 = bool2(bool(_uniforms.colorWhite.y));
false;
Detect cases in Metal where out params are swizzled. We will need to emit a helper function to work around this case, as GLSL supports swizzled out params, but Metal does not. In this CL, we do not yet synthesize the helper function, but we annotate the code with a comment indicating affected calls. (Of course, this will be replaced with a helper function in a followup CL) Even detecting a swizzle is actually an interesting problem, because index expressions are sometimes actually swizzles, depending on the type of the base expression. Also, the index or swizzle might be nested in several other valid assignable expressions. Change-Id: I8c74f9a7daec08eff1f32387f8b6b96851c1bd6e Bug: skia:10855 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341057 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-12-04 20:36:49 +00:00
bool3 b3;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
b3 = bool3(bool(_uniforms.colorWhite.z));
false;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
bool4 b4;
Revert "Inline functions of the form 'return (expr)' only." This reverts commit 92748af1a5051e9fe329c8200f0fa3b47aadbdd7. Reason for revert: SkSLCommaSideEffects_GPU crashing on Android Original change's description: > Inline functions of the form 'return (expr)' only. > > This drastically reduces the number of functions which we allow to be > inlined. If this change does not hurt our performance, it will allow us > to trivially remove hundreds of LOC. All current data leads us to > believe that it may affect the Mali 400 but is highly unlikely to change > results on any other device in the tree. > > More info: http://go/optimization-in-sksl-inliner > > Change-Id: Ia6b706742ce5407453e0e697b6c1f9201084c0e8 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384858 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I6a670dacaa58fe3386ff50375ac6d1cac4fd7f2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385161 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-15 22:08:38 +00:00
b4 = bool4(bool(_uniforms.colorWhite.w));
false;
b4.xw = bool2(bool(_uniforms.colorWhite.y));
false;
b3.z = bool(_uniforms.colorWhite.x);
false;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
bool ok = true;
Performance experiment: disable control-flow analysis. This CL will be used to test for potential performance regressions (or improvements) that we might cause by disabling this optimization pass. It will be reverted in ~1 day. Change-Id: I26b7687c341eb6d81231406381c39869cfccf6d6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381259 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-08 18:29:15 +00:00
ok = ok && 1.0 == (((((h * h2.x) * h3.x) * h4.x) * h2x2[0].x) * h3x3[0].x) * h4x4[0].x;
Migrate additional SkSL tests to run in dm. - MultipleAssignments - NegatedVectorLiteral - NumberCasts - OutParams - OutParamsTricky (disabled on GPU due to skia:11269) Change-Id: I87dc9c5019931f3d2dc3aafbe1e02d0eee2e1a05 Bug: skia:11009, skia:11269 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366400 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-04 19:50:03 +00:00
ok = ok && 1.0 == (((((f * f2.x) * f3.x) * f4.x) * f2x2[0].x) * f3x3[0].x) * f4x4[0].x;
ok = ok && 1 == ((i * i2.x) * i3.x) * i4.x;
ok = ok && (((b && b2.x) && b3.x) && b4.x);
_out.sk_FragColor = ok ? _uniforms.colorGreen : _uniforms.colorRed;
Remove unnecessary _out pointer in Metal. Like _globals, it's not actually necessary to indirect through a separate pointer at all. The output struct is now passed by reference and the additional pointer variable is removed. (Additionally, renamed _skGlobals back to _globals.) Change-Id: Id089a20cb751cdaedc48462a52da78ee43783611 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/355632 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-19 18:07:55 +00:00
return _out;
Reland "Support out parameters that use a swizzle." This is a reland of 435b4826388cfb05a42efce0c0daf7b10695ad06 inlineStatement now takes a `const Expression* resultExpr` instead of `const Expression& resultExpr` because resultExpr will be null for a void function. Original change's description: > Support out parameters that use a swizzle. > > This CL also removes the `VariableExpression` class that was briefly > added in a prior CL. This class was intended to support cloning an > expression while changing the refKind of a VariableReference inside of > the expression, but it added state and complexity. In this CL, rather > than track this via extra state, the inliner just recurses into the > expression as needed to find its VariableReference. Since most relevant > expressions are just a VariableReference anyway, this is inexpensive. > > Change-Id: Id4d926b7d7520b5e6ce455446c05a6d59ef62a84 > Bug: skia:10756 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319917 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Bug: skia:10756 Change-Id: I35f76c21eccf0ba2ab47e4313e131f7aa26980fa Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320223 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-28 16:28:16 +00:00
}
Reference in New Issue Copy Permalink