Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 543b6eaa authored by Xusong Wang's avatar Xusong Wang Committed by android-build-merger
Browse files

Merge changes from topic "aosp-nnapi-memory-domain" 

am: 5f675cfd

Change-Id: I059395ca5e9f752492de72b70d9588002c43d845
parents af9a9cb5 5f675cfd

neuralnetworks/1.3/vts/functional/CompilationCachingTests.cpp

+16 −14
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ TEST_P(CompilationCachingTest, CacheSavingAndRetrieval) { 
    }



    // Execute and verify results.

    EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

    EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

}



TEST_P(CompilationCachingTest, CacheSavingAndRetrievalNonZeroOffset) {
@@ -518,7 +518,7 @@ TEST_P(CompilationCachingTest, CacheSavingAndRetrievalNonZeroOffset) { 
    }



    // Execute and verify results.

    EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

    EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

}



TEST_P(CompilationCachingTest, SaveToCacheInvalidNumCache) {
@@ -539,7 +539,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumCache) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -563,7 +563,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumCache) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -586,7 +586,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumCache) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -610,7 +610,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumCache) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -721,7 +721,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumFd) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -745,7 +745,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumFd) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -768,7 +768,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumFd) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -792,7 +792,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidNumFd) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -904,7 +904,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidAccessMode) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -926,7 +926,7 @@ TEST_P(CompilationCachingTest, SaveToCacheInvalidAccessMode) { 
        saveModelToCache(model, modelCache, dataCache, &preparedModel);

        ASSERT_NE(preparedModel, nullptr);

        // Execute and verify results.

        EvaluatePreparedModel(preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        EvaluatePreparedModel(kDevice, preparedModel, testModel, /*testKind=*/TestKind::GENERAL);

        // Check if prepareModelFromCache fails.

        preparedModel = nullptr;

        ErrorStatus status;
@@ -1070,7 +1070,8 @@ TEST_P(CompilationCachingTest, SaveToCache_TOCTOU) { 
                ASSERT_EQ(preparedModel, nullptr);

            } else {

                ASSERT_NE(preparedModel, nullptr);

                EvaluatePreparedModel(preparedModel, testModelAdd, /*testKind=*/TestKind::GENERAL);

                EvaluatePreparedModel(kDevice, preparedModel, testModelAdd,

                                      /*testKind=*/TestKind::GENERAL);

            }

        }

    }
@@ -1131,7 +1132,8 @@ TEST_P(CompilationCachingTest, PrepareFromCache_TOCTOU) { 
                ASSERT_EQ(preparedModel, nullptr);

            } else {

                ASSERT_NE(preparedModel, nullptr);

                EvaluatePreparedModel(preparedModel, testModelAdd, /*testKind=*/TestKind::GENERAL);

                EvaluatePreparedModel(kDevice, preparedModel, testModelAdd,

                                      /*testKind=*/TestKind::GENERAL);

            }

        }

    }

neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp

+297 −25

File changed.

Preview size limit exceeded, changes collapsed.

neuralnetworks/1.3/vts/functional/GeneratedTestHarness.h

+3 −1
Original line number Diff line number Diff line
@@ -62,13 +62,15 @@ enum class TestKind { 
    GENERAL,

    // Same as GENERAL but sets dimensions for the output tensors to zeros

    DYNAMIC_SHAPE,

    // Same as GENERAL but use device memories for inputs and outputs

    MEMORY_DOMAIN,

    // Tests if quantized model with TENSOR_QUANT8_ASYMM produces the same result

    // (OK/SKIPPED/FAILED) as the model with all such tensors converted to

    // TENSOR_QUANT8_ASYMM_SIGNED.

    QUANTIZATION_COUPLING

};



void EvaluatePreparedModel(const sp<IPreparedModel>& preparedModel,

void EvaluatePreparedModel(const sp<IDevice>& device, const sp<IPreparedModel>& preparedModel,

                           const test_helper::TestModel& testModel, TestKind testKind);



}  // namespace android::hardware::neuralnetworks::V1_3::vts::functional