summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdesprez <jdesprez@google.com>2018-03-29 14:23:34 -0700
committerjdesprez <jdesprez@google.com>2018-03-29 14:23:34 -0700
commit8cc3d6a51a4729ef63076e7230518f6c01bf824b (patch)
treed3e6a6a68de57d31316f5b76932b72fa170104b9
parent00db912043e6e6a02154eef5124282a02c7b88f7 (diff)
downloadml-8cc3d6a51a4729ef63076e7230518f6c01bf824b.tar.gz
Add NeuralNetworksApiBenchmark to apct suite metric
Add that module to the suite version APCT that will eventually replace the current execution model. Test: build device-tests.zip Bug: 77280599 Change-Id: I4195ed94c1d78c101c870ae25d0ec84381c44325
-rw-r--r--nn/runtime/test/benchmark/Android.mk1
-rw-r--r--nn/runtime/test/benchmark/AndroidTest.xml27
2 files changed, 28 insertions, 0 deletions
diff --git a/nn/runtime/test/benchmark/Android.mk b/nn/runtime/test/benchmark/Android.mk
index 5bfafb528..685d9b5b7 100644
--- a/nn/runtime/test/benchmark/Android.mk
+++ b/nn/runtime/test/benchmark/Android.mk
@@ -22,6 +22,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE += device-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := NeuralNetworksApiBenchmark
diff --git a/nn/runtime/test/benchmark/AndroidTest.xml b/nn/runtime/test/benchmark/AndroidTest.xml
new file mode 100644
index 000000000..a19225d84
--- /dev/null
+++ b/nn/runtime/test/benchmark/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<configuration description="Runs NeuralNetworksApiBenchmark metric instrumentation.">
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-suite-tag" value="apct-metric-instrumentation" />
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="NeuralNetworksApiBenchmark.apk" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.example.android.nn.benchmark" />
+ </test>
+</configuration>