[CMake] Declare all parts of *GenRegisterInfo.inc as outputs. #168405
+13
−1
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) ChangesThis tells the build system to check and regenerate the A follow-up from Full diff: https://github.com/llvm/llvm-project/pull/168405.diff 2 Files Affected:
diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake
index 9a2e73a1e3718..706ae03115814 100644
--- a/llvm/cmake/modules/TableGen.cmake
+++ b/llvm/cmake/modules/TableGen.cmake
@@ -66,6 +66,16 @@ function(tablegen project ofn)
list(APPEND LLVM_TABLEGEN_FLAGS "-omit-comments")
endif()
+ set(EXTRA_OUTPUTS)
+ if("-gen-register-info" IN_LIST ARGN)
+ string(REGEX REPLACE "\\.[^.]*$" "" OUTPUT_BASENAME ${ofn})
+ list(APPEND EXTRA_OUTPUTS
+ ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_BASENAME}Enums.inc
+ ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_BASENAME}Header.inc
+ ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_BASENAME}MCDesc.inc
+ ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_BASENAME}TargetDesc.inc)
+ endif()
+
# MSVC can't support long string literals ("long" > 65534 bytes)[1], so if there's
# a possibility of generated tables being consumed by MSVC, generate arrays of
# char literals, instead. If we're cross-compiling, then conservatively assume
@@ -126,7 +136,7 @@ function(tablegen project ofn)
set(LLVM_TABLEGEN_JOB_POOL "")
endif()
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn} ${EXTRA_OUTPUTS}
COMMAND ${tablegen_exe} ${ARG_UNPARSED_ARGUMENTS}
${tblgen_includes}
${LLVM_TABLEGEN_FLAGS}
diff --git a/llvm/utils/TableGen/RegisterInfoEmitter.cpp b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
index ef7b13e8940f8..3486a7a7fb08c 100644
--- a/llvm/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
@@ -1878,6 +1878,8 @@ TableGenOutputFiles RegisterInfoEmitter::run(StringRef FilenamePrefix) {
if (RegisterInfoDebug)
debugDump(errs());
+ // The suffixes should be in sync with the tablegen function in
+ // llvm/cmake/modules/TableGen.cmake.
return {Main,
{{"Enums.inc", Enums},
{"MCDesc.inc", MCDesc},
|
kosarev
requested review from
Paul-C-Anagnostopoulos,
arsenm,
chapuni,
jayfoad,
jurahul,
keith,
nhaehnle,
nico and
s-barannikov
lenary
reviewed
Nov 17, 2025
llvm/cmake/modules/TableGen.cmake
Outdated
|
|
||
| set(EXTRA_OUTPUTS) | ||
| if("-gen-register-info" IN_LIST ARGN) | ||
| string(REGEX REPLACE "\\.[^.]*$" "" OUTPUT_BASENAME ${ofn}) |
Member
There was a problem hiding this comment.
Nit: CMake has a function for getting the basename of a file, we should use it. I think the right syntax is cmake_path(GET ${ofn} STEMP OUTPUT_BASENAME) - https://cmake.org/cmake/help/latest/command/cmake_path.html#get-stem (available since 3.20, which is what LLVM requires)
lenary
approved these changes
Nov 17, 2025
Member
lenary
left a comment
lenary
left a comment
There was a problem hiding this comment.
LGTM, with or without the Nit addressed.
This tells the build system to check and regenerate the *GenRegisterInfo*.inc files, should any of them be missing for whatever reason. A follow-up from <#167700>.
kosarev
force-pushed
the
users/kosarev/tablegen-declare-all-outputs
branch
from
c6ed0c9 to
3c3dbaa
Compare
🐧 Linux x64 Test Results
|
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/27/builds/19100 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.
This tells the build system to check and regenerate the
GenRegisterInfo.inc files, should any of them be missing for
whatever reason.
A follow-up from
#167700.