Skip to content

Commit 3aff825

Browse files
web-flowfda0
web-flow
authored and
fda0
committed
Rename SPV_INTEL_subgroup_buffer_prefetch extension
The extension should be renamed from `subgroups` to `subgroup` to conform to current naming standards. (cherry picked from commit face9bf)
1 parent 7cd6dfd commit 3aff825

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

‎IGC/BiFModule/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ set(KHR_DEFINES "cl_khr_f16" "cl_khr_fp64" "cl_khr_gl_msaa_sharing" "cl_khr_mipm
480480
"cl_intel_subgroups_char" "cl_intel_subgroups_long" "cl_intel_subgroup_local_block_io" "cl_intel_64bit_global_atomics_placeholder"
481481
"cl_khr_subgroup_extended_types" "cl_khr_subgroup_non_uniform_vote" "cl_khr_subgroup_ballot" "cl_khr_subgroup_shuffle"
482482
"cl_khr_subgroup_shuffle_relative" "cl_khr_subgroup_non_uniform_arithmetic" "cl_khr_subgroup_clustered_reduce"
483-
"cl_khr_extended_bit_ops" "cl_intel_bit_instructions" "cl_intel_global_float_atomics" "cl_intel_subgroups_buffer_prefetch")
483+
"cl_khr_extended_bit_ops" "cl_intel_bit_instructions" "cl_intel_global_float_atomics" "cl_intel_subgroup_buffer_prefetch")
484484
set(KHR_DEFINES ${KHR_DEFINES} "cl_intel_subgroup_matrix_multiply_accumulate" "cl_intel_subgroup_split_matrix_multiply_accumulate")
485485
set(KHR_DEFINES ${KHR_DEFINES} "cl_intel_rt_production")
486486
set(KHR_DEFINES ${KHR_DEFINES} "cl_intel_subgroup_matrix_multiply_accumulate_tf32")

‎IGC/BiFModule/Headers/spirv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4830,12 +4830,12 @@ long4 SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageBlockReadINTEL, _v4i64_img2
48304830
long8 SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageBlockReadINTEL, _v8i64_img2d_ro_v2i32, _Rlong8)(global Img2d_ro* image, int2 coord);
48314831
#endif // cl_intel_subgroups_long
48324832

4833-
#ifdef cl_intel_subgroups_buffer_prefetch
4833+
#ifdef cl_intel_subgroup_buffer_prefetch
48344834
void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupBlockPrefetchINTEL, _p1i8, )(const global uchar* ptr, uint num_bytes);
48354835
void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupBlockPrefetchINTEL, _p1i16, )(const global ushort* ptr, uint num_bytes);
48364836
void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupBlockPrefetchINTEL, _p1i32, )(const global uint* ptr, uint num_bytes);
48374837
void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupBlockPrefetchINTEL, _p1i64, )(const global ulong* ptr, uint num_bytes);
4838-
#endif // cl_intel_subgroups_buffer_prefetch
4838+
#endif // cl_intel_subgroup_buffer_prefetch
48394839

48404840
#define DECL_SUB_GROUP_BROADCAST(TYPE, TYPE_ABBR) \
48414841
DECL_SUB_GROUP_BROADCAST_BASE(TYPE, TYPE_ABBR) \

