[LLVM][MLIR] Move LSP server support library from MLIR into LLVM #157885
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@nikic can I ask for a review? |
nikic
reviewed
Sep 11, 2025
| ) | ||
| target_link_libraries(LLVMSupportLSPTests | ||
| PRIVATE | ||
| LLVMSupportLSP) |
There was a problem hiding this comment.
Should also link as component.
| ${MLIR_MAIN_INCLUDE_DIR}/mlir/Tools/tblgen-lsp-server | ||
|
|
||
| LINK_COMPONENTS | ||
| SupportLSP |
There was a problem hiding this comment.
I'd add this to LLVM_LINK_COMPONENTS above to avoid mixing two styles.
There was a problem hiding this comment.
Ah, sure, missed that
|
Yes, I checked that compiling with the same CMake settings as the dylib build linked all fine. |
nikic
approved these changes
Sep 11, 2025
|
Thanks for the approve, can you also merge this please? I don't have the permissions to do that. |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/10/builds/13305 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/140/builds/30551 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/206/builds/6062 Here is the relevant piece of the build log for the reference |
alanzhao1
pushed a commit
to alanzhao1/llvm-project
that referenced
this pull request
Sep 11, 2025
Reverts llvm#157691 Change was relanded in llvm#157885
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Sep 11, 2025
Reverts llvm/llvm-project#157691 Change was relanded in llvm/llvm-project#157885
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/53/builds/19913 Here is the relevant piece of the build log for the reference |
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
|
Unfortunately, according to git bisect, this change is also responsible for the following test regression: Full logs (with CMake invocations, etc.): |
RKSimon
reviewed
Sep 15, 2025
| // mapping and erase it. | ||
| ResponseHandlerTy ResponseHandler; | ||
| { | ||
| std::lock_guard<std::mutex> responseHandlersLock(ResponseHandlerTy); |
There was a problem hiding this comment.
@Bertik23 @nikic I'm seeing MSVC warnings from this line:
E:\llvm\llvm-project\llvm\lib\Support\LSP\Transport.cpp(123): warning C4930: 'std::lock_guard<std::mutex> responseHandlersLock(llvm::lsp::MessageHandler::ResponseHandlerTy)': prototyped function not called (was a variable definition intended?)
Should it be this instead?
std::lock_guard<std::mutex> responseHandlersLock(ResponseHandler);
There was a problem hiding this comment.
Prior to me running clang-tidy on that file it was
std::lock_guard<std::mutex> responseHandlersLock(ResponseHandlersMutex);so I'd change it back to that
PR ready #158666
|
@Bertik23, could you help with that test regression too? |
|
@mgorny yes, I'm looking into it, but I was not yet able to reproduce the issue |
|
I can try to help (since I can reproduce it reliably), but I'd need some hints what to look at. The tests look quite opaque to me. |
|
@mgorny Would it be possible to get the actual output of the test by running This is a strange failure because the PR should be NFC, just moving code to a different place. Either something really got broken, or it could be some small detail, perhaps the JSON object being serialized in a different order? I checked and it uses DenseMap as storage, and AFAICT there is no guarantee about preserving insertion order. |
Isn't that the first big block in the test output? I'm pretty sure when I ran it manually, I got the same thing. I can recheck in a few minutes. |
|
Yep. Here's the output from a different (amd64) machine: |
|
Not quite sure. I was looking lower at the last chunk which lists the FileCheck stderr, and that one says |
|
Ah thanks for the output. I guess only stdout is piped to filecheck, that's why the content length is not in the second chunk. |
|
Somehow, we started returning errors when previously there were normal results. Expected: Actual: |
|
What I really don't get is where is the input it's supposed to process (i.e. the thing missing |
|
This is the json that is sent to the lsp server: and it should find the uri in the params object but somehow doesn't. Wondering if root is the top-level object or the params. But in any case, I don't understand how this patch could cause this. I must be missing something... |
|
Oh! I was looking for an actual Yeah, it's weird. I've checked twice, but I'll check one more time, just in case. |
|
It seems to me there is no actual file foo.pdll, there is instead a message that tells the server that a file foo.pdll was opened and what the contents are: |
|
Shit, I'm sorry — I think I've messed up the bisect after all. |
|
Okay, in my defense, I didn't screw up the bisect. This is some kind nasty bug. It is triggered by this commit on arm64, but on amd64 it happens prior to that. I'll try to bisect further there, but I suspect I won't find anything meaningful either. |
|
I think I see a potential cause:
|
aganea
added a commit
that referenced
this pull request
Sep 22, 2025
When building with latest MSVC on Windows, this fixes some compile-time warnings from last week's integration in #157885: ``` [321/5941] Building CXX object lib\Support\LSP\CMakeFiles\LLVMSupportLSP.dir\Transport.cpp.obj C:\git\llvm-project\llvm\lib\Support\LSP\Transport.cpp(123): warning C4930: 'std::lock_guard<std::mutex> responseHandlersLock(llvm::lsp::MessageHandler::ResponseHandlerTy)': prototyped function not called (was a variable definition intended?) [384/5941] Building CXX object unittests\Support\LSP\CMakeFiles\LLVMSupportLSPTests.dir\Transport.cpp.obj C:\git\llvm-project\llvm\unittests\Support\LSP\Transport.cpp(190): warning C4804: '+=': unsafe use of type 'bool' in operation ```
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Sep 22, 2025
When building with latest MSVC on Windows, this fixes some compile-time warnings from last week's integration in llvm/llvm-project#157885: ``` [321/5941] Building CXX object lib\Support\LSP\CMakeFiles\LLVMSupportLSP.dir\Transport.cpp.obj C:\git\llvm-project\llvm\lib\Support\LSP\Transport.cpp(123): warning C4930: 'std::lock_guard<std::mutex> responseHandlersLock(llvm::lsp::MessageHandler::ResponseHandlerTy)': prototyped function not called (was a variable definition intended?) [384/5941] Building CXX object unittests\Support\LSP\CMakeFiles\LLVMSupportLSPTests.dir\Transport.cpp.obj C:\git\llvm-project\llvm\unittests\Support\LSP\Transport.cpp(190): warning C4804: '+=': unsafe use of type 'bool' in operation ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a second PR on this patch (first #155572), that fixes the linking problem for
flang-aarch64-dylibtest.The SupportLSP library was made a component library.
This PR moves the generic Language Server Protocol (LSP) server support code that was copied from clangd into MLIR, into the LLVM tree so it can be reused by multiple subprojects.
Centralizing the generic LSP support in LLVM lowers the barrier to building new LSP servers across the LLVM ecosystem and avoids each subproject maintaining its own copy.
The code originated in clangd and was copied into MLIR for its LSP server. MLIR had this code seperate to be reused by all of their LSP server. This PR relocates the MLIR copy into LLVM as a shared component into LLVM/Support. If this is not a suitable place, please suggest a better one.
A follow up to this move could be deduplication with the original clangd implementation and converge on a single shared LSP support library used by clangd, MLIR, and future servers.
What changes
and their namespace was changed from mlir to llvm
I ran clang-tidy --fix and clang-format on the whole moved files (last two commits), as they are basically new files and should hold up to the code style used by LLVM.
MLIR LSP servers where updated to include these files from their new location and account for the namespace change.
This PR is made as part of the LLVM IR LSP project (RFC)