Skip to content

Commit 7943b73

Browse files
committed
[CIR] Gut out CI configuration
ghstack-source-id: 2d22b55 Pull-Request: #1990
1 parent ca31760 commit 7943b73

File tree

4 files changed

+14
-41
lines changed

4 files changed

+14
-41
lines changed

.ci/compute_projects.py

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,56 +40,29 @@
4040
# tested.
4141
DEPENDENTS_TO_TEST = {
4242
"llvm": {
43-
"bolt",
4443
"clang",
45-
"clang-tools-extra",
46-
"lld",
47-
"lldb",
4844
"mlir",
49-
"polly",
50-
"flang",
5145
},
52-
"lld": {"bolt", "cross-project-tests"},
53-
"clang": {"clang-tools-extra", "cross-project-tests", "lldb"},
54-
"mlir": {"flang"},
46+
"lld": {},
47+
"clang": {},
48+
"mlir": {},
5549
# Test everything if ci scripts are changed.
5650
".ci": {
5751
"llvm",
5852
"clang",
5953
"CIR",
60-
"lld",
61-
"lldb",
62-
"bolt",
63-
"clang-tools-extra",
64-
"mlir",
65-
"polly",
66-
"flang",
67-
"libclc",
68-
"openmp",
6954
},
7055
}
7156

7257
# This mapping describes runtimes that should be enabled for a specific project,
7358
# but not necessarily run for testing. The only case of this currently is lldb
7459
# which needs some runtimes enabled for tests.
75-
DEPENDENT_RUNTIMES_TO_BUILD = {"lldb": {"libcxx", "libcxxabi", "libunwind"}}
60+
DEPENDENT_RUNTIMES_TO_BUILD = {}
7661

7762
# This mapping describes runtimes that should be tested when the key project is
7863
# touched.
79-
DEPENDENT_RUNTIMES_TO_TEST = {
80-
"clang": {"compiler-rt"},
81-
"clang-tools-extra": {"libc"},
82-
"libc": {"libc"},
83-
"compiler-rt": {"compiler-rt"},
84-
"flang": {"flang-rt"},
85-
"flang-rt": {"flang-rt"},
86-
".ci": {"compiler-rt", "libc", "flang-rt"},
87-
}
88-
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
89-
"llvm": {"libcxx", "libcxxabi", "libunwind"},
90-
"clang": {"libcxx", "libcxxabi", "libunwind"},
91-
".ci": {"libcxx", "libcxxabi", "libunwind"},
92-
}
64+
DEPENDENT_RUNTIMES_TO_TEST = {}
65+
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {}
9366

9467
EXCLUDE_LINUX = {
9568
"cross-project-tests", # TODO(issues/132796): Tests are failing.

.ci/monolithic-linux.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ export LLVM_SYMBOLIZER_PATH=`which llvm-symbolizer`
4040
# Set up all runtimes either way. libcxx is a dependency of LLDB.
4141
# It will not be built unless it is used.
4242
cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
43-
-D LLVM_ENABLE_PROJECTS="${projects}" \
44-
-D LLVM_ENABLE_RUNTIMES="${runtimes}" \
43+
-D LLVM_ENABLE_PROJECTS="clang;mlir" \
44+
-D LLVM_TARGETS_TO_BUILD='X86;Arch64' \
4545
-G Ninja \
4646
-D CMAKE_PREFIX_PATH="${HOME}/.local" \
4747
-D CMAKE_BUILD_TYPE=Release \
48-
-D CLANG_ENABLE_CIR=${enable_cir} \
48+
-D CLANG_ENABLE_CIR=ON \
4949
-D LLVM_ENABLE_ASSERTIONS=ON \
5050
-D LLVM_BUILD_EXAMPLES=ON \
5151
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \
@@ -59,8 +59,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
5959
-D LLDB_ENABLE_PYTHON=ON \
6060
-D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
6161
-D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
62-
-D CMAKE_EXE_LINKER_FLAGS="-no-pie" \
63-
-D LLVM_ENABLE_WERROR=ON
62+
-D CMAKE_EXE_LINKER_FLAGS="-no-pie"
6463

6564
start-group "ninja"
6665

.ci/monolithic-windows.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ export LD=link
3636
# https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840/40
3737
# for further information.
3838
cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
39-
-D LLVM_ENABLE_PROJECTS="${projects}" \
39+
-D LLVM_ENABLE_PROJECTS="clang;mlir" \
4040
-G Ninja \
4141
-D CMAKE_BUILD_TYPE=Release \
42-
-D CLANG_ENABLE_CIR="${enable_cir}" \
42+
-D LLVM_TARGETS_TO_BUILD=X86;Arch64 \
43+
-D CLANG_ENABLE_CIR=ON \
4344
-D LLVM_ENABLE_ASSERTIONS=ON \
4445
-D LLVM_BUILD_EXAMPLES=ON \
4546
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \

.github/workflows/premerge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
runs-on:
35-
- depot-ubuntu-24.04-arm-16
3635
- llvm-premerge-linux-runners
3736
runs-on: ${{ matrix.runs-on }}
3837
container:
@@ -209,6 +208,7 @@ jobs:
209208
cmake -G Ninja \
210209
-B build \
211210
-S llvm \
211+
-DLLVM_TARGETS_TO_BUILD=AArch64;X86 \
212212
-DLLVM_ENABLE_PROJECTS="${projects_to_build}" \
213213
-DLLVM_DISABLE_ASSEMBLY_FILES=ON \
214214
-DCMAKE_BUILD_TYPE=Release \

0 commit comments

Comments
 (0)