[PATCH] Rename __builtin_ia32_kmov16 to __builtin_ia32_kmovw in gcc-{5,6}-branch

[PATCH] Rename __builtin_ia32_kmov16 to __builtin_ia32_kmovw in gcc-{5,6}-branch

[Senkevich, Andrew]

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

Hi,

attached patches are for renaming __builtin_ia32_kmov16 to __builtin_ia32_kmovw in GCC 5.* and 6.* branches since it was renamed in master.
Bootstrapped and regtested on x86_64-linux-gnu.

gcc/
	* config/i386/i386.c (__builtin_ia32_kmovw): Renamed from
	__builtin_ia32_kmov16 since it was renamed in master.
	* config/i386/avx512fintrin.h: Ditto.

Are they Ok to commit?


--
Andrew


[-- Attachment #2: rename_kmov_builtin_gcc-5-branch.patch --]
[-- Type: application/octet-stream, Size: 1850 bytes --]

diff --git a/gcc/config/i386/avx512fintrin.h b/gcc/config/i386/avx512fintrin.h
index c7a91c1..0d99358 100644
--- a/gcc/config/i386/avx512fintrin.h
+++ b/gcc/config/i386/avx512fintrin.h
@@ -12938,7 +12938,7 @@ extern __inline __mmask16
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 _mm512_kmov (__mmask16 __A)
 {
-  return __builtin_ia32_kmov16 (__A);
+  return __builtin_ia32_kmovw (__A);
 }
 
 extern __inline __m512
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index b1ac232..91d4c03 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -32351,7 +32351,7 @@ static const struct builtin_description bdesc_args[] =
   { OPTION_MASK_ISA_AVX512F, CODE_FOR_kunpckhi, "__builtin_ia32_kunpckhi", IX86_BUILTIN_KUNPCKBW, UNKNOWN, (int) HI_FTYPE_HI_HI },
   { OPTION_MASK_ISA_AVX512F, CODE_FOR_kxnorhi, "__builtin_ia32_kxnorhi", IX86_BUILTIN_KXNOR16, UNKNOWN, (int) HI_FTYPE_HI_HI },
   { OPTION_MASK_ISA_AVX512F, CODE_FOR_xorhi3, "__builtin_ia32_kxorhi", IX86_BUILTIN_KXOR16, UNKNOWN, (int) HI_FTYPE_HI_HI },
-  { OPTION_MASK_ISA_AVX512F, CODE_FOR_kmovw, "__builtin_ia32_kmov16", IX86_BUILTIN_KMOV16, UNKNOWN, (int) HI_FTYPE_HI },
+  { OPTION_MASK_ISA_AVX512F, CODE_FOR_kmovw, "__builtin_ia32_kmovw", IX86_BUILTIN_KMOV16, UNKNOWN, (int) HI_FTYPE_HI },
 
   /* SHA */
   { OPTION_MASK_ISA_SSE2, CODE_FOR_sha1msg1, 0, IX86_BUILTIN_SHA1MSG1, UNKNOWN, (int) V4SI_FTYPE_V4SI_V4SI },
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5c2190..ae965b5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-31  Andrew Senkevich  <andrew.senkevich@intel.com>
+
+	* config/i386/i386.c (__builtin_ia32_kmovw): Renamed from
+	__builtin_ia32_kmov16 since it was renamed in master.
+	* config/i386/avx512fintrin.h: Ditto.
+
 2017-05-30  Max Filippov  <jcmvbkbc@gmail.com>
 
 	Backport from mainline

[-- Attachment #3: rename_kmov_builtin_gcc-6-branch.patch --]
[-- Type: application/octet-stream, Size: 1863 bytes --]

diff --git a/gcc/config/i386/avx512fintrin.h b/gcc/config/i386/avx512fintrin.h
index f89330b..dbf4f86 100644
--- a/gcc/config/i386/avx512fintrin.h
+++ b/gcc/config/i386/avx512fintrin.h
@@ -12938,7 +12938,7 @@ extern __inline __mmask16
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 _mm512_kmov (__mmask16 __A)
 {
-  return __builtin_ia32_kmov16 (__A);
+  return __builtin_ia32_kmovw (__A);
 }
 
 extern __inline __m512
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 605135f..46aab9b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -34091,7 +34091,7 @@ static const struct builtin_description bdesc_args[] =
   { OPTION_MASK_ISA_AVX512F, CODE_FOR_kunpckhi, "__builtin_ia32_kunpckhi", IX86_BUILTIN_KUNPCKBW, UNKNOWN, (int) UHI_FTYPE_UHI_UHI },
   { OPTION_MASK_ISA_AVX512F, CODE_FOR_kxnorhi, "__builtin_ia32_kxnorhi", IX86_BUILTIN_KXNOR16, UNKNOWN, (int) UHI_FTYPE_UHI_UHI },
   { OPTION_MASK_ISA_AVX512F, CODE_FOR_xorhi3, "__builtin_ia32_kxorhi", IX86_BUILTIN_KXOR16, UNKNOWN, (int) UHI_FTYPE_UHI_UHI },
-  { OPTION_MASK_ISA_AVX512F, CODE_FOR_kmovw, "__builtin_ia32_kmov16", IX86_BUILTIN_KMOV16, UNKNOWN, (int) UHI_FTYPE_UHI },
+  { OPTION_MASK_ISA_AVX512F, CODE_FOR_kmovw, "__builtin_ia32_kmovw", IX86_BUILTIN_KMOV16, UNKNOWN, (int) UHI_FTYPE_UHI },
 
   /* SHA */
   { OPTION_MASK_ISA_SSE2, CODE_FOR_sha1msg1, 0, IX86_BUILTIN_SHA1MSG1, UNKNOWN, (int) V4SI_FTYPE_V4SI_V4SI },
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cae691d..30a5a2b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-31  Andrew Senkevich  <andrew.senkevich@intel.com>
+
+	* config/i386/i386.c (__builtin_ia32_kmovw): Renamed from
+	__builtin_ia32_kmov16 since it was renamed in master.
+	* config/i386/avx512fintrin.h: Ditto.
+
 2017-05-30  Max Filippov  <jcmvbkbc@gmail.com>
 
 	Backport from mainline

Re: [PATCH] Rename __builtin_ia32_kmov16 to __builtin_ia32_kmovw in gcc-{5,6}-branch

[Uros Bizjak]

On Wed, May 31, 2017 at 12:33 PM, Senkevich, Andrew
<andrew.senkevich@intel.com> wrote:
> Hi,
>
> attached patches are for renaming __builtin_ia32_kmov16 to __builtin_ia32_kmovw in GCC 5.* and 6.* branches since it was renamed in master.
> Bootstrapped and regtested on x86_64-linux-gnu.
>
> gcc/
>         * config/i386/i386.c (__builtin_ia32_kmovw): Renamed from
>         __builtin_ia32_kmov16 since it was renamed in master.
>         * config/i386/avx512fintrin.h: Ditto.
>
> Are they Ok to commit?

Various undocumented builtins are considered internal, unpublished
interface, so IMO there is no need to backport their renames.

Uros.

Re: [PATCH] Rename __builtin_ia32_kmov16 to __builtin_ia32_kmovw in gcc-{5,6}-branch

[Kirill Yukhin]

On 31 May 17:28, Uros Bizjak wrote:
> On Wed, May 31, 2017 at 12:33 PM, Senkevich, Andrew
> <andrew.senkevich@intel.com> wrote:
> > Hi,
> >
> > attached patches are for renaming __builtin_ia32_kmov16 to __builtin_ia32_kmovw in GCC 5.* and 6.* branches since it was renamed in master.
> > Bootstrapped and regtested on x86_64-linux-gnu.
> >
> > gcc/
> >         * config/i386/i386.c (__builtin_ia32_kmovw): Renamed from
> >         __builtin_ia32_kmov16 since it was renamed in master.
> >         * config/i386/avx512fintrin.h: Ditto.
> >
> > Are they Ok to commit?
> 
> Various undocumented builtins are considered internal, unpublished
> interface, so IMO there is no need to backport their renames.
+1

--
Thanks, K
> 
> Uros.