Skip to content

Commit a621773

Browse files
authored
Merge branch 'main' into nvlink-remarks/feat
2 parents cf98141 + 99cdc26 commit a621773

File tree

10 files changed

+29
-295
lines changed

10 files changed

+29
-295
lines changed

.ci/compute_projects.py

Lines changed: 14 additions & 2 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"},

.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

lldb/packages/Python/lldbsuite/test/gdbclientutils.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ class MockGDBServerResponder:
9292
class RESPONSE_DISCONNECT:
9393
pass
9494

95-
class RESPONSE_NONE:
96-
pass
97-
9895
def __init__(self):
9996
self.packetLog = []
10097

@@ -184,8 +181,6 @@ def respond(self, packet):
184181
return self.qQueryGDBServer()
185182
if packet == "qHostInfo":
186183
return self.qHostInfo()
187-
if packet.startswith("qEcho"):
188-
return self.qEcho(int(packet.split(":")[1]))
189184
if packet == "qGetWorkingDir":
190185
return self.qGetWorkingDir()
191186
if packet == "qOffsets":
@@ -242,9 +237,6 @@ def qProcessInfo(self):
242237
def qHostInfo(self):
243238
return "ptrsize:8;endian:little;"
244239

245-
def qEcho(self):
246-
return "E04"
247-
248240
def qQueryGDBServer(self):
249241
return "E04"
250242

@@ -663,8 +655,6 @@ def _handlePacket(self, packet):
663655
if not isinstance(response, list):
664656
response = [response]
665657
for part in response:
666-
if part is MockGDBServerResponder.RESPONSE_NONE:
667-
continue
668658
if part is MockGDBServerResponder.RESPONSE_DISCONNECT:
669659
raise self.TerminateConnectionException()
670660
self._sendPacket(part)

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,8 @@ GDBRemoteCommunication::WaitForPacketNoLock(StringExtractorGDBRemote &packet,
354354
disconnected = true;
355355
Disconnect();
356356
}
357-
} else {
358-
timed_out = true;
359357
}
358+
timed_out = true;
360359
break;
361360
case eConnectionStatusSuccess:
362361
// printf ("status = success but error = %s\n",

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ void GDBRemoteCommunicationClient::GetRemoteQSupported() {
406406
m_supports_qXfer_memory_map_read = eLazyBoolYes;
407407
else if (x == "qXfer:siginfo:read+")
408408
m_supports_qXfer_siginfo_read = eLazyBoolYes;
409-
else if (x == "qEcho+")
409+
else if (x == "qEcho")
410410
m_supports_qEcho = eLazyBoolYes;
411411
else if (x == "QPassSignals+")
412412
m_supports_QPassSignals = eLazyBoolYes;

0 commit comments

Comments
 (0)