From 01c102a6de3533060d0fdae935b70966182c3292 Mon Sep 17 00:00:00 2001 From: Alexander Fomin Date: Tue, 22 Sep 2015 11:14:25 +0000 Subject: [PATCH] re PR target/67480 (AVX512 bitwise logic operations pattern is incorrect) PR target/67480 gcc/ * config/i386/sse.md (define_mode_iterator VI48_AVX_AVX512F): New. (define_mode_iterator VI12_AVX_AVX512F): New. (define_insn "3"): Change all iterators to VI48_AVX_AVX512F. Extract remaining modes ... (define_insn "*3"): ... Into new pattern using VI12_AVX_AVX512F iterators without masking. gcc/testsuite/ * gcc.target/i386/pr67480.c: New test. From-SVN: r228010 --- gcc/ChangeLog | 10 +++ gcc/config/i386/sse.md | 129 +++++++++++++++++++++++++++++--- gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/gcc.target/i386/pr67480.c | 10 +++ 4 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr67480.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f6c1c80..3de9aef 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2015-09-22 Alexander Fomin + + PR target/67480 + * config/i386/sse.md (define_mode_iterator VI48_AVX_AVX512F): New. + (define_mode_iterator VI12_AVX_AVX512F): New. + (define_insn "3"): Change + all iterators to VI48_AVX_AVX512F. Extract remaining modes ... + (define_insn "*3"): ... Into new pattern using + VI12_AVX_AVX512F iterators without masking. + 2015-09-22 Kirill Yukhin * config.gcc: Support "skylake-avx512". diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md index 4535570..0a57db0 100644 --- a/gcc/config/i386/sse.md +++ b/gcc/config/i386/sse.md @@ -416,6 +416,14 @@ [(V16SI "TARGET_AVX512F") V8SI V4SI (V8DI "TARGET_AVX512F") V4DI V2DI]) +(define_mode_iterator VI48_AVX_AVX512F + [(V16SI "TARGET_AVX512F") (V8SI "TARGET_AVX") V4SI + (V8DI "TARGET_AVX512F") (V4DI "TARGET_AVX") V2DI]) + +(define_mode_iterator VI12_AVX_AVX512F + [ (V64QI "TARGET_AVX512F") (V32QI "TARGET_AVX") V16QI + (V32HI "TARGET_AVX512F") (V16HI "TARGET_AVX") V8HI]) + (define_mode_iterator V48_AVX2 [V4SF V2DF V8SF V4DF @@ -11077,10 +11085,10 @@ }) (define_insn "3" - [(set (match_operand:VI 0 "register_operand" "=x,v") - (any_logic:VI - (match_operand:VI 1 "nonimmediate_operand" "%0,v") - (match_operand:VI 2 "nonimmediate_operand" "xm,vm")))] + [(set (match_operand:VI48_AVX_AVX512F 0 "register_operand" "=x,v") + (any_logic:VI48_AVX_AVX512F + (match_operand:VI48_AVX_AVX512F 1 "nonimmediate_operand" "%0,v") + (match_operand:VI48_AVX_AVX512F 2 "nonimmediate_operand" "xm,vm")))] "TARGET_SSE && && ix86_binary_operator_ok (, mode, operands)" { @@ -11109,24 +11117,120 @@ case V4DImode: case V4SImode: case V2DImode: - if (TARGET_AVX512VL) + tmp = TARGET_AVX512VL ? "p" : "p"; + break; + default: + gcc_unreachable (); + } + break; + + case MODE_V8SF: + gcc_assert (TARGET_AVX); + case MODE_V4SF: + gcc_assert (TARGET_SSE); + gcc_assert (!); + tmp = "ps"; + break; + + default: + gcc_unreachable (); + } + + switch (which_alternative) + { + case 0: + if () + ops = "v%s\t{%%2, %%0, %%0|%%0, %%0, %%2}"; + else + ops = "%s\t{%%2, %%0|%%0, %%2}"; + break; + case 1: + ops = "v%s\t{%%2, %%1, %%0|%%0, %%1, %%2}"; + break; + default: + gcc_unreachable (); + } + + snprintf (buf, sizeof (buf), ops, tmp); + return buf; +} + [(set_attr "isa" "noavx,avx") + (set_attr "type" "sselog") + (set (attr "prefix_data16") + (if_then_else + (and (eq_attr "alternative" "0") + (eq_attr "mode" "TI")) + (const_string "1") + (const_string "*"))) + (set_attr "prefix" "") + (set (attr "mode") + (cond [(and (match_test " == 16") + (match_test "TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL")) + (const_string "") + (match_test "TARGET_AVX2") + (const_string "") + (match_test "TARGET_AVX") + (if_then_else + (match_test " > 16") + (const_string "V8SF") + (const_string "")) + (ior (not (match_test "TARGET_SSE2")) + (match_test "optimize_function_for_size_p (cfun)")) + (const_string "V4SF") + ] + (const_string "")))]) + +(define_insn "*3" + [(set (match_operand:VI12_AVX_AVX512F 0 "register_operand" "=x,v") + (any_logic: VI12_AVX_AVX512F + (match_operand:VI12_AVX_AVX512F 1 "nonimmediate_operand" "%0,v") + (match_operand:VI12_AVX_AVX512F 2 "nonimmediate_operand" "xm,vm")))] + "TARGET_SSE && ix86_binary_operator_ok (, mode, operands)" +{ + static char buf[64]; + const char *ops; + const char *tmp; + const char *ssesuffix; + + switch (get_attr_mode (insn)) + { + case MODE_XI: + gcc_assert (TARGET_AVX512F); + case MODE_OI: + gcc_assert (TARGET_AVX2 || TARGET_AVX512VL); + case MODE_TI: + gcc_assert (TARGET_SSE2 || TARGET_AVX512VL); + switch (mode) + { + case V64QImode: + case V32HImode: + if (TARGET_AVX512F) { - tmp = "p"; + tmp = "p"; + ssesuffix = "q"; + break; + } + case V32QImode: + case V16HImode: + case V16QImode: + case V8HImode: + if (TARGET_AVX512VL || TARGET_AVX2 || TARGET_SSE2) + { + tmp = "p"; + ssesuffix = TARGET_AVX512VL ? "q" : ""; break; } default: - tmp = TARGET_AVX512VL ? "pq" : "p"; + gcc_unreachable (); } break; - case MODE_V16SF: - gcc_assert (TARGET_AVX512F); case MODE_V8SF: gcc_assert (TARGET_AVX); case MODE_V4SF: gcc_assert (TARGET_SSE); - tmp = "ps"; + ssesuffix = ""; break; default: @@ -11137,15 +11241,16 @@ { case 0: ops = "%s\t{%%2, %%0|%%0, %%2}"; + snprintf (buf, sizeof (buf), ops, tmp); break; case 1: - ops = "v%s\t{%%2, %%1, %%0|%%0, %%1, %%2}"; + ops = "v%s%s\t{%%2, %%1, %%0|%%0, %%1, %%2}"; + snprintf (buf, sizeof (buf), ops, tmp, ssesuffix); break; default: gcc_unreachable (); } - snprintf (buf, sizeof (buf), ops, tmp); return buf; } [(set_attr "isa" "noavx,avx") diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9d1b796..9c9bc5a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-22 Alexander Fomin + + PR target/67480 + * gcc.target/i386/pr67480.c: New test. + 2015-09-22 Kirill Yukhin * gcc.target/i386/funcspec-5.c: Test avx512vl, avx512bw, diff --git a/gcc/testsuite/gcc.target/i386/pr67480.c b/gcc/testsuite/gcc.target/i386/pr67480.c new file mode 100644 index 0000000..90e6a6e --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr67480.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-mavx512bw -O2 -ftree-vectorize" { target i?86-*-* x86_64-*-* } } */ + +void +foo(const char *in, char *out, unsigned n) +{ + unsigned i; + for (i = 0; i < n; i++) + out[i] &= in[i]; +} -- 2.7.4