Add tooling for generating OSS test CMakeLists.txt

kirklandsign · kirklandsign · commit 51dbed35b496 · 2024-05-15T15:49:11.000-07:00
Use runtime/core/test as example:
python test/utils.generate_gtest_cmake_lists.py

Then run
sh test/run_oss_cpp_tests.sh

Note: for generate_gtest_cmake_lists.py CONFIG, you can use buck
```
buck cquery "inputs(deps('//runtime/core/test/...'))" | grep test.cpp
```
to get test srcs. However, manual check is needed.

After this, all runtime/core OSS tests are added.
diff --git a/runtime/core/exec_aten/testing_util/test/CMakeLists.txt b/runtime/core/exec_aten/testing_util/test/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# ### Editing this file ###
+# This file is generated by test/utils/generate_gtest_cmakelists.py
+#
+# This file should be formatted with
+# ~~~
+# cmake-format -i CMakeLists.txt
+# ~~~
+# It should also be cmake-lint clean.
+#
+
+cmake_minimum_required(VERSION 3.19)
+project(runtime_core_exec_aten_testing_util_test)
+
+# Use C++14 for test.
+set(CMAKE_CXX_STANDARD 14)
+
+set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
+
+include(${EXECUTORCH_ROOT}/build/Utils.cmake)
+
+# Find prebuilt executorch library
+find_package(executorch CONFIG REQUIRED)
+
+enable_testing()
+find_package(GTest CONFIG REQUIRED)
+
+# Let files say "include <executorch/path/to/header.h>".
+set(_common_include_directories ${EXECUTORCH_ROOT}/..)
+target_include_directories(executorch INTERFACE ${_common_include_directories})
+
+set(_test_srcs tensor_util_test.cpp tensor_factory_test.cpp ../tensor_util.cpp)
+
+add_executable(runtime_core_exec_aten_testing_util_test ${_test_srcs})
+target_link_libraries(
+  runtime_core_exec_aten_testing_util_test GTest::gtest GTest::gtest_main
+  GTest::gmock executorch
+)
+add_test(ExecuTorchTest runtime_core_exec_aten_testing_util_test)
diff --git a/runtime/core/exec_aten/util/test/CMakeLists.txt b/runtime/core/exec_aten/util/test/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# ### Editing this file ###
+# This file is generated by test/utils/generate_gtest_cmakelists.py
+#
+# This file should be formatted with
+# ~~~
+# cmake-format -i CMakeLists.txt
+# ~~~
+# It should also be cmake-lint clean.
+#
+
+cmake_minimum_required(VERSION 3.19)
+project(runtime_core_exec_aten_util_test)
+
+# Use C++14 for test.
+set(CMAKE_CXX_STANDARD 14)
+
+set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../..)
+
+include(${EXECUTORCH_ROOT}/build/Utils.cmake)
+
+# Find prebuilt executorch library
+find_package(executorch CONFIG REQUIRED)
+
+enable_testing()
+find_package(GTest CONFIG REQUIRED)
+
+# Let files say "include <executorch/path/to/header.h>".
+set(_common_include_directories ${EXECUTORCH_ROOT}/..)
+target_include_directories(executorch INTERFACE ${_common_include_directories})
+
+set(_test_srcs
+    tensor_util_test.cpp scalar_type_util_test.cpp
+    operator_impl_example_test.cpp dim_order_util_test.cpp
+    ../../testing_util/tensor_util.cpp
+)
+
+add_executable(runtime_core_exec_aten_util_test ${_test_srcs})
+target_link_libraries(
+  runtime_core_exec_aten_util_test GTest::gtest GTest::gtest_main GTest::gmock
+  executorch
+)
+add_test(ExecuTorchTest runtime_core_exec_aten_util_test)
diff --git a/runtime/core/portable_type/test/CMakeLists.txt b/runtime/core/portable_type/test/CMakeLists.txt
@@ -5,6 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 # ### Editing this file ###
+# This file is generated by test/utils/generate_gtest_cmakelists.py
 #
 # This file should be formatted with
 # ~~~
@@ -16,8 +17,8 @@
 cmake_minimum_required(VERSION 3.19)
 project(runtime_core_portable_type_test)
 
