[benchmark] Re-enable building benchmark tests

[mtrofin]

Gentle reminder - thanks!

[mtrofin]

Gentle reminder - thanks!

[lebedev.ri]

No particular opinion, if it works - cool.

[DavidSpickett]

I've reverted this (https://github.com/llvm/llvm-test-suite/commit/f6b04890c21ac634fcba6075017ec1487a85e132) as it's causing cmake to fail on all of the Linaro bots running the test suite.

E.g. https://lab.llvm.org/buildbot/#/builders/178/builds/151/steps/19/logs/stdio

CMake Error at cmake/modules/TestSuite.cmake:99 (add_dependencies):
  Cannot add target-level dependencies to non-existent target
  "donotoptimize_assembly_test".
  The add_dependencies works for top-level logical targets created by the
  add_executable, add_library, or add_custom_target commands.  If you want to
  add file-level dependencies see the DEPENDS option of the add_custom_target
  and add_custom_command commands.
Call Stack (most recent call first):
  MicroBenchmarks/libs/CMakeLists.txt:16 (test_suite_add_build_dependencies)

Do we need to enable these targets elsewhere before trying to add dependencies for them?

If it turns out the cmake cache needs clearing I can do that on our side.

[mtrofin]

In D105361#2882554, @DavidSpickett wrote:

I've reverted this (https://github.com/llvm/llvm-test-suite/commit/f6b04890c21ac634fcba6075017ec1487a85e132) as it's causing cmake to fail on all of the Linaro bots running the test suite.

E.g. https://lab.llvm.org/buildbot/#/builders/178/builds/151/steps/19/logs/stdio

CMake Error at cmake/modules/TestSuite.cmake:99 (add_dependencies):
  Cannot add target-level dependencies to non-existent target
  "donotoptimize_assembly_test".
  The add_dependencies works for top-level logical targets created by the
  add_executable, add_library, or add_custom_target commands.  If you want to
  add file-level dependencies see the DEPENDS option of the add_custom_target
  and add_custom_command commands.
Call Stack (most recent call first):
  MicroBenchmarks/libs/CMakeLists.txt:16 (test_suite_add_build_dependencies)

Do we need to enable these targets elsewhere before trying to add dependencies for them?

If it turns out the cmake cache needs clearing I can do that on our side.

This may be a caching issue. Can you look at the cache and see if BENCHMARK_ENABLE_TESTING is defined, and what value?

Locally, on a clean build directory, this has no issue.

[DavidSpickett]

Fix for review: https://reviews.llvm.org/D106155

MicroBenchmarks/libs/CMakeLists.txt

 # The benchmark library build system uses try_run tests to determine regex
 # Circumvent these tests and enforce std::regex
 set(CMAKE_CXX_STANDARD 11)
 set(HAVE_STD_REGEX 1)
 # When enforcing c++11 we need to disable one of the benchmark library's tests
 set(BENCHMARK_HAS_CXX03_FLAG 0)
 
-# Disable benchmark's test targets, to avoid needing to add
-# `test_suite_add_build_dependencies` for them as they evolve upstream.
-# `benchmark` is the only target we actually need.
-set(BENCHMARK_ENABLE_TESTING Off)
 add_subdirectory(benchmark)
 test_suite_add_build_dependencies(benchmark)
+test_suite_add_build_dependencies(output_test_helper)
+test_suite_add_build_dependencies(gtest)
+test_suite_add_build_dependencies(gmock)
+
+# These tests, when built with BENCHMARK_ENABLE_ASSEMBLY_TESTS is on.
+# They don't depend on the above, so we need to list them explicitly.
+test_suite_add_build_dependencies(donotoptimize_assembly_test)
+test_suite_add_build_dependencies(state_assembly_test)
+test_suite_add_build_dependencies(clobber_memory_assembly_test)