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

From-SVN: r231222

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.

gcc/testsuite/ChangeLog

+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

gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-1.c

 /* { 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 } } */