Revert "Performance experiment: Disable SkSL inliner in nanobench/skpbench."

This reverts commit 3f35ac10b4.

Reason for revert: concluding experiment

Original change's description:
> Performance experiment: Disable SkSL inliner in nanobench/skpbench.
>
> This will allow us to measure the impact (positive or negative) of
> inlining functions before submitting a shader to the driver.
>
> Change-Id: Icbd64096445a353187b30feea68573d89ca18664
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384317
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>

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

Change-Id: Ia7c34e3e2bb4f777a4bd18a5646e494eeb3c93ce
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384456
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2021-03-13 13:08:01 +00:00 committed by Skia Commit-Bot
parent ddcb4d94f9
commit 46e7507b0d
2 changed files with 0 additions and 11 deletions

View File

@ -80,10 +80,6 @@ extern bool gSkVMJITViaDylib;
#include "src/gpu/gl/GrGLUtil.h"
#include "tools/gpu/GrContextFactory.h"
namespace SkSL {
extern bool gSkSLInliner;
}
using sk_gpu_test::ContextInfo;
using sk_gpu_test::GrContextFactory;
using sk_gpu_test::TestContext;
@ -1244,7 +1240,6 @@ int main(int argc, char** argv) {
gSkForceRasterPipelineBlitter = FLAGS_forceRasterPipeline;
gUseSkVMBlitter = FLAGS_skvm;
gSkVMAllowJIT = gSkVMJITViaDylib = FLAGS_jit;
SkSL::gSkSLInliner = false; // Temporary experiment
int runs = 0;
BenchmarkStream benchStream;

View File

@ -88,10 +88,6 @@ static const char resultFormat[] =
static constexpr int kNumFlushesToPrimeCache = 3;
namespace SkSL {
extern bool gSkSLInliner;
}
struct Sample {
using duration = std::chrono::nanoseconds;
@ -501,8 +497,6 @@ int main(int argc, char** argv) {
exit(0); // This can be used to print the header and quit.
}
SkSL::gSkSLInliner = false; // Temporary experiment
// Parse the config.
const SkCommandLineConfigGpu* config = nullptr; // Initialize for spurious warning.
SkCommandLineConfigArray configs;