Skip to content

Commit a55fd37

Browse files
wenju-hewenju-he
committed
align SPIR-V function name in clang/lib/Headers/__clang_spirv_builtins.h
1 parent a4523a5 commit a55fd37

File tree

2 files changed

+64
-64
lines changed

2 files changed

+64
-64
lines changed

‎clang/lib/Headers/__clang_spirv_builtins.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,30 @@
5252
// Builtin IDs and sizes
5353

5454
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_num_workgroups) __size_t
55-
__spirv_NumWorkgroups(int);
55+
__spirv_BuiltInNumWorkgroups(int);
5656
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_workgroup_size) __size_t
57-
__spirv_WorkgroupSize(int);
57+
__spirv_BuiltInWorkgroupSize(int);
5858
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_workgroup_id) __size_t
59-
__spirv_WorkgroupId(int);
59+
__spirv_BuiltInWorkgroupId(int);
6060
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_local_invocation_id) __size_t
61-
__spirv_LocalInvocationId(int);
61+
__spirv_BuiltInLocalInvocationId(int);
6262
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_global_invocation_id) __size_t
63-
__spirv_GlobalInvocationId(int);
63+
__spirv_BuiltInGlobalInvocationId(int);
6464

6565
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_global_size) __size_t
66-
__spirv_GlobalSize(int);
66+
__spirv_BuiltInGlobalSize(int);
6767
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_global_offset) __size_t
68-
__spirv_GlobalOffset(int);
68+
__spirv_BuiltInGlobalOffset(int);
6969
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_subgroup_size) __uint32_t
70-
__spirv_SubgroupSize();
70+
__spirv_BuiltInSubgroupSize();
7171
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_subgroup_max_size) __uint32_t
72-
__spirv_SubgroupMaxSize();
72+
__spirv_BuiltInSubgroupMaxSize();
7373
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_num_subgroups) __uint32_t
74-
__spirv_NumSubgroups();
74+
__spirv_BuiltInNumSubgroups();
7575
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_subgroup_id) __uint32_t
76-
__spirv_SubgroupId();
76+
__spirv_BuiltInSubgroupId();
7777
extern __SPIRV_BUILTIN_ALIAS(__builtin_spirv_subgroup_local_invocation_id)
78-
__uint32_t __spirv_SubgroupLocalInvocationId();
78+
__uint32_t __spirv_BuiltInSubgroupLocalInvocationId();
7979

8080
// OpGenericCastToPtrExplicit
8181

‎clang/test/Headers/spirv_ids.cpp‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -53,58 +53,58 @@
5353
// CHECK: call i32 @llvm.spv.subgroup.id()
5454
// CHECK: call i32 @llvm.spv.subgroup.local.invocation.id()
5555

