Skip to content

Commit 69703b1

Browse files
committed
[ORC] Fix bot failure due to 7da6342 (ORC task dispatch unification).
Fixes the failure at https://lab.llvm.org/buildbot/#/builders/131/builds/62928, and add comments about unused variable and update debugging output. Coding my way home: 6.44615S, 128.16704W
1 parent 71c5964 commit 69703b1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

llvm/examples/OrcV2Examples/LLJITWithRemoteDebugging/RemoteJITUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ launchLocalExecutor(StringRef ExecutablePath) {
129129
close(FromExecutor[WriteEnd]);
130130

131131
auto EPC = SimpleRemoteEPC::Create<FDSimpleRemoteEPCTransport>(
132-
std::make_unique<DynamicThreadPoolTaskDispatcher>(),
132+
std::make_unique<DynamicThreadPoolTaskDispatcher>(std::nullopt),
133133
SimpleRemoteEPC::Setup(),
134134
FromExecutor[ReadEnd], ToExecutor[WriteEnd]);
135135
if (!EPC)
@@ -201,7 +201,7 @@ connectTCPSocket(StringRef NetworkAddress) {
201201
return CreateErr(toString(SockFD.takeError()));
202202

203203
return SimpleRemoteEPC::Create<FDSimpleRemoteEPCTransport>(
204-
std::make_unique<DynamicThreadPoolTaskDispatcher>(),
204+
std::make_unique<DynamicThreadPoolTaskDispatcher>(std::nullopt),
205205
SimpleRemoteEPC::Setup(), *SockFD);
206206
}
207207

llvm/lib/ExecutionEngine/Orc/LLJIT.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,8 +681,10 @@ Error LLJITBuilderState::prepareForConstruction() {
681681
inconvertibleErrorCode());
682682
#endif // !LLVM_ENABLE_THREADS
683683

684+
// Only used in debug builds.
684685
[[maybe_unused]] bool ConcurrentCompilationSettingDefaulted =
685686
!SupportConcurrentCompilation;
687+
686688
if (!SupportConcurrentCompilation) {
687689
#if LLVM_ENABLE_THREADS
688690
SupportConcurrentCompilation = NumCompileThreads || ES || EPC;
@@ -719,7 +721,7 @@ Error LLJITBuilderState::prepareForConstruction() {
719721
<< " Support concurrent compilation: "
720722
<< (*SupportConcurrentCompilation ? "Yes" : "No");
721723
if (ConcurrentCompilationSettingDefaulted)
722-
dbgs() << " (defaulted based on ES / EPC)\n";
724+
dbgs() << " (defaulted based on ES / EPC / NumCompileThreads)\n";
723725
else
724726
dbgs() << "\n";
725727
dbgs() << " Number of compile threads: " << NumCompileThreads << "\n";

0 commit comments

Comments
 (0)