Remove cmake-distinguishing references from names, comments

Author: alexreinking

master/master.cfg

@@ -57,6 +57,7 @@ GITHUB_TOKEN = (SECRETS_DIR / "github_token.txt").read_text().strip()
 HALIDE_BB_PASS = (SECRETS_DIR / "halide_bb_pass.txt").read_text().strip()
 WEBHOOK_TOKEN = (SECRETS_DIR / "webhook_token.txt").read_text().strip()
 
+
 # LLVM
 
 # At any given time, we test (at least) 3 LLVM versions:
@@ -226,7 +227,7 @@ performance_lock = WorkerLock("performance_lock", maxCount=9999)
 # When building the LLVM nightlies, we can sync & build LLVM independently
 # from other work, but when we update the install directory, we need to ensure
 # we have an exclusive lock across the entire worker. (Since we have a small
-# number of LLVM versions, and since 'make install' doesn't take very long,
+# number of LLVM versions, and since 'cmake --install' doesn't take very long,
 # we could probably just get by with a single lock for *any* llvm install,
 # but this isn't much harder to do.)
 llvm_build_locks = {}
@@ -300,9 +301,7 @@ class BuilderType:
     setup. (If we ever need to do so, compiler should be added to this.)
     """
 
-    def __init__(
-        self, arch, bits, os, halide_branch, llvm_branch, purpose, sanitizer=None
-    ):
+    def __init__(self, arch, bits, os, halide_branch, llvm_branch, purpose, sanitizer=None):
         assert arch in ["arm", "x86"]
         assert bits in [32, 64]
         assert os in ["linux", "windows", "osx"]
@@ -655,7 +654,7 @@ def get_halide_cmake_options(builder_type, build_dir):
     return options
 
 
-def get_ctest_options(builder_type, build_dir):
+def get_ctest_options(builder_type):
     assert builder_type.purpose != Purpose.llvm_nightly
 
     if builder_type.sanitizer:
@@ -669,7 +668,10 @@ def get_ctest_options(builder_type, build_dir):
         return {"build_config": "Release"}
 
 
-def get_halide_cmake_definitions(builder_type, halide_target="host", wasm_jit="wabt", extra_cmake_defs={}):
+def get_halide_cmake_definitions(builder_type, halide_target="host", wasm_jit="wabt", extra_cmake_defs=None):
+    if extra_cmake_defs is None:
+        extra_cmake_defs = {}
+
     cmake_definitions = {
         "Clang_DIR": get_llvm_install_path(builder_type, "lib/cmake/clang"),
         "CMAKE_INSTALL_PREFIX": get_halide_install_path(builder_type),
@@ -728,14 +730,15 @@ def get_halide_cmake_definitions(builder_type, halide_target="host", wasm_jit="w
     return cmake_definitions
 
 
-def get_cmake_build_command(builder_type, build_dir, targets=None):
-    cmd = ["ninja", "-C", build_dir, "-j", Property("WORKER_BUILD_PARALLELISM")]
+def get_build_command(builder_type, build_dir, targets=None):
+    cmd = ["cmake", "--build", build_dir, "-j", Property("WORKER_BUILD_PARALLELISM")]
 
     # TODO(srj): for debugging apps/c_backend
     if builder_type.os == "windows":
-        cmd.append("-v")
+        cmd.append("--verbose")
 
     if targets:
+        cmd.append("--target")
         cmd.extend(targets)
 
     return cmd
@@ -1162,7 +1165,7 @@ def add_llvm_steps(factory, builder_type, clean_rebuild):
             haltOnFailure=True,
             workdir=build_dir,
             env=Property("env"),
-            command=get_cmake_build_command(builder_type, build_dir, targets=["install"]),
+            command=get_build_command(builder_type, build_dir, targets=["install"]),
         )
     )
 
@@ -1291,7 +1294,7 @@ def add_llvm_steps(factory, builder_type, clean_rebuild):
     )
 
 
-def add_halide_cmake_build_steps(factory, builder_type):
+def add_halide_build_steps(factory, builder_type):
     # Always do a clean build for Halide
     source_dir = get_halide_source_path()
     build_dir = get_halide_build_path()
@@ -1354,12 +1357,12 @@ def add_halide_cmake_build_steps(factory, builder_type):
             haltOnFailure=True,
             workdir=build_dir,
             env=Property("env"),
-            command=get_cmake_build_command(builder_type, build_dir, targets=["all", "install"]),
+            command=get_build_command(builder_type, build_dir, targets=["all", "install"]),
         )
     )
 
 
-def add_halide_cmake_package_steps(factory, builder_type):
+def add_halide_package_steps(factory, builder_type):
     source_dir = get_halide_source_path()
 
     target = builder_type.halide_target()
@@ -1591,7 +1594,7 @@ def short_target(halide_target):
         return "<unknown>"
 
 
-def add_halide_cmake_test_steps(factory, builder_type):
+def add_halide_test_steps(factory, builder_type):
     parallelism = Property("WORKER_BUILD_PARALLELISM")
 
     labels = get_test_labels(builder_type)
@@ -1673,7 +1676,7 @@ def add_halide_cmake_test_steps(factory, builder_type):
                 haltOnFailure=True,
                 workdir=build_dir,
                 env=env,
-                command=get_cmake_build_command(builder_type, build_dir, targets=["all", "install"]),
+                command=get_build_command(builder_type, build_dir, targets=["all", "install"]),
             )
         )
 
@@ -1733,7 +1736,7 @@ def add_halide_cmake_test_steps(factory, builder_type):
                     labels=parallel_test_labels,
                     exclude_tests=exclude_tests,
                     jobs=parallelism,
-                    **get_ctest_options(builder_type, build_dir),
+                    **get_ctest_options(builder_type),
                 )
             )
 
@@ -1750,7 +1753,7 @@ def add_halide_cmake_test_steps(factory, builder_type):
                     labels=exclusive_test_labels,
                     verbose=True,
                     extra_flags=["--repeat", "until-pass:5"],
-                    **get_ctest_options(builder_type, build_dir),
+                    **get_ctest_options(builder_type),
                 )
             )
 
@@ -1793,7 +1796,7 @@ def add_halide_cmake_test_steps(factory, builder_type):
                     haltOnFailure=True,
                     workdir=apps_build_dir,
                     env=env,
-                    command=get_cmake_build_command(builder_type, apps_build_dir),
+                    command=get_build_command(builder_type, apps_build_dir),
                 )
             )
 
@@ -1823,22 +1826,22 @@ def add_halide_cmake_test_steps(factory, builder_type):
                     exclude_labels=["slow_tests"],
                     verbose=True,
                     extra_flags=retry_flags,
-                    **get_ctest_options(builder_type, apps_build_dir),
+                    **get_ctest_options(builder_type),
                 )
             )
 
 
-def create_halide_cmake_factory(builder_type):
+def create_halide_build_factory(builder_type):
     factory = BuildFactory()
     add_env_setup_step(factory, builder_type)
     add_get_halide_source_steps(factory, builder_type)
     add_create_venv_step(factory, builder_type)
-    add_halide_cmake_build_steps(factory, builder_type)
-    add_halide_cmake_test_steps(factory, builder_type)
+    add_halide_build_steps(factory, builder_type)
+    add_halide_test_steps(factory, builder_type)
 
     # If everything else looks ok, build a distrib.
     if builder_type.purpose == Purpose.halide_nightly:
-        add_halide_cmake_package_steps(factory, builder_type)
+        add_halide_package_steps(factory, builder_type)
 
     return factory
 
@@ -1875,7 +1878,7 @@ def create_halide_builder(arch, bits, os, halide_branch, llvm_branch, purpose):
         builder = BuilderConfig(
             name=builder_type.builder_label(),
             workernames=workers,
-            factory=create_halide_cmake_factory(builder_type),
+            factory=create_halide_build_factory(builder_type),
             collapseRequests=True,
             # We need counting access to our llvm branch during Halide builds.
             # (We could probably get by with access during only a subset of
@@ -1974,7 +1977,7 @@ def create_halide_scheduler(halide_branch):
         )
 
 
-def create_llvm_cmake_factory(builder_type):
+def create_llvm_build_factory(builder_type):
     factory = BuildFactory()
     add_env_setup_step(factory, builder_type)
     add_get_llvm_source_steps(factory, builder_type)
@@ -2002,7 +2005,7 @@ def create_llvm_builders():
                     name="%s/%s" % (label, w),
                     workerbuilddir=label,
                     workernames=[w],
-                    factory=create_llvm_cmake_factory(builder_type),
+                    factory=create_llvm_build_factory(builder_type),
                     collapseRequests=True,
                     # We want exclusive access to this workerlock
                     # thru all this Builder's steps. (We could probably