[builder][standalone-build] Have separate trace/verbose vars to control the build output

[kwk]

Summary

In D138114 I've introduced CMAKE_TRACE and mistakenly assumed it can be applied to cmake --build and cmake --install calls as well. That isn't the case. There only exist --verbose for build and install commands in cmake. That is why I have removed CMAKE_TRACE and replaced it with multiple variables to control llvm's, clang's, and lld's configure, build, check and install steps.

[kwk]

• Remove redundant vars

[kwk]

• Reorg vars

[kwk]

Squashed commits

zorg/buildbot/builders/annotated/standalone-build.sh

 
 BUILDBOT_ROOT=${BUILDBOT_ROOT:-${HERE}}
 REVISION=${BUILDBOT_REVISION:-origin/main}
 LLVM_ROOT="${BUILDBOT_ROOT}/llvm-project"
 BUILD_TYPE=Release
 INSTALL_ROOT_DIR=${BUILDBOT_ROOT}/install
 BUILD_ROOT_DIR=${BUILDBOT_ROOT}/build
 
-# Set CMAKE_TRACE=--trace to toggle on tracing of cmake calls to stderr
-CMAKE_TRACE=${CMAKE_TRACE:-}
+# Turn CMake into verbose or trace mode (only during configure)
+CMAKE_VERBOSE_LLVM=${CMAKE_VERBOSE_LLVM:-}
+CMAKE_VERBOSE_CLANG=${CMAKE_VERBOSE_CLANG:-}
+CMAKE_VERBOSE_LLD=${CMAKE_VERBOSE_LLD:-}
+
+# Enable CMake tracing during configure
+CMAKE_TRACE_CONFIGURE_LLVM=${CMAKE_TRACE_CONFIGURE_LLVM:-}
+CMAKE_TRACE_CONFIGURE_CLANG=${CMAKE_TRACE_CONFIGURE_CLANG:-}
+CMAKE_TRACE_CONFIGURE_LLD=${CMAKE_TRACE_CONFIGURE_LLD:-}
+
+# Enable CMake verbose-mode during building
+CMAKE_VERBOSE_BUILD_LLVM=${CMAKE_VERBOSE_BUILD_LLVM:-${CMAKE_VERBOSE_LLVM}}
+CMAKE_VERBOSE_BUILD_CLANG=${CMAKE_VERBOSE_BUILD_CLANG:-${CMAKE_VERBOSE_CLANG}}
+CMAKE_VERBOSE_BUILD_LLD=${CMAKE_VERBOSE_BUILD_LLD:-${CMAKE_VERBOSE_LLD}}
+
+# Enable CMake verbose-mode during checking
+CMAKE_VERBOSE_CHECK_LLVM=${CMAKE_VERBOSE_CHECK_LLVM:-${CMAKE_VERBOSE_LLVM}}
+CMAKE_VERBOSE_CHECK_CLANG=${CMAKE_VERBOSE_CHECK_CLANG:-${CMAKE_VERBOSE_CLANG}}
+CMAKE_VERBOSE_CHECK_LLD=${CMAKE_VERBOSE_CHECK_LLD:-${CMAKE_VERBOSE_LLD}}
+
+# Enable CMake verbose-mode during installation
+CMAKE_VERBOSE_INSTALL_LLVM=${CMAKE_VERBOSE_INSTALL_LLVM:-${CMAKE_VERBOSE_LLVM}}
+CMAKE_VERBOSE_INSTALL_CLANG=${CMAKE_VERBOSE_INSTALL_CLANG:-${CMAKE_VERBOSE_CLANG}}
+CMAKE_VERBOSE_INSTALL_LLD=${CMAKE_VERBOSE_INSTALL_LLD:-${CMAKE_VERBOSE_LLD}}
 
 install_dir() {
     echo ${INSTALL_ROOT_DIR}/$1
 }
 
 build_dir() {
     echo ${BUILD_ROOT_DIR}/$1
 }
build_llvm() {
     local LLVM_BUILD_DIR=$(build_dir llvm)
     local LLVM_INSTALL_DIR=$(install_dir llvm)
 
     build_step "Sparse checkout out llvm"
     git -C "${LLVM_ROOT}" sparse-checkout set llvm cmake third-party
 
     build_step "Configuring llvm"
 
-    cmake ${CMAKE_TRACE} \
+    cmake ${CMAKE_TRACE_CONFIGURE_LLVM} \
         -S ${LLVM_ROOT}/llvm \
         -B ${LLVM_BUILD_DIR} \
         -G Ninja \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -DLLVM_BUILD_LLVM_DYLIB=ON \
         -DLLVM_LINK_LLVM_DYLIB=ON \
         -DLLVM_INCLUDE_BENCHMARKS=OFF \
         -DLLVM_INSTALL_UTILS=ON \
         -DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL_DIR} \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
         -DLLVM_INCLUDE_UTILS:BOOL=ON \
         -DLLVM_INSTALL_UTILS:BOOL=ON \
         -DLLVM_UTILS_INSTALL_DIR:PATH=${LLVM_INSTALL_DIR}/bin \
         -DLLVM_CCACHE_BUILD=ON
 
     build_step "Building llvm"
