[zorg] Update testsuite parallelism settings for Linaro AArch64 builders.

[maxim-kuvyrkov]

Summary

We have moved production bots from 8-core to 64-core hardware, so update
testsuite parallelism settings accordingly. The 8-core machines are still
online and connected to silent buildmaster.

[maxim-kuvyrkov]

Correct patch. First upload had unrelated changes.

[kristof.beyls]

buildbot/osuosl/master/config/builders.py

1453 ↗

(On Diff #135368)

I think you don't want to remove the LLVM_PARALLEL_LINK_JOBS limit? Are you sure you have enough memory in the machine for 64 parallel links to work just fine?

[maxim-kuvyrkov]

buildbot/osuosl/master/config/builders.py

1453 ↗

(On Diff #135368)

Yes, that's intentional. We already handle those kinds of loads.

[kristof.beyls]

buildbot/osuosl/master/config/builders.py

1453 ↗

(On Diff #135368)

allright - LGTM then.

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
-                                       '--threads=8', '--build-threads=8'],
+                                       '--threads=64', '--build-threads=64'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
         ## TODO: Remove the X86 back-end after fixing the 90 bad tests
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
          'slavenames':["linaro-apm-04", "linaro-armv8-01-aarch64-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=True,
                       test=True,
                       useTwoStage=True,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57 -fuse-ld=lld',
-                                       '--threads=8', '--build-threads=8'],
+                                       '--threads=64', '--build-threads=64'],
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
                                         "-DLLVM_ENABLE_LLD=True"],
                ),
          'category'   : 'lld'},
 
         ## AArch64 Clang+LLVM run test-suite at -O0 (GlobalISel is now default).
         {'name': "clang-cmake-aarch64-global-isel",
          'slavenames':["linaro-apm-06", "linaro-armv8-01-aarch64-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-O0',
-                                       '--threads=8', '--build-threads=8'],
+                                       '--threads=64', '--build-threads=64'],
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         {'name': 'clang-x86-windows-msvc2015',
          'slavenames': ['windows-gcebot2'],
          'builddir': 'clang-x86-windows-msvc2015',
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                         clean=False,
def _get_sanitizer_builders():
                       clean=False,
                       checkout_compiler_rt=True,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=True,
                       testStage1=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
-                                       '--threads=8', '--build-threads=8'],
+                                       '--threads=64', '--build-threads=64'],
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
           # Juno
           {'name' : "clang-native-aarch64-full",
            'slavenames' :["juno-aarch64-01"],
return [
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
-                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
-                              'LLVM_PARALLEL_LINK_JOBS': '4'})},
+                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'slavenames': ['linaro-apm-03', 'linaro-armv8-01-aarch64-libcxx-noeh'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
-                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
-                              'LLVM_PARALLEL_LINK_JOBS': '4'})},
+                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57'})},
 
     ]
 
 # Experimental and stopped builders
 def _get_on_demand_builders():
     return [
         ]