Merge "Setup crystalball and add more perf tests" (5aaec978) · Commits · e / os / android_frameworks_base

apct-tests/perftests/textclassifier/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,9 @@ android_test {
	"androidx.test.rules",		"androidx.test.rules",
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"apct-perftests-utils",		"apct-perftests-utils",
			"collector-device-lib-platform",
	],		],
			data: [":perfetto_artifacts"],
	platform_apis: true,		platform_apis: true,
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	}		}

apct-tests/perftests/textclassifier/AndroidTest.xml

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,40 @@
	<option name="test-file-name" value="TextClassifierPerfTests.apk" />		<option name="test-file-name" value="TextClassifierPerfTests.apk" />
	</target_preparer>		</target_preparer>

			<!-- Needed for pushing the trace config file -->
			<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
			<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
			<option name="push-file" key="trace_config_detailed.textproto" value="/data/misc/perfetto-traces/trace_config.textproto" />
			</target_preparer>

			<!-- Needed for pulling the collected trace config on to the host -->
			<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
			<option name="pull-pattern-keys" value="perfetto_file_path" />
			</metrics_collector>

			<!-- Needed for storing the perfetto trace files in the sdcard/test_results-->
			<option name="isolated-storage" value="false" />

	<test class="com.android.tradefed.testtype.AndroidJUnitTest" >		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
	<option name="package" value="com.android.perftests.textclassifier" />		<option name="package" value="com.android.perftests.textclassifier" />
	<option name="hidden-api-checks" value="false"/>		<option name="hidden-api-checks" value="false"/>

			<!-- Listener related args for collecting the traces and waiting for the device to stabilize. -->
			<option name="device-listeners" value="android.device.collectors.ProcLoadListener,android.device.collectors.PerfettoListener" />
			<!-- Guarantee that user defined RunListeners will be running before any of the default listeners defined in this runner. -->
			<option name="instrumentation-arg" key="newRunListenerMode" value="true" />

			<!-- ProcLoadListener related arguments -->
			<!-- Wait for device last minute threshold to reach 3 with 2 minute timeout before starting the test run -->
			<option name="instrumentation-arg" key="procload-collector:per_run" value="true" />
			<option name="instrumentation-arg" key="proc-loadavg-threshold" value="3" />
			<option name="instrumentation-arg" key="proc-loadavg-timeout" value="120000" />
			<option name="instrumentation-arg" key="proc-loadavg-interval" value="10000" />

			<!-- PerfettoListener related arguments -->
			<option name="instrumentation-arg" key="perfetto_config_text_proto" value="true" />
			<option name="instrumentation-arg" key="perfetto_config_file" value="trace_config.textproto" />

			<option name="instrumentation-arg" key="newRunListenerMode" value="true" />
	</test>		</test>
	</configuration>		</configuration>

apct-tests/perftests/textclassifier/src/android/view/textclassifier/TextClassifierPerfTest.java

