[Buildbot] Updated configuration for Armv7/Aarch64 Win-x-Linux cross builders.

[vvereschaka]

Summary

In order to updated the cmake cache file for the Linux-x-Win cross builds, which has been changed to support building the libraries in the multitarget mode, we need to update the builder configuration to handle running the library tests properly. Currently we need to specify a proper target for the tests directly within the lit test parameters (or ninja target).

[gkistanova]

LGTM

[tstellar]

Hi, I think this change caused the llvm-clang-win-x-aarch64-release builder to fail. I'm seeing the following error in the logs which seems to be related to this change:

error: unable to create target: 'No available targets are compatible with triple "armv7-unknown-linux-gnueabihf"

The llvm-clang-win-x-armv7l-release builder also started failing around the same time, but I can't tell what caused it.

[vvereschaka]

Hi @tstellar,

thank you a lot to pointing at the problems. Looks like armv7 builder gets failed because of some missed commits. aarch64 looks very strange, but also possible that there is the same reason.
I'm investigating the problems.

[vvereschaka]

@tstellar,

I found that the release/14.x branch has missed at least the following commits for clang/cmake/caches/CrossWinToARMLinux.cmake file:

• https://github.com/llvm/llvm-project/commit/41f74bc7ae33d9cd9a1eaacfc29ba53a933c042f
• https://github.com/llvm/llvm-project/commit/d860ac5da6d71dd759d347a3c7d5e63705443694
• https://github.com/llvm/llvm-project/commit/19c1b084a7da9087fcdc16071b461ea33b6a68b4
• https://github.com/llvm/llvm-project/commit/18fa0b15ccf610f34af1231440f89d20cb99e7a0

All those changes are required to handle the latest changes within the libcxx/libcxxabi/libunwind libraries.
Is it possible to cherry-pick them from main into release/14.x?

Those libraries are actively getting changes and I expect additional changes for the toolchain cmake file during this week.

[vvereschaka]

Hi @tstellar,

thank you a lot! The armv7/aarch64 cross win-x-linux release builders are green now:

• https://lab.llvm.org/buildbot/#/builders/144/builds/238
• https://lab.llvm.org/buildbot/#/builders/143/builds/262

buildbot/osuosl/master/config/builders.py

'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     env={
                         'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
                         'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes',
                     })},
 
 # Cross builders.
 
     {'name' : "llvm-clang-win-x-armv7l",
-    'tags'  : ["clang", "llvm", "compiler-rt", "cross"," armv7l"],
+    'tags'  : ["clang", "llvm", "compiler-rt", "cross", "armv7"],
     'workernames' : ["as-builder-1"],
     'builddir': "x-armv7l",
     'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
                     vs="autodetect",
                     clean=True,
                     checks=[
                     "check-llvm",
                     "check-clang",
                     "check-lld",
-                    "check-compiler-rt"
+                    "check-compiler-rt-armv7-unknown-linux-gnueabihf"
                     ],
                     checks_on_target = [
                         ("libunwind",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libunwind/test"]),
+                            "runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test"]),
                         ("libc++abi",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libcxxabi/test"]),
+                            "runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test"]),
                         ("libc++",
                             ['python', 'bin/llvm-lit.py',
                             '-v', '-vv', '--threads=32',
-                            'runtimes/runtimes-bins/libcxx/test',
+                            'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test',
                             ])
                     ],
                     extra_configure_args=[
                         "-DLLVM_TARGETS_TO_BUILD=ARM",
-                        "-DTARGET_TRIPLE=armv7-linux-gnueabihf",
+                        "-DTARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
                         "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
                         "-DLLVM_LIT_ARGS=-v -vv --threads=32",
                         WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
                         WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
                     ],
                     cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
 
     {'name' : "llvm-clang-win-x-aarch64",
-    'tags'  : ["clang", "llvm", "compiler-rt", "cross"," aarch64"],
+    'tags'  : ["clang", "llvm", "compiler-rt", "cross", "aarch64"],
     'workernames' : ["as-builder-2"],
     'builddir': "x-aarch64",
     'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
                     vs="autodetect",
                     clean=True,
                     checks=[
                     "check-llvm",
                     "check-clang",
                     "check-lld",
-                    "check-compiler-rt"
+                    "check-compiler-rt-aarch64-unknown-linux-gnu"
                     ],
                     checks_on_target = [
                         ("libunwind",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libunwind/test"]),
+                            "runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test"]),
                         ("libc++abi",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libcxxabi/test"]),
+                            "runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test"]),
                         ("libc++",
                             ['python', 'bin/llvm-lit.py',
                             '-v', '-vv', '--threads=32',
-                            'runtimes/runtimes-bins/libcxx/test',
+                            'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test',
                             ])
                     ],
                     extra_configure_args=[
                         "-DLLVM_TARGETS_TO_BUILD=AArch64",
-                        "-DTARGET_TRIPLE=aarch64-linux-gnu",
+                        "-DTARGET_TRIPLE=aarch64-unknown-linux-gnu",
                         "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
                         "-DLLVM_LIT_ARGS=-v -vv --threads=32",
                         WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
                         WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
                     ],
                     cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
 
 # Clang builders.

