From 0e159efc76324f40c85581af4aca9cd4f0852cc8 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Tue, 7 Jan 2020 15:27:50 +0000 Subject: [PATCH] [amdgcn] Add more modes for vector comparisons 2020-01-07 Andrew Stubbs gcc/ * config/gcn/gcn-valu.md (VEC_1REG_INT_ALT): Delete iterator. (VEC_ALLREG_ALT): New iterator. (VEC_ALLREG_INT_MODE): New iterator. (VCMP_MODE): New iterator. (VCMP_MODE_INT): New iterator. (vec_cmpudi): Use VCMP_MODE_INT. (vec_cmpv64qidi): New define_expand. (vec_cmpdi_exec): Use VCMP_MODE. (vec_cmpudi_exec): New define_expand. (vec_cmpv64qidi_exec): New define_expand. (vec_cmpdi_dup): Use VCMP_MODE. (vec_cmpdi_dup_exec): Use VCMP_MODE. (vcond): Rename ... (vcond): ... to this. (vcond_exec): Rename ... (vcond_exec): ... to this. (vcondu): Rename ... (vcondu): ... to this. (vcondu_exec): Rename ... (vcondu_exec): ... to this. * config/gcn/gcn.c (print_operand): Fix 8 and 16 bit suffixes. * config/gcn/gcn.md (expander): Add sign_extend and zero_extend. From-SVN: r279961 --- gcc/ChangeLog | 26 ++++++++ gcc/config/gcn/gcn-valu.md | 151 +++++++++++++++++++++++++++++++-------------- gcc/config/gcn/gcn.c | 6 +- gcc/config/gcn/gcn.md | 4 +- 4 files changed, 137 insertions(+), 50 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 56d45ab..ca3b4d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,31 @@ 2020-01-07 Andrew Stubbs + * config/gcn/gcn-valu.md (VEC_1REG_INT_ALT): Delete iterator. + (VEC_ALLREG_ALT): New iterator. + (VEC_ALLREG_INT_MODE): New iterator. + (VCMP_MODE): New iterator. + (VCMP_MODE_INT): New iterator. + (vec_cmpudi): Use VCMP_MODE_INT. + (vec_cmpv64qidi): New define_expand. + (vec_cmpdi_exec): Use VCMP_MODE. + (vec_cmpudi_exec): New define_expand. + (vec_cmpv64qidi_exec): New define_expand. + (vec_cmpdi_dup): Use VCMP_MODE. + (vec_cmpdi_dup_exec): Use VCMP_MODE. + (vcond): Rename ... + (vcond): ... to this. + (vcond_exec): Rename ... + (vcond_exec): ... to this. + (vcondu): Rename ... + (vcondu): ... to this. + (vcondu_exec): Rename ... + (vcondu_exec): ... to + this. + * config/gcn/gcn.c (print_operand): Fix 8 and 16 bit suffixes. + * config/gcn/gcn.md (expander): Add sign_extend and zero_extend. + +2020-01-07 Andrew Stubbs + * config/gcn/constraints.md (DA): Update description and match. (DB): Likewise. (Db): New constraint. diff --git a/gcc/config/gcn/gcn-valu.md b/gcc/config/gcn/gcn-valu.md index 7dd7bb9..7c3de8c 100644 --- a/gcc/config/gcn/gcn-valu.md +++ b/gcc/config/gcn/gcn-valu.md @@ -26,8 +26,6 @@ (define_mode_iterator VEC_1REG_INT_MODE [V64SI]) -(define_mode_iterator VEC_1REG_INT_ALT - [V64SI]) (define_mode_iterator VEC_ALL1REG_INT_MODE [V64QI V64HI V64SI]) (define_mode_iterator VEC_ALL1REG_INT_ALT @@ -44,6 +42,12 @@ (define_mode_iterator VEC_ALLREG_MODE [V64QI V64HI V64SI V64HF V64SF ; Single reg V64DI V64DF]) ; Double reg +(define_mode_iterator VEC_ALLREG_ALT + [V64QI V64HI V64SI V64HF V64SF ; Single reg + V64DI V64DF]) ; Double reg +(define_mode_iterator VEC_ALLREG_INT_MODE + [V64QI V64HI V64SI ; Single reg + V64DI]) ; Double reg (define_mode_attr scalar_mode [(V64QI "qi") (V64HI "hi") (V64SI "si") @@ -2521,12 +2525,15 @@ ;; }}} ;; {{{ Vector comparison/merge +(define_mode_iterator VCMP_MODE [V64HI V64SI V64DI V64HF V64SF V64DF]) +(define_mode_iterator VCMP_MODE_INT [V64HI V64SI V64DI]) + (define_insn "vec_cmpdi" [(set (match_operand:DI 0 "register_operand" "=cV,cV, e, e,Sg,Sg") (match_operator 1 "comparison_operator" - [(match_operand:VEC_1REG_MODE 2 "gcn_alu_operand" + [(match_operand:VCMP_MODE 2 "gcn_alu_operand" "vSv, B,vSv, B, v,vA") - (match_operand:VEC_1REG_MODE 3 "gcn_vop3_operand" + (match_operand:VCMP_MODE 3 "gcn_vop3_operand" " v, v, v, v,vA, v")])) (clobber (match_scratch:DI 4 "= X, X, cV,cV, X, X"))] "" @@ -2543,8 +2550,8 @@ (define_expand "vec_cmpudi" [(match_operand:DI 0 "register_operand") (match_operator 1 "comparison_operator" - [(match_operand:VEC_1REG_INT_MODE 2 "gcn_alu_operand") - (match_operand:VEC_1REG_INT_MODE 3 "gcn_vop3_operand")])] + [(match_operand:VCMP_MODE_INT 2 "gcn_alu_operand") + (match_operand:VCMP_MODE_INT 3 "gcn_vop3_operand")])] "" { /* Unsigned comparisons use the same patterns as signed comparisons, @@ -2555,13 +2562,30 @@ DONE; }) +; There's no instruction for 8-bit vector comparison, so we need to extend. +(define_expand "vec_cmpv64qidi" + [(match_operand:DI 0 "register_operand") + (match_operator 1 "comparison_operator" + [(any_extend:V64SI (match_operand:V64QI 2 "gcn_alu_operand")) + (any_extend:V64SI (match_operand:V64QI 3 "gcn_vop3_operand"))])] + "can_create_pseudo_p ()" + { + rtx sitmp1 = gen_reg_rtx (V64SImode); + rtx sitmp2 = gen_reg_rtx (V64SImode); + + emit_insn (gen_v64qiv64si2 (sitmp1, operands[2])); + emit_insn (gen_v64qiv64si2 (sitmp2, operands[3])); + emit_insn (gen_vec_cmpv64sidi (operands[0], operands[1], sitmp1, sitmp2)); + DONE; + }) + (define_insn "vec_cmpdi_exec" [(set (match_operand:DI 0 "register_operand" "=cV,cV, e, e,Sg,Sg") (and:DI (match_operator 1 "comparison_operator" - [(match_operand:VEC_1REG_MODE 2 "gcn_alu_operand" + [(match_operand:VCMP_MODE 2 "gcn_alu_operand" "vSv, B,vSv, B, v,vA") - (match_operand:VEC_1REG_MODE 3 "gcn_vop3_operand" + (match_operand:VCMP_MODE 3 "gcn_vop3_operand" " v, v, v, v,vA, v")]) (match_operand:DI 4 "gcn_exec_reg_operand" " e, e, e, e, e, e"))) (clobber (match_scratch:DI 5 "= X, X, cV,cV, X, X"))] @@ -2576,14 +2600,50 @@ [(set_attr "type" "vopc,vopc,vopc,vopc,vop3a,vop3a") (set_attr "length" "4,8,4,8,8,8")]) +(define_expand "vec_cmpudi_exec" + [(match_operand:DI 0 "register_operand") + (match_operator 1 "comparison_operator" + [(match_operand:VCMP_MODE_INT 2 "gcn_alu_operand") + (match_operand:VCMP_MODE_INT 3 "gcn_vop3_operand")]) + (match_operand:DI 4 "gcn_exec_reg_operand")] + "" + { + /* Unsigned comparisons use the same patterns as signed comparisons, + except that they use unsigned operators (e.g. LTU vs LT). + The '%E1' directive then does the Right Thing. */ + emit_insn (gen_vec_cmpudi_exec (operands[0], operands[1], + operands[2], operands[3], + operands[4])); + DONE; + }) + +(define_expand "vec_cmpv64qidi_exec" + [(match_operand:DI 0 "register_operand") + (match_operator 1 "comparison_operator" + [(any_extend:V64SI (match_operand:V64QI 2 "gcn_alu_operand")) + (any_extend:V64SI (match_operand:V64QI 3 "gcn_vop3_operand"))]) + (match_operand:DI 4 "gcn_exec_reg_operand")] + "can_create_pseudo_p ()" + { + rtx sitmp1 = gen_reg_rtx (V64SImode); + rtx sitmp2 = gen_reg_rtx (V64SImode); + + emit_insn (gen_v64qiv64si2_exec (sitmp1, operands[2], + operands[2], operands[4])); + emit_insn (gen_v64qiv64si2_exec (sitmp2, operands[3], + operands[3], operands[4])); + emit_insn (gen_vec_cmpv64sidi_exec (operands[0], operands[1], sitmp1, + sitmp2, operands[4])); + DONE; + }) + (define_insn "vec_cmpdi_dup" [(set (match_operand:DI 0 "register_operand" "=cV,cV, e,e,Sg") (match_operator 1 "comparison_operator" - [(vec_duplicate:VEC_1REG_MODE + [(vec_duplicate:VCMP_MODE (match_operand: 2 "gcn_alu_operand" " Sv, B,Sv,B, A")) - (match_operand:VEC_1REG_MODE 3 "gcn_vop3_operand" - " v, v, v,v, v")])) + (match_operand:VCMP_MODE 3 "gcn_vop3_operand" " v, v, v,v, v")])) (clobber (match_scratch:DI 4 "= X,X,cV,cV, X"))] "" "@ @@ -2599,11 +2659,10 @@ [(set (match_operand:DI 0 "register_operand" "=cV,cV, e,e,Sg") (and:DI (match_operator 1 "comparison_operator" - [(vec_duplicate:VEC_1REG_MODE + [(vec_duplicate:VCMP_MODE (match_operand: 2 "gcn_alu_operand" " Sv, B,Sv,B, A")) - (match_operand:VEC_1REG_MODE 3 "gcn_vop3_operand" - " v, v, v,v, v")]) + (match_operand:VCMP_MODE 3 "gcn_vop3_operand" " v, v, v,v, v")]) (match_operand:DI 4 "gcn_exec_reg_operand" " e, e, e,e, e"))) (clobber (match_scratch:DI 5 "= X,X,cV,cV, X"))] "" @@ -2627,72 +2686,72 @@ "" "") -(define_expand "vcond" - [(match_operand:VEC_ALL1REG_MODE 0 "register_operand") - (match_operand:VEC_ALL1REG_MODE 1 "gcn_vop3_operand") - (match_operand:VEC_ALL1REG_MODE 2 "gcn_alu_operand") +(define_expand "vcond" + [(match_operand:VEC_ALLREG_MODE 0 "register_operand") + (match_operand:VEC_ALLREG_MODE 1 "gcn_vop3_operand") + (match_operand:VEC_ALLREG_MODE 2 "gcn_alu_operand") (match_operator 3 "comparison_operator" - [(match_operand:VEC_1REG_ALT 4 "gcn_alu_operand") - (match_operand:VEC_1REG_ALT 5 "gcn_vop3_operand")])] + [(match_operand:VEC_ALLREG_ALT 4 "gcn_alu_operand") + (match_operand:VEC_ALLREG_ALT 5 "gcn_vop3_operand")])] "" { rtx tmp = gen_reg_rtx (DImode); - emit_insn (gen_vec_cmpdi + emit_insn (gen_vec_cmpdi (tmp, operands[3], operands[4], operands[5])); - emit_insn (gen_vcond_mask_di + emit_insn (gen_vcond_mask_di (operands[0], operands[1], operands[2], tmp)); DONE; }) -(define_expand "vcond_exec" - [(match_operand:VEC_ALL1REG_MODE 0 "register_operand") - (match_operand:VEC_ALL1REG_MODE 1 "gcn_vop3_operand") - (match_operand:VEC_ALL1REG_MODE 2 "gcn_alu_operand") +(define_expand "vcond_exec" + [(match_operand:VEC_ALLREG_MODE 0 "register_operand") + (match_operand:VEC_ALLREG_MODE 1 "gcn_vop3_operand") + (match_operand:VEC_ALLREG_MODE 2 "gcn_alu_operand") (match_operator 3 "comparison_operator" - [(match_operand:VEC_1REG_ALT 4 "gcn_alu_operand") - (match_operand:VEC_1REG_ALT 5 "gcn_vop3_operand")]) + [(match_operand:VEC_ALLREG_ALT 4 "gcn_alu_operand") + (match_operand:VEC_ALLREG_ALT 5 "gcn_vop3_operand")]) (match_operand:DI 6 "gcn_exec_reg_operand" "e")] "" { rtx tmp = gen_reg_rtx (DImode); - emit_insn (gen_vec_cmpdi_exec + emit_insn (gen_vec_cmpdi_exec (tmp, operands[3], operands[4], operands[5], operands[6])); - emit_insn (gen_vcond_mask_di + emit_insn (gen_vcond_mask_di (operands[0], operands[1], operands[2], tmp)); DONE; }) -(define_expand "vcondu" - [(match_operand:VEC_ALL1REG_MODE 0 "register_operand") - (match_operand:VEC_ALL1REG_MODE 1 "gcn_vop3_operand") - (match_operand:VEC_ALL1REG_MODE 2 "gcn_alu_operand") +(define_expand "vcondu" + [(match_operand:VEC_ALLREG_MODE 0 "register_operand") + (match_operand:VEC_ALLREG_MODE 1 "gcn_vop3_operand") + (match_operand:VEC_ALLREG_MODE 2 "gcn_alu_operand") (match_operator 3 "comparison_operator" - [(match_operand:VEC_1REG_INT_ALT 4 "gcn_alu_operand") - (match_operand:VEC_1REG_INT_ALT 5 "gcn_vop3_operand")])] + [(match_operand:VEC_ALLREG_INT_MODE 4 "gcn_alu_operand") + (match_operand:VEC_ALLREG_INT_MODE 5 "gcn_vop3_operand")])] "" { rtx tmp = gen_reg_rtx (DImode); - emit_insn (gen_vec_cmpdi + emit_insn (gen_vec_cmpudi (tmp, operands[3], operands[4], operands[5])); - emit_insn (gen_vcond_mask_di + emit_insn (gen_vcond_mask_di (operands[0], operands[1], operands[2], tmp)); DONE; }) -(define_expand "vcondu_exec" - [(match_operand:VEC_ALL1REG_MODE 0 "register_operand") - (match_operand:VEC_ALL1REG_MODE 1 "gcn_vop3_operand") - (match_operand:VEC_ALL1REG_MODE 2 "gcn_alu_operand") +(define_expand "vcondu_exec" + [(match_operand:VEC_ALLREG_MODE 0 "register_operand") + (match_operand:VEC_ALLREG_MODE 1 "gcn_vop3_operand") + (match_operand:VEC_ALLREG_MODE 2 "gcn_alu_operand") (match_operator 3 "comparison_operator" - [(match_operand:VEC_1REG_INT_ALT 4 "gcn_alu_operand") - (match_operand:VEC_1REG_INT_ALT 5 "gcn_vop3_operand")]) + [(match_operand:VEC_ALLREG_INT_MODE 4 "gcn_alu_operand") + (match_operand:VEC_ALLREG_INT_MODE 5 "gcn_vop3_operand")]) (match_operand:DI 6 "gcn_exec_reg_operand" "e")] "" { rtx tmp = gen_reg_rtx (DImode); - emit_insn (gen_vec_cmpdi_exec + emit_insn (gen_vec_cmpudi_exec (tmp, operands[3], operands[4], operands[5], operands[6])); - emit_insn (gen_vcond_mask_di + emit_insn (gen_vcond_mask_di (operands[0], operands[1], operands[2], tmp)); DONE; }) diff --git a/gcc/config/gcn/gcn.c b/gcc/config/gcn/gcn.c index 4056f72..c78df1d 100644 --- a/gcc/config/gcn/gcn.c +++ b/gcc/config/gcn/gcn.c @@ -5939,10 +5939,10 @@ print_operand (FILE *file, rtx x, int code) switch (GET_MODE_SIZE (mode)) { case 1: - s = "32"; - break; + output_operand_lossage ("operand %%xn code invalid for QImode"); + return; case 2: - s = float_p ? "16" : "32"; + s = "16"; break; case 4: s = "32"; diff --git a/gcc/config/gcn/gcn.md b/gcc/config/gcn/gcn.md index 914a43a..a470536 100644 --- a/gcc/config/gcn/gcn.md +++ b/gcc/config/gcn/gcn.md @@ -360,7 +360,9 @@ (not "one_cmpl") (popcount "popcount") (clz "clz") - (ctz "ctz")]) + (ctz "ctz") + (sign_extend "extend") + (zero_extend "zero_extend")]) ;; }}} ;; {{{ Miscellaneous instructions -- 2.7.4