Commit 8d692766 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r333497: 

------------------------------------------------------------------------
r333497 | ctopper | 2018-05-29 20:38:15 -0700 (Tue, 29 May 2018) | 5 lines

[X86] Fix the names of a bunch of icelake intrinsics.

Mostly this fixes the names of all the 128-bit intrinsics to start with _mm_ instead of _mm128_ as is the convention and what the Intel docs say.

This also fixes the name of the bitshuffle intrinsics to say epi64 for 128 and 256 bit versions.
------------------------------------------------------------------------

llvm-svn: 333575
parent 06815bf8

clang/lib/Headers/avx512vlbitalgintrin.h

+16 −16
Original line number Diff line number Diff line
@@ -54,23 +54,23 @@ _mm256_maskz_popcnt_epi16(__mmask16 __U, __m256i __B) 
}



static __inline__ __m128i __DEFAULT_FN_ATTRS

_mm128_popcnt_epi16(__m128i __A)

_mm_popcnt_epi16(__m128i __A)

{

  return (__m128i) __builtin_ia32_vpopcntw_128((__v8hi) __A);

}



static __inline__ __m128i __DEFAULT_FN_ATTRS

_mm128_mask_popcnt_epi16(__m128i __A, __mmask8 __U, __m128i __B)

_mm_mask_popcnt_epi16(__m128i __A, __mmask8 __U, __m128i __B)

{

  return (__m128i) __builtin_ia32_selectw_128((__mmask8) __U,

              (__v8hi) _mm128_popcnt_epi16(__B),

              (__v8hi) _mm_popcnt_epi16(__B),

              (__v8hi) __A);

}



static __inline__ __m128i __DEFAULT_FN_ATTRS

_mm128_maskz_popcnt_epi16(__mmask8 __U, __m128i __B)

_mm_maskz_popcnt_epi16(__mmask8 __U, __m128i __B)

{

  return _mm128_mask_popcnt_epi16((__m128i) _mm_setzero_si128(),

  return _mm_mask_popcnt_epi16((__m128i) _mm_setzero_si128(),

              __U,

              __B);

}
@@ -98,29 +98,29 @@ _mm256_maskz_popcnt_epi8(__mmask32 __U, __m256i __B) 
}



static __inline__ __m128i __DEFAULT_FN_ATTRS

_mm128_popcnt_epi8(__m128i __A)

_mm_popcnt_epi8(__m128i __A)

{

  return (__m128i) __builtin_ia32_vpopcntb_128((__v16qi) __A);

}



static __inline__ __m128i __DEFAULT_FN_ATTRS

_mm128_mask_popcnt_epi8(__m128i __A, __mmask16 __U, __m128i __B)

_mm_mask_popcnt_epi8(__m128i __A, __mmask16 __U, __m128i __B)

{

  return (__m128i) __builtin_ia32_selectb_128((__mmask16) __U,

              (__v16qi) _mm128_popcnt_epi8(__B),

              (__v16qi) _mm_popcnt_epi8(__B),

              (__v16qi) __A);

}



static __inline__ __m128i __DEFAULT_FN_ATTRS

_mm128_maskz_popcnt_epi8(__mmask16 __U, __m128i __B)

_mm_maskz_popcnt_epi8(__mmask16 __U, __m128i __B)

{

  return _mm128_mask_popcnt_epi8((__m128i) _mm_setzero_si128(),

  return _mm_mask_popcnt_epi8((__m128i) _mm_setzero_si128(),

              __U,

              __B);

}



static __inline__ __mmask32 __DEFAULT_FN_ATTRS

_mm256_mask_bitshuffle_epi32_mask(__mmask32 __U, __m256i __A, __m256i __B)

_mm256_mask_bitshuffle_epi64_mask(__mmask32 __U, __m256i __A, __m256i __B)

{

  return (__mmask32) __builtin_ia32_vpshufbitqmb256_mask((__v32qi) __A,

              (__v32qi) __B,
@@ -128,15 +128,15 @@ _mm256_mask_bitshuffle_epi32_mask(__mmask32 __U, __m256i __A, __m256i __B) 
}



static __inline__ __mmask32 __DEFAULT_FN_ATTRS

_mm256_bitshuffle_epi32_mask(__m256i __A, __m256i __B)

_mm256_bitshuffle_epi64_mask(__m256i __A, __m256i __B)

{

  return _mm256_mask_bitshuffle_epi32_mask((__mmask32) -1,

  return _mm256_mask_bitshuffle_epi64_mask((__mmask32) -1,

              __A,

              __B);

}



static __inline__ __mmask16 __DEFAULT_FN_ATTRS

_mm128_mask_bitshuffle_epi16_mask(__mmask16 __U, __m128i __A, __m128i __B)

_mm_mask_bitshuffle_epi64_mask(__mmask16 __U, __m128i __A, __m128i __B)

{

  return (__mmask16) __builtin_ia32_vpshufbitqmb128_mask((__v16qi) __A,

              (__v16qi) __B,
@@ -144,9 +144,9 @@ _mm128_mask_bitshuffle_epi16_mask(__mmask16 __U, __m128i __A, __m128i __B) 
}



static __inline__ __mmask16 __DEFAULT_FN_ATTRS

_mm128_bitshuffle_epi16_mask(__m128i __A, __m128i __B)

_mm_bitshuffle_epi64_mask(__m128i __A, __m128i __B)

{

  return _mm128_mask_bitshuffle_epi16_mask((__mmask16) -1,

  return _mm_mask_bitshuffle_epi64_mask((__mmask16) -1,

              __A,

              __B);

}

clang/lib/Headers/avx512vlvbmi2intrin.h

+80 −91

File changed.

Preview size limit exceeded, changes collapsed.

clang/lib/Headers/avx512vlvnniintrin.h

+12 −12

File changed.

Preview size limit exceeded, changes collapsed.

clang/test/CodeGen/avx512vlbitalg-builtins.c

+30 −30

File changed.

Preview size limit exceeded, changes collapsed.

clang/test/CodeGen/avx512vlvbmi2-builtins.c

+150 −150

File changed.

Preview size limit exceeded, changes collapsed.