Skip to content

Commit

Permalink
LLVM_ENABLE_RUNTIMES=flang-rt for OpenMPBuilder builders (#389)
Browse files Browse the repository at this point in the history 
Add `enable_runtimes=['flang-rt']`, `depends_on_projects=['flang-rt']`,
and `add_lit_checks=['check-flang-rt']` to all OpenMPBuilder-based
builders that build flang. This prepares the removal of the "projects"
build of the flang runtime in
llvm/llvm-project#124126.

Split off from #333

Affected builders:
 * openmp-offload-amdgpu-clang-flang
 * openmp-offload-sles-build-only
 * openmp-offload-rhel-9_4
 * openmp-offload-rhel-8_8

Affected workers:
 * rocm-worker-hw-01 (staging)
 * rocm-worker-hw-04-sles
 * rocm-worker-hw-04-rhel-9_4 (staging)
 * rocm-worker-hw-04-rhel-8_8 (staging)

Admins listed for those workers:
 * AMD <dl.gcr.lightning.buildbot@amd.com>
  • Loading branch information
@Meinersbur
Meinersbur authored Feb 26, 2025
1 parent 98486bd commit 0ac8f9d
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions buildbot/osuosl/master/config/builders.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2034,8 +2034,8 @@
'builddir': "openmp-offload-amdgpu-clang-flang",
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
clean=True,
enable_runtimes=['compiler-rt', 'openmp', 'offload'],
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp', 'mlir', 'flang', 'compiler-rt'],
enable_runtimes=['compiler-rt', 'openmp', 'offload', 'flang-rt'],
depends_on_projects=['llvm','clang','lld', 'offload', 'openmp', 'mlir', 'flang', 'flang-rt', 'compiler-rt'],
extraCmakeArgs=[
"-DCMAKE_BUILD_TYPE=Release",
"-DCLANG_DEFAULT_LINKER=lld",
Expand Down Expand Up @@ -2064,7 +2064,7 @@
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
],
add_lit_checks=["check-flang", "check-offload"],
add_lit_checks=["check-flang", "check-flang-rt", "check-offload"],
add_openmp_lit_args=["--time-tests", "--timeout 100"],
)},

Expand All @@ -2076,8 +2076,8 @@
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
clean=True,
test=False, # we have no GPU avail, skip runtime tests
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
depends_on_projects=['llvm','clang', 'flang', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
enable_runtimes=['openmp', 'compiler-rt', 'offload', 'flang-rt'],
depends_on_projects=['llvm','clang', 'flang', 'flang-rt', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
extraCmakeArgs=[
"-DCMAKE_BUILD_TYPE=Release",
"-DCLANG_DEFAULT_LINKER=lld",
Expand All @@ -2097,7 +2097,7 @@
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
],
add_lit_checks=["check-clang", "check-flang", "check-llvm", "check-lld", "check-mlir"],
add_lit_checks=["check-clang", "check-flang", "check-flang-rt", "check-llvm", "check-lld", "check-mlir"],
add_openmp_lit_args=["--time-tests", "--timeout 100"],
)},

Expand All @@ -2108,8 +2108,8 @@
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
clean=True,
test=True,
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
depends_on_projects=['llvm','clang', 'flang', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
enable_runtimes=['openmp', 'compiler-rt', 'offload', 'flang-rt'],
depends_on_projects=['llvm','clang', 'flang', 'flang-rt', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
extraCmakeArgs=[
"-DCMAKE_BUILD_TYPE=Release",
"-DCLANG_DEFAULT_LINKER=lld",
Expand All @@ -2130,7 +2130,7 @@
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
],
add_lit_checks=["check-clang", "check-flang", "check-llvm", "check-lld", "check-mlir", "check-offload"],
add_lit_checks=["check-clang", "check-flang", "check-flang-rt", "check-llvm", "check-lld", "check-mlir", "check-offload"],
add_openmp_lit_args=["--time-tests", "--timeout 100", "--xfail=affinity/format/proc_bind.c"],
)},

Expand All @@ -2141,8 +2141,8 @@
'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
clean=True,
test=True,
enable_runtimes=['openmp', 'compiler-rt', 'offload'],
depends_on_projects=['llvm','clang', 'flang', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
enable_runtimes=['openmp', 'compiler-rt', 'offload', 'flang-rt'],
depends_on_projects=['llvm','clang', 'flang', 'flang-rt', 'lld', 'mlir', 'offload', 'openmp', 'compiler-rt'],
extraCmakeArgs=[
"-DCMAKE_BUILD_TYPE=Release",
"-DCLANG_DEFAULT_LINKER=lld",
Expand All @@ -2163,7 +2163,7 @@
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
"-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
],
add_lit_checks=["check-clang", "check-flang", "check-llvm", "check-lld", "check-mlir", "check-offload"],
add_lit_checks=["check-clang", "check-flang", "check-flang-rt", "check-llvm", "check-lld", "check-mlir", "check-offload"],
add_openmp_lit_args=["--time-tests", "--timeout 100", "--xfail=affinity/format/proc_bind.c"],
)},

Expand Down

0 comments on commit 0ac8f9d

Please sign in to comment.