56-
// NV: call noundef i64 @_Z21__spirv_NumWorkgroupsi(i32 noundef 0) #2
57-
// NV: call noundef i64 @_Z21__spirv_NumWorkgroupsi(i32 noundef 1) #2
58-
// NV: call noundef i64 @_Z21__spirv_NumWorkgroupsi(i32 noundef 2) #2
59-
// NV: call noundef i64 @_Z21__spirv_WorkgroupSizei(i32 noundef 0) #2
60-
// NV: call noundef i64 @_Z21__spirv_WorkgroupSizei(i32 noundef 1) #2
61-
// NV: call noundef i64 @_Z21__spirv_WorkgroupSizei(i32 noundef 2) #2
62-
// NV: call noundef i64 @_Z19__spirv_WorkgroupIdi(i32 noundef 0) #2
63-
// NV: call noundef i64 @_Z19__spirv_WorkgroupIdi(i32 noundef 1) #2
64-
// NV: call noundef i64 @_Z19__spirv_WorkgroupIdi(i32 noundef 2) #2
65-
// NV: call noundef i64 @_Z25__spirv_LocalInvocationIdi(i32 noundef 0) #2
66-
// NV: call noundef i64 @_Z25__spirv_LocalInvocationIdi(i32 noundef 1) #2
67-
// NV: call noundef i64 @_Z25__spirv_LocalInvocationIdi(i32 noundef 2) #2
68-
// NV: call noundef i64 @_Z26__spirv_GlobalInvocationIdi(i32 noundef 0) #2
69-
// NV: call noundef i64 @_Z26__spirv_GlobalInvocationIdi(i32 noundef 1) #2
70-
// NV: call noundef i64 @_Z26__spirv_GlobalInvocationIdi(i32 noundef 2) #2
71-
// NV: call noundef i64 @_Z18__spirv_GlobalSizei(i32 noundef 0) #2
72-
// NV: call noundef i64 @_Z18__spirv_GlobalSizei(i32 noundef 1) #2
73-
// NV: call noundef i64 @_Z18__spirv_GlobalSizei(i32 noundef 2) #2
74-
// NV: call noundef i64 @_Z20__spirv_GlobalOffseti(i32 noundef 0) #2
75-
// NV: call noundef i64 @_Z20__spirv_GlobalOffseti(i32 noundef 1) #2
76-
// NV: call noundef i64 @_Z20__spirv_GlobalOffseti(i32 noundef 2) #2
77-
// NV: call noundef i32 @_Z20__spirv_SubgroupSizev() #2
78-
// NV: call noundef i32 @_Z23__spirv_SubgroupMaxSizev() #2
79-
// NV: call noundef i32 @_Z20__spirv_NumSubgroupsv() #2
80-
// NV: call noundef i32 @_Z18__spirv_SubgroupIdv() #2
81-
// NV: call noundef i32 @_Z33__spirv_SubgroupLocalInvocationIdv() #2
56+
// NV: call noundef i64 @_Z28__spirv_BuiltInNumWorkgroupsi(i32 noundef 0) #2
57+
// NV: call noundef i64 @_Z28__spirv_BuiltInNumWorkgroupsi(i32 noundef 1) #2
58+
// NV: call noundef i64 @_Z28__spirv_BuiltInNumWorkgroupsi(i32 noundef 2) #2
59+
// NV: call noundef i64 @_Z28__spirv_BuiltInWorkgroupSizei(i32 noundef 0) #2
60+
// NV: call noundef i64 @_Z28__spirv_BuiltInWorkgroupSizei(i32 noundef 1) #2
61+
// NV: call noundef i64 @_Z28__spirv_BuiltInWorkgroupSizei(i32 noundef 2) #2
62+
// NV: call noundef i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 0) #2
63+
// NV: call noundef i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 1) #2
64+
// NV: call noundef i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 2) #2
65+
// NV: call noundef i64 @_Z32__spirv_BuiltInLocalInvocationIdi(i32 noundef 0) #2
66+
// NV: call noundef i64 @_Z32__spirv_BuiltInLocalInvocationIdi(i32 noundef 1) #2
67+
// NV: call noundef i64 @_Z32__spirv_BuiltInLocalInvocationIdi(i32 noundef 2) #2
68+
// NV: call noundef i64 @_Z33__spirv_BuiltInGlobalInvocationIdi(i32 noundef 0) #2
69+
// NV: call noundef i64 @_Z33__spirv_BuiltInGlobalInvocationIdi(i32 noundef 1) #2
70+
// NV: call noundef i64 @_Z33__spirv_BuiltInGlobalInvocationIdi(i32 noundef 2) #2
71+
// NV: call noundef i64 @_Z25__spirv_BuiltInGlobalSizei(i32 noundef 0) #2
72+
// NV: call noundef i64 @_Z25__spirv_BuiltInGlobalSizei(i32 noundef 1) #2
73+
// NV: call noundef i64 @_Z25__spirv_BuiltInGlobalSizei(i32 noundef 2) #2
74+
// NV: call noundef i64 @_Z27__spirv_BuiltInGlobalOffseti(i32 noundef 0) #2
75+
// NV: call noundef i64 @_Z27__spirv_BuiltInGlobalOffseti(i32 noundef 1) #2
76+
// NV: call noundef i64 @_Z27__spirv_BuiltInGlobalOffseti(i32 noundef 2) #2
77+
// NV: call noundef i32 @_Z27__spirv_BuiltInSubgroupSizev() #2
78+
// NV: call noundef i32 @_Z30__spirv_BuiltInSubgroupMaxSizev() #2
79+
// NV: call noundef i32 @_Z27__spirv_BuiltInNumSubgroupsv() #2
80+
// NV: call noundef i32 @_Z25__spirv_BuiltInSubgroupIdv() #2
81+
// NV: call noundef i32 @_Z40__spirv_BuiltInSubgroupLocalInvocationIdv() #2
8282

8383
void test_id_and_range() {
84-
__spirv_NumWorkgroups(0);
85-
__spirv_NumWorkgroups(1);
86-
__spirv_NumWorkgroups(2);
87-
__spirv_WorkgroupSize(0);
88-
__spirv_WorkgroupSize(1);
89-
__spirv_WorkgroupSize(2);
90-
__spirv_WorkgroupId(0);
91-
__spirv_WorkgroupId(1);
92-
__spirv_WorkgroupId(2);
93-
__spirv_LocalInvocationId(0);
94-
__spirv_LocalInvocationId(1);
95-
__spirv_LocalInvocationId(2);
96-
__spirv_GlobalInvocationId(0);
97-
__spirv_GlobalInvocationId(1);
98-
__spirv_GlobalInvocationId(2);
99-
__spirv_GlobalSize(0);
100-
__spirv_GlobalSize(1);
101-
__spirv_GlobalSize(2);
102-
__spirv_GlobalOffset(0);
103-
__spirv_GlobalOffset(1);
104-
__spirv_GlobalOffset(2);
105-
unsigned int ssize = __spirv_SubgroupSize();
106-
unsigned int smax = __spirv_SubgroupMaxSize();
107-
unsigned int snum = __spirv_NumSubgroups();
108-
unsigned int sid = __spirv_SubgroupId();
109-
unsigned int sinvocid = __spirv_SubgroupLocalInvocationId();
84+
__spirv_BuiltInNumWorkgroups(0);
85+
__spirv_BuiltInNumWorkgroups(1);
86+
__spirv_BuiltInNumWorkgroups(2);
87+
__spirv_BuiltInWorkgroupSize(0);
88+
__spirv_BuiltInWorkgroupSize(1);
89+
__spirv_BuiltInWorkgroupSize(2);
90+
__spirv_BuiltInWorkgroupId(0);
91+
__spirv_BuiltInWorkgroupId(1);
92+
__spirv_BuiltInWorkgroupId(2);
93+
__spirv_BuiltInLocalInvocationId(0);
94+
__spirv_BuiltInLocalInvocationId(1);
95+
__spirv_BuiltInLocalInvocationId(2);
96+
__spirv_BuiltInGlobalInvocationId(0);
97+
__spirv_BuiltInGlobalInvocationId(1);
98+
__spirv_BuiltInGlobalInvocationId(2);
99+
__spirv_BuiltInGlobalSize(0);
100+
__spirv_BuiltInGlobalSize(1);
101+
__spirv_BuiltInGlobalSize(2);
102+
__spirv_BuiltInGlobalOffset(0);
103+
__spirv_BuiltInGlobalOffset(1);
104+
__spirv_BuiltInGlobalOffset(2);
105+
unsigned int ssize = __spirv_BuiltInSubgroupSize();
106+
unsigned int smax = __spirv_BuiltInSubgroupMaxSize();
107+
unsigned int snum = __spirv_BuiltInNumSubgroups();
108+
unsigned int sid = __spirv_BuiltInSubgroupId();
109+
unsigned int sinvocid = __spirv_BuiltInSubgroupLocalInvocationId();
110110
}

0 commit comments

Comments
 (0)