Skip to content

Commit 4d7d739

Browse files
Merge branch 'main' into views-concat
2 parents 2aedde0 + 13a9b86 commit 4d7d739

File tree

1,541 files changed

+78480
-42307
lines changed

Some content is hidden

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

1,541 files changed

+78480
-42307
lines changed

.ci/compute_projects.py

Lines changed: 26 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,7 @@
6677
DEPENDENT_RUNTIMES_TO_TEST = {
6778
"clang": {"compiler-rt"},
6879
"clang-tools-extra": {"libc"},
80+
".ci": {"compiler-rt", "libc"},
6981
}
7082
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
7183
"llvm": {"libcxx", "libcxxabi", "libunwind"},
@@ -135,13 +147,11 @@ def _add_dependencies(projects: Set[str], runtimes: Set[str]) -> Set[str]:
135147
while current_projects_count != len(projects_with_dependents):
136148
current_projects_count = len(projects_with_dependents)
137149
for project in list(projects_with_dependents):
138-
if project not in PROJECT_DEPENDENCIES:
139-
continue
140-
projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
150+
if project in PROJECT_DEPENDENCIES:
151+
projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
141152
for runtime in runtimes:
142-
if runtime not in PROJECT_DEPENDENCIES:
143-
continue
144-
projects_with_dependents.update(PROJECT_DEPENDENCIES[runtime])
153+
if runtime in PROJECT_DEPENDENCIES:
154+
projects_with_dependents.update(PROJECT_DEPENDENCIES[runtime])
145155
return projects_with_dependents
146156

147157

@@ -187,18 +197,16 @@ def _compute_projects_to_build(
187197
def _compute_project_check_targets(projects_to_test: Set[str]) -> Set[str]:
188198
check_targets = set()
189199
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])
200+
if project_to_test in PROJECT_CHECK_TARGETS:
201+
check_targets.add(PROJECT_CHECK_TARGETS[project_to_test])
193202
return check_targets
194203

195204

196205
def _compute_runtimes_to_test(modified_projects: Set[str], platform: str) -> Set[str]:
197206
runtimes_to_test = set()
198207
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])
208+
if modified_project in DEPENDENT_RUNTIMES_TO_TEST:
209+
runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[modified_project])
202210
return _exclude_projects(runtimes_to_test, platform)
203211

204212

@@ -207,11 +215,10 @@ def _compute_runtimes_to_test_needs_reconfig(
207215
) -> Set[str]:
208216
runtimes_to_test = set()
209217
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-
)
218+
if modified_project in DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG:
219+
runtimes_to_test.update(
220+
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG[modified_project]
221+
)
215222
return _exclude_projects(runtimes_to_test, platform)
216223

217224

.ci/compute_projects_test.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,21 @@ def test_ci(self):
221221
env_variables = compute_projects.get_env_variables(
222222
[".ci/compute_projects.py"], "Linux"
223223
)
224-
self.assertEqual(env_variables["projects_to_build"], "clang;lld;lldb;llvm")
224+
self.assertEqual(
225+
env_variables["projects_to_build"],
226+
"bolt;clang;clang-tools-extra;flang;libclc;lld;lldb;llvm;mlir;polly",
227+
)
225228
self.assertEqual(
226229
env_variables["project_check_targets"],
227-
"check-clang check-lld check-lldb check-llvm",
230+
"check-bolt check-clang check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
228231
)
229232
self.assertEqual(
230233
env_variables["runtimes_to_build"],
231-
"libcxx;libcxxabi;libunwind",
234+
"compiler-rt;libc;libcxx;libcxxabi;libunwind",
232235
)
233236
self.assertEqual(
234237
env_variables["runtimes_check_targets"],
235-
"",
238+
"check-compiler-rt check-libc",
236239
)
237240
self.assertEqual(
238241
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

bolt/include/bolt/Profile/DataAggregator.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,9 @@ class DataAggregator : public DataReader {
374374
/// Parse a single pair of binary full path and associated build-id
375375
std::optional<std::pair<StringRef, StringRef>> parseNameBuildIDPair();
376376

377+
/// Coordinate reading and parsing of perf.data file
378+
void parsePerfData(BinaryContext &BC);
379+
377380
/// Coordinate reading and parsing of pre-aggregated file
378381
///
379382
/// The regular perf2bolt aggregation job is to read perf output directly.

0 commit comments

Comments
 (0)