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

Commit e3d0dad8 authored by Xusong Wang's avatar Xusong Wang
Browse files

Use proper alignment and padding for pointer arguments -- HAL. 

This CL modifies the shared memory allocation for pointer arguments to
use proper alignment and padding. We use default alignment (64) and
min padding (1) for HIDL drivers, and default alignment (64) and default
padding (64) for sAIDL drivers.

Bug: 184164929
Test: NNT_static
Change-Id: I22591640fa047d5f75d437edac1a7645d3b05526
Merged-In: I22591640fa047d5f75d437edac1a7645d3b05526
(cherry picked from commit 8bfa2439)
parent 43ae2ecf

neuralnetworks/1.0/utils/src/PreparedModel.cpp

+4 −2
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> Prepare 
    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared =

            NN_TRY(hal::utils::makeExecutionFailure(hal::utils::convertRequestFromPointerToShared(

                    &request, &maybeRequestInShared, &relocation)));

                    &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

                    &maybeRequestInShared, &relocation)));



    const auto hidlRequest = NN_TRY(hal::utils::makeExecutionFailure(convert(requestInShared)));
@@ -111,7 +112,8 @@ nn::GeneralResult<nn::SharedExecution> PreparedModel::createReusableExecution( 
    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            &request, &maybeRequestInShared, &relocation));

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

            &maybeRequestInShared, &relocation));



    auto hidlRequest = NN_TRY(convert(requestInShared));

    return Execution::create(shared_from_this(), std::move(hidlRequest), std::move(relocation));

neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp

+4 −2
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ ExecutionBurstController::execute(const nn::Request& request, nn::MeasureTiming 
    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared =

            NN_TRY(hal::utils::makeExecutionFailure(hal::utils::convertRequestFromPointerToShared(

                    &request, &maybeRequestInShared, &relocation)));

                    &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

                    &maybeRequestInShared, &relocation)));



    // clear pools field of request, as they will be provided via slots

    const auto requestWithoutPools = nn::Request{
@@ -373,7 +374,8 @@ nn::GeneralResult<nn::SharedExecution> ExecutionBurstController::createReusableE 
    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            &request, &maybeRequestInShared, &relocation));

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

            &maybeRequestInShared, &relocation));



    // clear pools field of request, as they will be provided via slots

    const auto requestWithoutPools = nn::Request{

neuralnetworks/1.2/utils/src/PreparedModel.cpp

+4 −2
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> Prepare 
    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared =

            NN_TRY(hal::utils::makeExecutionFailure(hal::utils::convertRequestFromPointerToShared(

                    &request, &maybeRequestInShared, &relocation)));

                    &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

                    &maybeRequestInShared, &relocation)));



    const auto hidlRequest = NN_TRY(hal::utils::makeExecutionFailure(convert(requestInShared)));

    const auto hidlMeasure = NN_TRY(hal::utils::makeExecutionFailure(convert(measure)));
@@ -140,7 +141,8 @@ nn::GeneralResult<nn::SharedExecution> PreparedModel::createReusableExecution( 
    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            &request, &maybeRequestInShared, &relocation));

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

            &maybeRequestInShared, &relocation));



    auto hidlRequest = NN_TRY(convert(requestInShared));

    auto hidlMeasure = NN_TRY(convert(measure));

neuralnetworks/1.3/utils/src/PreparedModel.cpp

+6 −3
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> Prepare 
    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared =

            NN_TRY(hal::utils::makeExecutionFailure(hal::utils::convertRequestFromPointerToShared(

                    &request, &maybeRequestInShared, &relocation)));

                    &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

                    &maybeRequestInShared, &relocation)));



    const auto hidlRequest = NN_TRY(hal::utils::makeExecutionFailure(convert(requestInShared)));

    const auto hidlMeasure = NN_TRY(hal::utils::makeExecutionFailure(convert(measure)));
@@ -184,7 +185,8 @@ PreparedModel::executeFenced(const nn::Request& request, const std::vector<nn::S 
    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            &request, &maybeRequestInShared, &relocation));

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

            &maybeRequestInShared, &relocation));



    const auto hidlRequest = NN_TRY(convert(requestInShared));

    const auto hidlWaitFor = NN_TRY(hal::utils::convertSyncFences(waitFor));
@@ -236,7 +238,8 @@ nn::GeneralResult<nn::SharedExecution> PreparedModel::createReusableExecution( 
    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            &request, &maybeRequestInShared, &relocation));

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

            &maybeRequestInShared, &relocation));



    auto hidlRequest = NN_TRY(convert(requestInShared));

    auto hidlMeasure = NN_TRY(convert(measure));

neuralnetworks/aidl/utils/src/Burst.cpp

+4 −2
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> Burst:: 
    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared =

            NN_TRY(hal::utils::makeExecutionFailure(hal::utils::convertRequestFromPointerToShared(

                    &request, &maybeRequestInShared, &relocation)));

                    &request, nn::kDefaultRequestMemoryAlignment, nn::kDefaultRequestMemoryPadding,

                    &maybeRequestInShared, &relocation)));



    const auto aidlRequest = NN_TRY(hal::utils::makeExecutionFailure(convert(requestInShared)));

    const auto aidlMeasure = NN_TRY(hal::utils::makeExecutionFailure(convert(measure)));
@@ -248,7 +249,8 @@ nn::GeneralResult<nn::SharedExecution> Burst::createReusableExecution( 
    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            &request, &maybeRequestInShared, &relocation));

            &request, nn::kDefaultRequestMemoryAlignment, nn::kDefaultRequestMemoryPadding,

            &maybeRequestInShared, &relocation));



    auto aidlRequest = NN_TRY(convert(requestInShared));

    const auto aidlMeasure = NN_TRY(convert(measure));