Skip to content

Commit c8f7e13

Browse files
committed
fix test
1 parent a2a00a9 commit c8f7e13

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

clang/test/AST/HLSL/RootSignature-Target-AST.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define EntryRootSig "CBV(b0)"
3131

3232
// CMD: -HLSLRootSignatureDecl 0x{{.*}} {{.*}} implicit [[CMD_RS_DECL:__hlsl_rootsig_decl_\d*]]
33-
// CMD-SAME: version: 1.2,
33+
// CMD-SAME: version: 1.1,
3434
// CMD-SAME: RootElements{
3535
// CMD-SAME: RootUAV(u0, space = 0, visibility = All, flags = DataVolatile)
3636
// CMD-SAME: }

clang/test/AST/HLSL/rootsignature-define-ast.hlsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
#define SampleUAV "UAV(u0)"
2222

2323
// CMD: -HLSLRootSignatureDecl 0x{{.*}} {{.*}} implicit [[CMD_DECL:__hlsl_rootsig_decl_\d*]]
24-
// CMD-SAME: version: 1.2, RootElements{
24+
// CMD-SAME: version: 1.1, RootElements{
2525
// CMD-SAME: RootSRV(t0,
2626
// CMD-SAME: space = 0, visibility = All, flags = DataStaticWhileSetAtExecute
2727
// CMD-SAME: )}
2828

2929
// CHECK: -HLSLRootSignatureDecl 0x{{.*}} {{.*}} implicit [[CBV_DECL:__hlsl_rootsig_decl_\d*]]
30-
// CHECK-SAME: version: 1.2, RootElements{
30+
// CHECK-SAME: version: 1.1, RootElements{
3131
// CHECK-SAME: RootCBV(b0,
3232
// CHECK-SAME: space = 0, visibility = All, flags = DataStaticWhileSetAtExecute
3333
// CHECK-SAME: )}
@@ -41,7 +41,7 @@
4141
void cbv_main() {}
4242

4343
// CHECK: -HLSLRootSignatureDecl 0x{{.*}} {{.*}} implicit [[UAV_DECL:__hlsl_rootsig_decl_\d*]]
44-
// CHECK-SAME: version: 1.2, RootElements{
44+
// CHECK-SAME: version: 1.1, RootElements{
4545
// CHECK-SAME: RootUAV(u0,
4646
// CHECK-SAME: space = 0, visibility = All, flags = DataVolatile
4747
// CHECK-SAME: )}

clang/test/CodeGenHLSL/RootSignature-Target.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: -hlsl-entry EntryRS -emit-llvm -o - %s | FileCheck %s
33

44
// CHECK: !dx.rootsignatures = !{![[#ENTRY:]]}
5-
// CHECK: ![[#ENTRY]] = !{null, ![[#ENTRY_RS:]], i32 3}
5+
// CHECK: ![[#ENTRY]] = !{null, ![[#ENTRY_RS:]], i32 2}
66
// CHECK: ![[#ENTRY_RS]] = !{![[#ROOT_CBV:]]}
77
// CHECK: ![[#ROOT_CBV]] = !{!"RootCBV", i32 0, i32 0, i32 0, i32 4}
88

clang/test/CodeGenHLSL/RootSignature.hlsl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// CHECK: !dx.rootsignatures = !{![[#EMPTY_ENTRY:]], ![[#DT_ENTRY:]],
44
// CHECK-SAME: ![[#RF_ENTRY:]], ![[#RC_ENTRY:]], ![[#RD_ENTRY:]], ![[#SS_ENTRY:]]}
55

6-
// CHECK: ![[#EMPTY_ENTRY]] = !{ptr @EmptyEntry, ![[#EMPTY:]], i32 3}
6+
// CHECK: ![[#EMPTY_ENTRY]] = !{ptr @EmptyEntry, ![[#EMPTY:]], i32 2}
77
// CHECK: ![[#EMPTY]] = !{}
88

99
[shader("compute"), RootSignature("")]
1010
[numthreads(1,1,1)]
1111
void EmptyEntry() {}
1212

