[HLSL] Fix Root signature test error #127261
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
|
@llvm/pr-subscribers-backend-directx Author: None (joaosaffran) ChangesFixing error detected in build bot in file closes: 127260 Full diff: https://github.com/llvm/llvm-project/pull/127261.diff 1 Files Affected:
diff --git a/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-MultipleEntryFunctions.ll b/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-MultipleEntryFunctions.ll
index 652f8092b7a69..0547b0bae7a7e 100644
--- a/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-MultipleEntryFunctions.ll
+++ b/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-MultipleEntryFunctions.ll
@@ -23,17 +23,16 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
!6 = !{ !7 } ; list of root signature elements
!7 = !{ !"RootFlags", i32 2 } ; 1 = allow_input_assembler_input_layout
-
-; CHECK-LABEL: Definition for 'main':
-; CHECK-NEXT: Flags: 0x000001
+; CHECK-LABEL: Definition for 'anotherMain':
+; CHECK-NEXT: Flags: 0x000002
; CHECK-NEXT: Version: 2
; CHECK-NEXT: NumParameters: 0
; CHECK-NEXT: RootParametersOffset: 0
; CHECK-NEXT: NumStaticSamplers: 0
; CHECK-NEXT: StaticSamplersOffset: 0
-; CHECK-LABEL: Definition for 'anotherMain':
-; CHECK-NEXT: Flags: 0x000002
+; CHECK-LABEL: Definition for 'main':
+; CHECK-NEXT: Flags: 0x000001
; CHECK-NEXT: Version: 2
; CHECK-NEXT: NumParameters: 0
; CHECK-NEXT: RootParametersOffset: 0
|
|
I don't think this is correct. It looks to me like this is printing the root signature flags in a non-deterministic order. The problem is that we're iterating over a map in RootSignatureAnalysisPrinter - this isn't guaranteed any particular order. Instead, we should iterate over the functions in the module and look them up in the map. |
bogner
reviewed
Feb 14, 2025
| const auto &[Function, RSD] = P; | ||
| OS << "Definition for '" << Function->getName() << "':\n"; | ||
| for (const auto &F : M) { | ||
| const auto RSD = RSDMap.at(&F); |
There was a problem hiding this comment.
This will crash if there are functions in the module without root signatures (ie, if the root signature metadata isn't present, or if there are helper functions without their own root signatures)
bogner
reviewed
Feb 14, 2025
| @@ -155,6 +155,7 @@ analyzeModule(Module &M) { | |||
|
|
|||
| if (RootElementListNode == nullptr) { | |||
| reportError(Ctx, "Missing Root Element List Metadata node."); | |||
| continue; | |||
There was a problem hiding this comment.
Better to fix this in a separate PR (also are there any tests for this error? I'm surprised they don't crash or otherwise have issues)
There was a problem hiding this comment.
There was a test for this at some point in time, might get lost during one of the iterations from the original PR. Will make a new one with this fix, a test and I will double-check the current tests.
| for (const auto &P : RSDMap) { | ||
| const auto &[Function, RSD] = P; | ||
| OS << "Definition for '" << Function->getName() << "':\n"; | ||
| for (const auto &F : M) { |
There was a problem hiding this comment.
Better style to spell out the type if it doesn't show up elsewhere (such as in a cast).
Suggested change
| for (const auto &F : M) { | |
| for (const Function &F : M) { |
| const auto &[Function, RSD] = P; | ||
| OS << "Definition for '" << Function->getName() << "':\n"; | ||
| for (const auto &F : M) { | ||
| const auto &RSD = RSDMap.find(&F); |
There was a problem hiding this comment.
The type here is SmallDenseMap<const Function *, mcdxbc::RootSignatureDesc>::iterator - since this is actually a copy we shouldn't use a const reference here.
Suggested change
| const auto &RSD = RSDMap.find(&F); | |
| auto It = RSDMap.find(&F); |
joaosaffran
force-pushed
the
build-fail/fix
branch
from
3d24980 to
fb2aeee
Compare
bogner
approved these changes
Feb 14, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/10911 Here is the relevant piece of the build log for the reference |
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
Fixing error detected in build bot in file `RootSignature-MultipleEntryFunctions.ll` closes: [127260](llvm#127260) --------- Co-authored-by: joaosaffran <[email protected]>
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.
Fixing error detected in build bot in file
RootSignature-MultipleEntryFunctions.llcloses: 127260