AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9c242fff99
skia2/tests/sksl/blend/BlendLighten.asm.frag

97 lines
3.4 KiB
GLSL
Raw Normal View History

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
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise
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
OpExecutionMode %main OriginUpperLeft
OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise"
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpName %_UniformBuffer "_UniformBuffer"
OpMemberName %_UniformBuffer 0 "src"
OpMemberName %_UniformBuffer 1 "dst"
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
OpName %main "main"
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
OpName %_0_result "_0_result"
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
OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0
OpDecorate %sk_FragColor Index 0
OpDecorate %sk_Clockwise BuiltIn FrontFacing
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpMemberDecorate %_UniformBuffer 0 Offset 0
OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 1 Offset 16
OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
OpDecorate %_UniformBuffer Block
OpDecorate %10 Binding 0
OpDecorate %10 DescriptorSet 0
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %_0_result RelaxedPrecision
Eliminate inliner temporary variables for top-level-exit functions. When we determine that a function only contains a single return statement and it is at the top level (i.e. not inside any scopes), there is no need to create a temporary variable and store the result expression into a variable. Instead, we can directly replace the function-call expression with the return-statement's expression. Unlike my previous solution, this does not require variable declarations to be rewritten. The no-scopes limitation makes it slightly less effective in theory, but in practice we still get almost all of the benefit. The no-scope limitation bites us on structures like @if (true) { return x; } else { return y; } Which will optimize away the if, but leave the scope: { return x; } However, this is not a big deal; the biggest wins are single-line helper functions like `guarded_divide` and `unpremul` which retain the full benefit. Change-Id: I7fbb725e65db021b9795c04c816819669815578f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345167 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-12-17 19:38:56 +00:00
OpDecorate %22 RelaxedPrecision
OpDecorate %25 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %26 RelaxedPrecision
Eliminate inliner temporary variables for top-level-exit functions. When we determine that a function only contains a single return statement and it is at the top level (i.e. not inside any scopes), there is no need to create a temporary variable and store the result expression into a variable. Instead, we can directly replace the function-call expression with the return-statement's expression. Unlike my previous solution, this does not require variable declarations to be rewritten. The no-scopes limitation makes it slightly less effective in theory, but in practice we still get almost all of the benefit. The no-scope limitation bites us on structures like @if (true) { return x; } else { return y; } Which will optimize away the if, but leave the scope: { return x; } However, this is not a big deal; the biggest wins are single-line helper functions like `guarded_divide` and `unpremul` which retain the full benefit. Change-Id: I7fbb725e65db021b9795c04c816819669815578f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345167 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-12-17 19:38:56 +00:00
OpDecorate %27 RelaxedPrecision
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
OpDecorate %30 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %31 RelaxedPrecision
Eliminate inliner temporary variables for top-level-exit functions. When we determine that a function only contains a single return statement and it is at the top level (i.e. not inside any scopes), there is no need to create a temporary variable and store the result expression into a variable. Instead, we can directly replace the function-call expression with the return-statement's expression. Unlike my previous solution, this does not require variable declarations to be rewritten. The no-scopes limitation makes it slightly less effective in theory, but in practice we still get almost all of the benefit. The no-scope limitation bites us on structures like @if (true) { return x; } else { return y; } Which will optimize away the if, but leave the scope: { return x; } However, this is not a big deal; the biggest wins are single-line helper functions like `guarded_divide` and `unpremul` which retain the full benefit. Change-Id: I7fbb725e65db021b9795c04c816819669815578f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345167 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-12-17 19:38:56 +00:00
OpDecorate %32 RelaxedPrecision
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpDecorate %34 RelaxedPrecision
Eliminate redundant loads following stores. We now have two functions `writeOpLoad` and `writeOpStore` which are in charge of writing SpvOpLoad and SpvOpStore instructions. `writeOpStore` also keeps track of pointer stores in a "store cache." Subsequent loads from that same pointer will be found in the cache and will return the value stored in that pointer instead. Such a cache definitely cannot work in the face of control flow, so we make the following concessions: - `pruneReachableOps` is now `pruneConditionalOps`. Any pointers that are altered inside a potentially-unreachable block are cleared from the cache entirely. - The entire store cache is cleared at all OpLabels within a loop. The cache also cannot work in the presence of swizzled stores, so we make another significant concession: - The entire store cache is cleared whenever we store into a non-memory pointer (e.g., assigning into a swizzled LValue, such as `foo.xz`). Despite these significant limitations, this manages to dramatically shrink many real-world examples. Change-Id: I0981a0cf7b45b064e153e9ada271494c8e00cad5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/530054 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-04-18 14:57:14 +00:00
OpDecorate %37 RelaxedPrecision
Eliminate inliner temporary variables for top-level-exit functions. When we determine that a function only contains a single return statement and it is at the top level (i.e. not inside any scopes), there is no need to create a temporary variable and store the result expression into a variable. Instead, we can directly replace the function-call expression with the return-statement's expression. Unlike my previous solution, this does not require variable declarations to be rewritten. The no-scopes limitation makes it slightly less effective in theory, but in practice we still get almost all of the benefit. The no-scope limitation bites us on structures like @if (true) { return x; } else { return y; } Which will optimize away the if, but leave the scope: { return x; } However, this is not a big deal; the biggest wins are single-line helper functions like `guarded_divide` and `unpremul` which retain the full benefit. Change-Id: I7fbb725e65db021b9795c04c816819669815578f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345167 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-12-17 19:38:56 +00:00
OpDecorate %38 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %39 RelaxedPrecision
Eliminate redundant loads following stores. We now have two functions `writeOpLoad` and `writeOpStore` which are in charge of writing SpvOpLoad and SpvOpStore instructions. `writeOpStore` also keeps track of pointer stores in a "store cache." Subsequent loads from that same pointer will be found in the cache and will return the value stored in that pointer instead. Such a cache definitely cannot work in the face of control flow, so we make the following concessions: - `pruneReachableOps` is now `pruneConditionalOps`. Any pointers that are altered inside a potentially-unreachable block are cleared from the cache entirely. - The entire store cache is cleared at all OpLabels within a loop. The cache also cannot work in the presence of swizzled stores, so we make another significant concession: - The entire store cache is cleared whenever we store into a non-memory pointer (e.g., assigning into a swizzled LValue, such as `foo.xz`). Despite these significant limitations, this manages to dramatically shrink many real-world examples. Change-Id: I0981a0cf7b45b064e153e9ada271494c8e00cad5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/530054 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-04-18 14:57:14 +00:00
OpDecorate %41 RelaxedPrecision
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpDecorate %42 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %43 RelaxedPrecision
Eliminate redundant loads following stores. We now have two functions `writeOpLoad` and `writeOpStore` which are in charge of writing SpvOpLoad and SpvOpStore instructions. `writeOpStore` also keeps track of pointer stores in a "store cache." Subsequent loads from that same pointer will be found in the cache and will return the value stored in that pointer instead. Such a cache definitely cannot work in the face of control flow, so we make the following concessions: - `pruneReachableOps` is now `pruneConditionalOps`. Any pointers that are altered inside a potentially-unreachable block are cleared from the cache entirely. - The entire store cache is cleared at all OpLabels within a loop. The cache also cannot work in the presence of swizzled stores, so we make another significant concession: - The entire store cache is cleared whenever we store into a non-memory pointer (e.g., assigning into a swizzled LValue, such as `foo.xz`). Despite these significant limitations, this manages to dramatically shrink many real-world examples. Change-Id: I0981a0cf7b45b064e153e9ada271494c8e00cad5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/530054 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-04-18 14:57:14 +00:00
OpDecorate %45 RelaxedPrecision
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpDecorate %46 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %47 RelaxedPrecision
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
OpDecorate %48 RelaxedPrecision
Revert "Revert "Added more RelaxedPrecision decorations"" This reverts commit 7bba1f55e85c6ef909150cf91473f27d6ee2e9a3. Change-Id: I707a3c215f37376086e22eaa43916afeed6da4c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388456 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-03-23 18:16:52 +00:00
OpDecorate %49 RelaxedPrecision
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
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%sk_FragColor = OpVariable %_ptr_Output_v4float Output
%bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
%_UniformBuffer = OpTypeStruct %v4float %v4float
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
%10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
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
%void = OpTypeVoid
%14 = OpTypeFunction %void
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
%_ptr_Function_v4float = OpTypePointer Function %v4float
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
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
%float_1 = OpConstant %float 1
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
%int_1 = OpConstant %int 1
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
%v3float = OpTypeVector %float 3
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
%main = OpFunction %void None %14
%15 = OpLabel
%_0_result = OpVariable %_ptr_Function_v4float Function
Change sksl tests to avoid SPIR-V validation errors 'in' variables without locations aren't allowed. Use uniforms instead. Bug: skia:11738 Change-Id: Ic066106deb7409cff154b4be7cfb3e03a7025c7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385000 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-15 18:58:57 +00:00
%18 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%22 = OpLoad %v4float %18
%24 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%25 = OpLoad %v4float %24
%26 = OpCompositeExtract %float %25 3
%27 = OpFSub %float %float_1 %26
%28 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%30 = OpLoad %v4float %28
%31 = OpVectorTimesScalar %v4float %30 %27
%32 = OpFAdd %v4float %22 %31
OpStore %_0_result %32
Eliminate redundant loads following stores. We now have two functions `writeOpLoad` and `writeOpStore` which are in charge of writing SpvOpLoad and SpvOpStore instructions. `writeOpStore` also keeps track of pointer stores in a "store cache." Subsequent loads from that same pointer will be found in the cache and will return the value stored in that pointer instead. Such a cache definitely cannot work in the face of control flow, so we make the following concessions: - `pruneReachableOps` is now `pruneConditionalOps`. Any pointers that are altered inside a potentially-unreachable block are cleared from the cache entirely. - The entire store cache is cleared at all OpLabels within a loop. The cache also cannot work in the presence of swizzled stores, so we make another significant concession: - The entire store cache is cleared whenever we store into a non-memory pointer (e.g., assigning into a swizzled LValue, such as `foo.xz`). Despite these significant limitations, this manages to dramatically shrink many real-world examples. Change-Id: I0981a0cf7b45b064e153e9ada271494c8e00cad5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/530054 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-04-18 14:57:14 +00:00
%34 = OpVectorShuffle %v3float %32 %32 0 1 2
%36 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%37 = OpLoad %v4float %36
%38 = OpCompositeExtract %float %37 3
%39 = OpFSub %float %float_1 %38
%40 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%41 = OpLoad %v4float %40
%42 = OpVectorShuffle %v3float %41 %41 0 1 2
%43 = OpVectorTimesScalar %v3float %42 %39
%44 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%45 = OpLoad %v4float %44
%46 = OpVectorShuffle %v3float %45 %45 0 1 2
%47 = OpFAdd %v3float %43 %46
%33 = OpExtInst %v3float %1 FMax %34 %47
%48 = OpLoad %v4float %_0_result
%49 = OpVectorShuffle %v4float %48 %33 4 5 6 3
OpStore %_0_result %49
OpStore %sk_FragColor %49
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
OpReturn
OpFunctionEnd
Reference in New Issue Copy Permalink