Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a font microbench" into nyc-dev

Browse Source
This commit is contained in:
John Reck
2016-03-29 20:07:55 +00:00
committed by Android (Google) Code Review
parent e6ef0f9d77 2c0f93798b
commit a5c45459d3
4 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/Android.mk
View File

@@ -322,6 +322,7 @@ LOCAL_SRC_FILES += \
$(hwui_test_common_src_files) \
tests/microbench/main.cpp \
tests/microbench/DisplayListCanvasBench.cpp \
tests/microbench/FontBench.cpp \
tests/microbench/LinearAllocatorBench.cpp \
tests/microbench/PathParserBench.cpp \
tests/microbench/ShadowBench.cpp \

2
libs/hwui/font/Font.cpp
View File

@@ -356,8 +356,6 @@ void Font::measure(const SkPaint* paint, const glyph_t* glyphs,
}
void Font::precache(const SkPaint* paint, const glyph_t* glyphs, int numGlyphs) {
ATRACE_NAME("Precache Glyphs");
if (numGlyphs == 0 || glyphs == nullptr) {
return;
}

50
libs/hwui/tests/microbench/FontBench.cpp Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright (C) 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <benchmark/benchmark.h>
#include "GammaFontRenderer.h"
#include "tests/common/TestUtils.h"
#include <SkPaint.h>
using namespace android;
using namespace android::uirenderer;
void BM_FontRenderer_precache_cachehits(benchmark::State& state) {
TestUtils::runOnRenderThread([&state](renderthread::RenderThread& thread) {
SkPaint paint;
paint.setTextSize(20);
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
GammaFontRenderer gammaFontRenderer;
FontRenderer& fontRenderer = gammaFontRenderer.getFontRenderer();
fontRenderer.setFont(&paint, SkMatrix::I());
std::vector<glyph_t> glyphs;
std::vector<float> positions;
float totalAdvance;
uirenderer::Rect bounds;
TestUtils::layoutTextUnscaled(paint, "This is a test",
&glyphs, &positions, &totalAdvance, &bounds);
fontRenderer.precache(&paint, glyphs.data(), glyphs.size(), SkMatrix::I());
while (state.KeepRunning()) {
fontRenderer.precache(&paint, glyphs.data(), glyphs.size(), SkMatrix::I());
}
});
}
BENCHMARK(BM_FontRenderer_precache_cachehits);

20
libs/hwui/tests/microbench/FrameBuilderBench.cpp
View File

@@ -113,15 +113,17 @@ static auto SCENES = {
};
void BM_FrameBuilder_defer_scene(benchmark::State& state) {
const char* sceneName = *(SCENES.begin() + state.range_x());
state.SetLabel(sceneName);
auto nodes = getSyncedSceneNodes(sceneName);
while (state.KeepRunning()) {
FrameBuilder frameBuilder(sEmptyLayerUpdateQueue,
SkRect::MakeWH(gDisplay.w, gDisplay.h), gDisplay.w, gDisplay.h,
nodes, sLightGeometry, Caches::getInstance());
benchmark::DoNotOptimize(&frameBuilder);
}
TestUtils::runOnRenderThread([&state](RenderThread& thread) {
const char* sceneName = *(SCENES.begin() + state.range_x());
state.SetLabel(sceneName);
auto nodes = getSyncedSceneNodes(sceneName);
while (state.KeepRunning()) {
FrameBuilder frameBuilder(sEmptyLayerUpdateQueue,
SkRect::MakeWH(gDisplay.w, gDisplay.h), gDisplay.w, gDisplay.h,
nodes, sLightGeometry, Caches::getInstance());
benchmark::DoNotOptimize(&frameBuilder);
}
});
}
BENCHMARK(BM_FrameBuilder_defer_scene)->DenseRange(0, SCENES.size() - 1);