From 10f328c580fe1e897b51a7e4b38ee4c341d970f1 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 19 Jan 2021 00:08:02 +0100 Subject: Change hwui jank detection to use deadline & gpu completion (1/2) - Use GPU finish time as well as actual deadline to determine jank rate. - Use dynamic interval to adjust for 60/90hz switching - Move frame metrics reporting into JankTracker to adjust the deadline communicated to the app when in stuffing scenario. - Adjust double-stuffing detection to be a bit more readable. Test: GraphicsStatsValidationTest.java Test: adb shell dumpsys gfxinfo Test: FrameMetricsListenerTest Test: Log output of FrameMetricsObserver Bug: 169858044 Change-Id: I3a6b8ed163e2cf9cf2b67667110340ebe35f98a1 --- libs/hwui/tests/macrobench/TestSceneRunner.cpp | 8 +- libs/hwui/tests/unit/JankTrackerTests.cpp | 182 +++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 libs/hwui/tests/unit/JankTrackerTests.cpp (limited to 'libs/hwui/tests') diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp index 8c7d2612f39b..13ac3671c9c7 100644 --- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp +++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp @@ -146,7 +146,9 @@ void run(const TestScene::Info& info, const TestScene::Options& opts, testContext.waitForVsync(); nsecs_t vsync = systemTime(SYSTEM_TIME_MONOTONIC); UiFrameInfoBuilder(proxy->frameInfo()) - .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, std::numeric_limits::max()); + .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, + UiFrameInfoBuilder::UNKNOWN_DEADLINE, + UiFrameInfoBuilder::UNKNOWN_FRAME_INTERVAL); proxy->syncAndDrawFrame(); } @@ -162,7 +164,9 @@ void run(const TestScene::Info& info, const TestScene::Options& opts, { ATRACE_NAME("UI-Draw Frame"); UiFrameInfoBuilder(proxy->frameInfo()) - .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, std::numeric_limits::max()); + .setVsync(vsync, vsync, UiFrameInfoBuilder::INVALID_VSYNC_ID, + UiFrameInfoBuilder::UNKNOWN_DEADLINE, + UiFrameInfoBuilder::UNKNOWN_FRAME_INTERVAL); scene->doFrame(i); proxy->syncAndDrawFrame(); } diff --git a/libs/hwui/tests/unit/JankTrackerTests.cpp b/libs/hwui/tests/unit/JankTrackerTests.cpp new file mode 100644 index 000000000000..f467ebf5d888 --- /dev/null +++ b/libs/hwui/tests/unit/JankTrackerTests.cpp @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2021 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 + +#include +#include + +using namespace android; +using namespace android::uirenderer; + +class TestFrameMetricsObserver : public FrameMetricsObserver { +public: + void notify(const int64_t*) {} +}; + +TEST(JankTracker, noJank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr reporter = std::make_unique(); + + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 115_ms; + info->set(FrameInfoIndex::FrameCompleted) = 115_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 116_ms; + info->set(FrameInfoIndex::Vsync) = 117_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 129_ms; + info->set(FrameInfoIndex::GpuCompleted) = 131_ms; + info->set(FrameInfoIndex::FrameCompleted) = 131_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 136_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(2, container.get()->totalFrameCount()); + ASSERT_EQ(0, container.get()->jankFrameCount()); +} + + +TEST(JankTracker, jank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr reporter = std::make_unique(); + + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->totalFrameCount()); + ASSERT_EQ(1, container.get()->jankFrameCount()); +} + +TEST(JankTracker, legacyJankButNoRealJank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr reporter = std::make_unique(); + + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 117_ms; + info->set(FrameInfoIndex::GpuCompleted) = 118_ms; + info->set(FrameInfoIndex::FrameCompleted) = 118_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->totalFrameCount()); + ASSERT_EQ(0, container.get()->jankFrameCount()); + ASSERT_EQ(1, container.get()->jankLegacyFrameCount()); +} + +TEST(JankTracker, doubleStuffed) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr reporter = std::make_unique(); + + // First frame janks + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->jankFrameCount()); + + // Second frame is long, but doesn't jank because double-stuffed. + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 116_ms; + info->set(FrameInfoIndex::Vsync) = 122_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 129_ms; + info->set(FrameInfoIndex::GpuCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 136_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(2, container.get()->totalFrameCount()); + ASSERT_EQ(1, container.get()->jankFrameCount()); +} + +TEST(JankTracker, doubleStuffedThenPauseThenJank) { + std::mutex mutex; + ProfileDataContainer container(mutex); + JankTracker jankTracker(&container); + std::unique_ptr reporter = std::make_unique(); + + // First frame janks + FrameInfo* info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 100_ms; + info->set(FrameInfoIndex::Vsync) = 101_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 115_ms; + info->set(FrameInfoIndex::GpuCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameCompleted) = 121_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 120_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->jankFrameCount()); + + // Second frame is long, but doesn't jank because double-stuffed. + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 116_ms; + info->set(FrameInfoIndex::Vsync) = 122_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 129_ms; + info->set(FrameInfoIndex::GpuCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameCompleted) = 137_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 136_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(1, container.get()->jankFrameCount()); + + // Thirdframe is long and skips one frame some double stuffed logic gets reset + info = jankTracker.startFrame(); + info->set(FrameInfoIndex::IntendedVsync) = 148_ms; + info->set(FrameInfoIndex::Vsync) = 148_ms; + info->set(FrameInfoIndex::SwapBuffersCompleted) = 160_ms; + info->set(FrameInfoIndex::GpuCompleted) = 169_ms; + info->set(FrameInfoIndex::FrameCompleted) = 169_ms; + info->set(FrameInfoIndex::FrameInterval) = 16_ms; + info->set(FrameInfoIndex::FrameDeadline) = 168_ms; + jankTracker.finishFrame(*info, reporter); + + ASSERT_EQ(3, container.get()->totalFrameCount()); + ASSERT_EQ(2, container.get()->jankFrameCount()); +} \ No newline at end of file -- cgit v1.2.3-59-g8ed1b