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

Commit 315e9b89 authored by Slava Shklyaev's avatar Slava Shklyaev
Browse files

Add control flow performance to NNAPI Capabilities 

Bug: 139181916
Test: m
Change-Id: I62696a6519191e33568c9664c0047fb57426b99f
Merged-In: I62696a6519191e33568c9664c0047fb57426b99f
(cherry picked from commit 8a9b3065)
parent 36902cbc

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ ddcf89cd8ee2df0d32aee55050826446fb64f7aafde0a7cd946c64f61b1a364c android.hardwar 
2fa3679ad7c94b5e88724adcd560c561041068a4ca565c63830e68101988746a android.hardware.neuralnetworks@1.3::IFencedExecutionCallback

237b23b126a66f3432658020fed78cdd06ba6297459436fe6bae0ba753370833 android.hardware.neuralnetworks@1.3::IPreparedModel

0439a1fbbec7f16e5e4c653d85ac685d51bfafbae15b8f8cca530acdd7d6a8ce android.hardware.neuralnetworks@1.3::IPreparedModelCallback

2fabd246f985d94a0172dacefb0d6cf19e2aeb2d5f17752653988ef39570a52d android.hardware.neuralnetworks@1.3::types

5e2a14b40dc11da9d478185838f4401b652739922d14cecea0a0ce4c1359fe21 android.hardware.neuralnetworks@1.3::types

3e01d4446cd69fd1c48f8572efd97487bc179564b32bd795800b97bbe10be37b android.hardware.wifi@1.4::IWifi

a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardware.wifi.supplicant@1.3::ISupplicant

44445b8a03d7b9e68b2fbd954672c18a8fce9e32851b0692f4f4ab3407f86ecb android.hardware.wifi.supplicant@1.3::ISupplicantStaIface

neuralnetworks/1.3/types.hal

+26 −3
Original line number Diff line number Diff line
@@ -5176,8 +5176,10 @@ enum Priority : int32_t { 
/**

 * The capabilities of a driver.

 *

 * Performance of an operation comes from the type of its first operand.

 * This represents performance for non extension operand types.

 * This represents performance of non-extension operations.

 *

 * Performance of an operation other than {@link OperationType::IF} and

 * {@link OperationType::WHILE} comes from the type of its first operand.

 */

struct Capabilities {

    /**
@@ -5200,11 +5202,32 @@ struct Capabilities { 


    /**

     * Performance by operand type. Must be sorted by OperandType.

     * If a particular OperandType is not present in operandPerformance,

     *

     * If a particular {@link OperandType} is not present in operandPerformance,

     * its performance is treated as

     * { .execTime = FLT_MAX, .powerUsage = FLT_MAX }.

     *

     * Performance does not apply to {@link OperandType::SUBGRAPH}, and a driver

     * must not report operand performance for {@link OperandType::SUBGRAPH}.

     */

    vec<OperandPerformance> operandPerformance;



    /**

     * Performance of an {@link OperationType::IF} operation is the sum of

     * {@link Capabilities::ifPerformance} and the mean of performance for the

     * two branch subgraphs, where performance for a subgraph is the sum of the

     * performance of all operations within the subgraph.

     */

    PerformanceInfo ifPerformance;



    /**

     * Performance of a {@link OperationType::WHILE} operation is the sum of

     * {@link Capabilities::whilePerformance}, performance for the condition

     * subgraph and performance for the body subgraph, where performance for a

     * subgraph is the sum of the performance of all operations within the

     * subgraph.

     */

    PerformanceInfo whilePerformance;

};



/**

neuralnetworks/1.3/types.t

+26 −3
Original line number Diff line number Diff line
@@ -103,8 +103,10 @@ enum Priority : int32_t { 
/**

 * The capabilities of a driver.

 *

 * Performance of an operation comes from the type of its first operand.

 * This represents performance for non extension operand types.

 * This represents performance of non-extension operations.

 *

 * Performance of an operation other than {@link OperationType::IF} and

 * {@link OperationType::WHILE} comes from the type of its first operand.

 */

struct Capabilities {

    /**
@@ -127,11 +129,32 @@ struct Capabilities { 


    /**

     * Performance by operand type. Must be sorted by OperandType.

     * If a particular OperandType is not present in operandPerformance,

     *

     * If a particular {@link OperandType} is not present in operandPerformance,

     * its performance is treated as

     * { .execTime = FLT_MAX, .powerUsage = FLT_MAX }.

     *

     * Performance does not apply to {@link OperandType::SUBGRAPH}, and a driver

     * must not report operand performance for {@link OperandType::SUBGRAPH}.

     */

    vec<OperandPerformance> operandPerformance;



    /**

     * Performance of an {@link OperationType::IF} operation is the sum of

     * {@link Capabilities::ifPerformance} and the mean of performance for the

     * two branch subgraphs, where performance for a subgraph is the sum of the

     * performance of all operations within the subgraph.

     */

    PerformanceInfo ifPerformance;



    /**

     * Performance of a {@link OperationType::WHILE} operation is the sum of

     * {@link Capabilities::whilePerformance}, performance for the condition

     * subgraph and performance for the body subgraph, where performance for a

     * subgraph is the sum of the performance of all operations within the

     * subgraph.

     */

    PerformanceInfo whilePerformance;

};



/**

neuralnetworks/1.3/vts/functional/BasicTests.cpp

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ TEST_P(NeuralnetworksHidlTest, GetCapabilitiesTest) { 
                                   [](const OperandPerformance& a, const OperandPerformance& b) {

                                       return a.type < b.type;

                                   }));

        EXPECT_TRUE(std::all_of(opPerf.begin(), opPerf.end(), [](const OperandPerformance& a) {

            return a.type != OperandType::SUBGRAPH;

        }));

        EXPECT_TRUE(isPositive(capabilities.ifPerformance));

        EXPECT_TRUE(isPositive(capabilities.whilePerformance));

    });

    EXPECT_TRUE(ret.isOk());

}