Skip to content

R
riscv-gcc-1
Commit b49ae8a5 by Uros Bizjak Committed by Uros Bizjak
Options

i386.md (mmx_isa): Rename x64, x64_noavx and x64_avx to sse, sse_noavx and avx. 

	* config/i386/i386.md (mmx_isa): Rename x64, x64_noavx and x64_avx
	to sse, sse_noavx and avx.  Update all uses.

	* config/i386/mmx.md (sse_movntq): Add "isa" attribute.
	(*mmx_<plusminus_insn><mode>3): Ditto.
	(*mmx_mulv4hi3"): Ditto.
	(*mmx_smulv4hi3_highpart): Ditto.
	(*mmx_umulv4hi3_highpart): Ditto.
	(*mmx_pmaddwd): Ditto.
	(*sse2_umulv1siv1di3): Ditto.
	(*mmx_<code>v4hi3): Ditto.
	(*mmx_<code>v8qi3): Ditto.
	(mmx_ashr<mode>3): Ditto.
	("mmx_<shift_insn><mode>3): Ditto.
	(*mmx_eq<mode>3): Ditto.
	(mmx_gt<mode>3): Ditto.
	(mmx_andnot<mode>3): Ditto.
	(*mmx_<code><mode>3): Ditto.
	(*mmx_pinsrw): Ditto.
	(*mmx_pextrw): Ditto.
	(mmx_pshufw_1): Ditto.
	(*mmx_uavgv8qi3): Ditto.
	(*mmx_uavgv4hi3): Ditto.
	("mmx_psadbw): Ditto.
	* config/i386/sse.md (sse_cvtps2pi): Ditto.
	(sse_cvttps2pi): Ditto.
	(ssse3_pmaddubsw): Ditto.
	(*ssse3_pmulhrswv4hi3): Ditto.
	(ssse3_psign<mode>3): Ditto.

From-SVN: r272834
parent b09e0af6
Showing with 132 additions and 62 deletions
gcc/ChangeLog
2019-06-30 Uroš Bizjak <ubizjak@gmail.com>
* config/i386/i386.md (mmx_isa): Rename x64, x64_noavx and x64_avx
to sse, sse_noavx and avx. Update all uses.
2019-06-30 Uroš Bizjak <ubizjak@gmail.com>
* config/i386/mmx.md (sse_movntq): Add "isa" attribute.
(*mmx_<plusminus_insn><mode>3): Ditto.
(*mmx_mulv4hi3"): Ditto.
(*mmx_smulv4hi3_highpart): Ditto.
(*mmx_umulv4hi3_highpart): Ditto.
(*mmx_pmaddwd): Ditto.
(*sse2_umulv1siv1di3): Ditto.
(*mmx_<code>v4hi3): Ditto.
(*mmx_<code>v8qi3): Ditto.
(mmx_ashr<mode>3): Ditto.
("mmx_<shift_insn><mode>3): Ditto.
(*mmx_eq<mode>3): Ditto.
(mmx_gt<mode>3): Ditto.
(mmx_andnot<mode>3): Ditto.
(*mmx_<code><mode>3): Ditto.
(*mmx_pinsrw): Ditto.
(*mmx_pextrw): Ditto.
(mmx_pshufw_1): Ditto.
(*mmx_uavgv8qi3): Ditto.
(*mmx_uavgv4hi3): Ditto.
("mmx_psadbw): Ditto.
* config/i386/sse.md (sse_cvtps2pi): Ditto.
(sse_cvttps2pi): Ditto.
(ssse3_pmaddubsw): Ditto.
(*ssse3_pmulhrswv4hi3): Ditto.
(ssse3_psign<mode>3): Ditto.
2019-06-29 Eric Botcazou <ebotcazou@adacore.com> 2019-06-29 Eric Botcazou <ebotcazou@adacore.com>
* expr.c (expand_expr_real_1) <BIT_FIELD_REF>: Apply the big-endian * expr.c (expand_expr_real_1) <BIT_FIELD_REF>: Apply the big-endian
......
gcc/config/i386/i386.md
...@@ -801,7 +801,7 @@ ...@@ -801,7 +801,7 @@
(const_string "base")) (const_string "base"))
;; Define instruction set of MMX instructions ;; Define instruction set of MMX instructions
(define_attr "mmx_isa" "base,native,x64,x64_noavx,x64_avx" (define_attr "mmx_isa" "base,native,sse,sse_noavx,avx"
(const_string "base")) (const_string "base"))
(define_attr "enabled" "" (define_attr "enabled" ""
...@@ -845,12 +845,12 @@ ...@@ -845,12 +845,12 @@
(eq_attr "mmx_isa" "native") (eq_attr "mmx_isa" "native")
(symbol_ref "!TARGET_MMX_WITH_SSE") (symbol_ref "!TARGET_MMX_WITH_SSE")
(eq_attr "mmx_isa" "x64") (eq_attr "mmx_isa" "sse")
(symbol_ref "TARGET_MMX_WITH_SSE") (symbol_ref "TARGET_MMX_WITH_SSE")
(eq_attr "mmx_isa" "x64_avx") (eq_attr "mmx_isa" "sse_noavx")
(symbol_ref "TARGET_MMX_WITH_SSE && TARGET_AVX")
(eq_attr "mmx_isa" "x64_noavx")
(symbol_ref "TARGET_MMX_WITH_SSE && !TARGET_AVX") (symbol_ref "TARGET_MMX_WITH_SSE && !TARGET_AVX")
(eq_attr "mmx_isa" "avx")
(symbol_ref "TARGET_MMX_WITH_SSE && TARGET_AVX")
] ]
(const_int 1))) (const_int 1)))
......
gcc/config/i386/mmx.md
...@@ -247,7 +247,8 @@ ...@@ -247,7 +247,8 @@
"@ "@
movntq\t{%1, %0|%0, %1} movntq\t{%1, %0|%0, %1}
movnti\t{%1, %0|%0, %1}" movnti\t{%1, %0|%0, %1}"
[(set_attr "mmx_isa" "native,x64") [(set_attr "isa" "*,x64")
(set_attr "mmx_isa" "native,*")
(set_attr "type" "mmxmov,ssemov") (set_attr "type" "mmxmov,ssemov")
(set_attr "mode" "DI")]) (set_attr "mode" "DI")])
...@@ -594,7 +595,7 @@ ...@@ -594,7 +595,7 @@
(vec_duplicate:V4SF (match_dup 1)))] (vec_duplicate:V4SF (match_dup 1)))]
"operands[0] = lowpart_subreg (V4SFmode, operands[0], "operands[0] = lowpart_subreg (V4SFmode, operands[0],
GET_MODE (operands[0]));" GET_MODE (operands[0]));"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,ssemov,ssemov") (set_attr "type" "mmxcvt,ssemov,ssemov")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -730,7 +731,8 @@ ...@@ -730,7 +731,8 @@
p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2} p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2}
p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2} p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2}
vp<plusminus_mnemonic><mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vp<plusminus_mnemonic><mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxadd,sseadd,sseadd") (set_attr "type" "mmxadd,sseadd,sseadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -753,7 +755,8 @@ ...@@ -753,7 +755,8 @@
p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2} p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2}
p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2} p<plusminus_mnemonic><mmxvecsize>\t{%2, %0|%0, %2}
vp<plusminus_mnemonic><mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vp<plusminus_mnemonic><mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxadd,sseadd,sseadd") (set_attr "type" "mmxadd,sseadd,sseadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -781,7 +784,8 @@ ...@@ -781,7 +784,8 @@
pmullw\t{%2, %0|%0, %2} pmullw\t{%2, %0|%0, %2}
pmullw\t{%2, %0|%0, %2} pmullw\t{%2, %0|%0, %2}
vpmullw\t{%2, %1, %0|%0, %1, %2}" vpmullw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxmul,ssemul,ssemul") (set_attr "type" "mmxmul,ssemul,ssemul")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -814,7 +818,8 @@ ...@@ -814,7 +818,8 @@
pmulhw\t{%2, %0|%0, %2} pmulhw\t{%2, %0|%0, %2}
pmulhw\t{%2, %0|%0, %2} pmulhw\t{%2, %0|%0, %2}
vpmulhw\t{%2, %1, %0|%0, %1, %2}" vpmulhw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxmul,ssemul,ssemul") (set_attr "type" "mmxmul,ssemul,ssemul")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -849,7 +854,8 @@ ...@@ -849,7 +854,8 @@
pmulhuw\t{%2, %0|%0, %2} pmulhuw\t{%2, %0|%0, %2}
pmulhuw\t{%2, %0|%0, %2} pmulhuw\t{%2, %0|%0, %2}
vpmulhuw\t{%2, %1, %0|%0, %1, %2}" vpmulhuw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxmul,ssemul,ssemul") (set_attr "type" "mmxmul,ssemul,ssemul")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -900,7 +906,8 @@ ...@@ -900,7 +906,8 @@
pmaddwd\t{%2, %0|%0, %2} pmaddwd\t{%2, %0|%0, %2}
pmaddwd\t{%2, %0|%0, %2} pmaddwd\t{%2, %0|%0, %2}
vpmaddwd\t{%2, %1, %0|%0, %1, %2}" vpmaddwd\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxmul,sseiadd,sseiadd") (set_attr "type" "mmxmul,sseiadd,sseiadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -971,7 +978,8 @@ ...@@ -971,7 +978,8 @@
pmuludq\t{%2, %0|%0, %2} pmuludq\t{%2, %0|%0, %2}
pmuludq\t{%2, %0|%0, %2} pmuludq\t{%2, %0|%0, %2}
vpmuludq\t{%2, %1, %0|%0, %1, %2}" vpmuludq\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxmul,ssemul,ssemul") (set_attr "type" "mmxmul,ssemul,ssemul")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1004,7 +1012,8 @@ ...@@ -1004,7 +1012,8 @@
p<maxmin_int>w\t{%2, %0|%0, %2} p<maxmin_int>w\t{%2, %0|%0, %2}
p<maxmin_int>w\t{%2, %0|%0, %2} p<maxmin_int>w\t{%2, %0|%0, %2}
vp<maxmin_int>w\t{%2, %1, %0|%0, %1, %2}" vp<maxmin_int>w\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxadd,sseiadd,sseiadd") (set_attr "type" "mmxadd,sseiadd,sseiadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1037,7 +1046,8 @@ ...@@ -1037,7 +1046,8 @@
p<maxmin_int>b\t{%2, %0|%0, %2} p<maxmin_int>b\t{%2, %0|%0, %2}
p<maxmin_int>b\t{%2, %0|%0, %2} p<maxmin_int>b\t{%2, %0|%0, %2}
vp<maxmin_int>b\t{%2, %1, %0|%0, %1, %2}" vp<maxmin_int>b\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxadd,sseiadd,sseiadd") (set_attr "type" "mmxadd,sseiadd,sseiadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1051,7 +1061,8 @@ ...@@ -1051,7 +1061,8 @@
psra<mmxvecsize>\t{%2, %0|%0, %2} psra<mmxvecsize>\t{%2, %0|%0, %2}
psra<mmxvecsize>\t{%2, %0|%0, %2} psra<mmxvecsize>\t{%2, %0|%0, %2}
vpsra<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vpsra<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxshft,sseishft,sseishft") (set_attr "type" "mmxshft,sseishft,sseishft")
(set (attr "length_immediate") (set (attr "length_immediate")
(if_then_else (match_operand 2 "const_int_operand") (if_then_else (match_operand 2 "const_int_operand")
...@@ -1076,7 +1087,8 @@ ...@@ -1076,7 +1087,8 @@
p<vshift><mmxvecsize>\t{%2, %0|%0, %2} p<vshift><mmxvecsize>\t{%2, %0|%0, %2}
p<vshift><mmxvecsize>\t{%2, %0|%0, %2} p<vshift><mmxvecsize>\t{%2, %0|%0, %2}
vp<vshift><mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vp<vshift><mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxshft,sseishft,sseishft") (set_attr "type" "mmxshft,sseishft,sseishft")
(set (attr "length_immediate") (set (attr "length_immediate")
(if_then_else (match_operand 2 "const_int_operand") (if_then_else (match_operand 2 "const_int_operand")
...@@ -1116,7 +1128,8 @@ ...@@ -1116,7 +1128,8 @@
pcmpeq<mmxvecsize>\t{%2, %0|%0, %2} pcmpeq<mmxvecsize>\t{%2, %0|%0, %2}
pcmpeq<mmxvecsize>\t{%2, %0|%0, %2} pcmpeq<mmxvecsize>\t{%2, %0|%0, %2}
vpcmpeq<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vpcmpeq<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxcmp,ssecmp,ssecmp") (set_attr "type" "mmxcmp,ssecmp,ssecmp")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1130,7 +1143,8 @@ ...@@ -1130,7 +1143,8 @@
pcmpgt<mmxvecsize>\t{%2, %0|%0, %2} pcmpgt<mmxvecsize>\t{%2, %0|%0, %2}
pcmpgt<mmxvecsize>\t{%2, %0|%0, %2} pcmpgt<mmxvecsize>\t{%2, %0|%0, %2}
vpcmpgt<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vpcmpgt<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxcmp,ssecmp,ssecmp") (set_attr "type" "mmxcmp,ssecmp,ssecmp")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1150,7 +1164,8 @@ ...@@ -1150,7 +1164,8 @@
pandn\t{%2, %0|%0, %2} pandn\t{%2, %0|%0, %2}
pandn\t{%2, %0|%0, %2} pandn\t{%2, %0|%0, %2}
vpandn\t{%2, %1, %0|%0, %1, %2}" vpandn\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxadd,sselog,sselog") (set_attr "type" "mmxadd,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1181,7 +1196,8 @@ ...@@ -1181,7 +1196,8 @@
p<logic>\t{%2, %0|%0, %2} p<logic>\t{%2, %0|%0, %2}
p<logic>\t{%2, %0|%0, %2} p<logic>\t{%2, %0|%0, %2}
vp<logic>\t{%2, %1, %0|%0, %1, %2}" vp<logic>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxadd,sselog,sselog") (set_attr "type" "mmxadd,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1211,7 +1227,7 @@ ...@@ -1211,7 +1227,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_pack (operands, <any_s_truncate:CODE>); DONE;" "ix86_split_mmx_pack (operands, <any_s_truncate:CODE>); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxshft,sselog,sselog") (set_attr "type" "mmxshft,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1230,7 +1246,7 @@ ...@@ -1230,7 +1246,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_pack (operands, SS_TRUNCATE); DONE;" "ix86_split_mmx_pack (operands, SS_TRUNCATE); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxshft,sselog,sselog") (set_attr "type" "mmxshft,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1252,7 +1268,7 @@ ...@@ -1252,7 +1268,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_punpck (operands, true); DONE;" "ix86_split_mmx_punpck (operands, true); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1274,7 +1290,7 @@ ...@@ -1274,7 +1290,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_punpck (operands, false); DONE;" "ix86_split_mmx_punpck (operands, false); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1294,7 +1310,7 @@ ...@@ -1294,7 +1310,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_punpck (operands, true); DONE;" "ix86_split_mmx_punpck (operands, true); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1314,7 +1330,7 @@ ...@@ -1314,7 +1330,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_punpck (operands, false); DONE;" "ix86_split_mmx_punpck (operands, false); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1334,7 +1350,7 @@ ...@@ -1334,7 +1350,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_punpck (operands, true); DONE;" "ix86_split_mmx_punpck (operands, true); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1354,7 +1370,7 @@ ...@@ -1354,7 +1370,7 @@
"TARGET_MMX_WITH_SSE && reload_completed" "TARGET_MMX_WITH_SSE && reload_completed"
[(const_int 0)] [(const_int 0)]
"ix86_split_mmx_punpck (operands, false); DONE;" "ix86_split_mmx_punpck (operands, false); DONE;"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1385,22 +1401,25 @@ ...@@ -1385,22 +1401,25 @@
< GET_MODE_NUNITS (V4HImode))" < GET_MODE_NUNITS (V4HImode))"
{ {
operands[3] = GEN_INT (exact_log2 (INTVAL (operands[3]))); operands[3] = GEN_INT (exact_log2 (INTVAL (operands[3])));
if (TARGET_MMX_WITH_SSE && TARGET_AVX) switch (which_alternative)
{ {
case 2:
if (MEM_P (operands[2])) if (MEM_P (operands[2]))
return "vpinsrw\t{%3, %2, %1, %0|%0, %1, %2, %3}"; return "vpinsrw\t{%3, %2, %1, %0|%0, %1, %2, %3}";
else else
return "vpinsrw\t{%3, %k2, %1, %0|%0, %1, %k2, %3}"; return "vpinsrw\t{%3, %k2, %1, %0|%0, %1, %k2, %3}";
} case 1:
else case 0:
{
if (MEM_P (operands[2])) if (MEM_P (operands[2]))
return "pinsrw\t{%3, %2, %0|%0, %2, %3}"; return "pinsrw\t{%3, %2, %0|%0, %2, %3}";
else else
return "pinsrw\t{%3, %k2, %0|%0, %k2, %3}"; return "pinsrw\t{%3, %k2, %0|%0, %k2, %3}";
default:
gcc_unreachable ();
} }
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxcvt,sselog,sselog") (set_attr "type" "mmxcvt,sselog,sselog")
(set_attr "length_immediate" "1") (set_attr "length_immediate" "1")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1416,7 +1435,8 @@ ...@@ -1416,7 +1435,8 @@
"@ "@
pextrw\t{%2, %1, %0|%0, %1, %2} pextrw\t{%2, %1, %0|%0, %1, %2}
%vpextrw\t{%2, %1, %0|%0, %1, %2}" %vpextrw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64") [(set_attr "isa" "*,sse2")
(set_attr "mmx_isa" "native,*")
(set_attr "type" "mmxcvt,sselog1") (set_attr "type" "mmxcvt,sselog1")
(set_attr "length_immediate" "1") (set_attr "length_immediate" "1")
(set_attr "mode" "DI,TI")]) (set_attr "mode" "DI,TI")])
...@@ -1465,7 +1485,8 @@ ...@@ -1465,7 +1485,8 @@
gcc_unreachable (); gcc_unreachable ();
} }
} }
[(set_attr "mmx_isa" "native,x64") [(set_attr "isa" "*,sse2")
(set_attr "mmx_isa" "native,*")
(set_attr "type" "mmxcvt,sselog") (set_attr "type" "mmxcvt,sselog")
(set_attr "length_immediate" "1") (set_attr "length_immediate" "1")
(set_attr "mode" "DI,TI")]) (set_attr "mode" "DI,TI")])
...@@ -1524,7 +1545,7 @@ ...@@ -1524,7 +1545,7 @@
emit_insn (gen_rtx_SET (operands[0], op)); emit_insn (gen_rtx_SET (operands[0], op));
DONE; DONE;
} }
[(set_attr "mmx_isa" "native,x64,x64_avx") [(set_attr "mmx_isa" "native,sse,avx")
(set_attr "type" "mmxcvt,sselog1,ssemov") (set_attr "type" "mmxcvt,sselog1,ssemov")
(set_attr "length_immediate" "1,1,0") (set_attr "length_immediate" "1,1,0")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1544,7 +1565,7 @@ ...@@ -1544,7 +1565,7 @@
(vec_duplicate:V4SI (match_dup 1)))] (vec_duplicate:V4SI (match_dup 1)))]
"operands[0] = lowpart_subreg (V4SImode, operands[0], "operands[0] = lowpart_subreg (V4SImode, operands[0],
GET_MODE (operands[0]));" GET_MODE (operands[0]));"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx,avx")
(set_attr "type" "mmxcvt,ssemov,ssemov,ssemov") (set_attr "type" "mmxcvt,ssemov,ssemov,ssemov")
(set_attr "mode" "DI,TI,TI,TI")]) (set_attr "mode" "DI,TI,TI,TI")])
...@@ -1766,16 +1787,24 @@ ...@@ -1766,16 +1787,24 @@
&& (TARGET_SSE || TARGET_3DNOW) && (TARGET_SSE || TARGET_3DNOW)
&& ix86_binary_operator_ok (PLUS, V8QImode, operands)" && ix86_binary_operator_ok (PLUS, V8QImode, operands)"
{ {
/* These two instructions have the same operation, but their encoding switch (which_alternative)
is different. Prefer the one that is de facto standard. */ {
if (TARGET_MMX_WITH_SSE && TARGET_AVX) case 2:
return "vpavgb\t{%2, %1, %0|%0, %1, %2}"; return "vpavgb\t{%2, %1, %0|%0, %1, %2}";
else if (TARGET_SSE || TARGET_3DNOW_A) case 1:
return "pavgb\t{%2, %0|%0, %2}"; case 0:
else /* These two instructions have the same operation, but their encoding
return "pavgusb\t{%2, %0|%0, %2}"; is different. Prefer the one that is de facto standard. */
if (TARGET_SSE || TARGET_3DNOW_A)
return "pavgb\t{%2, %0|%0, %2}";
else
return "pavgusb\t{%2, %0|%0, %2}";
default:
gcc_unreachable ();
}
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxshft,sseiadd,sseiadd") (set_attr "type" "mmxshft,sseiadd,sseiadd")
(set (attr "prefix_extra") (set (attr "prefix_extra")
(if_then_else (if_then_else
...@@ -1822,7 +1851,8 @@ ...@@ -1822,7 +1851,8 @@
pavgw\t{%2, %0|%0, %2} pavgw\t{%2, %0|%0, %2}
pavgw\t{%2, %0|%0, %2} pavgw\t{%2, %0|%0, %2}
vpavgw\t{%2, %1, %0|%0, %1, %2}" vpavgw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxshft,sseiadd,sseiadd") (set_attr "type" "mmxshft,sseiadd,sseiadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1837,7 +1867,8 @@ ...@@ -1837,7 +1867,8 @@
psadbw\t{%2, %0|%0, %2} psadbw\t{%2, %0|%0, %2}
psadbw\t{%2, %0|%0, %2} psadbw\t{%2, %0|%0, %2}
vpsadbw\t{%2, %1, %0|%0, %1, %2}" vpsadbw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,sse2_noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "mmxshft,sseiadd,sseiadd") (set_attr "type" "mmxshft,sseiadd,sseiadd")
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -1862,7 +1893,7 @@ ...@@ -1862,7 +1893,7 @@
operands[2] = lowpart_subreg (QImode, operands[0], operands[2] = lowpart_subreg (QImode, operands[0],
GET_MODE (operands[0])); GET_MODE (operands[0]));
} }
[(set_attr "mmx_isa" "native,x64") [(set_attr "mmx_isa" "native,sse")
(set_attr "type" "mmxcvt,ssemov") (set_attr "type" "mmxcvt,ssemov")
(set_attr "mode" "DI,TI")]) (set_attr "mode" "DI,TI")])
......
gcc/config/i386/sse.md
...@@ -5150,7 +5150,7 @@ ...@@ -5150,7 +5150,7 @@
} }
DONE; DONE;
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "ssecvt") (set_attr "type" "ssecvt")
(set_attr "mode" "V4SF")]) (set_attr "mode" "V4SF")])
...@@ -5164,7 +5164,8 @@ ...@@ -5164,7 +5164,8 @@
"@ "@
cvtps2pi\t{%1, %0|%0, %q1} cvtps2pi\t{%1, %0|%0, %q1}
%vcvtps2dq\t{%1, %0|%0, %1}" %vcvtps2dq\t{%1, %0|%0, %1}"
[(set_attr "mmx_isa" "native,x64") [(set_attr "isa" "*,sse2")
(set_attr "mmx_isa" "native,*")
(set_attr "type" "ssecvt") (set_attr "type" "ssecvt")
(set_attr "unit" "mmx,*") (set_attr "unit" "mmx,*")
(set_attr "mode" "DI")]) (set_attr "mode" "DI")])
...@@ -5178,7 +5179,8 @@ ...@@ -5178,7 +5179,8 @@
"@ "@
cvttps2pi\t{%1, %0|%0, %q1} cvttps2pi\t{%1, %0|%0, %q1}
%vcvttps2dq\t{%1, %0|%0, %1}" %vcvttps2dq\t{%1, %0|%0, %1}"
[(set_attr "mmx_isa" "native,x64") [(set_attr "isa" "*,sse2")
(set_attr "mmx_isa" "native,*")
(set_attr "type" "ssecvt") (set_attr "type" "ssecvt")
(set_attr "unit" "mmx,*") (set_attr "unit" "mmx,*")
(set_attr "prefix_rep" "0") (set_attr "prefix_rep" "0")
...@@ -15893,7 +15895,7 @@ ...@@ -15893,7 +15895,7 @@
ix86_move_vector_high_sse_to_mmx (op0); ix86_move_vector_high_sse_to_mmx (op0);
DONE; DONE;
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "sseiadd") (set_attr "type" "sseiadd")
(set_attr "atom_unit" "complex") (set_attr "atom_unit" "complex")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
...@@ -16009,7 +16011,7 @@ ...@@ -16009,7 +16011,7 @@
ix86_move_vector_high_sse_to_mmx (op0); ix86_move_vector_high_sse_to_mmx (op0);
DONE; DONE;
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "sseiadd") (set_attr "type" "sseiadd")
(set_attr "atom_unit" "complex") (set_attr "atom_unit" "complex")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
...@@ -16192,7 +16194,8 @@ ...@@ -16192,7 +16194,8 @@
pmaddubsw\t{%2, %0|%0, %2} pmaddubsw\t{%2, %0|%0, %2}
pmaddubsw\t{%2, %0|%0, %2} pmaddubsw\t{%2, %0|%0, %2}
vpmaddubsw\t{%2, %1, %0|%0, %1, %2}" vpmaddubsw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "sseiadd") (set_attr "type" "sseiadd")
(set_attr "atom_unit" "simul") (set_attr "atom_unit" "simul")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
...@@ -16313,7 +16316,8 @@ ...@@ -16313,7 +16316,8 @@
pmulhrsw\t{%2, %0|%0, %2} pmulhrsw\t{%2, %0|%0, %2}
pmulhrsw\t{%2, %0|%0, %2} pmulhrsw\t{%2, %0|%0, %2}
vpmulhrsw\t{%2, %1, %0|%0, %1, %2}" vpmulhrsw\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "sseimul") (set_attr "type" "sseimul")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
(set (attr "prefix_rex") (symbol_ref "x86_extended_reg_mentioned_p (insn)")) (set (attr "prefix_rex") (symbol_ref "x86_extended_reg_mentioned_p (insn)"))
...@@ -16373,7 +16377,7 @@ ...@@ -16373,7 +16377,7 @@
rtx vec_const = gen_rtx_CONST_VECTOR (V4SImode, par); rtx vec_const = gen_rtx_CONST_VECTOR (V4SImode, par);
operands[5] = force_const_mem (V4SImode, vec_const); operands[5] = force_const_mem (V4SImode, vec_const);
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
(set (attr "prefix_rex") (symbol_ref "x86_extended_reg_mentioned_p (insn)")) (set (attr "prefix_rex") (symbol_ref "x86_extended_reg_mentioned_p (insn)"))
(set_attr "mode" "DI,TI,TI")]) (set_attr "mode" "DI,TI,TI")])
...@@ -16406,7 +16410,8 @@ ...@@ -16406,7 +16410,8 @@
psign<mmxvecsize>\t{%2, %0|%0, %2} psign<mmxvecsize>\t{%2, %0|%0, %2}
psign<mmxvecsize>\t{%2, %0|%0, %2} psign<mmxvecsize>\t{%2, %0|%0, %2}
vpsign<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}" vpsign<mmxvecsize>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "isa" "*,noavx,avx")
(set_attr "mmx_isa" "native,*,*")
(set_attr "type" "sselog1") (set_attr "type" "sselog1")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
(set (attr "prefix_rex") (symbol_ref "x86_extended_reg_mentioned_p (insn)")) (set (attr "prefix_rex") (symbol_ref "x86_extended_reg_mentioned_p (insn)"))
...@@ -16510,7 +16515,7 @@ ...@@ -16510,7 +16515,7 @@
} }
operands[0] = lowpart_subreg (V1TImode, op0, GET_MODE (op0)); operands[0] = lowpart_subreg (V1TImode, op0, GET_MODE (op0));
} }
[(set_attr "mmx_isa" "native,x64_noavx,x64_avx") [(set_attr "mmx_isa" "native,sse_noavx,avx")
(set_attr "type" "sseishft") (set_attr "type" "sseishft")
(set_attr "atom_unit" "sishuf") (set_attr "atom_unit" "sishuf")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
...@@ -16587,7 +16592,7 @@ ...@@ -16587,7 +16592,7 @@
"@ "@
pabs<mmxvecsize>\t{%1, %0|%0, %1} pabs<mmxvecsize>\t{%1, %0|%0, %1}
%vpabs<mmxvecsize>\t{%1, %0|%0, %1}" %vpabs<mmxvecsize>\t{%1, %0|%0, %1}"
[(set_attr "mmx_isa" "native,x64") [(set_attr "mmx_isa" "native,*")
(set_attr "type" "sselog1") (set_attr "type" "sselog1")
(set_attr "prefix_rep" "0") (set_attr "prefix_rep" "0")
(set_attr "prefix_extra" "1") (set_attr "prefix_extra" "1")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment