commit 4f065e286df6863b86dcf7382a4bb78e56b39626
author Brian Osman <brianosman@google.com> Sat Feb 13 01:06:03 2021 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Feb 13 01:06:13 2021 +0000
tree 56c41986325407919a91817e815939369e3d12b2
parent 80b02af6ba96cf3da555d2aa7ddc5f44e5e2f57d

Revert "Performance experiment: Disable SkSL optimization in nanobench/skpbench"

This reverts commit 5ad759065d6c674ab1921e5e3568baf9bebddbe7.

Reason for revert: Experiment concluded - got the data we need.

Original change's description:
> Performance experiment: Disable SkSL optimization in nanobench/skpbench
>
> Change-Id: I974571e7e0e9d0170f92b970d425d9ce530e312e
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369716
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

TBR=bsalomon@google.com,brianosman@google.com,johnstiles@google.com

Change-Id: I68bc07e8a604abb77fe9c1f1dac794ab7b90b9e9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370156
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index ed04c20..78b556d 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -65,7 +65,6 @@
 extern bool gUseSkVMBlitter;
 extern bool gSkVMAllowJIT;
 extern bool gSkVMJITViaDylib;
-extern bool gSkSLAllowOptimization;
 
 #ifndef SK_BUILD_FOR_WIN
     #include <unistd.h>
@@ -1241,7 +1240,6 @@
     gSkForceRasterPipelineBlitter = FLAGS_forceRasterPipeline;
     gUseSkVMBlitter = FLAGS_skvm;
     gSkVMAllowJIT = gSkVMJITViaDylib = FLAGS_jit;
-    gSkSLAllowOptimization = false;  // Temporary experiment
 
     int runs = 0;
     BenchmarkStream benchStream;

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index b0b6051..137084e 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -67,8 +67,6 @@
 
 #endif
 
-bool gSkSLAllowOptimization = true;
-
 namespace SkSL {
 
 using RefKind = VariableReference::RefKind;
@@ -1608,7 +1606,7 @@
     bool success = false;
     if (fErrorCount) {
         // Do not return programs that failed to compile.
-    } else if (settings.fOptimize && gSkSLAllowOptimization && !this->optimize(*program)) {
+    } else if (settings.fOptimize && !this->optimize(*program)) {
         // Do not return programs that failed to optimize.
     } else {
         // We have a successful program!

tools/skpbench/skpbench.cpp

diff --git a/tools/skpbench/skpbench.cpp b/tools/skpbench/skpbench.cpp
index 9388852..34ab43b 100644
--- a/tools/skpbench/skpbench.cpp
+++ b/tools/skpbench/skpbench.cpp
@@ -88,8 +88,6 @@
 
 static constexpr int kNumFlushesToPrimeCache = 3;
 
-extern bool gSkSLAllowOptimization;
-
 struct Sample {
     using duration = std::chrono::nanoseconds;
 
@@ -498,8 +496,6 @@
         exit(0); // This can be used to print the header and quit.
     }
 
-    gSkSLAllowOptimization = false;  // Temporary experiment
-
     // Parse the config.
     const SkCommandLineConfigGpu* config = nullptr; // Initialize for spurious warning.
     SkCommandLineConfigArray configs;