Skip to content

Commit 1db2ddc

Browse files
Merge branch 'main' into EntryValFixInstrRef
2 parents 60f7bc6 + edf0d0d commit 1db2ddc

File tree

6,525 files changed

+305313
-127466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,525 files changed

+305313
-127466
lines changed

.ci/compute_projects.py

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,19 @@
5252
"clang": {"clang-tools-extra", "cross-project-tests"},
5353
"mlir": {"flang"},
5454
# Test everything if ci scripts are changed.
55-
# FIXME: Figure out what is missing and add here.
56-
".ci": {"llvm", "clang", "lld", "lldb"},
55+
".ci": {
56+
"llvm",
57+
"clang",
58+
"lld",
59+
"lldb",
60+
"bolt",
61+
"clang-tools-extra",
62+
"mlir",
63+
"polly",
64+
"flang",
65+
"libclc",
66+
"openmp",
67+
},
5768
}
5869

5970
# This mapping describes runtimes that should be enabled for a specific project,
@@ -66,6 +77,8 @@
6677
DEPENDENT_RUNTIMES_TO_TEST = {
6778
"clang": {"compiler-rt"},
6879
"clang-tools-extra": {"libc"},
80+
"libc": {"libc"},
81+
".ci": {"compiler-rt", "libc"},
6982
}
7083
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
7184
"llvm": {"libcxx", "libcxxabi", "libunwind"},
@@ -135,13 +148,11 @@ def _add_dependencies(projects: Set[str], runtimes: Set[str]) -> Set[str]:
135148
while current_projects_count != len(projects_with_dependents):
136149
current_projects_count = len(projects_with_dependents)
137150
for project in list(projects_with_dependents):
138-
if project not in PROJECT_DEPENDENCIES:
139-
continue
140-
projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
151+
if project in PROJECT_DEPENDENCIES:
152+
projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
141153
for runtime in runtimes:
142-
if runtime not in PROJECT_DEPENDENCIES:
143-
continue
144-
projects_with_dependents.update(PROJECT_DEPENDENCIES[runtime])
154+
if runtime in PROJECT_DEPENDENCIES:
155+
projects_with_dependents.update(PROJECT_DEPENDENCIES[runtime])
145156
return projects_with_dependents
146157

147158

@@ -187,18 +198,16 @@ def _compute_projects_to_build(
187198
def _compute_project_check_targets(projects_to_test: Set[str]) -> Set[str]:
188199
check_targets = set()
189200
for project_to_test in projects_to_test:
190-
if project_to_test not in PROJECT_CHECK_TARGETS:
191-
continue
192-
check_targets.add(PROJECT_CHECK_TARGETS[project_to_test])
201+
if project_to_test in PROJECT_CHECK_TARGETS:
202+
check_targets.add(PROJECT_CHECK_TARGETS[project_to_test])
193203
return check_targets
194204

195205

196206
def _compute_runtimes_to_test(modified_projects: Set[str], platform: str) -> Set[str]:
197207
runtimes_to_test = set()
198208
for modified_project in modified_projects:
199-
if modified_project not in DEPENDENT_RUNTIMES_TO_TEST:
200-
continue
201-
runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[modified_project])
209+
if modified_project in DEPENDENT_RUNTIMES_TO_TEST:
210+
runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[modified_project])
202211
return _exclude_projects(runtimes_to_test, platform)
203212

204213

@@ -207,11 +216,10 @@ def _compute_runtimes_to_test_needs_reconfig(
207216
) -> Set[str]:
208217
runtimes_to_test = set()
209218
for modified_project in modified_projects:
210-
if modified_project not in DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG:
211-
continue
212-
runtimes_to_test.update(
213-
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG[modified_project]
214-
)
219+
if modified_project in DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG:
220+
runtimes_to_test.update(
221+
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG[modified_project]
222+
)
215223
return _exclude_projects(runtimes_to_test, platform)
216224

217225

.ci/compute_projects_test.py

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_top_level_file(self):
187187
self.assertEqual(env_variables["runtimes_check_targets"], "")
188188
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
189189

190-
def test_exclude_runtiems_in_projects(self):
190+
def test_exclude_libcxx_in_projects(self):
191191
env_variables = compute_projects.get_env_variables(
192192
["libcxx/CMakeLists.txt"], "Linux"
193193
)
@@ -197,6 +197,16 @@ def test_exclude_runtiems_in_projects(self):
197197
self.assertEqual(env_variables["runtimes_check_targets"], "")
198198
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
199199

