From bdfb351b028b26de3435371f20cb687732253940 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 24 Mar 2011 17:09:36 -0700 Subject: [PATCH] alpha: Unify zero_extend patterns with attribute enabled. From-SVN: r171429 --- gcc/ChangeLog | 9 +++ gcc/config/alpha/alpha.md | 142 ++++++++++----------------------- gcc/config/alpha/predicates.md | 6 ++ 3 files changed, 57 insertions(+), 100 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aef5088dff9..6f212844970 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-02-24 Richard Henderson + + * config/alpha/alpha.md (attribute isa): New. + (attribute enabled): New. + (zero_extendqihi2): Merge from *zero_extendqihi2_{bwx,nobwx}. + (zero_extendqisi2, zero_extendqidi2): Similarly. + (zero_extendhisi2, zero_extendhidi2): Similarly. + * config/alpha/predicates.md (reg_or_bwx_memory_operand): New. + 2011-02-24 Richard Henderson * config/alpha/predicates.md (input_operand): Revert last change; diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md index 38d40b55f7e..cb3821c92bc 100644 --- a/gcc/config/alpha/alpha.md +++ b/gcc/config/alpha/alpha.md @@ -177,6 +177,18 @@ (define_attr "cannot_copy" "false,true" (const_string "false")) + +;; Used to control the "enabled" attribute on a per-instruction basis. +(define_attr "isa" "base,bwx,max,fix,cix" + (const_string "base")) + +(define_attr "enabled" "" + (cond [(eq_attr "isa" "bwx") (symbol_ref "TARGET_BWX") + (eq_attr "isa" "max") (symbol_ref "TARGET_MAX") + (eq_attr "isa" "fix") (symbol_ref "TARGET_FIX") + (eq_attr "isa" "cix") (symbol_ref "TARGET_CIX") + ] + (const_int 1))) ;; Include scheduling descriptions. @@ -1092,130 +1104,60 @@ operands[4] = GEN_INT (mask2); }) -(define_expand "zero_extendqihi2" - [(set (match_operand:HI 0 "register_operand" "") - (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))] - "" -{ - if (! TARGET_BWX) - operands[1] = force_reg (QImode, operands[1]); -}) - -(define_insn "*zero_extendqihi2_bwx" +(define_insn "zero_extendqihi2" [(set (match_operand:HI 0 "register_operand" "=r,r") - (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "r,m")))] - "TARGET_BWX" + (zero_extend:HI + (match_operand:QI 1 "reg_or_bwx_memory_operand" "r,m")))] + "" "@ and %1,0xff,%0 ldbu %0,%1" - [(set_attr "type" "ilog,ild")]) + [(set_attr "type" "ilog,ild") + (set_attr "isa" "*,bwx")]) -(define_insn "*zero_extendqihi2_nobwx" - [(set (match_operand:HI 0 "register_operand" "=r") - (zero_extend:HI (match_operand:QI 1 "register_operand" "r")))] - "! TARGET_BWX" - "and %1,0xff,%0" - [(set_attr "type" "ilog")]) - -(define_expand "zero_extendqisi2" - [(set (match_operand:SI 0 "register_operand" "") - (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))] - "" -{ - if (! TARGET_BWX) - operands[1] = force_reg (QImode, operands[1]); -}) - -(define_insn "*zero_extendqisi2_bwx" +(define_insn "zero_extendqisi2" [(set (match_operand:SI 0 "register_operand" "=r,r") - (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "r,m")))] - "TARGET_BWX" + (zero_extend:SI + (match_operand:QI 1 "reg_or_bwx_memory_operand" "r,m")))] + "" "@ and %1,0xff,%0 ldbu %0,%1" - [(set_attr "type" "ilog,ild")]) - -(define_insn "*zero_extendqisi2_nobwx" - [(set (match_operand:SI 0 "register_operand" "=r") - (zero_extend:SI (match_operand:QI 1 "register_operand" "r")))] - "! TARGET_BWX" - "and %1,0xff,%0" - [(set_attr "type" "ilog")]) - -(define_expand "zero_extendqidi2" - [(set (match_operand:DI 0 "register_operand" "") - (zero_extend:DI (match_operand:QI 1 "nonimmediate_operand" "")))] - "" -{ - if (! TARGET_BWX) - operands[1] = force_reg (QImode, operands[1]); -}) + [(set_attr "type" "ilog,ild") + (set_attr "isa" "*,bwx")]) -(define_insn "*zero_extendqidi2_bwx" +(define_insn "zero_extendqidi2" [(set (match_operand:DI 0 "register_operand" "=r,r") - (zero_extend:DI (match_operand:QI 1 "nonimmediate_operand" "r,m")))] - "TARGET_BWX" + (zero_extend:DI + (match_operand:QI 1 "reg_or_bwx_memory_operand" "r,m")))] + "" "@ and %1,0xff,%0 ldbu %0,%1" - [(set_attr "type" "ilog,ild")]) - -(define_insn "*zero_extendqidi2_nobwx" - [(set (match_operand:DI 0 "register_operand" "=r") - (zero_extend:DI (match_operand:QI 1 "register_operand" "r")))] - "! TARGET_BWX" - "and %1,0xff,%0" - [(set_attr "type" "ilog")]) - -(define_expand "zero_extendhisi2" - [(set (match_operand:SI 0 "register_operand" "") - (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "")))] - "" -{ - if (! TARGET_BWX) - operands[1] = force_reg (HImode, operands[1]); -}) + [(set_attr "type" "ilog,ild") + (set_attr "isa" "*,bwx")]) -(define_insn "*zero_extendhisi2_bwx" +(define_insn "zero_extendhisi2" [(set (match_operand:SI 0 "register_operand" "=r,r") - (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r,m")))] - "TARGET_BWX" + (zero_extend:SI + (match_operand:HI 1 "reg_or_bwx_memory_operand" "r,m")))] + "" "@ zapnot %1,3,%0 ldwu %0,%1" - [(set_attr "type" "shift,ild")]) - -(define_insn "*zero_extendhisi2_nobwx" - [(set (match_operand:SI 0 "register_operand" "=r") - (zero_extend:SI (match_operand:HI 1 "register_operand" "r")))] - "! TARGET_BWX" - "zapnot %1,3,%0" - [(set_attr "type" "shift")]) - -(define_expand "zero_extendhidi2" - [(set (match_operand:DI 0 "register_operand" "") - (zero_extend:DI (match_operand:HI 1 "nonimmediate_operand" "")))] - "" -{ - if (! TARGET_BWX) - operands[1] = force_reg (HImode, operands[1]); -}) + [(set_attr "type" "shift,ild") + (set_attr "isa" "*,bwx")]) -(define_insn "*zero_extendhidi2_bwx" +(define_insn "zero_extendhidi2" [(set (match_operand:DI 0 "register_operand" "=r,r") - (zero_extend:DI (match_operand:HI 1 "nonimmediate_operand" "r,m")))] - "TARGET_BWX" + (zero_extend:DI + (match_operand:HI 1 "reg_or_bwx_memory_operand" "r,m")))] + "" "@ zapnot %1,3,%0 ldwu %0,%1" - [(set_attr "type" "shift,ild")]) - -(define_insn "*zero_extendhidi2_nobwx" - [(set (match_operand:DI 0 "register_operand" "=r") - (zero_extend:DI (match_operand:HI 1 "register_operand" "r")))] - "" - "zapnot %1,3,%0" - [(set_attr "type" "shift")]) + [(set_attr "type" "shift,ild") + (set_attr "isa" "*,bwx")]) (define_insn "zero_extendsidi2" [(set (match_operand:DI 0 "register_operand" "=r") diff --git a/gcc/config/alpha/predicates.md b/gcc/config/alpha/predicates.md index da76d4f5bfd..e43564dbc34 100644 --- a/gcc/config/alpha/predicates.md +++ b/gcc/config/alpha/predicates.md @@ -617,3 +617,9 @@ return false; return for_each_rtx (&op, some_small_symbolic_operand_int, NULL); }) + +;; Accept a register, or a memory if BWX is enabled. +(define_predicate "reg_or_bwx_memory_operand" + (ior (match_operand 0 "register_operand") + (and (match_test "TARGET_BWX") + (match_operand 0 "memory_operand")))) -- 2.30.2