‎IGC/BiFModule/Implementation/IGCBiF_Intrinsics_Lsc.cl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ ulong __builtin_IB_lsc_atomic_cmpxchg_global_ulong(volatile __global ulong *bas
405405
ulong __builtin_IB_lsc_atomic_cmpxchg_local_ulong(volatile __local ulong *base, int immElemOff, ulong cmp, ulong val);
406406
#endif // cl_intel_pvc_lsc_validation
407407

408-
#ifdef cl_intel_subgroups_buffer_prefetch
408+
#ifdef cl_intel_subgroup_buffer_prefetch
409409
// 1D Block prefetches
410410
void __builtin_IB_lsc_simd_block_prefetch_uchar(const __global uchar*, enum LSC_LDCC cacheOpt);
411411
void __builtin_IB_lsc_simd_block_prefetch_uchar2(const __global uchar*, enum LSC_LDCC cacheOpt);
@@ -428,7 +428,7 @@ void __builtin_IB_lsc_simd_block_prefetch_ulong(const __global ulong*, enum LSC_
428428
void __builtin_IB_lsc_simd_block_prefetch_ulong2(const __global ulong*, enum LSC_LDCC cacheOpt);
429429
void __builtin_IB_lsc_simd_block_prefetch_ulong4(const __global ulong*, enum LSC_LDCC cacheOpt);
430430
void __builtin_IB_lsc_simd_block_prefetch_ulong8(const __global ulong*, enum LSC_LDCC cacheOpt);
431-
#endif // cl_intel_subgroups_buffer_prefetch
431+
#endif // cl_intel_subgroup_buffer_prefetch
432432

433433
#ifdef cl_intel_subgroup_extended_block_read
434434
// 2d block read

‎IGC/BiFModule/Implementation/group.cl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,7 @@ DEF_INTEL_SUB_GROUP_BLOCK_READ_GLOBAL(long4, v4i64, long, i64, simd_block_read_4
17381738
DEF_INTEL_SUB_GROUP_BLOCK_READ_GLOBAL(long8, v8i64, long, i64, simd_block_read_8_global_l)
17391739
#endif // cl_intel_subgroups_long
17401740

1741-
#ifdef cl_intel_subgroups_buffer_prefetch
1741+
#ifdef cl_intel_subgroup_buffer_prefetch
17421742

17431743
void __internal_SubgroupBlockPrefetchINTEL_char_cache_controls(const global uchar* ptr, uint num_bytes, enum LSC_LDCC cacheOpt)
17441744
{
@@ -1859,7 +1859,7 @@ void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupBlockPrefetchINTEL, _p1i64, )(cons
18591859
{
18601860
__internal_SubgroupBlockPrefetchINTEL_long_cache_controls(ptr, num_bytes, LSC_LDCC_DEFAULT);
18611861
}
1862-
#endif // cl_intel_subgroups_buffer_prefetch
1862+
#endif // cl_intel_subgroup_buffer_prefetch
18631863

18641864
#ifdef cl_intel_subgroup_local_block_io
18651865

‎IGC/BiFModule/Languages/OpenCL/IBiF_Sub_Groups.cl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ DEFN_INTEL_SUB_GROUP_BLOCK_WRITE_GLOBAL(intel_sub_group_block_write_ul4, ulong4,
790790
DEFN_INTEL_SUB_GROUP_BLOCK_WRITE_GLOBAL(intel_sub_group_block_write_ul8, ulong8, ulong, i64, v8i64, __builtin_IB_simd_block_write_8_global_l)
791791
#endif // cl_intel_subgroups_long
792792

793-
#ifdef cl_intel_subgroups_buffer_prefetch
793+
#ifdef cl_intel_subgroup_buffer_prefetch
794794
#define DEFN_INTEL_SUB_GROUP_BLOCK_PREFETCH(FUNC_POSTFIX, PTR_TYPE, PTR_TYPE_MANGLING, NUM_BYTES) \
795795
void OVERLOADABLE intel_sub_group_block_prefetch_##FUNC_POSTFIX(const global PTR_TYPE* p) \
796796
{ \
@@ -818,7 +818,7 @@ DEFN_INTEL_SUB_GROUP_BLOCK_PREFETCH(ul, ulong, i64, 8)
818818
DEFN_INTEL_SUB_GROUP_BLOCK_PREFETCH(ul2, ulong, i64, 16)
819819
DEFN_INTEL_SUB_GROUP_BLOCK_PREFETCH(ul4, ulong, i64, 32)
820820
DEFN_INTEL_SUB_GROUP_BLOCK_PREFETCH(ul8, ulong, i64, 64)
821-
#endif // cl_intel_subgroups_buffer_prefetch
821+
#endif // cl_intel_subgroup_buffer_prefetch
822822

823823
#ifdef cl_intel_subgroup_local_block_io
824824
//

‎IGC/BiFModule/Languages/OpenCL/opencl_cth_released.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6501,7 +6501,7 @@ void __attribute__((overloadable)) intel_sub_group_block_write_ul8(__local ul
65016501

65026502
#endif // cl_intel_subgroup_local_block_io
65036503

6504-
#ifdef cl_intel_subgroups_buffer_prefetch
6504+
#ifdef cl_intel_subgroup_buffer_prefetch
65056505
void __attribute__((overloadable)) intel_sub_group_block_prefetch_uc(const __global uchar* p);
65066506
void __attribute__((overloadable)) intel_sub_group_block_prefetch_uc2(const __global uchar* p);
65076507
void __attribute__((overloadable)) intel_sub_group_block_prefetch_uc4(const __global uchar* p);
@@ -6523,7 +6523,7 @@ void __attribute__((overloadable)) intel_sub_group_block_prefetch_ul(const __glo
65236523
void __attribute__((overloadable)) intel_sub_group_block_prefetch_ul2(const __global ulong* p);
65246524
void __attribute__((overloadable)) intel_sub_group_block_prefetch_ul4(const __global ulong* p);
65256525
void __attribute__((overloadable)) intel_sub_group_block_prefetch_ul8(const __global ulong* p);
6526-
#endif // cl_intel_subgroups_buffer_prefetch
6526+
#endif // cl_intel_subgroup_buffer_prefetch
65276527

65286528
#if defined(cl_khr_subgroup_non_uniform_arithmetic) || defined(cl_khr_subgroup_clustered_reduce)
65296529
#define DECL_SUB_GROUP_NON_UNIFORM_OPERATION(TYPE, GROUP_TYPE, OPERATION)

‎IGC/ocloc_tests/Builtins/cl_intel_subgroup_buffer_prefetch/PVC/block_prefetch.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
1111
// UNSUPPORTED: sys32
1212

1313
// RUN: ocloc compile -file %s -device pvc -options "-igc_opts 'DumpVISAASMToConsole=1'" \
14-
// RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroups_buffer_prefetch" | FileCheck %s
14+
// RUN: -internal_options "-cl-ext=-all,+cl_intel_subgroup_buffer_prefetch" | FileCheck %s
1515

1616
__attribute__((intel_reqd_sub_group_size(16)))
1717
kernel void test_char(const global uchar* buffer) {

0 commit comments

Comments
 (0)