-# Use C++11 for test.
-set(CMAKE_CXX_STANDARD 11)
+# Use C++14 for test.
+set(CMAKE_CXX_STANDARD 14)
 
 set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 
@@ -30,9 +31,7 @@ enable_testing()
 find_package(GTest CONFIG REQUIRED)
 
 # Let files say "include <executorch/path/to/header.h>".
-set(_common_include_directories
-    ${EXECUTORCH_ROOT}/..
-)
+set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 target_include_directories(executorch INTERFACE ${_common_include_directories})
 
 set(_test_srcs optional_test.cpp executor_tensor_test.cpp half_test.cpp
@@ -41,6 +40,7 @@ set(_test_srcs optional_test.cpp executor_tensor_test.cpp half_test.cpp
 
 add_executable(runtime_core_portable_type_test ${_test_srcs})
 target_link_libraries(
-  runtime_core_portable_type_test GTest::gtest GTest::gtest_main executorch
+  runtime_core_portable_type_test GTest::gtest GTest::gtest_main GTest::gmock
+  executorch
 )
 add_test(ExecuTorchTest runtime_core_portable_type_test)
diff --git a/runtime/core/test/CMakeLists.txt b/runtime/core/test/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# ### Editing this file ###
+# This file is generated by test/utils/generate_gtest_cmakelists.py
+#
+# This file should be formatted with
+# ~~~
+# cmake-format -i CMakeLists.txt
+# ~~~
+# It should also be cmake-lint clean.
+#
+
+cmake_minimum_required(VERSION 3.19)
+project(runtime_core_test)
+
+# Use C++14 for test.
+set(CMAKE_CXX_STANDARD 14)
+
+set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+
+include(${EXECUTORCH_ROOT}/build/Utils.cmake)
+
+# Find prebuilt executorch library
+find_package(executorch CONFIG REQUIRED)
+
+enable_testing()
+find_package(GTest CONFIG REQUIRED)
+
+# Let files say "include <executorch/path/to/header.h>".
+set(_common_include_directories ${EXECUTORCH_ROOT}/..)
+target_include_directories(executorch INTERFACE ${_common_include_directories})
+
+set(_test_srcs
+    span_test.cpp
+    error_handling_test.cpp
+    event_tracer_test.cpp
+    freeable_buffer_test.cpp
+    array_ref_test.cpp
+    memory_allocator_test.cpp
+    hierarchical_allocator_test.cpp
+    evalue_test.cpp
+)
+
+add_executable(runtime_core_test ${_test_srcs})
+target_link_libraries(
+  runtime_core_test GTest::gtest GTest::gtest_main GTest::gmock executorch
+)
+add_test(ExecuTorchTest runtime_core_test)
diff --git a/runtime/core/test/span_test.cpp b/runtime/core/test/span_test.cpp
@@ -44,7 +44,7 @@ TEST(SpanTest, MutableElements) {
 TEST(SpanTest, Empty) {
   int64_t x[2] = {1, 2};
   Span<int64_t> span_full = {x, 2};
-  Span<int64_t> span_empty = {x, (int64_t)0};
+  Span<int64_t> span_empty = {x, (size_t)0};
 
   EXPECT_FALSE(span_full.empty());
   EXPECT_TRUE(span_empty.empty());
diff --git a/test/run_oss_cpp_tests.sh b/test/run_oss_cpp_tests.sh
@@ -15,9 +15,12 @@ build_executorch() {
 build_and_run_test() {
   local test_dir=$1
   cmake "${test_dir}" -Bcmake-out/"${test_dir}" -DCMAKE_INSTALL_PREFIX=cmake-out
-  cmake --build cmake-out/"${test_dir}"
+  cmake --build cmake-out/"${test_dir}" -j9
   for t in $(cmake-out/"${test_dir}"/*test); do ./"$t"; done
 }
 
 build_executorch
 build_and_run_test runtime/core/portable_type/test/
+build_and_run_test runtime/core/test/
+build_and_run_test runtime/core/exec_aten/util/test/
+build_and_run_test runtime/core/exec_aten/testing_util/test/
diff --git a/test/utils/generate_gtest_cmakelists.py b/test/utils/generate_gtest_cmakelists.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+import os
+import shutil
+import subprocess
+
+
+TEMPLATE = """# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# ### Editing this file ###
+# This file is generated by test/utils/generate_gtest_cmakelists.py
+#
+# This file should be formatted with
+# ~~~
+# cmake-format -i CMakeLists.txt
+# ~~~
+# It should also be cmake-lint clean.
+#
+
+cmake_minimum_required(VERSION 3.19)
+project({project_name})
+
+# Use C++14 for test.
+set(CMAKE_CXX_STANDARD 14)
+
+set(EXECUTORCH_ROOT ${{CMAKE_CURRENT_SOURCE_DIR}}/{path_to_root})
+
+include(${{EXECUTORCH_ROOT}}/build/Utils.cmake)
+
+# Find prebuilt executorch library
+find_package(executorch CONFIG REQUIRED)
+
+enable_testing()
+find_package(GTest CONFIG REQUIRED)
+
+# Let files say "include <executorch/path/to/header.h>".
+set(_common_include_directories
+    ${{EXECUTORCH_ROOT}}/..
+)
+target_include_directories(executorch INTERFACE ${{_common_include_directories}})
+
+set(_test_srcs {test_srcs})
+
+add_executable({project_name} ${{_test_srcs}})
+target_link_libraries(
+  {project_name} GTest::gtest GTest::gtest_main GTest::gmock executorch
+)
+add_test(ExecuTorchTest {project_name})
+"""
+
+
+def calculate_project_name(path_to_root):
+    """
+    Get a cmake project name for that path using relative path.
+    >>> calculate_project_name("runtime/core/portable_type/test")
+    'runtime_core_portable_type_test'
+    """
+    return path_to_root.replace("/", "_")
+
+
+def calculate_relative_path(path_to_root):
+    """
+    Return the relative path from the path_to_root to root (i.e. "..")
+    >>> calculate_relative_path("runtime/core/portable_type/test")
+    '../../../..'
+    """
+    return os.path.relpath("/", "/" + path_to_root)
+
+
+def format_template(path_to_root, test_srcs):
+    """
+    Format the template with the given path_to_root and test_srcs.
+    """
+    return TEMPLATE.format(
+        project_name=calculate_project_name(path_to_root),
+        path_to_root=calculate_relative_path(path_to_root),
+        test_srcs=" ".join(test_srcs),
+    )
+
+
+CONFIG = [
+    (
+        "runtime/core/portable_type/test",
+        [
+            "optional_test.cpp",
+            "executor_tensor_test.cpp",
+            "half_test.cpp",
+            "scalar_test.cpp",
+            "tensor_impl_test.cpp",
+        ],
+    ),
+    (
+        "runtime/core/test",
+        [
+            "span_test.cpp",
+            "error_handling_test.cpp",
+            "event_tracer_test.cpp",
+            "freeable_buffer_test.cpp",
+            "array_ref_test.cpp",
+            "memory_allocator_test.cpp",
+            "hierarchical_allocator_test.cpp",
+            "evalue_test.cpp",
+        ],
+    ),
+    (
+        "runtime/core/exec_aten/util/test",
+        [
+            "tensor_util_test.cpp",
+            "scalar_type_util_test.cpp",
+            "operator_impl_example_test.cpp",
+            "dim_order_util_test.cpp",
+            "../../testing_util/tensor_util.cpp",
+        ],
+    ),
+    (
+        "runtime/core/exec_aten/testing_util/test",
+        ["tensor_util_test.cpp", "tensor_factory_test.cpp", "../tensor_util.cpp"],
+    ),
+]
+
+
+def write_template(path_to_root, test_srcs):
+    """
+    Write the template to the given path_to_root.
+    """
+    with open(os.path.join(path_to_root, "CMakeLists.txt"), "w") as f:
+        f.write(format_template(path_to_root, test_srcs))
+
+
+if __name__ == "__main__":
+    for path_to_root, test_srcs in CONFIG:
+        write_template(path_to_root, test_srcs)
+        if shutil.which("cmake-format") is not None:
+            subprocess.run(
+                ["cmake-format", "-i", path_to_root + "/CMakeLists.txt"], check=True
+            )
+        else:
+            print(f"Please run cmake-format -i {path_to_root}/CMakeLists.txt")
+    print("Note: Please update test/run_oss_cpp_tests.sh")