buildbot/osuosl/master/config/release_builders.py

'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                     env={
                         'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
                         'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes',
                     })},
 
 # Cross builders.
 
     {'name' : "llvm-clang-win-x-armv7l-release",
-    'tags'  : ["clang", "llvm", "compiler-rt", "cross"," armv7l", "release"],
+    'tags'  : ["clang", "llvm", "compiler-rt", "cross", "armv7", "release"],
     'workernames' : ["as-builder-1"],
     'builddir': "x-armv7l-rel",
     'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
                     vs="autodetect",
                     clean=True,
                     checks=[
                     "check-llvm",
                     "check-clang",
                     "check-lld",
-                    "check-compiler-rt"
+                    "check-compiler-rt-armv7-unknown-linux-gnueabihf"
                     ],
                     checks_on_target = [
                         ("libunwind",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libunwind/test"]),
+                            "runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test"]),
                         ("libc++abi",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libcxxabi/test"]),
+                            "runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test"]),
                         ("libc++",
                             ['python', 'bin/llvm-lit.py',
                             '-v', '-vv', '--threads=32',
-                            'runtimes/runtimes-bins/libcxx/test',
+                            'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test',
                             ])
                     ],
                     extra_configure_args=[
                         "-DLLVM_TARGETS_TO_BUILD=ARM",
-                        "-DTARGET_TRIPLE=armv7-linux-gnueabihf",
+                        "-DTARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
                         "-DDEFAULT_SYSROOT=C:/buildbot/.arm-ubuntu",
                         "-DLLVM_LIT_ARGS=-v -vv --threads=32",
                         WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
                         WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
                     ],
                     cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
 
     {'name' : "llvm-clang-win-x-aarch64-release",
     'tags'  : ["clang", "llvm", "compiler-rt", "cross", "aarch64", "release"],
     'workernames' : ["as-builder-2"],
     'builddir': "x-aarch64-rel",
     'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
                     vs="autodetect",
                     clean=True,
                     checks=[
                     "check-llvm",
                     "check-clang",
                     "check-lld",
-                    "check-compiler-rt"
+                    "check-compiler-rt-aarch64-unknown-linux-gnu"
                     ],
                     checks_on_target = [
                         ("libunwind",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libunwind/test"]),
+                            "runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test"]),
                         ("libc++abi",
                             ["python", "bin/llvm-lit.py",
                             "-v", "-vv", "--threads=32",
-                            "runtimes/runtimes-bins/libcxxabi/test"]),
+                            "runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test"]),
                         ("libc++",
                             ['python', 'bin/llvm-lit.py',
                             '-v', '-vv', '--threads=32',
-                            'runtimes/runtimes-bins/libcxx/test',
+                            'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test',
                             ])
                     ],
                     extra_configure_args=[
                         "-DLLVM_TARGETS_TO_BUILD=AArch64",
-                        "-DTARGET_TRIPLE=aarch64-linux-gnu",
+                        "-DTARGET_TRIPLE=aarch64-unknown-linux-gnu",
                         "-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
                         "-DLLVM_LIT_ARGS=-v -vv --threads=32",
                         WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
                         WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
                     ],
                     cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
 
 # LLD builders.