Skip to content

Commit a1bdae8

Browse files
authored
Remove Key Instruction builder and add a new Debugify builder (#555)
1 parent 3d57d08 commit a1bdae8

File tree

2 files changed

+29
-17
lines changed

2 files changed

+29
-17
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,24 +1039,27 @@
10391039
"-DLLVM_USE_LINKER=gold",
10401040
"-DLLVM_ENABLE_WERROR=OFF"])},
10411041

1042-
{'name': "llvm-clang-key-instructions",
1043-
'tags' : ["llvm", "clang", "compiler-rt", "lld", "cross-project-tests"],
1044-
'workernames': ["sie-linux-worker5"],
1045-
'builddir': "llvm-ki",
1046-
'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
1047-
depends_on_projects=['llvm','clang','compiler-rt','lld','cross-project-tests'],
1042+
{'name': "llvm-x86_64-debugify-coverage",
1043+
'tags': ["llvm", "clang", "lld"],
1044+
'workernames': ["sie-linux-worker5"],
1045+
'builddir': "llvm-dbg",
1046+
'factory': DebugifyBuilder.getDebugifyBuildFactory(
1047+
clean=True,
1048+
depends_on_projects=['llvm','clang','lld'],
10481049
extra_configure_args=[
1049-
"-DCMAKE_C_COMPILER=gcc",
1050-
"-DCMAKE_CXX_COMPILER=g++",
1051-
"-DCMAKE_BUILD_TYPE=Release",
1052-
"-DCLANG_ENABLE_CLANGD=OFF",
1053-
"-DLLVM_BUILD_RUNTIME=ON",
1050+
"-DCMAKE_C_COMPILER=clang",
1051+
"-DCMAKE_CXX_COMPILER=clang++",
1052+
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
1053+
"-DCMAKE_C_FLAGS_RELWITHDEBINFO=-O2 -gmlt -DNDEBUG",
1054+
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O2 -gmlt -DNDEBUG",
1055+
"-DLLVM_CCACHE_BUILD=ON",
10541056
"-DLLVM_BUILD_TESTS=ON",
10551057
"-DLLVM_ENABLE_ASSERTIONS=ON",
1056-
"-DLLVM_EXPERIMENTAL_KEY_INSTRUCTIONS=ON",
10571058
"-DLLVM_INCLUDE_EXAMPLES=OFF",
1058-
"-DLLVM_LIT_ARGS=--verbose --timeout=900",
1059-
"-DLLVM_USE_LINKER=gold"])},
1059+
"-DLLVM_TARGETS_TO_BUILD=X86",
1060+
"-DLLVM_LIT_ARGS=-v",
1061+
"-DLLVM_USE_LINKER=lld",
1062+
"-DLLVM_ENABLE_WERROR=OFF"])},
10601063

10611064
{'name': "llvm-clang-x86_64-darwin",
10621065
'tags' : ["llvm", "clang", "clang-tools-extra", "lld", "cross-project-tests"],

buildbot/osuosl/master/config/status.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def getReporters():
360360
"llvm-clang-x86_64-darwin",
361361
"llvm-clang-aarch64-darwin",
362362
"llvm-clang-aarch64-darwin-release",
363-
"llvm-clang-key-instructions"])
363+
"llvm-x86_64-debugify-coverage"])
364364
]),
365365
reporters.MailNotifier(
366366
fromaddr = status_email_fromaddr,
@@ -485,8 +485,7 @@ def getReporters():
485485
utils.LLVMDefaultBuildStatusGenerator(
486486
builders = [
487487
"cross-project-tests-sie-ubuntu",
488-
"llvm-clang-x86_64-sie-win",
489-
"llvm-clang-key-instructions"])
488+
"llvm-clang-x86_64-sie-win"])
490489
]),
491490
reporters.MailNotifier(
492491
fromaddr = status_email_fromaddr,
@@ -560,6 +559,16 @@ def getReporters():
560559
"flang-runtime-cuda-gcc",
561560
"flang-runtime-cuda-clang"])
562561
]),
562+
reporters.MailNotifier(
563+
fromaddr = status_email_fromaddr,
564+
sendToInterestedUsers = False,
565+
extraRecipients = ["[email protected]"],
566+
generators = [
567+
utils.LLVMDefaultBuildStatusGenerator(
568+
builders = [
569+
"llvm-x86_64-debugify-coverage"])
570+
]),
571+
563572
])
564573

565574
return r

0 commit comments

Comments
 (0)