Skip to content

Commit bdbe5c7

Browse files
committed
[X86] Make the pointer arguments to avx512 gather/scatter intrinsics 'void*' to match gcc and Intel's documentation.
The avx2 gather intrinsics are documented to use 'int', 'long long', 'float', or 'double' *. So I'm leaving those. This matches gcc. llvm-svn: 350696
1 parent befee40 commit bdbe5c7

File tree

3 files changed

+96
-96
lines changed

3 files changed

+96
-96
lines changed

clang/lib/Headers/avx512fintrin.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7630,177 +7630,177 @@ _mm512_maskz_getexp_ps (__mmask16 __U, __m512 __A)
76307630

76317631
#define _mm512_i64gather_ps(index, addr, scale) \
76327632
(__m256)__builtin_ia32_gatherdiv16sf((__v8sf)_mm256_undefined_ps(), \
7633-
(float const *)(addr), \
7633+
(void const *)(addr), \
76347634
(__v8di)(__m512i)(index), (__mmask8)-1, \
76357635
(int)(scale))
76367636

76377637
#define _mm512_mask_i64gather_ps(v1_old, mask, index, addr, scale) \
76387638
(__m256)__builtin_ia32_gatherdiv16sf((__v8sf)(__m256)(v1_old),\
7639-
(float const *)(addr), \
7639+
(void const *)(addr), \
76407640
(__v8di)(__m512i)(index), \
76417641
(__mmask8)(mask), (int)(scale))
76427642

76437643
#define _mm512_i64gather_epi32(index, addr, scale) \
76447644
(__m256i)__builtin_ia32_gatherdiv16si((__v8si)_mm256_undefined_si256(), \
7645-
(int const *)(addr), \
7645+
(void const *)(addr), \
76467646
(__v8di)(__m512i)(index), \
76477647
(__mmask8)-1, (int)(scale))
76487648

76497649
#define _mm512_mask_i64gather_epi32(v1_old, mask, index, addr, scale) \
76507650
(__m256i)__builtin_ia32_gatherdiv16si((__v8si)(__m256i)(v1_old), \
7651-
(int const *)(addr), \
7651+
(void const *)(addr), \
76527652
(__v8di)(__m512i)(index), \
76537653
(__mmask8)(mask), (int)(scale))
76547654

76557655
#define _mm512_i64gather_pd(index, addr, scale) \
76567656
(__m512d)__builtin_ia32_gatherdiv8df((__v8df)_mm512_undefined_pd(), \
7657-
(double const *)(addr), \
7657+
(void const *)(addr), \
76587658
(__v8di)(__m512i)(index), (__mmask8)-1, \
76597659
(int)(scale))
76607660

76617661
#define _mm512_mask_i64gather_pd(v1_old, mask, index, addr, scale) \
76627662
(__m512d)__builtin_ia32_gatherdiv8df((__v8df)(__m512d)(v1_old), \
7663-
(double const *)(addr), \
7663+
(void const *)(addr), \
76647664
(__v8di)(__m512i)(index), \
76657665
(__mmask8)(mask), (int)(scale))
76667666

76677667
#define _mm512_i64gather_epi64(index, addr, scale) \
76687668
(__m512i)__builtin_ia32_gatherdiv8di((__v8di)_mm512_undefined_epi32(), \
7669-
(long long const *)(addr), \
7669+
(void const *)(addr), \
76707670
(__v8di)(__m512i)(index), (__mmask8)-1, \
76717671
(int)(scale))
76727672

76737673
#define _mm512_mask_i64gather_epi64(v1_old, mask, index, addr, scale) \
76747674
(__m512i)__builtin_ia32_gatherdiv8di((__v8di)(__m512i)(v1_old), \
7675-
(long long const *)(addr), \
7675+
(void const *)(addr), \
76767676
(__v8di)(__m512i)(index), \
76777677
(__mmask8)(mask), (int)(scale))
76787678