-    cmake ${CMAKE_TRACE} --build ${LLVM_BUILD_DIR}
+    cmake ${CMAKE_VERBOSE_BUILD_LLVM} --build ${LLVM_BUILD_DIR}
     
     build_step "Testing llvm"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_TRACE} --build ${LLVM_BUILD_DIR} --target check-all
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_CHECK_LLVM} --build ${LLVM_BUILD_DIR} --target check-all
 
     build_step "Installing llvm"
     rm -rf ${LLVM_INSTALL_DIR}
-    cmake ${CMAKE_TRACE} --install ${LLVM_BUILD_DIR}
+    cmake ${CMAKE_VERBOSE_INSTALL_LLVM} --install ${LLVM_BUILD_DIR}
 
     # This is meant to extinguish any dependency on files being taken
     # from the llvm build dir when building clang.
     build_step "Removing llvm build dir"
     rm -rf "${LLVM_BUILD_DIR}"
 }
 
 build_clang() {
     local PYTHON_LIT_INSTALL_DIR=$(install_dir python-lit)
     local LLVM_INSTALL_DIR=$(install_dir llvm)
     local CLANG_BUILD_DIR=$(build_dir clang)
     local CLANG_INSTALL_DIR=$(install_dir clang)
 
     build_step "Sparse checkout out clang"
     git -C "${LLVM_ROOT}" sparse-checkout set clang cmake
 
     build_step "Configuring clang"
-    cmake ${CMAKE_TRACE} \
+    cmake ${CMAKE_TRACE_CONFIGURE_CLANG} \
         -S ${LLVM_ROOT}/clang \
         -B ${CLANG_BUILD_DIR} \
         -G Ninja \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -DCLANG_LINK_CLANG_DYLIB=ON \
         -DCLANG_INCLUDE_TESTS=ON \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
         -DCMAKE_INSTALL_PREFIX=${CLANG_INSTALL_DIR} \
         -DLLVM_ROOT=${LLVM_INSTALL_DIR} \
         -DLLVM_ENABLE_ASSERTIONS=ON \
         -DLLVM_TABLEGEN_EXE=${LLVM_INSTALL_DIR}/bin/llvm-tblgen \
         -DLLVM_CCACHE_BUILD=ON
 
     build_step "Building clang"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_TRACE} --build ${CLANG_BUILD_DIR}
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_BUILD_CLANG} --build ${CLANG_BUILD_DIR}
+
+    # TODO(kwk): Add Clang check
 
     build_step "Installing clang"
     rm -rf ${CLANG_INSTALL_DIR}
-    cmake ${CMAKE_TRACE} --install ${CLANG_BUILD_DIR}
+    cmake ${CMAKE_VERBOSE_INSTALL_CLANG} --install ${CLANG_BUILD_DIR}
 
     build_step "Removing clang build dir"
     rm -rf ${CLANG_BUILD_DIR}
 }
 
 build_lld() {
     local LLVM_INSTALL_DIR=$(install_dir llvm)
     local PYTHON_LIT_INSTALL_DIR=$(install_dir python-lit)
build_lld() {
     # no sense when the llvm dir doesn't exist. Let's fix this by just providing
     # the empty llvm dir so that paths are resolved without errors.
     # TODO: I don't know how to fix this easily
     rm -rf "${LLVM_ROOT}"/llvm && mkdir "${LLVM_ROOT}"/llvm
     rm -rf ${LLD_INSTALL_DIR}
     rm -rf ${LLD_BUILD_DIR}
 
     build_step "Configuring lld"
-    cmake ${CMAKE_TRACE} \
+    cmake ${CMAKE_TRACE_CONFIGURE_LLD} \
         -S ${LLVM_ROOT}/lld \
         -B ${LLD_BUILD_DIR} \
         -G Ninja \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -DLLVM_LINK_LLVM_DYLIB=ON \
         -DCMAKE_INSTALL_PREFIX=${LLD_INSTALL_DIR} \
         -DLLVM_ROOT=${LLVM_INSTALL_DIR} \
         -DLLVM_CCACHE_BUILD=ON \
         -DLLVM_INCLUDE_TESTS=ON \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit
 
     build_step "Building lld"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_TRACE} --build ${LLD_BUILD_DIR}
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_BUILD_LLD} --build ${LLD_BUILD_DIR}
 
     build_step "Testing lld"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_TRACE} --build ${LLD_BUILD_DIR} --target check-lld
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_CHECK_LLD} --build ${LLD_BUILD_DIR} --target check-lld
 
     build_step "Installing lld"
     rm -rf ${LLD_INSTALL_DIR}
-    cmake ${CMAKE_TRACE} --install ${LLD_BUILD_DIR}
+    cmake ${CMAKE_VERBOSE_INSTALL_LLD} --install ${LLD_BUILD_DIR}
 
     build_step "Removing lld build dir"
     rm -rf ${LLD_BUILD_DIR}
 }
 
 setup_llvm_project
 pre_build_cleanup
 
 build_python_lit
 discover_python_lit
 build_llvm
 build_clang
 build_lld
 
 exit 0