From b242fb8ecc2f2ec7d12ef30ec7cc9d821e4d981a Mon Sep 17 00:00:00 2001 From: xfy Date: Tue, 16 Jun 2026 10:37:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(benchmark):=20=E6=8B=86=E5=88=86=20Baselin?= =?UTF-8?q?e=20Profile=20=E4=B8=8E=20Startup=20Profile=20=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseline/BaselineProfileGenerator.kt | 240 ++++++++++-------- 1 file changed, 128 insertions(+), 112 deletions(-) diff --git a/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt b/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt index bdc15a5..11440a2 100644 --- a/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt +++ b/macrobenchmark/src/main/java/plus/rua/project/baseline/BaselineProfileGenerator.kt @@ -30,9 +30,10 @@ import org.junit.runner.RunWith * `macrobenchmark/build/outputs/connected_android_test_additional_output/` * * 说明： - * - `includeInStartupProfile = true` 会同时生成两份产物： - * - `*-baseline-prof.txt`：用于 ART 的 AOT 编译优化 - * - `*-startup-prof.txt`：用于 AGP 的 DEX layout 优化 + * - 本文件包含两个生成测试： + * - `generateBaselineProfile()`：`includeInStartupProfile = false`，生成 `*-baseline-prof.txt`，用于 ART 的 AOT 编译优化 + * - `generateAppStartupProfile()`：`includeInStartupProfile = true`，生成 `*-startup-prof.txt`，用于 AGP 的 DEX layout 优化 + * - 两个测试执行相同的 `runCoreUserJourney()` 交互路径，因此两份 profile 覆盖范围一致 * - `updateBaselineProfile` Task 会分别将它们复制到： * - `core/src/main/baseline-prof.txt` * - `core/src/main/baselineProfiles/startup-prof.txt` @@ -66,122 +67,137 @@ class BaselineProfileGenerator { private fun MacrobenchmarkScope.safeWaitCalendarPager(timeout: Long = 5000): UiObject2? = device.wait(Until.findObject(By.res("calendar_pager")), timeout) + @Test + fun generateBaselineProfile() { + baselineProfileRule.collect( + packageName = "plus.rua.project", + includeInStartupProfile = false, + profileBlock = { + runCoreUserJourney() + } + ) + } + @Test fun generateAppStartupProfile() { baselineProfileRule.collect( packageName = "plus.rua.project", includeInStartupProfile = true, profileBlock = { - val TAG = "BaselineProfile" - - // ── 1. 冷启动 ────────────────────────────────────────── - pressHome() - device.executeShellCommand( - "am start -W -n plus.rua.project/.MainActivity" - ) - device.waitForIdle() - - // ── 2. 切换"显示调休"ON（覆盖 DayCell 大规模重组 + staggered 动画） ── - val fab1 = safeFindFab() - assertNotNull("FAB 必须存在", fab1) - fab1!!.click() - device.waitForIdle() - val legalHolidayOn = device.wait( - Until.findObject(By.text("显示调休")), 3000 - ) - assertNotNull("显示调休必须出现", legalHolidayOn) - legalHolidayOn!!.click() - device.waitForIdle() - - // ── 3. 右滑 CalendarPager → 上一个月 ────────────────────── - val calendarPager = safeWaitCalendarPager(3000) - assertNotNull("CalendarPager 必须存在", calendarPager) - calendarPager!!.swipe(Direction.RIGHT, 0.8f) - device.waitForIdle() - - // ── 4. 点击"今天"按钮跳回当月（覆盖 MonthHeader 今天按钮） ── - // 模拟器上 UI 渲染/动画较慢，使用较长超时等待按钮渲染 - val todayBtn = device.wait(Until.findObject(By.text("今天")), 10000) - assertNotNull("今天按钮必须出现", todayBtn) - todayBtn!!.click() - device.waitForIdle() - - // ── 5. 点击跨月日期（网格左上角 = 上月灰色日期） ────────── - val pagerRef = safeWaitCalendarPager(3000) - assertNotNull("CalendarPager 必须存在（跨月点击）", pagerRef) - val pagerBounds = pagerRef!!.visibleBounds - val colW = pagerBounds.width() / 7 - val rowH = pagerBounds.height() / 6 - device.click(pagerBounds.left + colW / 2, pagerBounds.top + rowH / 2) - device.waitForIdle() - - // ── 6. 再次点击"今天"跳回当月 ──────────────────────────── - val todayBtn2 = device.wait(Until.findObject(By.text("今天")), 3000) - if (todayBtn2 != null) { - todayBtn2.click() - device.waitForIdle() - } - - // ── 7. 点击 DayCell ──────────────────────────────────── - val todayCell = device.wait( - Until.findObject(By.descContains("今天")), 3000 - ) - if (todayCell != null) { - todayCell.click() - } else { - val calRef = safeWaitCalendarPager(3000) - if (calRef != null) { - val cb = calRef.visibleBounds - device.click(cb.centerX(), cb.centerY()) - } - } - device.waitForIdle() - - // ── 8. 拖拽 BottomCard 折叠到周视图 ───────────────────── - val bottomCard = device.wait(Until.findObject(By.res("bottom_card")), 5000) - assertNotNull("BottomCard 必须存在", bottomCard) - val bcBounds = bottomCard!!.visibleBounds - val cx = bcBounds.centerX() - val cy = bcBounds.centerY() - val dragDist = (bcBounds.height() * 0.4).toInt() - device.drag(cx, cy, cx, cy - dragDist, 20) - device.waitForIdle() - - // ── 9. 周视图左右翻页 ────────────────────────────────── - val weekPager = safeWaitCalendarPager(3000) - assertNotNull("周视图 CalendarPager 必须存在", weekPager) - weekPager!!.swipe(Direction.LEFT, 0.5f) - device.waitForIdle() - weekPager.swipe(Direction.RIGHT, 0.5f) - device.waitForIdle() - - // ── 10. 拖拽 BottomCard 展开回月视图 ───────────────────── - device.drag(cx, cy - dragDist, cx, cy, 20) - device.waitForIdle() - - // ── 11. 切换"显示调休"OFF ──────────────────────────────── - val fab3 = safeFindFab() - assertNotNull("FAB 必须存在（关闭调休）", fab3) - fab3!!.click() - device.waitForIdle() - val legalHolidayOff = device.wait( - Until.findObject(By.text("显示调休")), 3000 - ) - assertNotNull("显示调休必须出现", legalHolidayOff) - legalHolidayOff!!.click() - device.waitForIdle() - - // ── 12. CalendarPager 左右翻页 ────────────────────────── - val mainPager = safeWaitCalendarPager(5000) - if (mainPager != null) { - mainPager.swipe(Direction.LEFT, 0.5f) - device.waitForIdle() - safeWaitCalendarPager(3000)?.swipe(Direction.RIGHT, 0.5f) - device.waitForIdle() - } - - Log.d(TAG, "Baseline Profile / Startup Profile 生成完成，所有路径已覆盖") + runCoreUserJourney() } ) } + + private fun MacrobenchmarkScope.runCoreUserJourney() { + val TAG = "BaselineProfile" + + // ── 1. 冷启动 ────────────────────────────────────────── + pressHome() + device.executeShellCommand( + "am start -W -n plus.rua.project/.MainActivity" + ) + device.waitForIdle() + + // ── 2. 切换"显示调休"ON（覆盖 DayCell 大规模重组 + staggered 动画） ── + val fab1 = safeFindFab() + assertNotNull("FAB 必须存在", fab1) + fab1!!.click() + device.waitForIdle() + val legalHolidayOn = device.wait( + Until.findObject(By.text("显示调休")), 3000 + ) + assertNotNull("显示调休必须出现", legalHolidayOn) + legalHolidayOn!!.click() + device.waitForIdle() + + // ── 3. 右滑 CalendarPager → 上一个月 ────────────────────── + val calendarPager = safeWaitCalendarPager(3000) + assertNotNull("CalendarPager 必须存在", calendarPager) + calendarPager!!.swipe(Direction.RIGHT, 0.8f) + device.waitForIdle() + + // ── 4. 点击"今天"按钮跳回当月（覆盖 MonthHeader 今天按钮） ── + // 模拟器上 UI 渲染/动画较慢，使用较长超时等待按钮渲染 + val todayBtn = device.wait(Until.findObject(By.text("今天")), 10000) + assertNotNull("今天按钮必须出现", todayBtn) + todayBtn!!.click() + device.waitForIdle() + + // ── 5. 点击跨月日期（网格左上角 = 上月灰色日期） ────────── + val pagerRef = safeWaitCalendarPager(3000) + assertNotNull("CalendarPager 必须存在（跨月点击）", pagerRef) + val pagerBounds = pagerRef!!.visibleBounds + val colW = pagerBounds.width() / 7 + val rowH = pagerBounds.height() / 6 + device.click(pagerBounds.left + colW / 2, pagerBounds.top + rowH / 2) + device.waitForIdle() + + // ── 6. 再次点击"今天"跳回当月 ──────────────────────────── + val todayBtn2 = device.wait(Until.findObject(By.text("今天")), 3000) + if (todayBtn2 != null) { + todayBtn2.click() + device.waitForIdle() + } + + // ── 7. 点击 DayCell ──────────────────────────────────── + val todayCell = device.wait( + Until.findObject(By.descContains("今天")), 3000 + ) + if (todayCell != null) { + todayCell.click() + } else { + val calRef = safeWaitCalendarPager(3000) + if (calRef != null) { + val cb = calRef.visibleBounds + device.click(cb.centerX(), cb.centerY()) + } + } + device.waitForIdle() + + // ── 8. 拖拽 BottomCard 折叠到周视图 ───────────────────── + val bottomCard = device.wait(Until.findObject(By.res("bottom_card")), 5000) + assertNotNull("BottomCard 必须存在", bottomCard) + val bcBounds = bottomCard!!.visibleBounds + val cx = bcBounds.centerX() + val cy = bcBounds.centerY() + val dragDist = (bcBounds.height() * 0.4).toInt() + device.drag(cx, cy, cx, cy - dragDist, 20) + device.waitForIdle() + + // ── 9. 周视图左右翻页 ────────────────────────────────── + val weekPager = safeWaitCalendarPager(3000) + assertNotNull("周视图 CalendarPager 必须存在", weekPager) + weekPager!!.swipe(Direction.LEFT, 0.5f) + device.waitForIdle() + weekPager.swipe(Direction.RIGHT, 0.5f) + device.waitForIdle() + + // ── 10. 拖拽 BottomCard 展开回月视图 ───────────────────── + device.drag(cx, cy - dragDist, cx, cy, 20) + device.waitForIdle() + + // ── 11. 切换"显示调休"OFF ──────────────────────────────── + val fab3 = safeFindFab() + assertNotNull("FAB 必须存在（关闭调休）", fab3) + fab3!!.click() + device.waitForIdle() + val legalHolidayOff = device.wait( + Until.findObject(By.text("显示调休")), 3000 + ) + assertNotNull("显示调休必须出现", legalHolidayOff) + legalHolidayOff!!.click() + device.waitForIdle() + + // ── 12. CalendarPager 左右翻页 ────────────────────────── + val mainPager = safeWaitCalendarPager(5000) + if (mainPager != null) { + mainPager.swipe(Direction.LEFT, 0.5f) + device.waitForIdle() + safeWaitCalendarPager(3000)?.swipe(Direction.RIGHT, 0.5f) + device.waitForIdle() + } + + Log.d(TAG, "Baseline Profile / Startup Profile 生成完成，所有路径已覆盖") + } }