From e9c19b784bc18a74db2aeec0a27fcafc95d8e34a Mon Sep 17 00:00:00 2001
From: Michael Kruse <llvm-project@meinersbur.de>
Date: Sat, 22 Feb 2025 18:33:32 +0100
Subject: [PATCH] flang_runtime_OpenMPBuilder
---
buildbot/osuosl/master/config/builders.py | 24 +++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 180fe312..933dee6b 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -2031,8 +2031,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",
@@ -2061,7 +2061,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"],
)},
@@ -2073,8 +2073,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",
@@ -2094,7 +2094,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"],
)},
@@ -2105,8 +2105,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",
@@ -2127,7 +2127,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"],
)},
@@ -2138,8 +2138,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",
@@ -2160,7 +2160,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"],
)},