+44 −44

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package android.view.textclassifier;
	import android.content.Context;		import android.content.Context;
	import android.perftests.utils.BenchmarkState;		import android.perftests.utils.BenchmarkState;
	import android.perftests.utils.PerfStatusReporter;		import android.perftests.utils.PerfStatusReporter;
			import android.service.textclassifier.TextClassifierService;

	import androidx.test.InstrumentationRegistry;		import androidx.test.InstrumentationRegistry;
	import androidx.test.filters.LargeTest;		import androidx.test.filters.LargeTest;
	@@ -25,86 +26,85 @@ import androidx.test.filters.LargeTest;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Rule;		import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;
	import org.junit.runners.Parameterized;

	import java.util.Arrays;
	import java.util.Collection;
	import java.util.Collections;		import java.util.Collections;
	import java.util.Random;

	@RunWith(Parameterized.class)
	@LargeTest		@LargeTest
	public class TextClassifierPerfTest {		public class TextClassifierPerfTest {
	/** Request contains meaning text, rather than garbled text. */		private static final String TEXT = " Oh hi Mark, the number is (323) 654-6192.\n"
	private static final int ACTUAL_REQUEST = 0;		+ "Anyway, I'll meet you at 1600 Pennsylvania Avenue NW.\n"
	private static final String RANDOM_CHAR_SET = "abcdefghijklmnopqrstuvwxyz0123456789";		+ "My flight is LX 38 and I'll arrive at 8:00pm.\n"
			+ "Also, check out www.google.com.\n";

	@Rule		@Rule
	public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();		public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();

	@Parameterized.Parameters(name = "size{0}")
	public static Collection<Object[]> data() {
	return Arrays.asList(new Object[][]{{ACTUAL_REQUEST}, {10}, {100}, {1000}});
	}

	private TextClassifier mTextClassifier;		private TextClassifier mTextClassifier;
	private final int mSize;

	public TextClassifierPerfTest(int size) {
	mSize = size;
	}

	@Before		@Before
	public void setUp() {		public void setUp() {
	Context context = InstrumentationRegistry.getTargetContext();		Context context = InstrumentationRegistry.getTargetContext();
	TextClassificationManager textClassificationManager =		mTextClassifier = TextClassifierService.getDefaultTextClassifierImplementation(context);
	context.getSystemService(TextClassificationManager.class);
	mTextClassifier = textClassificationManager.getTextClassifier(TextClassifier.LOCAL);
	}		}

	@Test		@Test
	public void testSuggestConversationActions() {		public void testClassifyText() {
	String text = mSize == ACTUAL_REQUEST ? "Where are you?" : generateRandomString(mSize);		TextClassification.Request request =
	ConversationActions.Request request = createConversationActionsRequest(text);		new TextClassification.Request.Builder(TEXT, 0, TEXT.length()).build();
	BenchmarkState state = mPerfStatusReporter.getBenchmarkState();		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
	while (state.keepRunning()) {		while (state.keepRunning()) {
	mTextClassifier.suggestConversationActions(request);		mTextClassifier.classifyText(request);
	}		}
	}		}

	@Test		@Test
	public void testDetectLanguage() {		public void testSuggestSelection() {
	String text = mSize == ACTUAL_REQUEST		// Trying to select the phone number.
	? "これは日本語のテキストです" : generateRandomString(mSize);		TextSelection.Request request =
	TextLanguage.Request request = createTextLanguageRequest(text);		new TextSelection.Request.Builder(
			TEXT,
			/* startIndex= */ 28,
			/* endIndex= */29)
			.build();
	BenchmarkState state = mPerfStatusReporter.getBenchmarkState();		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
	while (state.keepRunning()) {		while (state.keepRunning()) {
	mTextClassifier.detectLanguage(request);		mTextClassifier.suggestSelection(request);
	}		}
	}		}

	private static ConversationActions.Request createConversationActionsRequest(CharSequence text) {		@Test
			public void testGenerateLinks() {
			TextLinks.Request request =
			new TextLinks.Request.Builder(TEXT).build();
			BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
			while (state.keepRunning()) {
			mTextClassifier.generateLinks(request);
			}
			}

			@Test
			public void testSuggestConversationActions() {
	ConversationActions.Message message =		ConversationActions.Message message =
	new ConversationActions.Message.Builder(		new ConversationActions.Message.Builder(
	ConversationActions.Message.PERSON_USER_OTHERS)		ConversationActions.Message.PERSON_USER_OTHERS)
	.setText(text)		.setText(TEXT)
	.build();		.build();
	return new ConversationActions.Request.Builder(Collections.singletonList(message))		ConversationActions.Request request = new ConversationActions.Request.Builder(
			Collections.singletonList(message))
	.build();		.build();
	}

	private static TextLanguage.Request createTextLanguageRequest(CharSequence text) {		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
	return new TextLanguage.Request.Builder(text).build();		while (state.keepRunning()) {
			mTextClassifier.suggestConversationActions(request);
			}
	}		}

	private static String generateRandomString(int length) {		@Test
	Random random = new Random();		public void testDetectLanguage() {
	StringBuilder stringBuilder = new StringBuilder(length);		TextLanguage.Request request = new TextLanguage.Request.Builder(TEXT).build();
	for (int i = 0; i < length; i++) {		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
	int index = random.nextInt(RANDOM_CHAR_SET.length());		while (state.keepRunning()) {
	stringBuilder.append(RANDOM_CHAR_SET.charAt(index));		mTextClassifier.detectLanguage(request);
	}		}
	return stringBuilder.toString();
	}		}
	}		}