diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 7c9078b164a2f..251b2e773cfb3 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -171,7 +171,6 @@ cc_benchmark { // Actual benchmarks. "tests/AssetManager2_bench.cpp", - "tests/AttributeResolution_bench.cpp", "tests/SparseEntry_bench.cpp", "tests/Theme_bench.cpp", ], diff --git a/libs/androidfw/tests/AssetManager2_bench.cpp b/libs/androidfw/tests/AssetManager2_bench.cpp index 437e147729648..85e8f25394e9e 100644 --- a/libs/androidfw/tests/AssetManager2_bench.cpp +++ b/libs/androidfw/tests/AssetManager2_bench.cpp @@ -81,18 +81,17 @@ static void BM_AssetManagerLoadFrameworkAssetsOld(benchmark::State& state) { } BENCHMARK(BM_AssetManagerLoadFrameworkAssetsOld); -static void BM_AssetManagerGetResource(benchmark::State& state, uint32_t resid) { - GetResourceBenchmark({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/, resid, state); +static void BM_AssetManagerGetResource(benchmark::State& state) { + GetResourceBenchmark({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/, + basic::R::integer::number1, state); } -BENCHMARK_CAPTURE(BM_AssetManagerGetResource, number1, basic::R::integer::number1); -BENCHMARK_CAPTURE(BM_AssetManagerGetResource, deep_ref, basic::R::integer::deep_ref); +BENCHMARK(BM_AssetManagerGetResource); -static void BM_AssetManagerGetResourceOld(benchmark::State& state, uint32_t resid) { - GetResourceBenchmarkOld({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/, resid, - state); +static void BM_AssetManagerGetResourceOld(benchmark::State& state) { + GetResourceBenchmarkOld({GetTestDataPath() + "/basic/basic.apk"}, nullptr /*config*/, + basic::R::integer::number1, state); } -BENCHMARK_CAPTURE(BM_AssetManagerGetResourceOld, number1, basic::R::integer::number1); -BENCHMARK_CAPTURE(BM_AssetManagerGetResourceOld, deep_ref, basic::R::integer::deep_ref); +BENCHMARK(BM_AssetManagerGetResourceOld); static void BM_AssetManagerGetLibraryResource(benchmark::State& state) { GetResourceBenchmark( @@ -197,7 +196,7 @@ BENCHMARK(BM_AssetManagerGetResourceLocales); static void BM_AssetManagerGetResourceLocalesOld(benchmark::State& state) { AssetManager assets; if (!assets.addAssetPath(String8(kFrameworkPath), nullptr /*cookie*/, false /*appAsLib*/, - true /*isSystemAssets*/)) { + false /*isSystemAssets*/)) { state.SkipWithError("Failed to load assets"); return; } @@ -212,44 +211,4 @@ static void BM_AssetManagerGetResourceLocalesOld(benchmark::State& state) { } BENCHMARK(BM_AssetManagerGetResourceLocalesOld); -static void BM_AssetManagerSetConfigurationFramework(benchmark::State& state) { - std::unique_ptr 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 diff --git a/libs/androidfw/tests/AttributeResolution_bench.cpp b/libs/androidfw/tests/AttributeResolution_bench.cpp deleted file mode 100644 index fa300c50218aa..0000000000000 --- a/libs/androidfw/tests/AttributeResolution_bench.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/* - * 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 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 = - 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 = assetmanager.NewTheme(); - theme->ApplyStyle(app::R::style::StyleTwo); - - std::array 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 values; - std::array 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 framework_apk = ApkAssets::Load(kFrameworkPath); - if (framework_apk == nullptr) { - state.SkipWithError("failed to load framework assets"); - return; - } - - std::unique_ptr 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 = 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 = assetmanager.NewTheme(); - theme->ApplyStyle(Theme_Material_Light); - - std::array 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 values; - std::array 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 diff --git a/libs/androidfw/tests/BenchmarkHelpers.cpp b/libs/androidfw/tests/BenchmarkHelpers.cpp index faddfe599af48..a8abcb5df86c2 100644 --- a/libs/androidfw/tests/BenchmarkHelpers.cpp +++ b/libs/androidfw/tests/BenchmarkHelpers.cpp @@ -42,12 +42,10 @@ void GetResourceBenchmarkOld(const std::vector& paths, const ResTab Res_value value; ResTable_config selected_config; uint32_t flags; - uint32_t last_ref = 0u; while (state.KeepRunning()) { - 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); + table.getResource(resid, &value, false /*may_be_bag*/, 0u /*density*/, &flags, + &selected_config); } } @@ -74,12 +72,10 @@ void GetResourceBenchmark(const std::vector& paths, const ResTable_ Res_value value; ResTable_config selected_config; uint32_t flags; - uint32_t last_id = 0u; while (state.KeepRunning()) { - 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); + assetmanager.GetResource(resid, false /* may_be_bag */, 0u /* density_override */, &value, + &selected_config, &flags); } } diff --git a/libs/androidfw/tests/data/basic/R.h b/libs/androidfw/tests/data/basic/R.h index b7e814fea079b..94a2a14ced878 100644 --- a/libs/androidfw/tests/data/basic/R.h +++ b/libs/androidfw/tests/data/basic/R.h @@ -34,7 +34,6 @@ struct R { struct layout { enum : uint32_t { main = 0x7f020000, - layoutt = 0x7f020001, }; }; @@ -56,7 +55,6 @@ struct R { number2 = 0x7f040001, ref1 = 0x7f040002, ref2 = 0x7f040003, - deep_ref = 0x7f040004, // From feature number3 = 0x80030000, diff --git a/libs/androidfw/tests/data/basic/basic.apk b/libs/androidfw/tests/data/basic/basic.apk index 1733b6a165464..18ef75e91dedc 100644 Binary files a/libs/androidfw/tests/data/basic/basic.apk and b/libs/androidfw/tests/data/basic/basic.apk differ diff --git a/libs/androidfw/tests/data/basic/res/layout/layout.xml b/libs/androidfw/tests/data/basic/res/layout/layout.xml deleted file mode 100644 index 045ede454bca3..0000000000000 --- a/libs/androidfw/tests/data/basic/res/layout/layout.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -