Added missing ChangeLogs. Fix scan pattern for gcc.target/i386/avx512vl-vextracti32x4...

From-SVN: r231222

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7072624fa7a526415e4ec40d8e019bca2b4ac0a4..7989fd8420ac9401d17ee44a2ffa30467d1839a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -14,6 +14,13 @@
        belonging to different loops.
        (vect_analyze_data_ref_accesses): Likewise.
 
+2015-12-02  Kirill Yukhin  <kirill.yukhin@intel.com>
+
+       * config/i386/sse.md (define_insn "vec_extract_hi_<mode>_maskm"):
+       Remove "prefix_extra".
+       (define_insn "vec_extract_hi_<mode>_mask"): New.
+       (define_insn "vec_extract_hi_<mode>"): Remove masking.
+
 2015-12-02  Jan Hubicka  <hubicka@ucw.cz>
 
        * ipa-pure-const.c (ignore_edge_for_pure_const): New function.
@@ -171,6 +178,7 @@
        * tree-ssa-structalias.c (find_func_aliases_for_builtin_call)
        (find_func_clobbers, ipa_pta_execute): Handle BUILT_IN_GOACC_PARALLEL.
 
+>>>>>>> .r231221
 2015-12-02  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000.md (cstore_si_as_di): New expander.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 074cdceb5259958de6fd8bce441d4a5ef932ae6e..f3a526bd2543529db6f3483df9fb4bdabb75dc4e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-02  Kirill Yukhin  <kirill.yukhin@intel.com>
+
+       * gcc.target/i386/avx512vl-vextractf32x4-1.c: Fix scan pattern.
+       * gcc.target/i386/avx512vl-vextracti32x4-1.c: Fix scan pattern.
+
 2015-12-03  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/67800
@@ -48,6 +53,7 @@
        * gfortran.dg/graphite/pr68550-1.f90: New.
        * gfortran.dg/graphite/pr68550-2.f90: New.
 
+>>>>>>> .r231221
 2015-12-02  Marek Polacek  <polacek@redhat.com>
 
        PR c/68513

diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-1.c b/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-1.c
index 7ee87dd82ec0acc9ec0abb3d1ccc4d20f87905f4..0826a0b8e043caf976f7c55bc3b673a1e2f0cc4c 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-mavx512vl -O2" } */
-/* { dg-final { scan-assembler-times "vextracti32x4\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)"  1 } } */
+/* { dg-final { scan-assembler-times "vextracti\(?:128|32x4\)\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)"  1 } } */
 /* { dg-final { scan-assembler-times "vextracti32x4\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vextracti32x4\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */