diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a644230e9d5..4f5fae857be 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2017-05-02 Uros Bizjak + + Backport from mainline + 2017-05-11 Uros Bizjak + + PR target/80706 + * config/i386/sync.md (UNSPEC_LDX_ATOMIC): New unspec. + (UNSPEC_STX_ATOMIC): Ditto. + (loaddi_via_sse): New insn. + (storedi_via_sse): Ditto. + (atomic_loaddi_fpu): Emit loaddi_via_sse and storedi_via_sse. + Update corresponding peephole2 patterns. + (atomic_storedi_fpu): Ditto. + 2017-05-13 Bill Schmidt Backport from mainline diff --git a/gcc/config/i386/sync.md b/gcc/config/i386/sync.md index 20d46fe248e..29b82f86d43 100644 --- a/gcc/config/i386/sync.md +++ b/gcc/config/i386/sync.md @@ -25,6 +25,9 @@ UNSPEC_FILD_ATOMIC UNSPEC_FIST_ATOMIC + UNSPEC_LDX_ATOMIC + UNSPEC_STX_ATOMIC + ;; __atomic support UNSPEC_LDA UNSPEC_STA @@ -199,9 +202,8 @@ } else { - adjust_reg_mode (tmp, DImode); - emit_move_insn (tmp, src); - emit_move_insn (mem, tmp); + emit_insn (gen_loaddi_via_sse (tmp, src)); + emit_insn (gen_storedi_via_sse (mem, tmp)); } if (mem != dst) @@ -226,10 +228,12 @@ "operands[5] = gen_lowpart (DFmode, operands[1]);") (define_peephole2 - [(set (match_operand:DI 0 "sse_reg_operand") - (match_operand:DI 1 "memory_operand")) + [(set (match_operand:DF 0 "sse_reg_operand") + (unspec:DF [(match_operand:DI 1 "memory_operand")] + UNSPEC_LDX_ATOMIC)) (set (match_operand:DI 2 "memory_operand") - (match_dup 0)) + (unspec:DI [(match_dup 0)] + UNSPEC_STX_ATOMIC)) (set (match_operand:DF 3 "fp_register_operand") (match_operand:DF 4 "memory_operand"))] "!TARGET_64BIT @@ -301,7 +305,9 @@ rtx dst = operands[0], src = operands[1]; rtx mem = operands[2], tmp = operands[3]; - if (!SSE_REG_P (src)) + if (SSE_REG_P (src)) + emit_move_insn (dst, src); + else { if (REG_P (src)) { @@ -313,16 +319,13 @@ { emit_insn (gen_loaddi_via_fpu (tmp, src)); emit_insn (gen_storedi_via_fpu (dst, tmp)); - DONE; } else { - adjust_reg_mode (tmp, DImode); - emit_move_insn (tmp, src); - src = tmp; + emit_insn (gen_loaddi_via_sse (tmp, src)); + emit_insn (gen_storedi_via_sse (dst, tmp)); } } - emit_move_insn (dst, src); DONE; }) @@ -344,10 +347,12 @@ (define_peephole2 [(set (match_operand:DF 0 "memory_operand") (match_operand:DF 1 "fp_register_operand")) - (set (match_operand:DI 2 "sse_reg_operand") - (match_operand:DI 3 "memory_operand")) + (set (match_operand:DF 2 "sse_reg_operand") + (unspec:DF [(match_operand:DI 3 "memory_operand")] + UNSPEC_LDX_ATOMIC)) (set (match_operand:DI 4 "memory_operand") - (match_dup 2))] + (unspec:DI [(match_dup 2)] + UNSPEC_STX_ATOMIC))] "!TARGET_64BIT && peep2_reg_dead_p (3, operands[2]) && rtx_equal_p (operands[0], adjust_address_nv (operands[3], DFmode, 0))" @@ -382,6 +387,32 @@ [(set_attr "type" "fmov") (set_attr "mode" "DI")]) +(define_insn "loaddi_via_sse" + [(set (match_operand:DF 0 "register_operand" "=x") + (unspec:DF [(match_operand:DI 1 "memory_operand" "m")] + UNSPEC_LDX_ATOMIC))] + "TARGET_SSE" +{ + if (TARGET_SSE2) + return "%vmovq\t{%1, %0|%0, %1}"; + return "movlps\t{%1, %0|%0, %1}"; +} + [(set_attr "type" "ssemov") + (set_attr "mode" "DI")]) + +(define_insn "storedi_via_sse" + [(set (match_operand:DI 0 "memory_operand" "=m") + (unspec:DI [(match_operand:DF 1 "register_operand" "x")] + UNSPEC_STX_ATOMIC))] + "TARGET_SSE" +{ + if (TARGET_SSE2) + return "%vmovq\t{%1, %0|%0, %1}"; + return "movlps\t{%1, %0|%0, %1}"; +} + [(set_attr "type" "ssemov") + (set_attr "mode" "DI")]) + (define_expand "atomic_compare_and_swap" [(match_operand:QI 0 "register_operand") ;; bool success output (match_operand:SWI124 1 "register_operand") ;; oldval output diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4c488152ac5..dda12154451 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2017-05-14 Uros Bizjak + + Backport from mainline + 2017-05-11 Uros Bizjak + Jakub Jelinek + + PR target/80706 + * gcc.target/i386/pr80706.c: New test. + + 2017-05-11 Uros Bizjak + + * gcc.target/i386/pr22152.c: Fix undefined testcase. + Remove unnecessary loop. Run on 32-bit targets only. + 2017-05-13 Bill Schmidt Backport from mainline diff --git a/gcc/testsuite/gcc.target/i386/pr22152.c b/gcc/testsuite/gcc.target/i386/pr22152.c index 5e2d4ac731b..489c8e9f8c4 100644 --- a/gcc/testsuite/gcc.target/i386/pr22152.c +++ b/gcc/testsuite/gcc.target/i386/pr22152.c @@ -1,18 +1,18 @@ -/* { dg-do compile } */ +/* { dg-do compile { target ia32 } } */ /* { dg-options "-O2 -msse2 -mtune=core2" } */ /* { dg-additional-options "-mno-vect8-ret-in-mem" { target *-*-vxworks* } } */ -/* { dg-additional-options "-mabi=sysv" { target x86_64-*-mingw* } } */ #include -__m64 -unsigned_add3 (const __m64 * a, const __m64 * b, unsigned int count) -{ - __m64 sum; - unsigned int i; +typedef __SIZE_TYPE__ size_t; - for (i = 1; i < count; i++) - sum = _mm_add_si64 (a[i], b[i]); +__m64 +unsigned_add3 (const __m64 * a, const __m64 * b, size_t count) +{ + __m64 sum = { 0, 0 }; + + if (count > 0) + sum = _mm_add_si64 (a[count-1], b[count-1]); return sum; } diff --git a/gcc/testsuite/gcc.target/i386/pr80706.c b/gcc/testsuite/gcc.target/i386/pr80706.c new file mode 100644 index 00000000000..7cc1b8f57b9 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr80706.c @@ -0,0 +1,30 @@ +/* PR target/80706 */ +/* { dg-do run { target sse2_runtime } } */ +/* { dg-options "-O2 -msse2" } */ + +union U { double value; struct S { int lsw; int msw; } parts; }; + +__attribute__((noinline, noclone)) double +foo (void) +{ + __asm volatile ("" : : : "memory"); + return 2.0; +} + +__attribute__((noinline, noclone)) double +bar (void) +{ + double s = foo (); + union U z; + z.value = s; + z.parts.lsw = 0; + return z.value * z.value + s * s; +} + +int +main () +{ + if (bar () != 8.0) + __builtin_abort (); + return 0; +}