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

Commit f9a46c0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make VtsHalNeuralnetworks* tests more binder-friendly." into... 

Merge "Make VtsHalNeuralnetworks* tests more binder-friendly." into android12-tests-dev am: 2a04b446 am: 2a397228 am: 73754429 am: 5f04374b am: 2c080e3d am: 796ff4f0 am: 9f3ffe12

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194136



Change-Id: I97a2ea4a3efe2ef7b888e7146b8df7e28912cc4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fc5f50a 9f3ffe12

neuralnetworks/1.0/vts/functional/ValidateModel.cpp

+10 −12
Original line number Diff line number Diff line
@@ -232,26 +232,24 @@ size_t sizeForBinder(const Model& model) { 
//     currently 1Mb, which is shared by all transactions in progress

//     for the process."

//

// Will our representation fit under this limit?  There are two complications:

// Will our representation fit under this limit?  There are three complications:

// - Our representation size is just approximate (see sizeForBinder()).

// - This object may not be the only occupant of the Binder transaction buffer.

// - This object may not be the only occupant of the Binder transaction buffer

//   (although our VTS test suite should not be putting multiple objects in the

//   buffer at once).

// - IBinder.MAX_IPC_SIZE recommends limiting a transaction to 64 * 1024 bytes.

// So we'll be very conservative: We want the representation size to be no

// larger than half the transaction buffer size.

// larger than half the recommended limit.

//

// If our representation grows large enough that it still fits within

// the transaction buffer but combined with other transactions may

// exceed the buffer size, then we may see intermittent HAL transport

// errors.

static bool exceedsBinderSizeLimit(size_t representationSize) {

    // Instead of using this fixed buffer size, we might instead be able to use

    // ProcessState::self()->getMmapSize(). However, this has a potential

    // problem: The binder/mmap size of the current process does not necessarily

    // indicate the binder/mmap size of the service (i.e., the other process).

    // The only way it would be a good indication is if both the current process

    // and the service use the default size.

    static const size_t kHalfBufferSize = 1024 * 1024 / 2;



    return representationSize > kHalfBufferSize;

    // There is no C++ API to retrieve the value of the Java variable IBinder.MAX_IPC_SIZE.

    static const size_t kHalfMaxIPCSize = 64 * 1024 / 2;



    return representationSize > kHalfMaxIPCSize;

}



///////////////////////// VALIDATE EXECUTION ORDER ////////////////////////////

neuralnetworks/1.1/vts/functional/ValidateModel.cpp

+10 −12
Original line number Diff line number Diff line
@@ -252,26 +252,24 @@ size_t sizeForBinder(const Model& model) { 
//     currently 1Mb, which is shared by all transactions in progress

//     for the process."

//

// Will our representation fit under this limit?  There are two complications:

// Will our representation fit under this limit?  There are three complications:

// - Our representation size is just approximate (see sizeForBinder()).

// - This object may not be the only occupant of the Binder transaction buffer.

// - This object may not be the only occupant of the Binder transaction buffer

//   (although our VTS test suite should not be putting multiple objects in the

//   buffer at once).

// - IBinder.MAX_IPC_SIZE recommends limiting a transaction to 64 * 1024 bytes.

// So we'll be very conservative: We want the representation size to be no

// larger than half the transaction buffer size.

// larger than half the recommended limit.

//

// If our representation grows large enough that it still fits within

// the transaction buffer but combined with other transactions may

// exceed the buffer size, then we may see intermittent HAL transport

// errors.

static bool exceedsBinderSizeLimit(size_t representationSize) {

    // Instead of using this fixed buffer size, we might instead be able to use

    // ProcessState::self()->getMmapSize(). However, this has a potential

    // problem: The binder/mmap size of the current process does not necessarily

    // indicate the binder/mmap size of the service (i.e., the other process).

    // The only way it would be a good indication is if both the current process

    // and the service use the default size.

    static const size_t kHalfBufferSize = 1024 * 1024 / 2;



    return representationSize > kHalfBufferSize;

    // There is no C++ API to retrieve the value of the Java variable IBinder.MAX_IPC_SIZE.

    static const size_t kHalfMaxIPCSize = 64 * 1024 / 2;



    return representationSize > kHalfMaxIPCSize;

}



///////////////////////// VALIDATE EXECUTION ORDER ////////////////////////////

neuralnetworks/1.2/vts/functional/ValidateModel.cpp

+10 −12
Original line number Diff line number Diff line
@@ -291,26 +291,24 @@ size_t sizeForBinder(const Model& model) { 
//     currently 1Mb, which is shared by all transactions in progress

//     for the process."

//

// Will our representation fit under this limit?  There are two complications:

// Will our representation fit under this limit?  There are three complications:

// - Our representation size is just approximate (see sizeForBinder()).

// - This object may not be the only occupant of the Binder transaction buffer.

// - This object may not be the only occupant of the Binder transaction buffer

//   (although our VTS test suite should not be putting multiple objects in the

//   buffer at once).

// - IBinder.MAX_IPC_SIZE recommends limiting a transaction to 64 * 1024 bytes.

// So we'll be very conservative: We want the representation size to be no

// larger than half the transaction buffer size.

// larger than half the recommended limit.

//

// If our representation grows large enough that it still fits within

// the transaction buffer but combined with other transactions may

// exceed the buffer size, then we may see intermittent HAL transport

// errors.

static bool exceedsBinderSizeLimit(size_t representationSize) {

    // Instead of using this fixed buffer size, we might instead be able to use

    // ProcessState::self()->getMmapSize(). However, this has a potential

    // problem: The binder/mmap size of the current process does not necessarily

    // indicate the binder/mmap size of the service (i.e., the other process).

    // The only way it would be a good indication is if both the current process

    // and the service use the default size.

    static const size_t kHalfBufferSize = 1024 * 1024 / 2;



    return representationSize > kHalfBufferSize;

    // There is no C++ API to retrieve the value of the Java variable IBinder.MAX_IPC_SIZE.

    static const size_t kHalfMaxIPCSize = 64 * 1024 / 2;



    return representationSize > kHalfMaxIPCSize;

}



///////////////////////// VALIDATE EXECUTION ORDER ////////////////////////////

neuralnetworks/1.3/vts/functional/ValidateModel.cpp

+10 −12
Original line number Diff line number Diff line
@@ -308,26 +308,24 @@ size_t sizeForBinder(const Model& model) { 
//     currently 1Mb, which is shared by all transactions in progress

//     for the process."

//

// Will our representation fit under this limit?  There are two complications:

// Will our representation fit under this limit?  There are three complications:

// - Our representation size is just approximate (see sizeForBinder()).

// - This object may not be the only occupant of the Binder transaction buffer.

// - This object may not be the only occupant of the Binder transaction buffer

//   (although our VTS test suite should not be putting multiple objects in the

//   buffer at once).

// - IBinder.MAX_IPC_SIZE recommends limiting a transaction to 64 * 1024 bytes.

// So we'll be very conservative: We want the representation size to be no

// larger than half the transaction buffer size.

// larger than half the recommended limit.

//

// If our representation grows large enough that it still fits within

// the transaction buffer but combined with other transactions may

// exceed the buffer size, then we may see intermittent HAL transport

// errors.

static bool exceedsBinderSizeLimit(size_t representationSize) {

    // Instead of using this fixed buffer size, we might instead be able to use

    // ProcessState::self()->getMmapSize(). However, this has a potential

    // problem: The binder/mmap size of the current process does not necessarily

    // indicate the binder/mmap size of the service (i.e., the other process).

    // The only way it would be a good indication is if both the current process

    // and the service use the default size.

    static const size_t kHalfBufferSize = 1024 * 1024 / 2;



    return representationSize > kHalfBufferSize;

    // There is no C++ API to retrieve the value of the Java variable IBinder.MAX_IPC_SIZE.

    static const size_t kHalfMaxIPCSize = 64 * 1024 / 2;



    return representationSize > kHalfMaxIPCSize;

}



///////////////////////// VALIDATE EXECUTION ORDER ////////////////////////////

neuralnetworks/aidl/vts/functional/ValidateModel.cpp

+10 −12
Original line number Diff line number Diff line
@@ -344,26 +344,24 @@ size_t sizeForBinder(const Model& model) { 
//     currently 1Mb, which is shared by all transactions in progress

//     for the process."

//

// Will our representation fit under this limit?  There are two complications:

// Will our representation fit under this limit?  There are three complications:

// - Our representation size is just approximate (see sizeForBinder()).

// - This object may not be the only occupant of the Binder transaction buffer.

// - This object may not be the only occupant of the Binder transaction buffer

//   (although our VTS test suite should not be putting multiple objects in the

//   buffer at once).

// - IBinder.MAX_IPC_SIZE recommends limiting a transaction to 64 * 1024 bytes.

// So we'll be very conservative: We want the representation size to be no

// larger than half the transaction buffer size.

// larger than half the recommended limit.

//

// If our representation grows large enough that it still fits within

// the transaction buffer but combined with other transactions may

// exceed the buffer size, then we may see intermittent HAL transport

// errors.

static bool exceedsBinderSizeLimit(size_t representationSize) {

    // Instead of using this fixed buffer size, we might instead be able to use

    // ProcessState::self()->getMmapSize(). However, this has a potential

    // problem: The binder/mmap size of the current process does not necessarily

    // indicate the binder/mmap size of the service (i.e., the other process).

    // The only way it would be a good indication is if both the current process

    // and the service use the default size.

    static const size_t kHalfBufferSize = 1024 * 1024 / 2;



    return representationSize > kHalfBufferSize;

    // There is no C++ API to retrieve the value of the Java variable IBinder.MAX_IPC_SIZE.

    static const size_t kHalfMaxIPCSize = 64 * 1024 / 2;



    return representationSize > kHalfMaxIPCSize;

}



///////////////////////// VALIDATE EXECUTION ORDER ////////////////////////////