libandroidfw: Add ApplyStyle and SetConfiguration benchmark
Test: mma frameworks/base/libs/androidfw Test: adb sync system data Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks Change-Id: Ia6b441f186ccb455acbee15723f0d2d5657b09b5
This commit is contained in:
@@ -171,6 +171,7 @@ cc_benchmark {
|
||||
|
||||
// Actual benchmarks.
|
||||
"tests/AssetManager2_bench.cpp",
|
||||
"tests/AttributeResolution_bench.cpp",
|
||||
"tests/SparseEntry_bench.cpp",
|
||||
"tests/Theme_bench.cpp",
|
||||
],
|
||||
|
||||
@@ -81,17 +81,18 @@ static void BM_AssetManagerLoadFrameworkAssetsOld(benchmark::State& state) {
|
||||
}
|
||||
BENCHMARK(BM_AssetManagerLoadFrameworkAssetsOld);
|
||||
|
||||
static void BM_AssetManagerGetResource(benchmark::State& state) {
|
||||
GetResourceBenchmark({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/,
|
||||
basic::R::integer::number1, state);
|
||||
static void BM_AssetManagerGetResource(benchmark::State& state, uint32_t resid) {
|
||||
GetResourceBenchmark({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/, resid, state);
|
||||
}
|
||||
BENCHMARK(BM_AssetManagerGetResource);
|
||||
BENCHMARK_CAPTURE(BM_AssetManagerGetResource, number1, basic::R::integer::number1);
|
||||
BENCHMARK_CAPTURE(BM_AssetManagerGetResource, deep_ref, basic::R::integer::deep_ref);
|
||||
|
||||
static void BM_AssetManagerGetResourceOld(benchmark::State& state) {
|
||||
GetResourceBenchmarkOld({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/,
|
||||
basic::R::integer::number1, state);
|
||||
static void BM_AssetManagerGetResourceOld(benchmark::State& state, uint32_t resid) {
|
||||
GetResourceBenchmarkOld({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/, resid,
|
||||
state);
|
||||
}
|
||||
BENCHMARK(BM_AssetManagerGetResourceOld);
|
||||
BENCHMARK_CAPTURE(BM_AssetManagerGetResourceOld, number1, basic::R::integer::number1);
|
||||
BENCHMARK_CAPTURE(BM_AssetManagerGetResourceOld, deep_ref, basic::R::integer::deep_ref);
|
||||
|
||||
static void BM_AssetManagerGetLibraryResource(benchmark::State& state) {
|
||||
GetResourceBenchmark(
|
||||
@@ -196,7 +197,7 @@ BENCHMARK(BM_AssetManagerGetResourceLocales);
|
||||
static void BM_AssetManagerGetResourceLocalesOld(benchmark::State& state) {
|
||||
AssetManager assets;
|
||||
if (!assets.addAssetPath(String8(kFrameworkPath), nullptr /*cookie*/, false /*appAsLib*/,
|
||||
false /*isSystemAssets*/)) {
|
||||
true /*isSystemAssets*/)) {
|
||||
state.SkipWithError("Failed to load assets");
|
||||
return;
|
||||
}
|
||||
@@ -211,4 +212,44 @@ static void BM_AssetManagerGetResourceLocalesOld(benchmark::State& state) {
|
||||
}
|
||||
BENCHMARK(BM_AssetManagerGetResourceLocalesOld);
|
||||
|
||||
static void BM_AssetManagerSetConfigurationFramework(benchmark::State& state) {
|
||||
std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(kFrameworkPath);
|
||||
if (apk == nullptr) {
|
||||
state.SkipWithError("Failed to load assets");
|
||||
return;
|
||||
}
|
||||
|
||||
AssetManager2 assets;
|
||||
assets.SetApkAssets({apk.get()});
|
||||
|
||||
ResTable_config config;
|
||||
memset(&config, 0, sizeof(config));
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
config.sdkVersion = ~config.sdkVersion;
|
||||
assets.SetConfiguration(config);
|
||||
}
|
||||
}
|
||||
BENCHMARK(BM_AssetManagerSetConfigurationFramework);
|
||||
|
||||
static void BM_AssetManagerSetConfigurationFrameworkOld(benchmark::State& state) {
|
||||
AssetManager assets;
|
||||
if (!assets.addAssetPath(String8(kFrameworkPath), nullptr /*cookie*/, false /*appAsLib*/,
|
||||
true /*isSystemAssets*/)) {
|
||||
state.SkipWithError("Failed to load assets");
|
||||
return;
|
||||
}
|
||||
|
||||
const ResTable& table = assets.getResources(true);
|
||||
|
||||
ResTable_config config;
|
||||
memset(&config, 0, sizeof(config));
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
config.sdkVersion = ~config.sdkVersion;
|
||||
assets.setConfiguration(config);
|
||||
}
|
||||
}
|
||||
BENCHMARK(BM_AssetManagerSetConfigurationFrameworkOld);
|
||||
|
||||
} // namespace android
|
||||
|
||||
175
libs/androidfw/tests/AttributeResolution_bench.cpp
Normal file
175
libs/androidfw/tests/AttributeResolution_bench.cpp
Normal file
@@ -0,0 +1,175 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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 "android-base/stringprintf.h"
|
||||
#include "androidfw/ApkAssets.h"
|
||||
#include "androidfw/AssetManager.h"
|
||||
#include "androidfw/AssetManager2.h"
|
||||
#include "androidfw/AttributeResolution.h"
|
||||
#include "androidfw/ResourceTypes.h"
|
||||
|
||||
#include "BenchmarkHelpers.h"
|
||||
#include "data/basic/R.h"
|
||||
#include "data/styles/R.h"
|
||||
|
||||
namespace app = com::android::app;
|
||||
namespace basic = com::android::basic;
|
||||
|
||||
namespace android {
|
||||
|
||||
constexpr const static char* kFrameworkPath = "/system/framework/framework-res.apk";
|
||||
constexpr const static uint32_t Theme_Material_Light = 0x01030237u;
|
||||
|
||||
static void BM_ApplyStyle(benchmark::State& state) {
|
||||
std::unique_ptr<const ApkAssets> styles_apk =
|
||||
ApkAssets::Load(GetTestDataPath() + "/styles/styles.apk");
|
||||
if (styles_apk == nullptr) {
|
||||
state.SkipWithError("failed to load assets");
|
||||
return;
|
||||
}
|
||||
|
||||
AssetManager2 assetmanager;
|
||||
assetmanager.SetApkAssets({styles_apk.get()});
|
||||
|
||||
std::unique_ptr<Asset> asset =
|
||||
assetmanager.OpenNonAsset("res/layout/layout.xml", Asset::ACCESS_BUFFER);
|
||||
if (asset == nullptr) {
|
||||
state.SkipWithError("failed to load layout");
|
||||
return;
|
||||
}
|
||||
|
||||
ResXMLTree xml_tree;
|
||||
if (xml_tree.setTo(asset->getBuffer(true), asset->getLength(), false /*copyData*/) != NO_ERROR) {
|
||||
state.SkipWithError("corrupt xml layout");
|
||||
return;
|
||||
}
|
||||
|
||||
// Skip to the first tag.
|
||||
while (xml_tree.next() != ResXMLParser::START_TAG) {
|
||||
}
|
||||
|
||||
std::unique_ptr<Theme> theme = assetmanager.NewTheme();
|
||||
theme->ApplyStyle(app::R::style::StyleTwo);
|
||||
|
||||
std::array<uint32_t, 6> attrs{{app::R::attr::attr_one, app::R::attr::attr_two,
|
||||
app::R::attr::attr_three, app::R::attr::attr_four,
|
||||
app::R::attr::attr_five, app::R::attr::attr_empty}};
|
||||
std::array<uint32_t, attrs.size() * STYLE_NUM_ENTRIES> values;
|
||||
std::array<uint32_t, attrs.size() + 1> indices;
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
ApplyStyle(theme.get(), &xml_tree, 0u /*def_style_attr*/, 0u /*def_style_res*/, attrs.data(),
|
||||
attrs.size(), values.data(), indices.data());
|
||||
}
|
||||
}
|
||||
BENCHMARK(BM_ApplyStyle);
|
||||
|
||||
static void BM_ApplyStyleFramework(benchmark::State& state) {
|
||||
std::unique_ptr<const ApkAssets> framework_apk = ApkAssets::Load(kFrameworkPath);
|
||||
if (framework_apk == nullptr) {
|
||||
state.SkipWithError("failed to load framework assets");
|
||||
return;
|
||||
}
|
||||
|
||||
std::unique_ptr<const ApkAssets> basic_apk =
|
||||
ApkAssets::Load(GetTestDataPath() + "/basic/basic.apk");
|
||||
if (basic_apk == nullptr) {
|
||||
state.SkipWithError("failed to load assets");
|
||||
return;
|
||||
}
|
||||
|
||||
AssetManager2 assetmanager;
|
||||
assetmanager.SetApkAssets({framework_apk.get(), basic_apk.get()});
|
||||
|
||||
ResTable_config device_config;
|
||||
memset(&device_config, 0, sizeof(device_config));
|
||||
device_config.language[0] = 'e';
|
||||
device_config.language[1] = 'n';
|
||||
device_config.country[0] = 'U';
|
||||
device_config.country[1] = 'S';
|
||||
device_config.orientation = ResTable_config::ORIENTATION_PORT;
|
||||
device_config.smallestScreenWidthDp = 700;
|
||||
device_config.screenWidthDp = 700;
|
||||
device_config.screenHeightDp = 1024;
|
||||
device_config.sdkVersion = 27;
|
||||
|
||||
Res_value value;
|
||||
ResTable_config config;
|
||||
uint32_t flags = 0u;
|
||||
ApkAssetsCookie cookie =
|
||||
assetmanager.GetResource(basic::R::layout::layoutt, false /*may_be_bag*/,
|
||||
0u /*density_override*/, &value, &config, &flags);
|
||||
if (cookie == kInvalidCookie) {
|
||||
state.SkipWithError("failed to find R.layout.layout");
|
||||
return;
|
||||
}
|
||||
|
||||
size_t len = 0u;
|
||||
const char* layout_path =
|
||||
assetmanager.GetStringPoolForCookie(cookie)->string8At(value.data, &len);
|
||||
if (layout_path == nullptr || len == 0u) {
|
||||
state.SkipWithError("failed to lookup layout path");
|
||||
return;
|
||||
}
|
||||
|
||||
std::unique_ptr<Asset> asset = assetmanager.OpenNonAsset(
|
||||
StringPiece(layout_path, len).to_string(), cookie, Asset::ACCESS_BUFFER);
|
||||
if (asset == nullptr) {
|
||||
state.SkipWithError("failed to load layout");
|
||||
return;
|
||||
}
|
||||
|
||||
ResXMLTree xml_tree;
|
||||
if (xml_tree.setTo(asset->getBuffer(true), asset->getLength(), false /*copyData*/) != NO_ERROR) {
|
||||
state.SkipWithError("corrupt xml layout");
|
||||
return;
|
||||
}
|
||||
|
||||
// Skip to the first tag.
|
||||
while (xml_tree.next() != ResXMLParser::START_TAG) {
|
||||
}
|
||||
|
||||
std::unique_ptr<Theme> theme = assetmanager.NewTheme();
|
||||
theme->ApplyStyle(Theme_Material_Light);
|
||||
|
||||
std::array<uint32_t, 92> attrs{
|
||||
{0x0101000e, 0x01010034, 0x01010095, 0x01010096, 0x01010097, 0x01010098, 0x01010099,
|
||||
0x0101009a, 0x0101009b, 0x010100ab, 0x010100af, 0x010100b0, 0x010100b1, 0x0101011f,
|
||||
0x01010120, 0x0101013f, 0x01010140, 0x0101014e, 0x0101014f, 0x01010150, 0x01010151,
|
||||
0x01010152, 0x01010153, 0x01010154, 0x01010155, 0x01010156, 0x01010157, 0x01010158,
|
||||
0x01010159, 0x0101015a, 0x0101015b, 0x0101015c, 0x0101015d, 0x0101015e, 0x0101015f,
|
||||
0x01010160, 0x01010161, 0x01010162, 0x01010163, 0x01010164, 0x01010165, 0x01010166,
|
||||
0x01010167, 0x01010168, 0x01010169, 0x0101016a, 0x0101016b, 0x0101016c, 0x0101016d,
|
||||
0x0101016e, 0x0101016f, 0x01010170, 0x01010171, 0x01010217, 0x01010218, 0x0101021d,
|
||||
0x01010220, 0x01010223, 0x01010224, 0x01010264, 0x01010265, 0x01010266, 0x010102c5,
|
||||
0x010102c6, 0x010102c7, 0x01010314, 0x01010315, 0x01010316, 0x0101035e, 0x0101035f,
|
||||
0x01010362, 0x01010374, 0x0101038c, 0x01010392, 0x01010393, 0x010103ac, 0x0101045d,
|
||||
0x010104b6, 0x010104b7, 0x010104d6, 0x010104d7, 0x010104dd, 0x010104de, 0x010104df,
|
||||
0x01010535, 0x01010536, 0x01010537, 0x01010538, 0x01010546, 0x01010567, 0x011100c9,
|
||||
0x011100ca}};
|
||||
|
||||
std::array<uint32_t, attrs.size() * STYLE_NUM_ENTRIES> values;
|
||||
std::array<uint32_t, attrs.size() + 1> indices;
|
||||
while (state.KeepRunning()) {
|
||||
ApplyStyle(theme.get(), &xml_tree, 0x01010084u /*def_style_attr*/, 0u /*def_style_res*/,
|
||||
attrs.data(), attrs.size(), values.data(), indices.data());
|
||||
}
|
||||
}
|
||||
BENCHMARK(BM_ApplyStyleFramework);
|
||||
|
||||
} // namespace android
|
||||
@@ -42,10 +42,12 @@ void GetResourceBenchmarkOld(const std::vector<std::string>& paths, const ResTab
|
||||
Res_value value;
|
||||
ResTable_config selected_config;
|
||||
uint32_t flags;
|
||||
uint32_t last_ref = 0u;
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
table.getResource(resid, &value, false /*may_be_bag*/, 0u /*density*/, &flags,
|
||||
&selected_config);
|
||||
ssize_t block = table.getResource(resid, &value, false /*may_be_bag*/, 0u /*density*/, &flags,
|
||||
&selected_config);
|
||||
table.resolveReference(&value, block, &last_ref, &flags, &selected_config);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,10 +74,12 @@ void GetResourceBenchmark(const std::vector<std::string>& paths, const ResTable_
|
||||
Res_value value;
|
||||
ResTable_config selected_config;
|
||||
uint32_t flags;
|
||||
uint32_t last_id = 0u;
|
||||
|
||||
while (state.KeepRunning()) {
|
||||
assetmanager.GetResource(resid, false /* may_be_bag */, 0u /* density_override */, &value,
|
||||
&selected_config, &flags);
|
||||
ApkAssetsCookie cookie = assetmanager.GetResource(
|
||||
resid, false /* may_be_bag */, 0u /* density_override */, &value, &selected_config, &flags);
|
||||
assetmanager.ResolveReference(cookie, &value, &selected_config, &flags, &last_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ struct R {
|
||||
struct layout {
|
||||
enum : uint32_t {
|
||||
main = 0x7f020000,
|
||||
layoutt = 0x7f020001,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -55,6 +56,7 @@ struct R {
|
||||
number2 = 0x7f040001,
|
||||
ref1 = 0x7f040002,
|
||||
ref2 = 0x7f040003,
|
||||
deep_ref = 0x7f040004,
|
||||
|
||||
// From feature
|
||||
number3 = 0x80030000,
|
||||
|
||||
Binary file not shown.
25
libs/androidfw/tests/data/basic/res/layout/layout.xml
Normal file
25
libs/androidfw/tests/data/basic/res/layout/layout.xml
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2018 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.
|
||||
-->
|
||||
<Button xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/ok"
|
||||
android:layout_width="0sp"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="2dip"
|
||||
android:layout_marginEnd="2dip"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textStyle="bold"
|
||||
android:text="@android:string/ok" />
|
||||
@@ -22,6 +22,7 @@
|
||||
<attr name="attr2" format="reference|integer" />
|
||||
|
||||
<public type="layout" name="main" id="0x7f020000" />
|
||||
<public type="layout" name="layout" id="0x7f020001" />
|
||||
|
||||
<public type="string" name="test1" id="0x7f030000" />
|
||||
<string name="test1">test1</string>
|
||||
@@ -43,6 +44,18 @@
|
||||
<public type="integer" name="ref2" id="0x7f040003" />
|
||||
<integer name="ref2">12000</integer>
|
||||
|
||||
<public type="integer" name="deep_ref" id="0x7f040004" />
|
||||
<integer name="deep_ref">@integer/deep_ref_1</integer>
|
||||
<integer name="deep_ref_1">@integer/deep_ref_2</integer>
|
||||
<integer name="deep_ref_2">@integer/deep_ref_3</integer>
|
||||
<integer name="deep_ref_3">@integer/deep_ref_4</integer>
|
||||
<integer name="deep_ref_4">@integer/deep_ref_5</integer>
|
||||
<integer name="deep_ref_5">@integer/deep_ref_6</integer>
|
||||
<integer name="deep_ref_6">@integer/deep_ref_7</integer>
|
||||
<integer name="deep_ref_7">@integer/deep_ref_8</integer>
|
||||
<integer name="deep_ref_8">@integer/deep_ref_9</integer>
|
||||
<integer name="deep_ref_9">100</integer>
|
||||
|
||||
<public type="style" name="Theme1" id="0x7f050000" />
|
||||
<style name="Theme1">
|
||||
<item name="com.android.basic:attr1">100</item>
|
||||
|
||||
Reference in New Issue
Block a user