commit 4537089a5cd17e49f5bb8d5e7f8374e451872387
author David Svantesson <david.svantesson@arm.com> Wed Feb 22 11:08:57 2023 +0000
committer David Svantesson <david.svantesson@arm.com> Fri Feb 24 14:32:23 2023 +0000
tree b475936988d47584a182cee0808172bac0023804
parent 08bc348b9282f73ddd53795e10161104d9a4fd51

Fixes for CMake and Bazel builds, tests failing in scons

- Fix 4 failing tests for multi_isa builds when experimental_fixed_format_kernels=1
- Fixes for CMake and Bazel builds to pass validation tests
- Update documentation, remove “-DCPPTHREADS=1” flag from CMake build example

Partially resolves: ONCPUML-1181

Signed-off-by: David Svantesson <david.svantesson@arm.com>
Change-Id: I7101676260a0adcb7b6ff6f4342ae36f921e7120
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9189
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index d33cf6b..e3ad75a 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -66,6 +66,12 @@
     visibility = ["//visibility:public"],
 )
 
+bool_flag(
+    name = "enable_bf16_validation",
+    build_setting_default = False,
+    visibility = ["//visibility:public"],
+)
+
 #---------------------------------------------------------------------
 # Flag variables
 config_setting(
@@ -103,6 +109,14 @@
     },
 )
 
+config_setting(
+    name = "bf16_validation_flag",
+    flag_values = {
+        ":enable_bf16_validation": "true",
+    },
+)
+
+
 #---------------------------------------------------------------------
 # Common defines used for all targets
 cc_library(
@@ -112,7 +126,6 @@
                   "ARM_COMPUTE_CPU_ENABLED",
                   "ARM_COMPUTE_ENABLE_NEON",
                   "ARM_COMPUTE_ENABLE_FP16",
-                  "ARM_COMPUTE_ENABLE_BF16",
                   "ARM_COMPUTE_ENABLE_I8MM",
                   "ENABLE_FP16_KERNELS",
                   "ENABLE_FP32_KERNELS",
@@ -125,6 +138,9 @@
                   "DARM_COMPUTE_GRAPH_ENABLED",
                   "ARM_COMPUTE_ENABLE_SVEF32MM",
                   "ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS",
+                  "ENABLE_SVE",
+                  "ARM_COMPUTE_ENABLE_SVE",
+                  "_GLIBCXX_USE_NANOSLEEP"
               ] + select({
                   "//:debug_flag": [
                       "ARM_COMPUTE_DEBUG_ENABLED",
@@ -227,9 +243,8 @@
         "//conditions:default": [],
     }),
     local_defines = [
-        "ENABLE_SVE",
-        "ARM_COMPUTE_ENABLE_SVE",
         "ARM_COMPUTE_ENABLE_SVE2",
+        "ARM_COMPUTE_ENABLE_BF16"
     ],
     deps = [
         "//:common_defines",
@@ -277,8 +292,7 @@
         "//conditions:default": [],
     }),
     local_defines = [
-        "ENABLE_SVE",
-        "ARM_COMPUTE_ENABLE_SVE",
+        "ARM_COMPUTE_ENABLE_BF16",
     ],
     deps = [
         "//:common_defines",
@@ -333,6 +347,9 @@
         "//:openmp_flag": ["-fopenmp"],
         "//conditions:default": [],
     }),
+    local_defines = [
+        "ARM_COMPUTE_ENABLE_BF16",
+    ],
     visibility = ["//visibility:public"],
     deps = [
         "//:common_defines",
@@ -342,6 +359,8 @@
         "//include",
         "//support",
         "//utils",
+        "//:arm_compute_sve",
+        "//:arm_compute_sve2"
     ],
     alwayslink = True,
 )