[zorg] Add AArch32 global-isel bots

[maxim-kuvyrkov]

Summary

Add 32-bit ARMv7 and ARMv8 global-isel bots. These bots ensure that
global-isel does not regress at -O0.

Patch by Diana Picus.

[maxim-kuvyrkov]

This is being tested on my local buildmaster: http://ex40-01.tcwglab.linaro.org:32775/builders/clang-cmake-armv8-global-isel/builds/

[rovka]

buildbot/osuosl/master/config/builders.py

324 ↗

(On Diff #133587)

Well, technically my patch was only for the ARMv7 part. I'm not sure how this one is supposed to work. What makes this AArch32? If we run on an armv8 machine, won't it by default use AArch64?

[maxim-kuvyrkov]

buildbot/osuosl/master/config/builders.py

324 ↗

(On Diff #133587)

Docker containers are started on ARMv8 machine under "linux32" personality and with armhf ubuntu rootfs. This makes LLVM detect bot as armv8l-linux-gnueabihf .

[rovka]

buildbot/osuosl/master/config/builders.py

324 ↗

(On Diff #133587)

Ah, ok. I'd like it better if we set the triple on the command line, since that would make things more explicit. Alternatively, it might be a good idea to build only the ARM target, and not AArch64, to make sure things blow up if this ends up on a misconfigured container in the future.

[rengolin]

buildbot/osuosl/master/config/builders.py

308 ↗

(On Diff #133587)

you don't need all the -mllvm options, just O0 should be fine.

324 ↗

(On Diff #133587)

I agree with @rovka, you shouldn't rely on the host to tell you what to run. We also want to test armv7 and armv8, so for now, setting the triple to armv8 should be fine, but we shouldn't disable the armv7 bot later in the future, as the code-gen path are different.

Now I remember why I chose to also force the CPU: because A15 stresses almost all relevant instructions form the ARMv7 set. If you don't choose anything you can end up picking A8 which will be the bare minimum.

In the ARMv8 case, you'll probably have A53, which will test more instructions, but will also stop testing ARMv7 specific paths. So, if we move to 32-bit emulation for ARMv7, we should have *both* ARMv7+A15 and ARMv8+A53/7.

Making the flags explicit also help reproducing builds and test, both for bisecting and investigating as well as re-building the container and getting a different behaviour (but still the same builds).

[rovka]

buildbot/osuosl/master/config/builders.py

308 ↗

(On Diff #133587)

Yes, you do! This is ARM, not AArch64, we're not on-by-default yet. Please leave the -mllvm options there.

[rengolin]

buildbot/osuosl/master/config/builders.py

308 ↗

(On Diff #133587)

D'oh! Ignore me!

[maxim-kuvyrkov]

buildbot/osuosl/master/config/builders.py

324 ↗

(On Diff #133587)

Agree. I'm going to experiment with setting clang/LLVM default flags at cmake stage; if that doesn't work, we'll just pass triple via testsuite flags.

[maxim-kuvyrkov]

buildbot/osuosl/master/config/builders.py

324 ↗

(On Diff #133587)

I'm going to commit this as is, and connect to silent master. Then I'm going to experiment with triples and default arch flags in a future patch.
FWIW, there is extremely low chance of running any 32-bit armv8 bot in aarch64 world (and vice versa) due to how containers are configured.

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

return [
          'slavenames':["linaro-armv8-01-arm-quick"],
          'builddir':"clang-cmake-armv8-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
 
+        ## ARMv7 Clang + LLVM run test-suite with GlobalISel enabled
+        {'name' : "clang-cmake-armv7-global-isel",
+         'slavenames':["linaro-tk1-09"],
+         'builddir':"clang-cmake-armv7-global-isel",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                      clean=False,
+                      checkout_compiler_rt=False,
+                      checkout_lld=False,
+                      test=True,
+                      useTwoStage=False,
+                      runTestSuite=True,
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
+                                       '--threads=4', '--build-threads=4'],
+                      extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
+                                        "-DLLVM_PARALLEL_LINK_JOBS=2"])},
+
+        ## ARMv8 Clang + LLVM run test-suite with GlobalISel enabled
+        {'name' : "clang-cmake-armv8-global-isel",
+         'slavenames':["linaro-armv8-01-arm-global-isel"],
+         'builddir':"clang-cmake-armv8-global-isel",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                      clean=False,
+                      checkout_compiler_rt=False,
+                      checkout_lld=False,
+                      test=True,
+                      useTwoStage=False,
+                      runTestSuite=True,
+                      testsuite_flags=['--cppflags', '-O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
+                                       '--threads=64', '--build-threads=64'],
+                      extra_cmake_args=["-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
+
         ## ARMv7 check-all self-host with CMake builder
         ## No ARMv8 VFP builder since NEON is mandatory in ARMv8.
         {'name': "clang-cmake-armv7-selfhost",
          'slavenames':["linaro-tk1-07"],
          'builddir':"clang-cmake-armv7-selfhost",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
def _get_sanitizer_builders():
           {'name': "sanitizer-windows",
            'slavenames' :["sanitizer-windows"],
            'builddir': "sanitizer-windows",
            'factory': SanitizerBuilderWindows.getSanitizerWindowsBuildFactory(
                         vs='%VS140COMNTOOLS%')},
 
           ## ARMv7 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-armv7-full",
-           'slavenames':["linaro-tk1-08", "linaro-tk1-09"],
+           'slavenames':["linaro-tk1-08"],
            'builddir':"clang-cmake-armv7-full",
            'factory' : ClangBuilder.getClangCMakeBuildFactory(
                         clean=False,
                         checkout_lld=False,
                         extra_cmake_args=["-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
                                           "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                           "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 

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

return [
         create_slave("linaro-tk1-05", properties={'jobs' : 4}, max_builds=1),
         create_slave("linaro-tk1-06", properties={'jobs' : 4}, max_builds=1),
         create_slave("linaro-tk1-07", properties={'jobs' : 4}, max_builds=1),
         create_slave("linaro-tk1-08", properties={'jobs' : 4}, max_builds=1),
         create_slave("linaro-tk1-09", properties={'jobs' : 4}, max_builds=1),
         create_slave("linaro-armv8-01-arm-lnt", properties={'jobs' : 64}, max_builds=1),
         create_slave("linaro-armv8-01-arm-selfhost-neon", properties={'jobs' : 64}, max_builds=1),
         create_slave("linaro-armv8-01-arm-quick", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-armv8-01-arm-global-isel", properties={'jobs' : 64}, max_builds=1),
         create_slave("linaro-armv8-01-arm-full", properties={'jobs' : 64}, max_builds=1),
         create_slave("linaro-armv8-01-arm-full-selfhost", properties={'jobs' : 64}, max_builds=1),
         create_slave("linaro-armv8-01-arm-libcxx", properties={'jobs' : 64}, max_builds=1),
         create_slave("linaro-armv8-01-arm-libcxx-noeh", properties={'jobs' : 64}, max_builds=1),
 
         # AArch64 Linaro slaves
         create_slave("linaro-apm-01", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-02", properties={'jobs' : 8}, max_builds=1),