[libunwind][ci][AIX] Add libunwind to buildbot CI

[xingxue]

Summary

This patch changes scripts to add libunwind CI on AIX. Test config file ibm-libunwind-shared.cfg.in is introduced for testing on AIX.

[MaskRay]

Seems fine to me for libunwind, but I don't know the build bot setup enough. I will give a LGTM if you still lack an approval to make #libunwind green :)

[MaskRay]

libunwind/test/configs/ibm-libunwind-shared.cfg.in

23

Why is LIBPATH needed?

35

delete the trailing blank line

[xingxue]

Deleted a trailing empty line in file ibm-libunwind-shared.cfg.in.

libunwind/test/configs/ibm-libunwind-shared.cfg.in

23

The AIX linker/loader does not support $ORIGIN so setting env var LIBPATH makes sure the loader loads libraries from the directories it specifies.

35

Done.

[xingxue]

Rebased and picked up the change in D125981 which introduces the cmake-bridge.cfg.in file to reduce the libunwind test config duplication. Thanks, @ldionne!

[MaskRay]

libunwind/test/configs/ibm-libunwind-shared.cfg.in

2

Delete # with no text. I know that you copy the style from another file in the directory, but it seems that libcxx/test/configs/*.cfg.in files don't have the redundant #.

[xingxue]

Deleted an empty line with a leading # sign as suggested.

[xingxue]

libunwind/test/configs/ibm-libunwind-shared.cfg.in

2

Deleted the empty line with a leading # sign at the top of the file. The current line 2 is kept which is consistent with libcxx/test/configs/ibm-libc++-shared.cfg.in.

[ldionne]

LGTM after my suggestion in run-buildbot.

libcxx/utils/ci/run-buildbot

603–610

This can now become simply:

generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AIX.cmake" \
                   -DLIBCXX_TEST_CONFIG="ibm-libc++-shared.cfg.in" \
                   -DLIBCXXABI_TEST_CONFIG="ibm-libc++abi-shared.cfg.in" \
                   -DLIBUNWIND_TEST_CONFIG="ibm-libunwind-shared.cfg.in"
check-runtimes

[xingxue]

Addressed comment - changed as per suggestion.

[xingxue]

libcxx/utils/ci/run-buildbot

603–610

Changed as suggested, thanks!

