commit dd2fdea9c21f4cfb3790e990cdb2c3046876a445
author Ethan Nicholas <ethannicholas@google.com> Tue Jul 20 15:23:04 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 20 20:28:54 2021 +0000
tree 4fce81475f599d4cc50d1b21c9c5bb4d0220f7fd
parent f953071c11e092e1fc3ce09832d3d3e33b2f6f5e

Initial land of DSLParser

The DSLParser is an alternative to the existing SkSLParser which goes
directly to IR code using the SkSL DSL. It is substantially faster and
simpler than the existing parser->IRGenerator pipeline, but not yet
feature complete nor fully tested.

Change-Id: Iee45e9b527a3b88faa2ea74fc512051c8a38c5d4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400622
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 7d16698..f139300 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -15,6 +15,7 @@
 #include "src/core/SkTraceEvent.h"
 #include "src/sksl/SkSLAnalysis.h"
 #include "src/sksl/SkSLConstantFolder.h"
+#include "src/sksl/SkSLDSLParser.h"
 #include "src/sksl/SkSLIRGenerator.h"
 #include "src/sksl/SkSLOperators.h"
 #include "src/sksl/SkSLProgramSettings.h"
@@ -421,9 +422,11 @@
 
     SkASSERT(!settings.fExternalFunctions || (kind == ProgramKind::kGeneric));
 
+#if !SKSL_DSL_PARSER
     // Loading and optimizing our base module might reset the inliner, so do that first,
     // *then* configure the inliner with the settings for this program.
     const ParsedModule& baseModule = this->moduleForProgramKind(kind);
+#endif
 
     // Honor our optimization-override flags.
     switch (sOptimizer) {
@@ -459,6 +462,10 @@
     fErrorCount = 0;
     fInliner.reset();
 
+#if SKSL_DSL_PARSER
+    settings.fDSLMangling = false;
+    return DSLParser(this, settings, kind, text).program();
+#else
     auto textPtr = std::make_unique<String>(std::move(text));
     AutoSource as(this, textPtr.get());
 
@@ -491,6 +498,7 @@
         memoryPool->detachFromThread();
     }
     return success ? std::move(program) : nullptr;
+#endif // SKSL_DSL_PARSER
 }
 
 void Compiler::verifyStaticTests(const Program& program) {
@@ -998,7 +1006,10 @@
     fErrorCount++;
     Position pos = this->position(offset);
     fErrorTextLength.push_back(fErrorText.length());
-    fErrorText += "error: " + (pos.fLine >= 1 ? to_string(pos.fLine) + ": " : "") + msg + "\n";
+    if (!msg.starts_with("error: ")) {
+        fErrorText += "error: ";
+    }
+    fErrorText += (pos.fLine >= 1 ? to_string(pos.fLine) + ": " : "") + msg + "\n";
 }
 
 void Compiler::setErrorCount(int c) {