[TableGen] Strip directories from filename prefixes. #168355
Merged
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
Member
|
@llvm/pr-subscribers-tablegen Author: Ivan Kosarev (kosarev) ChangesFixes #167700 to support Full diff: https://github.com/llvm/llvm-project/pull/168355.diff 1 Files Affected:
diff --git a/llvm/lib/TableGen/Main.cpp b/llvm/lib/TableGen/Main.cpp
index c3869c3fb9a5a..165c957fc9977 100644
--- a/llvm/lib/TableGen/Main.cpp
+++ b/llvm/lib/TableGen/Main.cpp
@@ -167,8 +167,7 @@ int llvm::TableGenMain(const char *argv0,
// Write output to memory.
Timer.startBackendTimer("Backend overall");
- SmallString<128> FilenamePrefix(OutputFilename);
- sys::path::replace_extension(FilenamePrefix, "");
+ SmallString<128> FilenamePrefix(sys::path::stem(OutputFilename));
TableGenOutputFiles OutFiles;
unsigned status = 0;
// ApplyCallback will return true if it did not apply any callback. In that
|
Member
|
this doesn't fix the core bazel issue because this also affects the output path, so the assumption is that instead of outputting |
Member
|
something like this would solve that: diff --git a/llvm/utils/TableGen/RegisterInfoEmitter.cpp b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
index ef7b13e8940f..286d5bf637ce 100644
--- a/llvm/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
@@ -29,6 +29,7 @@
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Format.h"
+#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TableGen/Error.h"
#include "llvm/TableGen/Record.h"
@@ -104,7 +105,7 @@ static void emitInclude(StringRef FilenamePrefix, StringRef IncludeFile,
StringRef GuardMacro, raw_ostream &OS) {
OS << "#ifdef " << GuardMacro << '\n';
OS << "#undef " << GuardMacro << '\n';
- OS << "#include \"" << FilenamePrefix << IncludeFile << "\"\n";
+ OS << "#include \"" << sys::path::stem(FilenamePrefix) << IncludeFile << "\"\n";
OS << "#endif\n\n";
} |
Collaborator
Author
|
This PR should have the same effect. It would make most sense to strip the directories from the suffix in the first place. |
Member
|
see my comment above about why that is not the case |
Member
|
the problem is that llvm-project/llvm/lib/TableGen/Main.cpp Lines 197 to 200 in dbd97c8 |
Member
|
fwiw i just validated with my diff above + my bazel PR everything builds again |
Member
Fixes #167700 to support builds where TableGen's output file is specified as full path rather than just filename.
kosarev
force-pushed
the
users/kosarev/strip-dirs-in-tablegen-prefix
branch
from
cf78b7a to
ab305c0
Compare
Collaborator
Author
|
Updated. |
keith
approved these changes
Nov 17, 2025
Member
keith
left a comment
keith
left a comment
There was a problem hiding this comment.
tested and it does work with the bazel build, thanks!
Collaborator
Author
|
Thanks. Will merge this as soon as the buildbots show it green. |
🐧 Linux x64 Test Results
|
Member
|
🚢 🎉 |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/11/builds/28225 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #167700 to support
builds where TableGen's output file is specified as full path
rather than just filename.