aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPablo Marquez Tello <pablo.tello@arm.com>2021-07-16 10:25:22 +0100
committerNikhil Raj Arm <nikhil.raj@arm.com>2021-07-16 11:51:56 +0000
commitd0c5df2695e6e30d600c0339f547373c0c6667b0 (patch)
tree77b07e4541e5050249aed505e3b339abf34bcb33 /scripts
parentd844c08861706803ea7bebe64450e5feaa9b8179 (diff)
downloadComputeLibrary-d0c5df2695e6e30d600c0339f547373c0c6667b0.tar.gz
Disabled armv8-2a on Android P
* Resolved COMPMID-4645 Change-Id: I69a3844563257dbaefd20720fd6c12654bf73cf4 Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5960 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Nikhil Raj Arm <nikhil.raj@arm.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/arm_compute_library_nn_driver.go12
1 files changed, 7 insertions, 5 deletions
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"), ",")