Bazel and CMake updates

Updates to CMake and Bazel builds addressing:
* Cmake options are named too generic
* Use CMAKE_CXX_FLAGS_DEBUG instead of DEBUG option
* Option to disable tests
* Bazel: rename "arm_compute" to "arm_compute_core"

Resolves: ONCPUML-1252

Signed-off-by: David Svantesson <david.svantesson@arm.com>
Change-Id: If65b0cfcca77e2423777b0b901a5b733cfca6bfc
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9501
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: SiCong Li <sicong.li@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>

9 files changed, 101 insertions, 113 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
index d246336c29..f897a1a6aa 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -192,7 +192,7 @@ cc_library(
     name = "arm_compute_graph",
     srcs = ["//src:arm_compute_graph_srcs"],
     copts = [
-                "-march=armv8.2-a+fp16",  # What arch is it we should go for here?
+                "-march=armv8.2-a+fp16",
             ] + select({
                 "//:debug_flag": [
                     "-O0",
@@ -211,7 +211,7 @@ cc_library(
             }),
     visibility = ["//visibility:public"],
     deps = [
-        "arm_compute",
+        "arm_compute_core",
         "//:common_defines",
         "//arm_compute:graph_headers",
     ],
@@ -225,7 +225,7 @@ cc_library(
     name = "arm_compute_sve2",
     srcs = ["//src:arm_compute_sve2_srcs"],
     copts = [
-                "-march=armv8.6-a+sve2+fp16+dotprod",  # What arch is it we should go for here?
+                "-march=armv8.6-a+sve2+fp16+dotprod",
             ] + select({
                 "//:debug_flag": [
                     "-O0",
@@ -276,7 +276,7 @@ cc_library(
     name = "arm_compute_sve",
     srcs = ["//src:arm_compute_sve_srcs"],
     copts = [
-                "-march=armv8.2-a+sve+fp16+dotprod",  # What arch is it we should go for here?
+                "-march=armv8.2-a+sve+fp16+dotprod",
             ] + select({
                 "//:debug_flag": [
                     "-O0",
@@ -323,8 +323,8 @@ cc_library(
 # Core and Runtime library
 
 cc_library(
-    name = "arm_compute",
-    srcs = ["//src:arm_compute_srcs"],
+    name = "arm_compute_core",
+    srcs = ["//src:arm_compute_core_srcs"],
     hdrs = glob([
         "core/NEON/kernels/**/*.h",
         "core/NEON/kernels/**/*.hpp",
@@ -333,7 +333,7 @@ cc_library(
         "//:create_version_file",
     ],
     copts = [
-                "-march=armv8.2-a+fp16",  # What arch is it we should go for here?
+                "-march=armv8.2-a+fp16",
             ] + select({
                 "//:debug_flag": [
                     "-O0",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 060370d33a..3c6798784a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ endif()
 # ---------------------------------------------------------------------
 # Configuration
 
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -gdwarf-2 -DARM_COMPUTE_ASSERTS_ENABLED")
 # Default to Release Build
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_BUILD_TYPE
@@ -113,26 +114,20 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   add_compile_options("-Wno-psabi")
 endif()
 
-# Compile with -Werror if WERROR set
-if(WERROR)
+# Compile with -Werror if ARM_COMPUTE_WERROR set
+if(ARM_COMPUTE_WERROR)
   add_compile_options("-Werror")
 endif()
 
-# Compile with debug flags and define ARM_COMPUTE_ASSERTS_ENABLED if DEBUG set
-if(DEBUG)
-  add_compile_options("-O0" "-g" "-gdwarf-2")
-  add_definitions(-DARM_COMPUTE_ASSERTS_ENABLED) # ARM_COMPUTE_DEBUG_ENABLED ??
-endif()
-
 # Compile with -fno-exceptions flag and define ARM_COMPUTE_EXCEPTIONS_DISABLED
-# if DEBUG set
-if(NOT EXCEPTIONS)
+# if ARM_COMPUTE_EXCEPTIONS not set
+if(NOT ARM_COMPUTE_EXCEPTIONS)
   add_compile_options("-fno-exceptions")
   add_definitions(-DARM_COMPUTE_EXCEPTIONS_DISABLED)
 endif()
 
-# Link OpenMP libraries if OPENMP flag on
-if(OPENMP)
+# Link OpenMP libraries if ARM_COMPUTE_OPENMP set
+if(ARM_COMPUTE_OPENMP)
   find_package(OpenMP)
   if(OpenMP_CXX_FOUND)
     link_libraries(OpenMP::OpenMP_CXX)
@@ -240,37 +235,36 @@ add_library(ArmCompute::Graph ALIAS arm_compute_graph)
 # Library Target Sources
 add_subdirectory(src)
 
-# ---------------------------------------------------------------------
-# Validation Framework Library
-add_library(arm_compute_validation_framework "")
-# target_compile_options(arm_compute_validation_framework PRIVATE
-# "-march=armv8.2-a")
-target_compile_options(arm_compute_validation_framework
-                       PRIVATE "-march=armv8.2-a+fp16")
-
-add_subdirectory(tests)
-target_include_directories(
-  arm_compute_validation_framework
-  PUBLIC $<INSTALL_INTERFACE:include>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-         ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_options(arm_compute_validation_framework
-                       PUBLIC ${COMMON_CXX_FLAGS})
-                       target_link_libraries(
-                        arm_compute_validation_framework
-    PUBLIC arm_compute_core arm_compute_graph)
-
-# ---------------------------------------------------------------------
-# Validation Binary
+if(ARM_COMPUTE_BUILD_TESTING)
+  # ---------------------------------------------------------------------
+  # Validation Framework Library
+  add_library(arm_compute_validation_framework "")
+  # target_compile_options(arm_compute_validation_framework PRIVATE
+  # "-march=armv8.2-a")
+  target_compile_options(arm_compute_validation_framework
+                        PRIVATE "-march=armv8.2-a+fp16")
+
+  add_subdirectory(tests)
+  target_include_directories(
+    arm_compute_validation_framework
+    PUBLIC $<INSTALL_INTERFACE:include>
+          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+          ${CMAKE_CURRENT_SOURCE_DIR})
+  target_compile_options(arm_compute_validation_framework
+                        PUBLIC ${COMMON_CXX_FLAGS})
+                        target_link_libraries(
+                          arm_compute_validation_framework
+      PUBLIC arm_compute_core arm_compute_graph)
 
-if(BUILD_TESTING)
+  # ---------------------------------------------------------------------
+  # Validation Binary
 
   add_executable(arm_compute_validation "")
   target_compile_options(arm_compute_validation PRIVATE "-march=armv8.2-a+fp16")
-  if(ENABLE_BF16_VALIDATION)
+  if(ARM_COMPUTE_ENABLE_BF16_VALIDATION)
     target_compile_definitions(arm_compute_validation PRIVATE ARM_COMPUTE_ENABLE_BF16)
   endif()
-  if(ENABLE_SVE_VALIDATION)
+  if(ARM_COMPUTE_ENABLE_SVE_VALIDATION)
     target_compile_definitions(arm_compute_validation PRIVATE ENABLE_SVE)
     target_compile_definitions(arm_compute_validation PRIVATE ARM_COMPUTE_ENABLE_SVE)
   endif()
@@ -300,11 +294,11 @@ if(BUILD_TESTING)
     arm_compute_benchmark PUBLIC arm_compute_core arm_compute_graph
                                  arm_compute_validation_framework)
 
-endif() # BUILD_TESTING
+endif() # ARM_COMPUTE_BUILD_TESTING
 # ---------------------------------------------------------------------
 # Examples Binaries
 
-if(BUILD_EXAMPLES)
+if(ARM_COMPUTE_BUILD_EXAMPLES)
 
   add_subdirectory(examples)
 
@@ -331,4 +325,4 @@ if(BUILD_EXAMPLES)
     target_link_libraries(${test_name} PUBLIC arm_compute_core)
   endforeach()
 
-endif() # BUILD_EXAMPLES
+endif() # ARM_COMPUTE_BUILD_EXAMPLES
diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index e2aa2bfbff..a4ef135bdf 100644
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -26,30 +26,29 @@ include(CMakeDependentOption)
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
-option(DEBUG "Enable ['-O0','-g','-gdwarf-2'] compilation flags" OFF)
-option(WERROR "Enable the -Werror compilation flag" OFF)
-option(EXCEPTIONS "Enable C++ exception support" ON)
-option(LOGGING "Enable logging" OFF)
-
-option(GEMM_TUNER "Build gemm_tuner programs" OFF) # Not used atm
-option(BUILD_EXAMPLES "Build example programs" OFF)
-
-option(BUILD_TESTING "Build tests" OFF)
-option(CPPTHREADS "Enable C++11 threads backend" OFF)
-option(OPENMP "Enable OpenMP backend" ON)
+option(ARM_COMPUTE_WERROR "Enable the -Werror compilation flag" OFF)
+option(ARM_COMPUTE_EXCEPTIONS "Enable C++ exception support" ON)
+option(ARM_COMPUTE_LOGGING "Enable logging" OFF)
+option(ARM_COMPUTE_BUILD_EXAMPLES "Build example programs" OFF)
+option(ARM_COMPUTE_BUILD_TESTING "Build tests" OFF)
+option(ARM_COMPUTE_CPPTHREADS "Enable C++11 threads backend" OFF)
+option(ARM_COMPUTE_OPENMP "Enable OpenMP backend" ON)
 
 #
-if(CPPTHREADS)
+if(ARM_COMPUTE_CPPTHREADS)
   add_definitions(-DARM_COMPUTE_CPP_SCHEDULER)
 endif()
 #
-if(LOGGING)
+if(ARM_COMPUTE_LOGGING)
   add_definitions(-DARM_COMPUTE_LOGGING_ENABLED)
 endif()
 
 # ---------------------------------------------------------------------
 # Backends
 
+option(ARM_COMPUTE_ENABLE_BF16_VALIDATION "" OFF)
+option(ARM_COMPUTE_ENABLE_SVE_VALIDATION "" OFF)
+
 option(ENABLE_NEON "Enable Arm® Neon™ support" ON)
 option(ARM_COMPUTE_CPU_ENABLED "" ON)
 option(ARM_COMPUTE_ENABLE_NEON "" ON)
@@ -66,8 +65,6 @@ option(ENABLE_NCHW_KERNELS "" ON)
 option(ARM_COMPUTE_GRAPH_ENABLED "" ON)
 option(ARM_COMPUTE_ENABLE_SVEF32MM "" ON)
 option(ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS "" ON)
-option(ENABLE_BF16_VALIDATION "" OFF)
-option(ENABLE_SVE_VALIDATION "" OFF)
 
 if(ENABLE_NEON)
   add_definitions(-DENABLE_NEON)
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index d01a588824..d10cd8e15d 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -36,5 +36,3 @@ if(NOT GIT_FOUND OR RESULT)
 endif()
 
 file(WRITE "arm_compute_version.embed" "\"${ACL_VERSION_SHA}\"")
-
-# TODO: List build options
diff --git a/docs/user_guide/how_to_build_and_run_examples.dox b/docs/user_guide/how_to_build_and_run_examples.dox
index e0079cf42a..75b0a5df54 100644
--- a/docs/user_guide/how_to_build_and_run_examples.dox
+++ b/docs/user_guide/how_to_build_and_run_examples.dox
@@ -399,7 +399,7 @@ SVM allocations are supported for all the underlying allocations in Compute Libr
 @section S1_8_experimental_builds Experimental Bazel and CMake builds
 
 In addition to the scons build the repository includes experimental Bazel and CMake builds.
-Both are similar to the scons multi_isa build. It compiles all libraries with Neon (TM) support, as well as SVE and SVE2 libraries. The build is CPU only, not including OpenCL support.  Both were successfully built with gcc / g++ version 10.2.
+These builds currently support a limited range of options. Both are similar to the scons multi_isa build. It compiles all libraries with Neon (TM) support, as well as SVE and SVE2 libraries. The build is CPU only, not including OpenCL support. Only Linux environment is targeted for now. Both were successfully built with gcc / g++ version 10.2.
 
 @subsection S1_8_1_bazel_build Bazel build
 
@@ -495,14 +495,14 @@ File structure for all files included in the CMake build:
 
 Available build options:
 
-	- DEBUG: Enable ['-O0','-g','-gdwarf-2'] compilation flags
-	- WERROR: Enable -Werror compilation flag
-	- EXCEPTIONS: If disabled ARM_COMPUTE_EXCEPTIONS_DISABLED is enabled
-	- LOGGING: Enable logging
-	- BUILD_EXAMPLES: Build examples
-	- BUILD_TESTING: Build tests
-	- CPPTHREADS: Enable C++11 threads backend
-	- OPENMP: Enable OpenMP backend
+	- CMAKE_BUILD_TYPE: "Release" (default) enables ['-O3', '-DNDEBUG'] compilation flags, "Debug" enables ['-O0','-g','-gdwarf-2', '-DARM_COMPUTE_ASSERTS_ENABLED']
+	- ARM_COMPUTE_WERROR: Enable -Werror compilation flag
+	- ARM_COMPUTE_EXCEPTIONS: If disabled ARM_COMPUTE_EXCEPTIONS_DISABLED is enabled
+	- ARM_COMPUTE_LOGGING: Enable logging
+	- ARM_COMPUTE_BUILD_EXAMPLES: Build examples
+	- ARM_COMPUTE_BUILD_TESTING: Build tests
+	- ARM_COMPUTE_CPPTHREADS: Enable C++11 threads backend
+	- ARM_COMPUTE_OPENMP: Enable OpenMP backend
 
 @subsubsection S1_8_2_3_example_builds Example builds
 
@@ -510,7 +510,7 @@ To build libraries, examples and tests:
 
 	mkdir build
 	cd build
-	cmake .. -DOPENMP=1 -DWERROR=0 -DDEBUG=0 -DBUILD_EXAMPLES=1 -DBUILD_TESTING=1 -DCMAKE_INSTALL_LIBDIR=.
+	cmake .. -DCMAKE_BUILD_TYPE=Release -DARM_COMPUTE_OPENMP=1 -DARM_COMPUTE_WERROR=0 -DARM_COMPUTE_BUILD_EXAMPLES=1 -DARM_COMPUTE_BUILD_TESTING=1 -DCMAKE_INSTALL_LIBDIR=.
 	cmake --build . -j32
 
 @section S1_8_fixed_format Building with support for fixed format kernels
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 5b82a3200a..f2a22dba54 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -29,7 +29,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -42,7 +42,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -55,7 +55,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -68,7 +68,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -81,7 +81,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -94,7 +94,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -110,7 +110,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -123,7 +123,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -139,7 +139,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -152,7 +152,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -165,7 +165,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -178,7 +178,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -191,7 +191,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -204,7 +204,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -217,7 +217,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -230,7 +230,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -243,7 +243,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -256,7 +256,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -269,7 +269,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -282,7 +282,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -295,7 +295,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -308,7 +308,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -321,7 +321,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -334,7 +334,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -347,7 +347,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -360,7 +360,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -373,7 +373,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -386,7 +386,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -399,7 +399,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
@@ -412,7 +412,7 @@ cc_binary(
     copts = ["-march=armv8.2-a+fp16"],
     linkstatic = False,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//include",
         "//utils",
diff --git a/scripts/generate_build_files.py b/scripts/generate_build_files.py
index 0e639bf17e..beb32d06b8 100644
--- a/scripts/generate_build_files.py
+++ b/scripts/generate_build_files.py
@@ -149,7 +149,7 @@ filegroup(
 )
 
 filegroup(
-        name = "arm_compute_srcs",
+        name = "arm_compute_core_srcs",
         srcs = ["{line_separator.join(srcs_core)}"]  +
     glob(["**/*.h",
     "**/*.hpp",
@@ -189,8 +189,7 @@ target_sources(
     arm_compute_core
     PRIVATE
     {line_separator.join(srcs_core)}
-)
-    """
+)"""
     return template
 
 
@@ -232,8 +231,8 @@ def gather_sources():
 
     # Get attributes
     data_types = ["qasymm8", "qasymm8_signed", "qsymm16",
-                  "fp16", "fp32", "integer"]  # Are all needed?
-    data_layouts = ["nhwc", "nchw"]  # Are both needed?
+                  "fp16", "fp32", "integer"]
+    data_layouts = ["nhwc", "nchw"]
     fixed_format_kernels = ["fixed_format_kernels"]
     attrs = data_types + data_layouts + \
         fixed_format_kernels + ["estate64"]
diff --git a/src/BUILD.bazel b/src/BUILD.bazel
index 44a1e83aa6..8f35c7a659 100644
--- a/src/BUILD.bazel
+++ b/src/BUILD.bazel
@@ -355,7 +355,7 @@ filegroup(
 )
 
 filegroup(
-        name = "arm_compute_srcs",
+        name = "arm_compute_core_srcs",
         srcs = ["c/AclContext.cpp",
 	"c/AclOperator.cpp",
 	"c/AclQueue.cpp",
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index 606f403f38..13d78958e5 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -54,7 +54,7 @@ cc_library(
             }),
     linkstatic = True,
     deps = [
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:common_defines",
         "//tests/framework",
     ],
@@ -95,7 +95,7 @@ cc_binary(
     linkstatic = True,
     deps = [
         ":validation_framework",
-        "//:arm_compute",
+        "//:arm_compute_core",
         "//:arm_compute_graph",
         "//:common_defines",
         "//tests/framework",
@@ -147,6 +147,6 @@ cc_binary(
     deps = [
         ":arm_compute_validation",
         ":validation_framework",
-        "//:arm_compute",
+        "//:arm_compute_core",
     ],
 )