commit 47d147641b36886e41084cedf9a752e212a7e49e
author Michael Butler <butlermichael@google.com> Tue Jun 09 12:57:28 2020 -0700
committer Michael Butler <butlermichael@google.com> Mon Jun 15 16:21:07 2020 -0700
tree ceebe63734f75a506fa1e096cb4b68fe7a69aa3a
parent 10bf3a28fb8ea69ec614bdc41d0d81077f419dd3

Change TEST_MAPPING configuration of NeuralNetworksTest_static

This change restricts presubmit to only run a single pass of
NeuralNetworksTest_static ("pass 10"), corresponding to:
 * useCpuOnly = 0
 * computeMode = ComputeMode::ASYNC
 * allowSyncExecHal = 1

Bug: 131770421
Test: mma
Test: atest
Change-Id: Ifd316ea87151ae80001208a38cb7af321f7cf9ec
Merged-In: Ifd316ea87151ae80001208a38cb7af321f7cf9ec
(cherry picked from commit 4762e99607eeb533117d1284d0a8dc3158fde48f)

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index f3eaa99..74ff411 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -15,6 +15,18 @@
         {
           // b/153876253, temporarily filter out failing l2_norm tests
           "include-filter": "-*l2_normalization_axis_corner_case*"
+        },
+        {
+          // Restrict NeuralNetworksTest_static to run only a single
+          // pass consisting of:
+          // * useCpuOnly = 0
+          // * computeMode = ComputeMode::ASYNC
+          // * allowSyncExecHal = 1
+          //
+          // The value here is a bitmask indicating only "pass 10"
+          // should be run (1024 = 2^10). The bit conversions can be
+          // found in frameworks/ml/nn/runtime/test/TestMain.cpp.
+          "native-test-flag": "1024"
         }
       ]
     },

runtime/test/TestMain.cpp

diff --git a/runtime/test/TestMain.cpp b/runtime/test/TestMain.cpp
index a4fefae..f89c7ad 100644
--- a/runtime/test/TestMain.cpp
+++ b/runtime/test/TestMain.cpp
@@ -56,6 +56,11 @@
 // true, and if we are asked to set it to false, we return 0 ("success") without
 // running tests.
 static int test(bool useCpuOnly, Execution::ComputeMode computeMode, bool allowSyncExecHal = true) {
+    // NOTE: The test mapping configuration (frameworks/ml/nn/TEST_MAPPING) uses
+    // the value of 1024 to only run pass 10 of the test, corresponding to
+    // "useCpuOnly = 0, computeMode = ComputeMode::ASYNC, allowSyncExecHal = 1".
+    // If you change the bit representation here, also make the corresponding
+    // change to the TEST_MAPPING file to run the equivalent pass of the test.
     uint32_t passIndex =
             (useCpuOnly << 0) + (static_cast<uint32_t>(computeMode) << 1) + (allowSyncExecHal << 3);