Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 21 additions & 41 deletions buildbot/osuosl/master/config/builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -750,25 +750,32 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
"-DCMAKE_BUILD_TYPE=Release",
"-DLLVM_LIT_ARGS=-vj 20"])},

{'name' : "clang-ppc64-aix",
'tags' : ["clang", "aix", "ppc"],
{'name' : "clang-flang-ppc64-aix",
'tags' : ["clang", "aix", "ppc64", "flang"],
'workernames' : ["aix-ppc64"],
'builddir': "clang-ppc64-aix",
'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
depends_on_projects=["llvm", "clang", "compiler-rt"],
clean=False,
'builddir': "clang-flang-ppc64-aix",
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
depends_on_projects=['llvm', 'mlir', 'clang', 'flang', 'flang-rt', 'compiler-rt', 'openmp'],
checks=['check-llvm', 'check-clang', 'check-flang', 'check-mlir', 'check-compiler-rt', 'check-openmp', 'check-flang-rt'],
extra_configure_args=[
"-DLLVM_ENABLE_ASSERTIONS=On",
"-DLLVM_LIT_ARGS=-v --time-tests",
"-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++",
'-DLLVM_DEFAULT_TARGET_TRIPLE=powerpc64-ibm-aix',
'-DLLVM_INSTALL_UTILS=ON',
'-DCMAKE_CXX_STANDARD=17',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I don't think this flag is really necessary, I think we already set this in the CMakeLists.txt somewhere for LLVM

'-DLLVM_LIT_ARGS=-j 60 -v --time-tests',
'-DFLANG_ENABLE_WERROR=ON',
'-DLLVM_ENABLE_ASSERTIONS=ON',
"-DPython3_EXECUTABLE:FILEPATH=python3",
"-DLLVM_ENABLE_ZLIB=OFF", "-DLLVM_APPEND_VC_REV=OFF",
"-DLLVM_PARALLEL_LINK_JOBS=2",
"-DLLVM_ENABLE_WERROR=ON",
"-DSANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH:BOOL=ON"]),
'env' : {'OBJECT_MODE': '64'}},

"-DSANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH:BOOL=ON",
],
env={
'CC': 'clang',
'CXX': 'clang++',
'LD': 'lld',
'OBJECT_MODE': '64'
})},

{'name' : "clang-s390x-linux",
'tags' : ["clang"],
'workernames' : ["systemz-1"],
Expand Down Expand Up @@ -2617,33 +2624,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
"-DLLVM_CCACHE_BUILD=ON"])},

{'name' : 'ppc64-flang-aix',
'tags' : ["flang", "ppc", "ppc64", "aix"],
'workernames' : ['ppc64-flang-aix-test'],
'builddir': 'ppc64-flang-aix-build',
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
clean=False,
depends_on_projects=['llvm', 'mlir', 'clang', 'flang', 'flang-rt', 'compiler-rt', 'openmp'],
checks=['check-flang', 'check-flang-rt'],
extra_configure_args=[
'-DLLVM_DEFAULT_TARGET_TRIPLE=powerpc64-ibm-aix',
'-DLLVM_INSTALL_UTILS=ON',
'-DCMAKE_CXX_STANDARD=17',
'-DLLVM_LIT_ARGS=--threads=20 -v --time-tests',
'-DFLANG_ENABLE_WERROR=ON',
'-DLLVM_ENABLE_ASSERTIONS=ON',
"-DPython3_EXECUTABLE:FILEPATH=python3",
"-DLLVM_ENABLE_ZLIB=OFF", "-DLLVM_APPEND_VC_REV=OFF",
"-DLLVM_PARALLEL_LINK_JOBS=2",
"-DSANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH:BOOL=ON",
],
env={
'CC': 'clang',
'CXX': 'clang++',
'LD': 'lld',
'OBJECT_MODE': '64'
})},

# Builders responsible building Sphinx documentation.

{'name' : "lld-sphinx-docs",
Expand Down
3 changes: 1 addition & 2 deletions buildbot/osuosl/master/config/workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ def get_all():
create_worker("sanitizer-buildbot12", properties={'jobs': 48}, max_builds=2),

# POWER 8 PowerPC AIX 7.2
create_worker("aix-ppc64", properties={'jobs': 10}, max_builds=1),
create_worker("ppc64-flang-aix-test", properties={'jobs': 10}, max_builds=1),
create_worker("aix-ppc64", properties={'jobs': 80}, max_builds=1),

# IBM z13 (s390x), Ubuntu 16.04.2
create_worker("systemz-1", properties={'jobs': 4, 'vcs_protocol': 'https'}, max_builds=4),
Expand Down