From 0506208ca0e5cf36f0200b75087f62cc7e91c543 Mon Sep 17 00:00:00 2001 From: John Stiles Date: Wed, 12 Apr 2023 14:56:54 -0400 Subject: Enforce program stack limits on function parameters. Previously, a function's parameter list did not count against its stack size limit. Bug: chromium:1432603 Change-Id: If49dce98f3155f3144a766c26b5a3a39401ce1b2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/670236 Auto-Submit: John Stiles Commit-Queue: John Stiles Reviewed-by: Kevin Lubick Reviewed-by: Nicolette Prevost (cherry picked from commit 4dc748f14c6650cb45c7086a39af1760bfda41d2) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/670341 Reviewed-by: John Stiles Commit-Queue: Kevin Lubick --- gn/sksl_tests.gni | 1 + resources/sksl/BUILD.bazel | 1 + .../sksl/errors/ProgramTooLarge_Parameters.rts | 14 +++++++ src/sksl/ir/SkSLFunctionDefinition.cpp | 43 +++++++++++++--------- tests/sksl/errors/ProgramTooLarge_Parameters.glsl | 6 +++ 5 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 resources/sksl/errors/ProgramTooLarge_Parameters.rts create mode 100644 tests/sksl/errors/ProgramTooLarge_Parameters.glsl diff --git a/gn/sksl_tests.gni b/gn/sksl_tests.gni index 2ac52e543d..19ce61663b 100644 --- a/gn/sksl_tests.gni +++ b/gn/sksl_tests.gni @@ -199,6 +199,7 @@ sksl_error_tests = [ "errors/PrivateTypes.rts", "errors/PrivateVariables.rts", "errors/ProgramTooLarge_Globals.rts", + "errors/ProgramTooLarge_Parameters.rts", "errors/ProgramTooLarge_Stack.rts", "errors/PrototypeInFuncBody.rts", "errors/RTAdjustType.sksl", diff --git a/resources/sksl/BUILD.bazel b/resources/sksl/BUILD.bazel index 2ed2f2b2be..6c21edc6d7 100644 --- a/resources/sksl/BUILD.bazel +++ b/resources/sksl/BUILD.bazel @@ -350,6 +350,7 @@ skia_filegroup( "errors/PrivateTypes.rts", "errors/PrivateVariables.rts", "errors/ProgramTooLarge_Globals.rts", + "errors/ProgramTooLarge_Parameters.rts", "errors/ProgramTooLarge_Stack.rts", "errors/PrototypeInFuncBody.rts", "errors/RTAdjustType.sksl", diff --git a/resources/sksl/errors/ProgramTooLarge_Parameters.rts b/resources/sksl/errors/ProgramTooLarge_Parameters.rts new file mode 100644 index 0000000000..cced977be4 --- /dev/null +++ b/resources/sksl/errors/ProgramTooLarge_Parameters.rts @@ -0,0 +1,14 @@ +struct S { + half4 ah4[1]; + half ah[99999]; + half4 h4; + half h; +}; + +void func(int small, + S big_chungus, + S no_report /*we don't need to report overflows past the first*/) {} + +/*%%* +variable 'big_chungus' exceeds the stack size limit +*%%*/ diff --git a/src/sksl/ir/SkSLFunctionDefinition.cpp b/src/sksl/ir/SkSLFunctionDefinition.cpp index f5ff4f9411..b33a4352a6 100644 --- a/src/sksl/ir/SkSLFunctionDefinition.cpp +++ b/src/sksl/ir/SkSLFunctionDefinition.cpp @@ -37,6 +37,7 @@ #include #include #include +#include namespace SkSL { @@ -88,9 +89,29 @@ std::unique_ptr FunctionDefinition::Convert(const Context& c bool builtin) { class Finalizer : public ProgramWriter { public: - Finalizer(const Context& context, const FunctionDeclaration& function) + Finalizer(const Context& context, const FunctionDeclaration& function, Position pos) : fContext(context) - , fFunction(function) {} + , fFunction(function) { + // Function parameters count as local variables. + for (const Variable* var : function.parameters()) { + this->addLocalVariable(var, pos); + } + } + + void addLocalVariable(const Variable* var, Position pos) { + // We count the number of slots used, but don't consider the precision of the base type. + // In practice, this reflects what GPUs actually do pretty well. (i.e., RelaxedPrecision + // math doesn't mean your variable takes less space.) We also don't attempt to reclaim + // slots at the end of a Block. + size_t prevSlotsUsed = fSlotsUsed; + fSlotsUsed = SkSafeMath::Add(fSlotsUsed, var->type().slotCount()); + // To avoid overzealous error reporting, only trigger the error at the first + // place where the stack limit is exceeded. + if (prevSlotsUsed < kVariableSlotLimit && fSlotsUsed >= kVariableSlotLimit) { + fContext.fErrors->error(pos, "variable '" + std::string(var->name()) + + "' exceeds the stack size limit"); + } + } ~Finalizer() override { SkASSERT(fBreakableLevel == 0); @@ -109,24 +130,12 @@ std::unique_ptr FunctionDefinition::Convert(const Context& c bool visitStatement(Statement& stmt) override { switch (stmt.kind()) { case Statement::Kind::kVarDeclaration: { - // We count the number of slots used, but don't consider the precision of the - // base type. In practice, this reflects what GPUs really do pretty well. - // (i.e., RelaxedPrecision math doesn't mean your variable takes less space.) - // We also don't attempt to reclaim slots at the end of a Block. - size_t prevSlotsUsed = fSlotsUsed; const Variable* var = stmt.as().var(); if (var->type().isOrContainsUnsizedArray()) { fContext.fErrors->error(stmt.fPosition, "unsized arrays are not permitted here"); - break; - } - fSlotsUsed = SkSafeMath::Add(fSlotsUsed, var->type().slotCount()); - // To avoid overzealous error reporting, only trigger the error at the first - // place where the stack limit is exceeded. - if (prevSlotsUsed < kVariableSlotLimit && fSlotsUsed >= kVariableSlotLimit) { - fContext.fErrors->error(stmt.fPosition, - "variable '" + std::string(var->name()) + - "' exceeds the stack size limit"); + } else { + this->addLocalVariable(var, stmt.fPosition); } break; } @@ -219,7 +228,7 @@ std::unique_ptr FunctionDefinition::Convert(const Context& c using INHERITED = ProgramWriter; }; - Finalizer(context, function).visitStatement(*body); + Finalizer(context, function, pos).visitStatement(*body); if (function.isMain() && ProgramConfig::IsVertex(context.fConfig->fKind)) { append_rtadjust_fixup_to_vertex_main(context, function, body->as()); } diff --git a/tests/sksl/errors/ProgramTooLarge_Parameters.glsl b/tests/sksl/errors/ProgramTooLarge_Parameters.glsl new file mode 100644 index 0000000000..d92c3256e8 --- /dev/null +++ b/tests/sksl/errors/ProgramTooLarge_Parameters.glsl @@ -0,0 +1,6 @@ +### Compilation failed: + +error: 10: variable 'big_chungus' exceeds the stack size limit + S no_report /*we don't need to report overflows past the first*/) {} + ^^ +1 error -- cgit v1.2.3