From f7721bcfda0f7049c7db97a1342c46017e3c86d9 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 23 May 2017 18:14:01 +0000 Subject: [PATCH] Revert "add knob to turn off fancy SkJumper features" This reverts commit 5373609d90d8f84b75718b15f3522f9d2f4226cb. Reason for revert: doesn't look like we'll need this. Original change's description: > add knob to turn off fancy SkJumper features > > This is a new public API for testing (layout tests). > > Change-Id: I10345231bad373c741b1e9656e546000538121b3 > Reviewed-on: https://skia-review.googlesource.com/17712 > Reviewed-by: Florin Malita > Commit-Queue: Mike Klein > Change-Id: Ieed2576d7fc06528384b7476508610e0e29b894f Reviewed-on: https://skia-review.googlesource.com/17719 Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- include/core/SkGraphics.h | 4 ---- src/core/SkGraphics.cpp | 5 ----- src/jumper/SkJumper.cpp | 8 +++----- src/jumper/SkJumper.h | 2 -- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/include/core/SkGraphics.h b/include/core/SkGraphics.h index 5900044..4b62e55 100644 --- a/include/core/SkGraphics.h +++ b/include/core/SkGraphics.h @@ -26,10 +26,6 @@ public: // We're in the middle of cleaning this up. static void Term() {} - // If called immediately after Init(), SkJumper will use only a per-CPU baseline - // feature set, ignoring any more advanced instructions that may be available. - static void DisableFancySkJumperFeatures(); - /** * Return the version numbers for the library. If the parameter is not * null, it is set to the version number. diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp index 015b820..803b743 100644 --- a/src/core/SkGraphics.cpp +++ b/src/core/SkGraphics.cpp @@ -28,7 +28,6 @@ #include "SkTSearch.h" #include "SkTime.h" #include "SkUtils.h" -#include "../jumper/SkJumper.h" #include @@ -110,7 +109,3 @@ void SkGraphics::SetFlags(const char* flags) { flags = nextSemi + 1; } while (nextSemi); } - -void SkGraphics::DisableFancySkJumperFeatures() { - gSkJumperEnableFancyFeatures = false; -} diff --git a/src/jumper/SkJumper.cpp b/src/jumper/SkJumper.cpp index f8354ce..8daf29e 100644 --- a/src/jumper/SkJumper.cpp +++ b/src/jumper/SkJumper.cpp @@ -114,8 +114,6 @@ static const SkJumper_Engine kPortable = { static SkJumper_Engine gPlatform = kPortable; static SkOnce gChooseEngineOnce; -bool gSkJumperEnableFancyFeatures = true; - static SkJumper_Engine choose_engine() { #if __has_feature(memory_sanitizer) // We'll just run portable code. @@ -139,7 +137,7 @@ static SkJumper_Engine choose_engine() { } #elif defined(__x86_64__) || defined(_M_X64) - if (gSkJumperEnableFancyFeatures && SkCpu::Supports(SkCpu::HSW)) { + if (1 && SkCpu::Supports(SkCpu::HSW)) { return { #define M(stage) ASM(stage, hsw), { SK_RASTER_PIPELINE_STAGES(M) }, @@ -147,7 +145,7 @@ static SkJumper_Engine choose_engine() { #undef M }; } - if (gSkJumperEnableFancyFeatures && SkCpu::Supports(SkCpu::AVX)) { + if (1 && SkCpu::Supports(SkCpu::AVX)) { return { #define M(stage) ASM(stage, avx), { SK_RASTER_PIPELINE_STAGES(M) }, @@ -155,7 +153,7 @@ static SkJumper_Engine choose_engine() { #undef M }; } - if (gSkJumperEnableFancyFeatures && SkCpu::Supports(SkCpu::SSE41)) { + if (1 && SkCpu::Supports(SkCpu::SSE41)) { return { #define M(stage) ASM(stage, sse41), { SK_RASTER_PIPELINE_STAGES(M) }, diff --git a/src/jumper/SkJumper.h b/src/jumper/SkJumper.h index b0a781c..7d6d0af 100644 --- a/src/jumper/SkJumper.h +++ b/src/jumper/SkJumper.h @@ -8,8 +8,6 @@ #ifndef SkJumper_DEFINED #define SkJumper_DEFINED -extern bool gSkJumperEnableFancyFeatures; - // This file contains definitions shared by SkJumper.cpp (compiled normally as part of Skia) // and SkJumper_stages.cpp (compiled into Skia _and_ offline into SkJumper_generated.h). // Keep it simple! -- 2.7.4