13-
// CHECK: ![[#DT_ENTRY]] = !{ptr @DescriptorTableEntry, ![[#DT_RS:]], i32 3}
13+
// CHECK: ![[#DT_ENTRY]] = !{ptr @DescriptorTableEntry, ![[#DT_RS:]], i32 2}
1414
// CHECK: ![[#DT_RS]] = !{![[#TABLE:]]}
1515
// CHECK: ![[#TABLE]] = !{!"DescriptorTable", i32 0, ![[#CBV:]], ![[#SRV:]]}
1616
// CHECK: ![[#CBV]] = !{!"CBV", i32 1, i32 0, i32 0, i32 -1, i32 4}
@@ -25,7 +25,7 @@ void EmptyEntry() {}
2525
[numthreads(1,1,1)]
2626
void DescriptorTableEntry() {}
2727

28-
// CHECK: ![[#RF_ENTRY]] = !{ptr @RootFlagsEntry, ![[#RF_RS:]], i32 3}
28+
// CHECK: ![[#RF_ENTRY]] = !{ptr @RootFlagsEntry, ![[#RF_RS:]], i32 2}
2929
// CHECK: ![[#RF_RS]] = !{![[#ROOT_FLAGS:]]}
3030
// CHECK: ![[#ROOT_FLAGS]] = !{!"RootFlags", i32 2114}
3131

@@ -38,7 +38,7 @@ void DescriptorTableEntry() {}
3838
[numthreads(1,1,1)]
3939
void RootFlagsEntry() {}
4040

41-
// CHECK: ![[#RC_ENTRY]] = !{ptr @RootConstantsEntry, ![[#RC_RS:]], i32 3}
41+
// CHECK: ![[#RC_ENTRY]] = !{ptr @RootConstantsEntry, ![[#RC_RS:]], i32 2}
4242
// CHECK: ![[#RC_RS]] = !{![[#ROOT_CONSTANTS:]]}
4343
// CHECK: ![[#ROOT_CONSTANTS]] = !{!"RootConstants", i32 5, i32 1, i32 2, i32 1}
4444

@@ -52,7 +52,7 @@ void RootFlagsEntry() {}
5252
[numthreads(1,1,1)]
5353
void RootConstantsEntry() {}
5454

55-
// CHECK: ![[#RD_ENTRY]] = !{ptr @RootDescriptorsEntry, ![[#RD_RS:]], i32 3}
55+
// CHECK: ![[#RD_ENTRY]] = !{ptr @RootDescriptorsEntry, ![[#RD_RS:]], i32 2}
5656
// CHECK: ![[#RD_RS]] = !{![[#ROOT_CBV:]], ![[#ROOT_UAV:]], ![[#ROOT_SRV:]]}
5757
// CHECK: ![[#ROOT_CBV]] = !{!"RootCBV", i32 0, i32 0, i32 0, i32 4}
5858
// CHECK: ![[#ROOT_UAV]] = !{!"RootUAV", i32 0, i32 42, i32 3, i32 2}
@@ -66,7 +66,7 @@ void RootConstantsEntry() {}
6666
[numthreads(1,1,1)]
6767
void RootDescriptorsEntry() {}
6868

69-
// CHECK: ![[#SS_ENTRY]] = !{ptr @StaticSamplerEntry, ![[#SS_RS:]], i32 3}
69+
// CHECK: ![[#SS_ENTRY]] = !{ptr @StaticSamplerEntry, ![[#SS_RS:]], i32 2}
7070
// CHECK: ![[#SS_RS]] = !{![[#STATIC_SAMPLER:]]}
7171

7272
// checking filter = 0x4

clang/test/Driver/dxc_rootsig-define.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define NotEmptyRS "CBV(b0)"
1919

2020
// CHECK: !dx.rootsignatures = !{![[#ENTRY:]]}
21-
// CHECK: ![[#ENTRY]] = !{ptr @main, ![[#RS:]], i32 3}
21+
// CHECK: ![[#ENTRY]] = !{ptr @main, ![[#RS:]], i32 2}
2222

2323
// REG: ![[#RS]] = !{![[#CBV:]]}
2424
// REG: ![[#CBV]] = !{!"RootCBV"

0 commit comments

Comments
 (0)