76797679
#define _mm512_i32gather_ps(index, addr, scale) \
76807680
(__m512)__builtin_ia32_gathersiv16sf((__v16sf)_mm512_undefined_ps(), \
7681-
(float const *)(addr), \
7681+
(void const *)(addr), \
76827682
(__v16sf)(__m512)(index), \
76837683
(__mmask16)-1, (int)(scale))
76847684

76857685
#define _mm512_mask_i32gather_ps(v1_old, mask, index, addr, scale) \
76867686
(__m512)__builtin_ia32_gathersiv16sf((__v16sf)(__m512)(v1_old), \
7687-
(float const *)(addr), \
7687+
(void const *)(addr), \
76887688
(__v16sf)(__m512)(index), \
76897689
(__mmask16)(mask), (int)(scale))
76907690

76917691
#define _mm512_i32gather_epi32(index, addr, scale) \
76927692
(__m512i)__builtin_ia32_gathersiv16si((__v16si)_mm512_undefined_epi32(), \
7693-
(int const *)(addr), \
7693+
(void const *)(addr), \
76947694
(__v16si)(__m512i)(index), \
76957695
(__mmask16)-1, (int)(scale))
76967696

76977697
#define _mm512_mask_i32gather_epi32(v1_old, mask, index, addr, scale) \
76987698
(__m512i)__builtin_ia32_gathersiv16si((__v16si)(__m512i)(v1_old), \
7699-
(int const *)(addr), \
7699+
(void const *)(addr), \
77007700
(__v16si)(__m512i)(index), \
77017701
(__mmask16)(mask), (int)(scale))
77027702

77037703
#define _mm512_i32gather_pd(index, addr, scale) \
77047704
(__m512d)__builtin_ia32_gathersiv8df((__v8df)_mm512_undefined_pd(), \
7705-
(double const *)(addr), \
7705+
(void const *)(addr), \
77067706
(__v8si)(__m256i)(index), (__mmask8)-1, \
77077707
(int)(scale))
77087708

77097709
#define _mm512_mask_i32gather_pd(v1_old, mask, index, addr, scale) \
77107710
(__m512d)__builtin_ia32_gathersiv8df((__v8df)(__m512d)(v1_old), \
7711-
(double const *)(addr), \
7711+
(void const *)(addr), \
77127712
(__v8si)(__m256i)(index), \
77137713
(__mmask8)(mask), (int)(scale))
77147714

77157715
#define _mm512_i32gather_epi64(index, addr, scale) \
77167716
(__m512i)__builtin_ia32_gathersiv8di((__v8di)_mm512_undefined_epi32(), \
7717-
(long long const *)(addr), \
7717+
(void const *)(addr), \
77187718
(__v8si)(__m256i)(index), (__mmask8)-1, \
77197719
(int)(scale))
77207720

77217721
#define _mm512_mask_i32gather_epi64(v1_old, mask, index, addr, scale) \
77227722
(__m512i)__builtin_ia32_gathersiv8di((__v8di)(__m512i)(v1_old), \
7723-
(long long const *)(addr), \
7723+
(void const *)(addr), \
77247724
(__v8si)(__m256i)(index), \
77257725
(__mmask8)(mask), (int)(scale))
77267726

77277727
#define _mm512_i64scatter_ps(addr, index, v1, scale) \
7728-
__builtin_ia32_scatterdiv16sf((float *)(addr), (__mmask8)-1, \
7728+
__builtin_ia32_scatterdiv16sf((void *)(addr), (__mmask8)-1, \
77297729
(__v8di)(__m512i)(index), \
77307730
(__v8sf)(__m256)(v1), (int)(scale))
77317731

77327732
#define _mm512_mask_i64scatter_ps(addr, mask, index, v1, scale) \
7733-
__builtin_ia32_scatterdiv16sf((float *)(addr), (__mmask8)(mask), \
7733+
__builtin_ia32_scatterdiv16sf((void *)(addr), (__mmask8)(mask), \
77347734
(__v8di)(__m512i)(index), \
77357735
(__v8sf)(__m256)(v1), (int)(scale))
77367736

77377737
#define _mm512_i64scatter_epi32(addr, index, v1, scale) \
7738-
__builtin_ia32_scatterdiv16si((int *)(addr), (__mmask8)-1, \
7738+
__builtin_ia32_scatterdiv16si((void *)(addr), (__mmask8)-1, \
77397739
(__v8di)(__m512i)(index), \
77407740
(__v8si)(__m256i)(v1), (int)(scale))
77417741

77427742
#define _mm512_mask_i64scatter_epi32(addr, mask, index, v1, scale) \
7743-
__builtin_ia32_scatterdiv16si((int *)(addr), (__mmask8)(mask), \
7743+
__builtin_ia32_scatterdiv16si((void *)(addr), (__mmask8)(mask), \
77447744
(__v8di)(__m512i)(index), \
77457745
(__v8si)(__m256i)(v1), (int)(scale))
77467746

77477747
#define _mm512_i64scatter_pd(addr, index, v1, scale) \
7748-
__builtin_ia32_scatterdiv8df((double *)(addr), (__mmask8)-1, \
7748+
__builtin_ia32_scatterdiv8df((void *)(addr), (__mmask8)-1, \
77497749
(__v8di)(__m512i)(index), \
77507750
(__v8df)(__m512d)(v1), (int)(scale))
77517751

77527752
#define _mm512_mask_i64scatter_pd(addr, mask, index, v1, scale) \
7753-
__builtin_ia32_scatterdiv8df((double *)(addr), (__mmask8)(mask), \
7753+
__builtin_ia32_scatterdiv8df((void *)(addr), (__mmask8)(mask), \
77547754
(__v8di)(__m512i)(index), \
77557755
(__v8df)(__m512d)(v1), (int)(scale))
77567756

77577757
#define _mm512_i64scatter_epi64(addr, index, v1, scale) \
7758-
__builtin_ia32_scatterdiv8di((long long *)(addr), (__mmask8)-1, \
7758+
__builtin_ia32_scatterdiv8di((void *)(addr), (__mmask8)-1, \
77597759
(__v8di)(__m512i)(index), \
77607760
(__v8di)(__m512i)(v1), (int)(scale))
77617761

77627762
#define _mm512_mask_i64scatter_epi64(addr, mask, index, v1, scale) \
7763-
__builtin_ia32_scatterdiv8di((long long *)(addr), (__mmask8)(mask), \
7763+
__builtin_ia32_scatterdiv8di((void *)(addr), (__mmask8)(mask), \
77647764
(__v8di)(__m512i)(index), \
77657765
(__v8di)(__m512i)(v1), (int)(scale))
77667766

77677767
#define _mm512_i32scatter_ps(addr, index, v1, scale) \
7768-
__builtin_ia32_scattersiv16sf((float *)(addr), (__mmask16)-1, \
7768+
__builtin_ia32_scattersiv16sf((void *)(addr), (__mmask16)-1, \
77697769
(__v16si)(__m512i)(index), \
77707770
(__v16sf)(__m512)(v1), (int)(scale))
77717771

77727772
#define _mm512_mask_i32scatter_ps(addr, mask, index, v1, scale) \
7773-
__builtin_ia32_scattersiv16sf((float *)(addr), (__mmask16)(mask), \
7773+
__builtin_ia32_scattersiv16sf((void *)(addr), (__mmask16)(mask), \
77747774
(__v16si)(__m512i)(index), \
77757775
(__v16sf)(__m512)(v1), (int)(scale))
77767776

77777777
#define _mm512_i32scatter_epi32(addr, index, v1, scale) \
7778-
__builtin_ia32_scattersiv16si((int *)(addr), (__mmask16)-1, \
7778+
__builtin_ia32_scattersiv16si((void *)(addr), (__mmask16)-1, \
77797779
(__v16si)(__m512i)(index), \
77807780
(__v16si)(__m512i)(v1), (int)(scale))
77817781

77827782
#define _mm512_mask_i32scatter_epi32(addr, mask, index, v1, scale) \
7783-
__builtin_ia32_scattersiv16si((int *)(addr), (__mmask16)(mask), \
7783+
__builtin_ia32_scattersiv16si((void *)(addr), (__mmask16)(mask), \
77847784
(__v16si)(__m512i)(index), \
77857785
(__v16si)(__m512i)(v1), (int)(scale))
77867786

77877787
#define _mm512_i32scatter_pd(addr, index, v1, scale) \
7788-
__builtin_ia32_scattersiv8df((double *)(addr), (__mmask8)-1, \
7788+
__builtin_ia32_scattersiv8df((void *)(addr), (__mmask8)-1, \
77897789
(__v8si)(__m256i)(index), \
77907790
(__v8df)(__m512d)(v1), (int)(scale))
77917791

77927792
#define _mm512_mask_i32scatter_pd(addr, mask, index, v1, scale) \
7793-
__builtin_ia32_scattersiv8df((double *)(addr), (__mmask8)(mask), \
7793+
__builtin_ia32_scattersiv8df((void *)(addr), (__mmask8)(mask), \
77947794
(__v8si)(__m256i)(index), \
77957795
(__v8df)(__m512d)(v1), (int)(scale))
77967796

77977797
#define _mm512_i32scatter_epi64(addr, index, v1, scale) \
7798-
__builtin_ia32_scattersiv8di((long long *)(addr), (__mmask8)-1, \
7798+
__builtin_ia32_scattersiv8di((void *)(addr), (__mmask8)-1, \
77997799
(__v8si)(__m256i)(index), \
78007800
(__v8di)(__m512i)(v1), (int)(scale))
78017801

78027802
#define _mm512_mask_i32scatter_epi64(addr, mask, index, v1, scale) \
7803-
__builtin_ia32_scattersiv8di((long long *)(addr), (__mmask8)(mask), \
7803+
__builtin_ia32_scattersiv8di((void *)(addr), (__mmask8)(mask), \
78047804
(__v8si)(__m256i)(index), \
78057805
(__v8di)(__m512i)(v1), (int)(scale))
78067806

clang/lib/Headers/avx512pfintrin.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,78 +33,78 @@
3333

3434
#define _mm512_mask_prefetch_i32gather_pd(index, mask, addr, scale, hint) \
3535
__builtin_ia32_gatherpfdpd((__mmask8)(mask), (__v8si)(__m256i)(index), \
36-
(long long const *)(addr), (int)(scale), \
36+
(void const *)(addr), (int)(scale), \
3737
(int)(hint))
3838

3939
#define _mm512_prefetch_i32gather_pd(index, addr, scale, hint) \
4040
__builtin_ia32_gatherpfdpd((__mmask8) -1, (__v8si)(__m256i)(index), \
41-
(long long const *)(addr), (int)(scale), \
41+
(void const *)(addr), (int)(scale), \
4242
(int)(hint))
4343

4444
#define _mm512_mask_prefetch_i32gather_ps(index, mask, addr, scale, hint) \
4545
__builtin_ia32_gatherpfdps((__mmask16)(mask), \
46-
(__v16si)(__m512i)(index), (int const *)(addr), \
46+
(__v16si)(__m512i)(index), (void const *)(addr), \
4747
(int)(scale), (int)(hint))
4848

4949
#define _mm512_prefetch_i32gather_ps(index, addr, scale, hint) \
5050
__builtin_ia32_gatherpfdps((__mmask16) -1, \
51-
(__v16si)(__m512i)(index), (int const *)(addr), \
51+
(__v16si)(__m512i)(index), (void const *)(addr), \
5252
(int)(scale), (int)(hint))
5353

5454
#define _mm512_mask_prefetch_i64gather_pd(index, mask, addr, scale, hint) \
5555
__builtin_ia32_gatherpfqpd((__mmask8)(mask), (__v8di)(__m512i)(index), \
56-
(long long const *)(addr), (int)(scale), \
56+
(void const *)(addr), (int)(scale), \
5757
(int)(hint))
5858

5959
#define _mm512_prefetch_i64gather_pd(index, addr, scale, hint) \
6060
__builtin_ia32_gatherpfqpd((__mmask8) -1, (__v8di)(__m512i)(index), \
61-
(long long const *)(addr), (int)(scale), \
61+
(void const *)(addr), (int)(scale), \
6262
(int)(hint))
6363

6464
#define _mm512_mask_prefetch_i64gather_ps(index, mask, addr, scale, hint) \
6565
__builtin_ia32_gatherpfqps((__mmask8)(mask), (__v8di)(__m512i)(index), \
66-
(int const *)(addr), (int)(scale), (int)(hint))
66+
(void const *)(addr), (int)(scale), (int)(hint))
6767

6868
#define _mm512_prefetch_i64gather_ps(index, addr, scale, hint) \
6969
__builtin_ia32_gatherpfqps((__mmask8) -1, (__v8di)(__m512i)(index), \
70-
(int const *)(addr), (int)(scale), (int)(hint))
70+
(void const *)(addr), (int)(scale), (int)(hint))
7171

7272
#define _mm512_prefetch_i32scatter_pd(addr, index, scale, hint) \
7373
__builtin_ia32_scatterpfdpd((__mmask8)-1, (__v8si)(__m256i)(index), \
74-
(long long *)(addr), (int)(scale), \
74+
(void *)(addr), (int)(scale), \
7575
(int)(hint))
7676

7777
#define _mm512_mask_prefetch_i32scatter_pd(addr, mask, index, scale, hint) \
7878
__builtin_ia32_scatterpfdpd((__mmask8)(mask), (__v8si)(__m256i)(index), \
79-
(long long *)(addr), (int)(scale), \
79+
(void *)(addr), (int)(scale), \
8080
(int)(hint))
8181

8282
#define _mm512_prefetch_i32scatter_ps(addr, index, scale, hint) \
8383
__builtin_ia32_scatterpfdps((__mmask16)-1, (__v16si)(__m512i)(index), \
84-
(int *)(addr), (int)(scale), (int)(hint))
84+
(void *)(addr), (int)(scale), (int)(hint))
8585

8686
#define _mm512_mask_prefetch_i32scatter_ps(addr, mask, index, scale, hint) \
8787
__builtin_ia32_scatterpfdps((__mmask16)(mask), \
88-
(__v16si)(__m512i)(index), (int *)(addr), \
88+
(__v16si)(__m512i)(index), (void *)(addr), \
8989
(int)(scale), (int)(hint))
9090

9191
#define _mm512_prefetch_i64scatter_pd(addr, index, scale, hint) \
9292
__builtin_ia32_scatterpfqpd((__mmask8)-1, (__v8di)(__m512i)(index), \
93-
(long long *)(addr), (int)(scale), \
93+
(void *)(addr), (int)(scale), \
9494
(int)(hint))
9595

9696
#define _mm512_mask_prefetch_i64scatter_pd(addr, mask, index, scale, hint) \
9797
__builtin_ia32_scatterpfqpd((__mmask8)(mask), (__v8di)(__m512i)(index), \
98-
(long long *)(addr), (int)(scale), \
98+
(void *)(addr), (int)(scale), \
9999
(int)(hint))
100100

101101
#define _mm512_prefetch_i64scatter_ps(addr, index, scale, hint) \
102102
__builtin_ia32_scatterpfqps((__mmask8)-1, (__v8di)(__m512i)(index), \
103-
(int *)(addr), (int)(scale), (int)(hint))
103+
(void *)(addr), (int)(scale), (int)(hint))
104104

105105
#define _mm512_mask_prefetch_i64scatter_ps(addr, mask, index, scale, hint) \
106106
__builtin_ia32_scatterpfqps((__mmask8)(mask), (__v8di)(__m512i)(index), \
107-
(int *)(addr), (int)(scale), (int)(hint))
107+
(void *)(addr), (int)(scale), (int)(hint))
108108

109109
#undef __DEFAULT_FN_ATTRS
110110

0 commit comments

Comments
 (0)