clean up self review

joaosaffran · joaosaffran · commit a6a9fe9acc17 · 2025-08-29T20:46:15.000-07:00
diff --git a/llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp b/llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp
@@ -193,7 +193,6 @@ bool verifyRegisterOverflow(uint64_t Register, uint32_t NumDescriptors) {
 
 uint64_t updateAppendingRegister(uint64_t AppendingRegister,
                                  uint64_t NumDescriptors, uint64_t Offset) {
-
   return Offset == ~0U ? AppendingRegister + NumDescriptors
                        : Offset + NumDescriptors;
 }
diff --git a/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinations.ll b/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinations.ll
@@ -54,111 +54,111 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
 !20 = !{ !"UAV", i32 5, i32 1, i32 15, i32 5, i32 65540 }
 
 ;DXC:- Name:            RTS0
-;DXC-NEXT: Size:            400
-;DXC-NEXT: RootSignature:
-;DXC-NEXT:   Version:         2
-;DXC-NEXT:   NumRootParameters: 2
-;DXC-NEXT:   RootParametersOffset: 24
-;DXC-NEXT:   NumStaticSamplers: 0
-;DXC-NEXT:   StaticSamplersOffset: 400
-;DXC-NEXT:   Parameters:
-;DXC-NEXT:     - ParameterType:   0
-;DXC-NEXT:       ShaderVisibility: 0
-;DXC-NEXT:       Table:
-;DXC-NEXT:         NumRanges:       11
-;DXC-NEXT:         RangesOffset:    56
-;DXC-NEXT:         Ranges:
-;DXC-NEXT:           - RangeType:       0
-;DXC-NEXT:             NumDescriptors:  1
-;DXC-NEXT:             BaseShaderRegister: 0
-;DXC-NEXT:             RegisterSpace:   5
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 4294967295
-;DXC-NEXT:             DESCRIPTORS_VOLATILE: true
-;DXC-NEXT:           - RangeType:       1
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   6
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DESCRIPTORS_VOLATILE: true
-;DXC-NEXT:           - RangeType:       2
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   7
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DATA_VOLATILE:   true
-;DXC-NEXT:           - RangeType:       0
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   8
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DATA_STATIC:     true
-;DXC-NEXT:           - RangeType:       1
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   9
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DATA_STATIC_WHILE_SET_AT_EXECUTE: true
-;DXC-NEXT:           - RangeType:       2
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   10
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DESCRIPTORS_VOLATILE: true
-;DXC-NEXT:             DATA_VOLATILE:   true
-;DXC-NEXT:           - RangeType:       0
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   11
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DESCRIPTORS_VOLATILE: true
-;DXC-NEXT:             DATA_STATIC_WHILE_SET_AT_EXECUTE: true
-;DXC-NEXT:           - RangeType:       1
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   12
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
-;DXC-NEXT:           - RangeType:       2
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   13
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DATA_VOLATILE:   true
-;DXC-NEXT:             DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
-;DXC-NEXT:           - RangeType:       0
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   14
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DATA_STATIC:     true
-;DXC-NEXT:             DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
-;DXC-NEXT:           - RangeType:       1
-;DXC-NEXT:             NumDescriptors:  5
-;DXC-NEXT:             BaseShaderRegister: 1
-;DXC-NEXT:             RegisterSpace:   15
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 5
-;DXC-NEXT:             DATA_STATIC_WHILE_SET_AT_EXECUTE: true
-;DXC-NEXT:             DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
-;DXC-NEXT:     - ParameterType:   0
-;DXC-NEXT:       ShaderVisibility: 0
-;DXC-NEXT:       Table:
-;DXC-NEXT:         NumRanges:       3
-;DXC-NEXT:         RangesOffset:    328
-;DXC-NEXT:         Ranges:
-;DXC-NEXT:           - RangeType:       3
-;DXC-NEXT:             NumDescriptors:  1
-;DXC-NEXT:             BaseShaderRegister: 0
-;DXC-NEXT:             RegisterSpace:   1
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 4294967295
-;DXC-NEXT:           - RangeType:       3
-;DXC-NEXT:             NumDescriptors:  1
-;DXC-NEXT:             BaseShaderRegister: 0
-;DXC-NEXT:             RegisterSpace:   3
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 4294967295
-;DXC-NEXT:             DESCRIPTORS_VOLATILE: true
-;DXC-NEXT:           - RangeType:       3
-;DXC-NEXT:             NumDescriptors:  1
-;DXC-NEXT:             BaseShaderRegister: 0
-;DXC-NEXT:             RegisterSpace:   4
-;DXC-NEXT:             OffsetInDescriptorsFromTableStart: 4294967295
-;DXC-NEXT:             DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
+;DXC-NEXT:    Size:            400
+;DXC-NEXT:    RootSignature:
+;DXC-NEXT:      Version:         2
+;DXC-NEXT:      NumRootParameters: 2
+;DXC-NEXT:      RootParametersOffset: 24
+;DXC-NEXT:      NumStaticSamplers: 0
+;DXC-NEXT:      StaticSamplersOffset: 400
+;DXC-NEXT:      Parameters:
+;DXC-NEXT:        - ParameterType:   0
+;DXC-NEXT:          ShaderVisibility: 0
+;DXC-NEXT:          Table:
+;DXC-NEXT:            NumRanges:       11
+;DXC-NEXT:            RangesOffset:    56
+;DXC-NEXT:            Ranges:
+;DXC-NEXT:              - RangeType:       0
+;DXC-NEXT:                NumDescriptors:  1
+;DXC-NEXT:                BaseShaderRegister: 0
+;DXC-NEXT:                RegisterSpace:   5
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 4294967295
+;DXC-NEXT:                DESCRIPTORS_VOLATILE: true
+;DXC-NEXT:              - RangeType:       1
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   6
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DESCRIPTORS_VOLATILE: true
+;DXC-NEXT:              - RangeType:       2
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   7
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DATA_VOLATILE:   true
+;DXC-NEXT:              - RangeType:       0
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   8
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DATA_STATIC:     true
+;DXC-NEXT:              - RangeType:       1
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   9
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DATA_STATIC_WHILE_SET_AT_EXECUTE: true
+;DXC-NEXT:              - RangeType:       2
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   10
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DESCRIPTORS_VOLATILE: true
+;DXC-NEXT:                DATA_VOLATILE:   true
+;DXC-NEXT:              - RangeType:       0
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   11
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DESCRIPTORS_VOLATILE: true
+;DXC-NEXT:                DATA_STATIC_WHILE_SET_AT_EXECUTE: true
+;DXC-NEXT:              - RangeType:       1
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   12
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
+;DXC-NEXT:              - RangeType:       2
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   13
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DATA_VOLATILE:   true
+;DXC-NEXT:                DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
+;DXC-NEXT:              - RangeType:       0
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   14
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DATA_STATIC:     true
+;DXC-NEXT:                DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
+;DXC-NEXT:              - RangeType:       1
+;DXC-NEXT:                NumDescriptors:  5
+;DXC-NEXT:                BaseShaderRegister: 1
+;DXC-NEXT:                RegisterSpace:   15
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 5
+;DXC-NEXT:                DATA_STATIC_WHILE_SET_AT_EXECUTE: true
+;DXC-NEXT:                DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
+;DXC-NEXT:        - ParameterType:   0
+;DXC-NEXT:          ShaderVisibility: 0
+;DXC-NEXT:          Table:
+;DXC-NEXT:            NumRanges:       3
+;DXC-NEXT:            RangesOffset:    328
+;DXC-NEXT:            Ranges:
+;DXC-NEXT:              - RangeType:       3
+;DXC-NEXT:                NumDescriptors:  1
+;DXC-NEXT:                BaseShaderRegister: 0
+;DXC-NEXT:                RegisterSpace:   1
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 4294967295
+;DXC-NEXT:              - RangeType:       3
+;DXC-NEXT:                NumDescriptors:  1
+;DXC-NEXT:                BaseShaderRegister: 0
+;DXC-NEXT:                RegisterSpace:   3
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 4294967295
+;DXC-NEXT:                DESCRIPTORS_VOLATILE: true
+;DXC-NEXT:              - RangeType:       3
+;DXC-NEXT:                NumDescriptors:  1
+;DXC-NEXT:                BaseShaderRegister: 0
+;DXC-NEXT:                RegisterSpace:   4
+;DXC-NEXT:                OffsetInDescriptorsFromTableStart: 4294967295
+;DXC-NEXT:                DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
diff --git a/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinationsV1.ll b/llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinationsV1.ll
@@ -19,33 +19,33 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
 
 
 ; DXC:        - Name:            RTS0
-;DXC-NEXT:      Size:            104
-;DXC-NEXT:      RootSignature:
-;DXC-NEXT:        Version:         1
-;DXC-NEXT:        NumRootParameters: 2
-;DXC-NEXT:        RootParametersOffset: 24
-;DXC-NEXT:        NumStaticSamplers: 0
-;DXC-NEXT:        StaticSamplersOffset: 104
-;DXC-NEXT:        Parameters:
-;DXC-NEXT:          - ParameterType:   0
-;DXC-NEXT:            ShaderVisibility: 0
-;DXC-NEXT:            Table:
-;DXC-NEXT:              NumRanges:       1
-;DXC-NEXT:              RangesOffset:    56
-;DXC-NEXT:              Ranges:
-;DXC-NEXT:                - RangeType:       3
-;DXC-NEXT:                  NumDescriptors:  1
-;DXC-NEXT:                  BaseShaderRegister: 1
-;DXC-NEXT:                  RegisterSpace:   0
-;DXC-NEXT:                  OffsetInDescriptorsFromTableStart: 4294967295
-;DXC-NEXT:          - ParameterType:   0
-;DXC-NEXT:            ShaderVisibility: 0
-;DXC-NEXT:            Table:
-;DXC-NEXT:              NumRanges:       1
-;DXC-NEXT:              RangesOffset:    84
-;DXC-NEXT:              Ranges:
-;DXC-NEXT:                - RangeType:       1
-;DXC-NEXT:                  NumDescriptors:  5
-;DXC-NEXT:                  BaseShaderRegister: 1
-;DXC-NEXT:                  RegisterSpace:   10
-;DXC-NEXT:                  OffsetInDescriptorsFromTableStart: 5
+; DXC-NEXT:     Size:            104
+; DXC-NEXT:     RootSignature:
+; DXC-NEXT:       Version:         1
+; DXC-NEXT:       NumRootParameters: 2
+; DXC-NEXT:       RootParametersOffset: 24
+; DXC-NEXT:       NumStaticSamplers: 0
+; DXC-NEXT:       StaticSamplersOffset: 104
+; DXC-NEXT:       Parameters:
+; DXC-NEXT:         - ParameterType:   0
+; DXC-NEXT:           ShaderVisibility: 0
+; DXC-NEXT:           Table:
+; DXC-NEXT:             NumRanges:       1
+; DXC-NEXT:             RangesOffset:    56
+; DXC-NEXT:             Ranges:
+; DXC-NEXT:               - RangeType:       3
+; DXC-NEXT:                 NumDescriptors:  1
+; DXC-NEXT:                 BaseShaderRegister: 1
+; DXC-NEXT:                 RegisterSpace:   0
+; DXC-NEXT:                 OffsetInDescriptorsFromTableStart: 4294967295
+; DXC-NEXT:         - ParameterType:   0
+; DXC-NEXT:           ShaderVisibility: 0
+; DXC-NEXT:           Table:
+; DXC-NEXT:             NumRanges:       1
+; DXC-NEXT:             RangesOffset:    84
+; DXC-NEXT:             Ranges:
+; DXC-NEXT:                - RangeType:       1
+; DXC-NEXT:                 NumDescriptors:  5
+; DXC-NEXT:                 BaseShaderRegister: 1
+; DXC-NEXT:                 RegisterSpace:   10
+; DXC-NEXT:                 OffsetInDescriptorsFromTableStart: 5

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ bool verifyRegisterOverflow(uint64_t Register, uint32_t NumDescriptors) {`
`193`	`193`
`194`	`194`	`uint64_t updateAppendingRegister(uint64_t AppendingRegister,`
`195`	`195`	`uint64_t NumDescriptors, uint64_t Offset) {`
`196`		`-`
`197`	`196`	`return Offset == ~0U ? AppendingRegister + NumDescriptors`
`198`	`197`	`: Offset + NumDescriptors;`
`199`	`198`	`}`