200+
def test_include_libc_in_runtimes(self):
201+
env_variables = compute_projects.get_env_variables(
202+
["libc/CMakeLists.txt"], "Linux"
203+
)
204+
self.assertEqual(env_variables["projects_to_build"], "clang;lld")
205+
self.assertEqual(env_variables["project_check_targets"], "")
206+
self.assertEqual(env_variables["runtimes_to_build"], "libc")
207+
self.assertEqual(env_variables["runtimes_check_targets"], "check-libc")
208+
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
209+
200210
def test_exclude_docs(self):
201211
env_variables = compute_projects.get_env_variables(
202212
["llvm/docs/CIBestPractices.rst"], "Linux"
@@ -221,18 +231,21 @@ def test_ci(self):
221231
env_variables = compute_projects.get_env_variables(
222232
[".ci/compute_projects.py"], "Linux"
223233
)
224-
self.assertEqual(env_variables["projects_to_build"], "clang;lld;lldb;llvm")
234+
self.assertEqual(
235+
env_variables["projects_to_build"],
236+
"bolt;clang;clang-tools-extra;flang;libclc;lld;lldb;llvm;mlir;polly",
237+
)
225238
self.assertEqual(
226239
env_variables["project_check_targets"],
227-
"check-clang check-lld check-lldb check-llvm",
240+
"check-bolt check-clang check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
228241
)
229242
self.assertEqual(
230243
env_variables["runtimes_to_build"],
231-
"libcxx;libcxxabi;libunwind",
244+
"compiler-rt;libc;libcxx;libcxxabi;libunwind",
232245
)
233246
self.assertEqual(
234247
env_variables["runtimes_check_targets"],
235-
"",
248+
"check-compiler-rt check-libc",
236249
)
237250
self.assertEqual(
238251
env_variables["runtimes_check_targets_needs_reconfig"],

.ci/generate-buildkite-pipeline-premerge

Lines changed: 0 additions & 131 deletions
This file was deleted.

.ci/generate_test_report_buildkite.py

Lines changed: 0 additions & 57 deletions
This file was deleted.

.ci/monolithic-linux.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@ function at-exit {
4242

4343
# If building fails there will be no results files.
4444
shopt -s nullglob
45-
if command -v buildkite-agent 2>&1 >/dev/null
46-
then
47-
python3 "${MONOREPO_ROOT}"/.ci/generate_test_report_buildkite.py ":linux: Linux x64 Test Results" \
48-
"linux-x64-test-results" $retcode "${BUILD_DIR}"/test-results.*.xml
49-
else
50-
python3 "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":penguin: Linux x64 Test Results" \
51-
$retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
52-
fi
45+
46+
python3 "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":penguin: Linux x64 Test Results" \
47+
$retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
5348
}
5449
trap at-exit EXIT
5550

.ci/monolithic-windows.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,9 @@ function at-exit {
3737

3838
# If building fails there will be no results files.
3939
shopt -s nullglob
40-
if command -v buildkite-agent 2>&1 >/dev/null
41-
then
42-
python "${MONOREPO_ROOT}"/.ci/generate_test_report_buildkite.py ":windows: Windows x64 Test Results" \
43-
"windows-x64-test-results" $retcode "${BUILD_DIR}"/test-results.*.xml
44-
else
45-
python "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":window: Windows x64 Test Results" \
46-
$retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
47-
fi
40+
41+
python "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":window: Windows x64 Test Results" \
42+
$retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
4843
}
4944
trap at-exit EXIT
5045

.github/new-prs-labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,10 @@ llvm:instcombine:
632632
- llvm/test/Transforms/InstCombine/**
633633
- llvm/test/Transforms/InstSimplify/**
634634

635+
llvm:vectorcombine:
636+
- llvm/lib/Transforms/Vectorize/VectorCombine.cpp
637+
- llvm/test/Transforms/VectorCombine/**
638+
635639
clangd:
636640
- clang-tools-extra/clangd/**
637641

@@ -777,6 +781,10 @@ backend:NVPTX:
777781
- 'llvm/**/*nvptx*/**'
778782
- 'llvm/**/*NVPTX*/**'
779783

784+
backend:MIPS:
785+
- '**/*mips*'
786+
- '**/*Mips*'
787+
780788
backend:RISC-V:
781789
- clang/**/*riscv*
782790
- clang/**/*RISCV*

.github/workflows/email-check.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
COMMENT: >-
3333
⚠️ We detected that you are using a GitHub private e-mail address to contribute to the repo.<br/>
3434
Please turn off [Keep my email addresses private](https://github.com/settings/emails) setting in your account.<br/>
35-
See [LLVM Discourse](https://discourse.llvm.org/t/hidden-emails-on-github-should-we-do-something-about-it) for more information.
35+
See [LLVM Developer Policy](https://llvm.org/docs/DeveloperPolicy.html#email-addresses) and
36+
[LLVM Discourse](https://discourse.llvm.org/t/hidden-emails-on-github-should-we-do-something-about-it) for more information.
3637
run: |
3738
cat << EOF > comments
3839
[{"body" : "$COMMENT"}]

0 commit comments

Comments
 (0)