From d0c5df2695e6e30d600c0339f547373c0c6667b0 Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Fri, 16 Jul 2021 10:25:22 +0100 Subject: Disabled armv8-2a on Android P * Resolved COMPMID-4645 Change-Id: I69a3844563257dbaefd20720fd6c12654bf73cf4 Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5960 Tested-by: Arm Jenkins Reviewed-by: Nikhil Raj Arm --- scripts/arm_compute_library_nn_driver.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/arm_compute_library_nn_driver.go b/scripts/arm_compute_library_nn_driver.go index e17b15a7cd..0a09e17516 100644 --- a/scripts/arm_compute_library_nn_driver.go +++ b/scripts/arm_compute_library_nn_driver.go @@ -1,5 +1,5 @@ // -// Copyright © 2020 ARM Ltd. All rights reserved. +// Copyright © 2020-2021 ARM Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -20,10 +20,12 @@ func globalFlags(ctx android.BaseContext) []string { cppflags = append(cppflags, "-fno-addrsig") } - if (ctx.AConfig().PlatformVersionName() == "R" || ctx.AConfig().PlatformVersionName() == "11") && - (ctx.AConfig().DevicePrimaryArchType().String() == "armv8-2a") { - cppflags = append(cppflags, "-march=armv8.2-a+fp16") - } + if ((ctx.AConfig().PlatformVersionName() != "P" || ctx.AConfig().PlatformVersionName() != "9") && (ctx.AConfig().PlatformVersionName() == "R" || ctx.AConfig().PlatformVersionName() == "11")) { + if (ctx.AConfig().DevicePrimaryArchType().String() == "armv8-2a") { + cppflags = append(cppflags, "-march=armv8.2-a+fp16") + } + } + data_types := strings.Split(ctx.AConfig().GetenvWithDefault("COMPUTE_LIB_DATA_TYPE", "ALL"), ",") -- cgit v1.2.1