[AIX][PowerPC] Change AIX buildbot to target native AIX build

[ZarkoCA]

Summary

The AIX buildbot has been setting as ppc64le as its target. Change it to target
AIX instead.

[daltenty]

buildbot/osuosl/master/config/builders.py

667–670

Out of curiosity, do we set OBJECT_MODE somewhere here or rely on the worker side to set it to make sure we get the 64-bit variant?

[ZarkoCA]

buildbot/osuosl/master/config/builders.py

667–670

We are relying on the worker to set OBJECT_MODE=64. Would it better to hard code that as the target?

[daltenty]

buildbot/osuosl/master/config/builders.py

667–670

Hardcoding it as a target won't work presay, since that just affects the default target. We actually need it to be part of the build env, so CMake configures for the right bitmode.

For the libc++ buildbots we have it hardcoded in the env, so that there's no chance of the builder diverging from the specified bitmode based on the worker venv. We could probably do something similar here by passing an env to the build factory:

ClangBuilder.getClangCMakeBuildFactory(env={'OBJECT_MODE': '64'}

[ZarkoCA]

• Add OBJECT_MODE

[ZarkoCA]

buildbot/osuosl/master/config/builders.py

667–670

Got it, did that here as well. Thanks.

[daltenty]

LGTM, thanks!

[gkistanova]

Hi Zarko,

This patch has broken llvm-zorg.

There is no worker with the name "aix-ppc64" in the workers.py.

Did you forget to rename "aix-ppc64-ppc64le" to "aix-ppc64"?

If so, I have fixed that for you in https://github.com/llvm/llvm-zorg/commit/d4d8bac3d9d02ad73201dd2d5156724a7e421db0. Don't forget to rename you worker in the buildbot.tac file and restart.

Otherwise, you would need to propose a patch for workers.py.

[ZarkoCA]

In D115305#3201112, @gkistanova wrote:

Hi Zarko,

This patch has broken llvm-zorg.

There is no worker with the name "aix-ppc64" in the workers.py.

Did you forget to rename "aix-ppc64-ppc64le" to "aix-ppc64"?

If so, I have fixed that for you in https://github.com/llvm/llvm-zorg/commit/d4d8bac3d9d02ad73201dd2d5156724a7e421db0. Don't forget to rename you worker in the buildbot.tac file and restart.

Otherwise, you would need to propose a patch for workers.py.

Yes, I did forget. Thank you.

buildbot/osuosl/master/config/builders.py

'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
                         "-DCMAKE_CXX_COMPILER=clang++",
                         "-DCLANG_DEFAULT_LINKER=lld",
                         "-DCMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN:PATH=/opt/rh/devtoolset-7/root/usr",
                         "-DCMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN:PATH=/opt/rh/devtoolset-7/root/usr",
                         "-DLLVM_BINUTILS_INCDIR=/usr/include", "-DBUILD_SHARED_LIBS=ON", "-DLLVM_ENABLE_WERROR=ON",
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DLLVM_LIT_ARGS=-vj 20"])},
 
-    {'name' : "clang-ppc64-aix-ppc64le",
-    'tags'  : ["clang", "aix", "ppc", "ppc64le"],
-    'workernames' : ["aix-ppc64-ppc64le"],
-    'builddir': "clang-ppc64-aix-ppc64le",
+    {'name' : "clang-ppc64-aix",
+    'tags'  : ["clang", "aix", "ppc"],
+    'workernames' : ["aix-ppc64"],
+    'builddir': "clang-ppc64-aix",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                    env={'OBJECT_MODE': '64'},
                     clean=False,
                     checkout_clang_tools_extra=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
                     checkout_libcxx=False,
                     useTwoStage=False,
                     runTestSuite=False,
                     stage1_config='Release',
                     extra_cmake_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=On",
                         "-DCMAKE_C_COMPILER=/opt/IBM/openxlC/17.1.0/bin/ibm-clang",
                         "-DCMAKE_CXX_COMPILER=/opt/IBM/openxlC/17.1.0/bin/ibm-clang++_r",
                         "-DPython3_EXECUTABLE:FILEPATH=/opt/freeware/bin/python3_64",
                         "-DLLVM_ENABLE_ZLIB=OFF", "-DLLVM_APPEND_VC_REV=OFF",
-                        "-DLLVM_DEFAULT_TARGET_TRIPLE=powerpc64le-unknown-linux-gnu",
                         "-DLLVM_PARALLEL_LINK_JOBS=6",
                         "-DLLVM_ENABLE_WERROR=ON"])},
 
     {'name' : "clang-s390x-linux",
     'tags'  : ["clang"],
     'workernames' : ["systemz-1"],
     'builddir': "clang-s390x-linux",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(