re PR target/70028 (Error: operand size mismatch for `kmovw' (wrong assembly generated) with -mavx512bw -masm=intel)

PR target/70028
	* config/i386/i386.md (kmovw): Move m constraint to 2nd alternative.
	(*movhi_internal): Put mask moves from and to memory separately
	from moves from/to GPRs.

	* gcc.target/i386/pr70028.c: New test.

From-SVN: r233904
This commit is contained in:
Jakub Jelinek 2016-03-02 14:10:36 +01:00 committed by Jakub Jelinek
parent c954de7f5c
commit 69fa742f51
4 changed files with 38 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2016-03-02 Jakub Jelinek <jakub@redhat.com>
PR target/70028
* config/i386/i386.md (kmovw): Move m constraint to 2nd alternative.
(*movhi_internal): Put mask moves from and to memory separately
from moves from/to GPRs.
2016-03-02 Richard Biener <rguenther@suse.de>
* genmatch.c (dt_node::gen_kids): Fix match code-gen for embedded

View File

@ -2442,7 +2442,7 @@
(define_insn "kmovw"
[(set (match_operand:HI 0 "nonimmediate_operand" "=k,k")
(unspec:HI
[(match_operand:HI 1 "nonimmediate_operand" "rm,k")]
[(match_operand:HI 1 "nonimmediate_operand" "r,km")]
UNSPEC_KMOV))]
"!(MEM_P (operands[0]) && MEM_P (operands[1])) && TARGET_AVX512F"
"@
@ -2454,8 +2454,8 @@
(define_insn "*movhi_internal"
[(set (match_operand:HI 0 "nonimmediate_operand" "=r,r ,r ,m ,k,k,rm")
(match_operand:HI 1 "general_operand" "r ,rn,rm,rn,rm,k,k"))]
[(set (match_operand:HI 0 "nonimmediate_operand" "=r,r ,r ,m ,k,k, r,m")
(match_operand:HI 1 "general_operand" "r ,rn,rm,rn,r,km,k,k"))]
"!(MEM_P (operands[0]) && MEM_P (operands[1]))"
{
switch (get_attr_type (insn))
@ -2469,7 +2469,8 @@
switch (which_alternative)
{
case 4: return "kmovw\t{%k1, %0|%0, %k1}";
case 5: return "kmovw\t{%1, %0|%0, %1}";
case 5: /* FALLTHRU */
case 7: return "kmovw\t{%1, %0|%0, %1}";
case 6: return "kmovw\t{%1, %k0|%k0, %1}";
default: gcc_unreachable ();
}
@ -2482,7 +2483,7 @@
}
}
[(set (attr "type")
(cond [(eq_attr "alternative" "4,5,6")
(cond [(eq_attr "alternative" "4,5,6,7")
(const_string "mskmov")
(match_test "optimize_function_for_size_p (cfun)")
(const_string "imov")
@ -2499,7 +2500,7 @@
]
(const_string "imov")))
(set (attr "prefix")
(if_then_else (eq_attr "alternative" "4,5,6")
(if_then_else (eq_attr "alternative" "4,5,6,7")
(const_string "vex")
(const_string "orig")))
(set (attr "mode")

View File

@ -1,3 +1,8 @@
2016-03-02 Jakub Jelinek <jakub@redhat.com>
PR target/70028
* gcc.target/i386/pr70028.c: New test.
2016-03-02 Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
* c-c++-common/asan/swapcontext-test-1.c,

View File

@ -0,0 +1,19 @@
/* PR target/70028 */
/* { dg-do assemble { target avx512bw } } */
/* { dg-require-effective-target int128 } */
/* { dg-require-effective-target masm_intel } */
/* { dg-options "-O2 -fno-forward-propagate -mavx512bw -masm=intel" } */
typedef unsigned short A;
typedef int B __attribute__ ((vector_size (32)));
typedef unsigned __int128 C;
typedef __int128 D __attribute__ ((vector_size (32)));
C
foo (A a, int b, unsigned c, C d, A e, unsigned f, B g, D h)
{
g[1] ^= (A) ~ a;
a ^= (unsigned) g[0];
h %= (D) h | 1;
return a + b + c + d + e + g[0] + g[1] + h[1];
}