From 73500c31de124403466d3742547dba32d7658392 Mon Sep 17 00:00:00 2001 From: Kirill Yukhin Date: Thu, 3 Dec 2015 10:00:57 +0000 Subject: [PATCH] Added missing ChangeLogs. Fix scan pattern for gcc.target/i386/avx512vl-vextracti32x4-1.c. From-SVN: r231222 --- gcc/ChangeLog | 8 ++++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-1.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7072624fa7a..7989fd8420a 100644 --- 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 + + * config/i386/sse.md (define_insn "vec_extract_hi__maskm"): + Remove "prefix_extra". + (define_insn "vec_extract_hi__mask"): New. + (define_insn "vec_extract_hi_"): Remove masking. + 2015-12-02 Jan Hubicka * 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 * config/rs6000/rs6000.md (cstore_si_as_di): New expander. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 074cdceb525..f3a526bd254 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-12-02 Kirill Yukhin + + * 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 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 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 7ee87dd82ec..0826a0b8e04 100644 --- 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 } } */ -- 2.30.2