Skip to content

R
riscv-gcc-1
Commit 1162730f by Uros Bizjak Committed by Uros Bizjak
Options

i386.md (shift_insn): Rename code attribute from shiftrt_insn. 

	* config/i386/i386.md (shift_insn): Rename code attribute from
	shiftrt_insn.  Also handle ashift RTX.
	(shift): Rename code attribute from shiftrt.  Also handle ashift RTX.
	(vshift): New code attribute.
	(<shift_insn>*): Rename from <shiftrt_insn>*. Update asm templates.
	(any_lshift): Move and rename code iterator from ...
	* config/i386/sse.md (lshift): ... here.
	(lshift_insn): Remove code attribute.
	(lshift): Remove code attribute.
	(vlshr<mode>3): Use lshiftrt RTX.
	(vashr<mode>3, ashrv16qi3, ashrv2di3): Use ashiftrt RTX.
	(vashl<mode>3, ashlv16qi3): Use ashift RTX.
	(avx2_<lshift>v<mode>): Rename from avx2_<shift_insn>v<mode>.  Use
	any_lshift code iterator.  Update asm template.
	(<shift_insn><mode>3): Macroize insn from lshr<mode>3 and ashl<mode>3
	usign any_lshift code iterator.
	* config/i386/mmx.md (mmx_<shift_insn><mode>3): Macroize insn from
	mmx_lshr<mode>3 and mmx_ashl<mode>3 usign any_lshift code iterator.
	* config/i386/i386.c (bdesc_args) <__builtin_ia32_psll>: Update.

From-SVN: r180624
parent 18232de4
Showing with 33 additions and 56 deletions
gcc/ChangeLog
...@@ -3,15 +3,21 @@ ...@@ -3,15 +3,21 @@
* config/i386/i386.md (shift_insn): Rename code attribute from * config/i386/i386.md (shift_insn): Rename code attribute from
shiftrt_insn. Also handle ashift RTX. shiftrt_insn. Also handle ashift RTX.
(shift): Rename code attribute from shiftrt. Also handle ashift RTX. (shift): Rename code attribute from shiftrt. Also handle ashift RTX.
(vshift): New code attribute.
(<shift_insn>*): Rename from <shiftrt_insn>*. Update asm templates. (<shift_insn>*): Rename from <shiftrt_insn>*. Update asm templates.
* config/i386/sse.md (any_lshift): Rename code iterator from lshift. (any_lshift): Move and rename code iterator from ...
* config/i386/sse.md (lshift): ... here.
(lshift_insn): Remove code attribute. (lshift_insn): Remove code attribute.
(lshift): Remove code attribute. (lshift): Remove code attribute.
(vlshr<mode>3): Use lshiftrt RTX. (vlshr<mode>3): Use lshiftrt RTX.
(vashr<mode>3): Use ashiftrt RTX. (vashr<mode>3, ashrv16qi3, ashrv2di3): Use ashiftrt RTX.
(vashl<mode>3): Use ashift RTX. (vashl<mode>3, ashlv16qi3): Use ashift RTX.
(avx2_<lshift>v<mode>): Rename from avx2_<shift_insn>v<mode>. Use (avx2_<lshift>v<mode>): Rename from avx2_<shift_insn>v<mode>. Use
any_lshift code iterator. Update asm template. any_lshift code iterator. Update asm template.
(<shift_insn><mode>3): Macroize insn from lshr<mode>3 and ashl<mode>3
usign any_lshift code iterator.
* config/i386/mmx.md (mmx_<shift_insn><mode>3): Macroize insn from
mmx_lshr<mode>3 and mmx_ashl<mode>3 usign any_lshift code iterator.
* config/i386/i386.c (bdesc_args) <__builtin_ia32_psll>: Update. * config/i386/i386.c (bdesc_args) <__builtin_ia32_psll>: Update.
2011-10-28 Georg-Johann Lay <avr@gjlay.de> 2011-10-28 Georg-Johann Lay <avr@gjlay.de>
gcc/config/i386/i386.md
...@@ -772,6 +772,9 @@ ...@@ -772,6 +772,9 @@
;; Base name for insn mnemonic. ;; Base name for insn mnemonic.
(define_code_attr logic [(and "and") (ior "or") (xor "xor")]) (define_code_attr logic [(and "and") (ior "or") (xor "xor")])
;; Mapping of logic-shift operators
(define_code_iterator any_lshift [ashift lshiftrt])
;; Mapping of shift-right operators ;; Mapping of shift-right operators
(define_code_iterator any_shiftrt [lshiftrt ashiftrt]) (define_code_iterator any_shiftrt [lshiftrt ashiftrt])
...@@ -781,6 +784,7 @@ ...@@ -781,6 +784,7 @@
;; Base name for insn mnemonic. ;; Base name for insn mnemonic.
(define_code_attr shift [(ashift "sll") (lshiftrt "shr") (ashiftrt "sar")]) (define_code_attr shift [(ashift "sll") (lshiftrt "shr") (ashiftrt "sar")])
(define_code_attr vshift [(ashift "sll") (lshiftrt "srl") (ashiftrt "sra")])
;; Mapping of rotate operators ;; Mapping of rotate operators
(define_code_iterator any_rotate [rotate rotatert]) (define_code_iterator any_rotate [rotate rotatert])
......
gcc/config/i386/mmx.md
...@@ -1037,27 +1037,13 @@ ...@@ -1037,27 +1037,13 @@
(const_string "0"))) (const_string "0")))
(set_attr "mode" "DI")]) (set_attr "mode" "DI")])
(define_insn "mmx_lshr<mode>3" (define_insn "mmx_<shift_insn><mode>3"
[(set (match_operand:MMXMODE248 0 "register_operand" "=y") [(set (match_operand:MMXMODE248 0 "register_operand" "=y")
(lshiftrt:MMXMODE248 (any_lshift:MMXMODE248
(match_operand:MMXMODE248 1 "register_operand" "0") (match_operand:MMXMODE248 1 "register_operand" "0")
(match_operand:SI 2 "nonmemory_operand" "yN")))] (match_operand:SI 2 "nonmemory_operand" "yN")))]
"TARGET_MMX" "TARGET_MMX"
"psrl<mmxvecsize>\t{%2, %0|%0, %2}" "p<vshift><mmxvecsize>\t{%2, %0|%0, %2}"
[(set_attr "type" "mmxshft")
(set (attr "length_immediate")
(if_then_else (match_operand 2 "const_int_operand" "")
(const_string "1")
(const_string "0")))
(set_attr "mode" "DI")])
(define_insn "mmx_ashl<mode>3"
[(set (match_operand:MMXMODE248 0 "register_operand" "=y")
(ashift:MMXMODE248
(match_operand:MMXMODE248 1 "register_operand" "0")
(match_operand:SI 2 "nonmemory_operand" "yN")))]
"TARGET_MMX"
"psll<mmxvecsize>\t{%2, %0|%0, %2}"
[(set_attr "type" "mmxshft") [(set_attr "type" "mmxshft")
(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" "")
......
gcc/config/i386/sse.md
...@@ -167,9 +167,6 @@ ...@@ -167,9 +167,6 @@
(V4SI "vec") (V8SI "avx2") (V4SI "vec") (V8SI "avx2")
(V2DI "vec") (V4DI "avx2")]) (V2DI "vec") (V4DI "avx2")])
;; Mapping of logic-shift operators
(define_code_iterator any_lshift [ashift lshiftrt])
(define_mode_attr ssedoublemode (define_mode_attr ssedoublemode
[(V16HI "V16SI") (V8HI "V8SI")]) [(V16HI "V16SI") (V8HI "V8SI")])
...@@ -5826,34 +5823,15 @@ ...@@ -5826,34 +5823,15 @@
(set_attr "prefix" "orig,vex") (set_attr "prefix" "orig,vex")
(set_attr "mode" "<sseinsnmode>")]) (set_attr "mode" "<sseinsnmode>")])
(define_insn "lshr<mode>3" (define_insn "<shift_insn><mode>3"
[(set (match_operand:VI248_AVX2 0 "register_operand" "=x,x") [(set (match_operand:VI248_AVX2 0 "register_operand" "=x,x")
(lshiftrt:VI248_AVX2 (any_lshift:VI248_AVX2
(match_operand:VI248_AVX2 1 "register_operand" "0,x") (match_operand:VI248_AVX2 1 "register_operand" "0,x")
(match_operand:SI 2 "nonmemory_operand" "xN,xN")))] (match_operand:SI 2 "nonmemory_operand" "xN,xN")))]
"TARGET_SSE2" "TARGET_SSE2"
"@ "@
psrl<ssemodesuffix>\t{%2, %0|%0, %2} p<vshift><ssemodesuffix>\t{%2, %0|%0, %2}
vpsrl<ssemodesuffix>\t{%2, %1, %0|%0, %1, %2}" v<vshift><ssemodesuffix>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "isa" "noavx,avx")
(set_attr "type" "sseishft")
(set (attr "length_immediate")
(if_then_else (match_operand 2 "const_int_operand" "")
(const_string "1")
(const_string "0")))
(set_attr "prefix_data16" "1,*")
(set_attr "prefix" "orig,vex")
(set_attr "mode" "<sseinsnmode>")])
(define_insn "ashl<mode>3"
[(set (match_operand:VI248_AVX2 0 "register_operand" "=x,x")
(ashift:VI248_AVX2
(match_operand:VI248_AVX2 1 "register_operand" "0,x")
(match_operand:SI 2 "nonmemory_operand" "xN,xN")))]
"TARGET_SSE2"
"@
psll<ssemodesuffix>\t{%2, %0|%0, %2}
vpsll<ssemodesuffix>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "isa" "noavx,avx") [(set_attr "isa" "noavx,avx")
(set_attr "type" "sseishft") (set_attr "type" "sseishft")
(set (attr "length_immediate") (set (attr "length_immediate")
...@@ -11406,9 +11384,10 @@ ...@@ -11406,9 +11384,10 @@
;; SSE2 doesn't have some shift varients, so define versions for XOP ;; SSE2 doesn't have some shift varients, so define versions for XOP
(define_expand "ashlv16qi3" (define_expand "ashlv16qi3"
[(match_operand:V16QI 0 "register_operand" "") [(set (match_operand:V16QI 0 "register_operand" "")
(match_operand:V16QI 1 "register_operand" "") (ashift:V16QI
(match_operand:SI 2 "nonmemory_operand" "")] (match_operand:V16QI 1 "register_operand" "")
(match_operand:SI 2 "nonmemory_operand" "")))]
"TARGET_XOP" "TARGET_XOP"
{ {
rtvec vs = rtvec_alloc (16); rtvec vs = rtvec_alloc (16);
...@@ -11442,9 +11421,10 @@ ...@@ -11442,9 +11421,10 @@
}) })
(define_expand "ashrv16qi3" (define_expand "ashrv16qi3"
[(match_operand:V16QI 0 "register_operand" "") [(set (match_operand:V16QI 0 "register_operand" "")
(match_operand:V16QI 1 "register_operand" "") (ashiftrt:V16QI
(match_operand:SI 2 "nonmemory_operand" "")] (match_operand:V16QI 1 "register_operand" "")
(match_operand:SI 2 "nonmemory_operand" "")))]
"TARGET_XOP" "TARGET_XOP"
{ {
rtvec vs = rtvec_alloc (16); rtvec vs = rtvec_alloc (16);
...@@ -11473,9 +11453,10 @@ ...@@ -11473,9 +11453,10 @@
}) })
(define_expand "ashrv2di3" (define_expand "ashrv2di3"
[(match_operand:V2DI 0 "register_operand" "") [(set (match_operand:V2DI 0 "register_operand" "")
(match_operand:V2DI 1 "register_operand" "") (ashiftrt:V2DI
(match_operand:DI 2 "nonmemory_operand" "")] (match_operand:V2DI 1 "register_operand" "")
(match_operand:DI 2 "nonmemory_operand" "")))]
"TARGET_XOP" "TARGET_XOP"
{ {
rtvec vs = rtvec_alloc (2); rtvec vs = rtvec_alloc (2);
...@@ -12484,7 +12465,7 @@ ...@@ -12484,7 +12465,7 @@
(match_operand:VI48_AVX2 1 "register_operand" "x") (match_operand:VI48_AVX2 1 "register_operand" "x")
(match_operand:VI48_AVX2 2 "nonimmediate_operand" "xm")))] (match_operand:VI48_AVX2 2 "nonimmediate_operand" "xm")))]
"TARGET_AVX2" "TARGET_AVX2"
"vp<shift>v<ssemodesuffix>\t{%2, %1, %0|%0, %1, %2}" "vp<vshift>v<ssemodesuffix>\t{%2, %1, %0|%0, %1, %2}"
[(set_attr "type" "sseishft") [(set_attr "type" "sseishft")
(set_attr "prefix" "vex") (set_attr "prefix" "vex")
(set_attr "mode" "<sseinsnmode>")]) (set_attr "mode" "<sseinsnmode>")])
......
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