libcxx/cmake/caches/AIX.cmake

 set(CMAKE_BUILD_TYPE Release CACHE STRING "")
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
 set(CMAKE_C_FLAGS "-D__LIBC_NO_CPP_MATH_OVERLOADS__" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-D__LIBC_NO_CPP_MATH_OVERLOADS__" CACHE STRING "")
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-G -Wl,-bcdtors:all:-2147483548:s" CACHE STRING "")
 
 set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
 set(LIBCXX_ENABLE_ASSERTIONS OFF CACHE BOOL "")
 set(LIBCXX_ABI_VERSION "1" CACHE STRING "")
 set(LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "")
 set(LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY OFF CACHE BOOL "")
 set(LIBCXX_ENABLE_SHARED ON CACHE BOOL "")
 set(LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
 set(LIBCXXABI_ENABLE_SHARED ON CACHE BOOL "")
 set(LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
 set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
+set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
+set(LIBUNWIND_ENABLE_SHARED ON CACHE BOOL "")
+set(LIBUNWIND_ENABLE_STATIC OFF CACHE BOOL "")

libcxx/utils/ci/run-buildbot

generate-cmake \
           -C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake"
     echo "+++ Running the libc++ tests"
     ${NINJA} -vC "${BUILD_DIR}" check-cxx
 ;;
 aix)
     export CC=ibm-clang
     export CXX=ibm-clang++_r
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AIX.cmake" \
                    -DLIBCXX_TEST_CONFIG="ibm-libc++-shared.cfg.in" \
                    -DLIBCXXABI_TEST_CONFIG="ibm-libc++abi-shared.cfg.in" \
-                   -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"
-    # TODO: use check-runtimes once libunwind builds cleanly on AIX.
-    ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi
-    ${NINJA} -vC "${BUILD_DIR}" check-cxx check-cxxabi
+                   -DLIBUNWIND_TEST_CONFIG="ibm-libunwind-shared.cfg.in" \
+                   -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind"
+    ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi install-unwind
+    check-runtimes
 ;;
 #################################################################
 # Insert vendor-specific internal configurations below.
 #
 # This allows vendors to extend this file with their own internal
 # configurations without running into merge conflicts with upstream.
 #################################################################
 
 #################################################################
 *)
     echo "${BUILDER} is not a known configuration"
     exit 1
 ;;
 esac

libunwind/test/CMakeLists.txt

 endif()
 
 foreach(param IN LISTS LIBUNWIND_TEST_PARAMS)
   string(REGEX REPLACE "(.+)=(.+)" "\\1" name "${param}")
   string(REGEX REPLACE "(.+)=(.+)" "\\2" value "${param}")
   serialize_lit_param("${name}" "\"${value}\"")
 endforeach()
 
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/configs/cmake-bridge.cfg.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/cmake-bridge.cfg"
+               @ONLY)
+
 configure_lit_site_cfg(
   "${LIBUNWIND_TEST_CONFIG}"
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
   MAIN_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py")
 
 add_lit_testsuite(check-unwind "Running libunwind tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS unwind ${LIBUNWIND_TEST_DEPS})

libunwind/test/configs/cmake-bridge.cfg.in

+@AUTO_GEN_COMMENT@
+
+@SERIALIZED_LIT_PARAMS@
+
+#
+# This file performs the bridge between the CMake configuration and the Lit
+# configuration files by setting up the LitConfig object and various Lit
+# substitutions from CMake variables.
+#
+# Individual configuration files can take advantage of this bridge by
+# loading the file and then setting up the remaining Lit substitutions.
+#
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+site.addsitedir(os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test'))
+import libcxx.test.format
+
+# Basic configuration of the test suite
+config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
+config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
+config.recursiveExpansionLimit = 10
+config.test_exec_root = '@CMAKE_BINARY_DIR@'
+config.target_info = "@LIBUNWIND_TARGET_INFO@"
+
+# TODO: This is a non-standard Lit attribute and we should have another way of accessing this.
+config.host_triple = '@LLVM_HOST_TRIPLE@'
+
+config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
+config.substitutions.append(('%{libcxx}', '@LIBCXXABI_LIBCXX_PATH@'))
+config.substitutions.append(('%{include}', '@LIBUNWIND_SOURCE_DIR@/include'))
+config.substitutions.append(('%{cxx-include}', '@LIBCXXABI_HEADER_DIR@/include/c++/v1'))
+config.substitutions.append(('%{cxx-target-include}', '@LIBCXXABI_HEADER_DIR@/%{triple}/include/c++/v1'))
+config.substitutions.append(('%{lib}', '@LIBUNWIND_LIBRARY_DIR@'))
+config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))

libunwind/test/configs/ibm-libunwind-shared.cfg.in

+@AUTO_GEN_COMMENT@
+
+@SERIALIZED_LIT_PARAMS@
+
+#
+# Testing configuration for libunwind on AIX.
+#
+# This file is a lot simpler than the ones for libc++ and libc++abi because
+# while libunwind is written in C++, it doesn't use the C++ Standard Library
+# so we don't need to set that up to run the tests correctly.
+#
+
+lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
+
+config.substitutions.append(('%{flags}', ''))
+config.substitutions.append(('%{compile_flags}',
+    '-nostdinc++ -I %{include} -I %{cxx-include}'
+))
+config.substitutions.append(('%{link_flags}',
+    '-nostdlib++ -L %{lib} -lunwind -ldl -Wl,-bbigtoc'
+))
+config.substitutions.append(('%{exec}',
+    '%{executor} --execdir %T --env LIBPATH=%{lib} -- '
+))
+
+import os, site
+site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
+import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
+libcxx.test.newconfig.configure(
+    libcxx.test.params.DEFAULT_PARAMETERS,
+    libcxx.test.features.DEFAULT_FEATURES,
+    config,
+    lit_config
+)
+

libunwind/test/configs/llvm-libunwind-shared.cfg.in

 @AUTO_GEN_COMMENT@
 
 @SERIALIZED_LIT_PARAMS@
 
 #
 # Configuration file for running the libunwind tests against the shared library.
 #
 # This file is a lot simpler than the ones for libc++ and libc++abi because
 # while libunwind is written in C++, it doesn't use the C++ Standard Library
 # so we don't need to set that up to run the tests correctly.
 #
 
-import os, site
-site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
-import libcxx.test.format
-
-# Basic configuration of the test suite
-config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
-config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
-config.test_format = libcxx.test.format.CxxStandardLibraryTest()
-config.recursiveExpansionLimit = 10
-config.test_exec_root = '@CMAKE_BINARY_DIR@'
-config.target_info = "@LIBUNWIND_TARGET_INFO@"
+lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
 
 compile_flags = []
 link_flags = []
 if @LIBUNWIND_USES_ARM_EHABI@:
     config.available_features.add('libunwind-arm-ehabi')
 
 if not @LIBUNWIND_ENABLE_THREADS@:
     config.available_features.add('libunwind-no-threads')
 
 if @LIBUNWIND_ENABLE_CET@:
     compile_flags.append('-fcf-protection=full')
 
 if '@CMAKE_SYSTEM_NAME@' == 'Linux':
     link_flags.append('-Wl,--export-dynamic')
 
 # Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
 compile_flags.append('-funwind-tables')
 
-config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))
-
-config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
 local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@'
 config.substitutions.append(('%{flags}',
     '-isysroot {}'.format(local_sysroot) if local_sysroot else ''
 ))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
 ))
 config.substitutions.append(('%{link_flags}',

libunwind/test/configs/llvm-libunwind-static.cfg.in

 @AUTO_GEN_COMMENT@
 
 @SERIALIZED_LIT_PARAMS@
 
 #
 # Configuration file for running the libunwind tests against the static library.
 #
 # This file is a lot simpler than the ones for libc++ and libc++abi because
 # while libunwind is written in C++, it doesn't use the C++ Standard Library
 # so we don't need to set that up to run the tests correctly.
 #
 
-import os, site
-site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
-import libcxx.test.format
-
-# Basic configuration of the test suite
-config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
-config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
-config.test_format = libcxx.test.format.CxxStandardLibraryTest()
-config.recursiveExpansionLimit = 10
-config.test_exec_root = '@CMAKE_BINARY_DIR@'
-config.target_info = "@LIBUNWIND_TARGET_INFO@"
+lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
 
 compile_flags = []
 link_flags = []
 
 if @LIBUNWIND_USES_ARM_EHABI@:
     config.available_features.add('libunwind-arm-ehabi')
 
 if not @LIBUNWIND_ENABLE_THREADS@:
     config.available_features.add('libunwind-no-threads')
 else:
     link_flags.append('-lpthread')
 
 if @LIBUNWIND_ENABLE_CET@:
     compile_flags.append('-fcf-protection=full')
 
 if '@CMAKE_SYSTEM_NAME@' == 'Linux':
     link_flags.append('-Wl,--export-dynamic')
 
 
 # Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
 compile_flags.append('-funwind-tables')
 
-config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))
-
-config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
-
 local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@'
 config.substitutions.append(('%{flags}',
     '-isysroot {}'.format(local_sysroot) if local_sysroot else ''
 ))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags))
 ))
 config.substitutions.append(('%{link_flags}',