From 02db03ca0584371504fd29ced77c00d601cb0971 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 3 Feb 2016 17:33:47 -0800 Subject: [PATCH] TaskManager bench bug:26964750 Change-Id: Ibda0cd2e5e64331a4367d4985d6acfd6f3baeda1 --- libs/hwui/Android.mk | 3 +- .../tests/microbench/TaskManagerBench.cpp | 93 +++++++++++++++++++ libs/hwui/thread/TaskManager.cpp | 2 +- libs/hwui/thread/TaskManager.h | 2 +- 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 libs/hwui/tests/microbench/TaskManagerBench.cpp diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index c232bd1101a35..3f0126fe5c325 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -316,7 +316,8 @@ LOCAL_SRC_FILES += \ tests/microbench/DisplayListCanvasBench.cpp \ tests/microbench/LinearAllocatorBench.cpp \ tests/microbench/PathParserBench.cpp \ - tests/microbench/ShadowBench.cpp + tests/microbench/ShadowBench.cpp \ + tests/microbench/TaskManagerBench.cpp ifeq (true, $(HWUI_NEW_OPS)) LOCAL_SRC_FILES += \ diff --git a/libs/hwui/tests/microbench/TaskManagerBench.cpp b/libs/hwui/tests/microbench/TaskManagerBench.cpp new file mode 100644 index 0000000000000..0ea30e4757fb8 --- /dev/null +++ b/libs/hwui/tests/microbench/TaskManagerBench.cpp @@ -0,0 +1,93 @@ +/* + * 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 + +#include "thread/Task.h" +#include "thread/TaskManager.h" +#include "thread/TaskProcessor.h" +#include "tests/microbench/MicroBench.h" + +#include + +using namespace android; +using namespace android::uirenderer; + +class TrivialTask : public Task {}; + +class TrivialProcessor : public TaskProcessor { +public: + TrivialProcessor(TaskManager* manager) + : TaskProcessor(manager) {} + virtual ~TrivialProcessor() {} + virtual void onProcess(const sp >& task) override { + TrivialTask* t = static_cast(task.get()); + t->setResult(reinterpret_cast(t) % 16 == 0 ? 'a' : 'b'); + } +}; + +BENCHMARK_NO_ARG(BM_TaskManager_allocateTask); +void BM_TaskManager_allocateTask::Run(int iters) { + std::vector > tasks; + tasks.reserve(iters); + + StartBenchmarkTiming(); + for (int i = 0; i < iters; i++) { + tasks.emplace_back(new TrivialTask); + MicroBench::DoNotOptimize(tasks.back()); + } + StopBenchmarkTiming(); +} + +BENCHMARK_NO_ARG(BM_TaskManager_enqueueTask); +void BM_TaskManager_enqueueTask::Run(int iters) { + TaskManager taskManager; + sp processor(new TrivialProcessor(&taskManager)); + std::vector > tasks; + tasks.reserve(iters); + + StartBenchmarkTiming(); + for (int i = 0; i < iters; i++) { + tasks.emplace_back(new TrivialTask); + MicroBench::DoNotOptimize(tasks.back()); + processor->add(tasks.back()); + } + StopBenchmarkTiming(); + + for (sp& task : tasks) { + task->getResult(); + } +} + +BENCHMARK_NO_ARG(BM_TaskManager_enqueueRunDeleteTask); +void BM_TaskManager_enqueueRunDeleteTask::Run(int iters) { + TaskManager taskManager; + sp processor(new TrivialProcessor(&taskManager)); + std::vector > tasks; + tasks.reserve(iters); + + StartBenchmarkTiming(); + for (int i = 0; i < iters; i++) { + tasks.emplace_back(new TrivialTask); + MicroBench::DoNotOptimize(tasks.back()); + processor->add(tasks.back()); + } + for (sp& task : tasks) { + MicroBench::DoNotOptimize(task->getResult()); + } + tasks.clear(); + StopBenchmarkTiming(); +} diff --git a/libs/hwui/thread/TaskManager.cpp b/libs/hwui/thread/TaskManager.cpp index a07845ecf659d..d346b859526e1 100644 --- a/libs/hwui/thread/TaskManager.cpp +++ b/libs/hwui/thread/TaskManager.cpp @@ -103,7 +103,7 @@ bool TaskManager::WorkerThread::threadLoop() { return true; } -bool TaskManager::WorkerThread::addTask(TaskWrapper task) { +bool TaskManager::WorkerThread::addTask(const TaskWrapper& task) { if (!isRunning()) { run(mName.string(), PRIORITY_DEFAULT); } else if (exitPending()) { diff --git a/libs/hwui/thread/TaskManager.h b/libs/hwui/thread/TaskManager.h index d0eb3049ae375..e4808f7b71819 100644 --- a/libs/hwui/thread/TaskManager.h +++ b/libs/hwui/thread/TaskManager.h @@ -80,7 +80,7 @@ private: public: WorkerThread(const String8 name): mSignal(Condition::WAKE_UP_ONE), mName(name) { } - bool addTask(TaskWrapper task); + bool addTask(const TaskWrapper& task); size_t getTaskCount() const; void exit();