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

Commit 46e968fb authored by Xusong Wang's avatar Xusong Wang Committed by android-build-merger
Browse files

Modify validateBurstSanitized to take a single request. am: 323ba2ee

am: ea06c2cd

Change-Id: Ib77f6aa865c9f831a2a2231000f283d52405e178
parents 1a00a6e8 ea06c2cd
Loading
Loading
Loading
Loading
+19 −22
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static bool isSanitized(const FmqResultDatum& datum) {
}

static void validateBurstSanitized(const sp<IPreparedModel>& preparedModel,
                                   const std::vector<Request>& requests) {
                                   const Request& request) {
    // create burst
    std::unique_ptr<RequestChannelSender> sender;
    std::unique_ptr<ResultChannelReceiver> receiver;
@@ -372,8 +372,6 @@ static void validateBurstSanitized(const sp<IPreparedModel>& preparedModel,
    ASSERT_NE(nullptr, receiver.get());
    ASSERT_NE(nullptr, context.get());

    // validate each request
    for (const Request& request : requests) {
    // load memory into callback slots
    std::vector<intptr_t> keys;
    keys.reserve(request.pools.size());
@@ -392,7 +390,6 @@ static void validateBurstSanitized(const sp<IPreparedModel>& preparedModel,
    ASSERT_TRUE(std::all_of(serialized->begin(), serialized->end(), isSanitized))
            << "The result serialized data is not properly sanitized";
}
}

///////////////////////////// ENTRY POINT //////////////////////////////////

@@ -400,7 +397,7 @@ void ValidationTest::validateBurst(const sp<IPreparedModel>& preparedModel,
                                   const Request& request) {
    ASSERT_NO_FATAL_FAILURE(validateBurstSerialization(preparedModel, request));
    ASSERT_NO_FATAL_FAILURE(validateBurstFmqLength(preparedModel, request));
    ASSERT_NO_FATAL_FAILURE(validateBurstSanitized(preparedModel, requests));
    ASSERT_NO_FATAL_FAILURE(validateBurstSanitized(preparedModel, request));
}

}  // namespace functional