From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2050) id 4CD8638515F8; Wed, 26 May 2021 06:37:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CD8638515F8 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: qu To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1060] C-SKY: Support fldrd/fstrd for fpuv2 and fldr.64/fstr.64 for fpuv3. X-Act-Checkin: gcc X-Git-Author: Geng Qi X-Git-Refname: refs/heads/master X-Git-Oldrev: 4553b95516176d578aa6ce81499509f6ec099bdb X-Git-Newrev: 41eba35b08a9bbd1f06b15e74942a94ea838d8cf Message-Id: <20210526063718.4CD8638515F8@sourceware.org> Date: Wed, 26 May 2021 06:37:18 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 06:37:18 -0000 https://gcc.gnu.org/g:41eba35b08a9bbd1f06b15e74942a94ea838d8cf commit r12-1060-g41eba35b08a9bbd1f06b15e74942a94ea838d8cf Author: Geng Qi Date: Wed May 26 11:29:19 2021 +0800 C-SKY: Support fldrd/fstrd for fpuv2 and fldr.64/fstr.64 for fpuv3. gcc/ChangeLog: * config/csky/csky.c (ck810_legitimate_index_p): Support "base + index" with DF mode. * config/csky/constraints.md ("Y"): New constraint for memory operands without index register. * config/csky/csky_insn_fpuv2.md (fpuv3_movdf): Use "Y" instead of "m" when mov between memory and general registers, and lower their priority. * config/csky/csky_insn_fpuv3.md (fpuv2_movdf): Likewise. gcc/testsuite/ChangeLog: * gcc.target/csky/fldrd_fstrd.c: New. * gcc.target/csky/fpuv3/fldr64_fstr64.c: New. Diff: --- gcc/config/csky/constraints.md | 4 ++++ gcc/config/csky/csky.c | 3 ++- gcc/config/csky/csky_insn_fpuv2.md | 4 ++-- gcc/config/csky/csky_insn_fpuv3.md | 16 ++++++++-------- gcc/testsuite/gcc.target/csky/fldrd_fstrd.c | 17 +++++++++++++++++ gcc/testsuite/gcc.target/csky/fpuv3/fldr64_fstr64.c | 18 ++++++++++++++++++ 6 files changed, 51 insertions(+), 11 deletions(-) diff --git a/gcc/config/csky/constraints.md b/gcc/config/csky/constraints.md index c9bc9f24a62..2641ab3961b 100644 --- a/gcc/config/csky/constraints.md +++ b/gcc/config/csky/constraints.md @@ -38,6 +38,10 @@ "Memory operands with base register, index register" (match_test "csky_valid_mem_constraint_operand (op, \"W\")")) +(define_memory_constraint "Y" + "Memory operands without index register" + (not (match_test "csky_valid_mem_constraint_operand (op, \"W\")"))) + (define_constraint "R" "Memory operands whose address is a label_ref" (and (match_code "mem") diff --git a/gcc/config/csky/csky.c b/gcc/config/csky/csky.c index 2b44edf2549..c0e42a26026 100644 --- a/gcc/config/csky/csky.c +++ b/gcc/config/csky/csky.c @@ -3152,7 +3152,8 @@ ck810_legitimate_index_p (machine_mode mode, rtx index, int strict_p) /* The follow index is for ldr instruction, the ldr cannot load dword data, so the mode size should not be larger than 4. */ - else if (GET_MODE_SIZE (mode) <= 4) + else if (GET_MODE_SIZE (mode) <= 4 + || (TARGET_HARD_FLOAT && CSKY_VREG_MODE_P (mode))) { if (is_csky_address_register_rtx_p (index, strict_p)) return 1; diff --git a/gcc/config/csky/csky_insn_fpuv2.md b/gcc/config/csky/csky_insn_fpuv2.md index d56b61f4032..7bab99ea6b3 100644 --- a/gcc/config/csky/csky_insn_fpuv2.md +++ b/gcc/config/csky/csky_insn_fpuv2.md @@ -480,8 +480,8 @@ ) (define_insn "*fpuv2_movdf" - [(set (match_operand:DF 0 "nonimmediate_operand" "=r,r, r,m, v,?r,Q,v,v,v") - (match_operand:DF 1 "general_operand" " r,m,mF,r,?r, v,v,Q,v,m"))] + [(set (match_operand:DF 0 "nonimmediate_operand" "=r, v,?r,Q,v,v,v,r, r,Y") + (match_operand:DF 1 "general_operand" " r,?r, v,v,Q,v,m,Y,YF,r"))] "CSKY_ISA_FEATURE (fpv2_df)" "* return csky_output_movedouble(operands, DFmode);" [(set (attr "length") diff --git a/gcc/config/csky/csky_insn_fpuv3.md b/gcc/config/csky/csky_insn_fpuv3.md index b5f47980fa6..7b9d4a7e0f4 100644 --- a/gcc/config/csky/csky_insn_fpuv3.md +++ b/gcc/config/csky/csky_insn_fpuv3.md @@ -90,27 +90,27 @@ ) (define_insn "*fpv3_movdf" - [(set (match_operand:DF 0 "nonimmediate_operand" "=r,r, r,m,v,?r,Q,v,v,v, v") - (match_operand:DF 1 "general_operand" " r,m,mF,r,?r,v,v,Q,v,m,Dv"))] + [(set (match_operand:DF 0 "nonimmediate_operand" "=r, v,?r,Q,v,v,v, v,r, r,Y") + (match_operand:DF 1 "general_operand" " r,?r, v,v,Q,v,m,Dv,Y,YF,r"))] "CSKY_ISA_FEATURE(fpv3_df)" "* switch (which_alternative) { - case 4: + case 1: if (TARGET_BIG_ENDIAN) return \"fmtvr.64\\t%0, %R1, %1\"; return \"fmtvr.64\\t%0, %1, %R1\"; - case 5: + case 2: if (TARGET_BIG_ENDIAN) return \"fmfvr.64\\t%R0, %0, %1\"; return \"fmfvr.64\\t%0, %R0, %1\"; + case 3: + case 4: case 6: - case 7: - case 9: return fpuv3_output_move(operands); - case 8: + case 5: return \"fmov.64\\t%0, %1\"; - case 10: + case 7: return \"fmovi.64\\t%0, %1\"; default: return csky_output_movedouble(operands, DFmode); diff --git a/gcc/testsuite/gcc.target/csky/fldrd_fstrd.c b/gcc/testsuite/gcc.target/csky/fldrd_fstrd.c new file mode 100644 index 00000000000..024de18f98c --- /dev/null +++ b/gcc/testsuite/gcc.target/csky/fldrd_fstrd.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-csky-options "-mcpu=ck810f -O1 -mhard-float" } */ + +double fldrd (double *pd, int index) +{ + return pd[index]; +} + +/* { dg-final { scan-assembler "fldrd" } } */ + +void fstrd (double *pd, int index, double d) +{ + pd[index] = d; +} + +/* { dg-final { scan-assembler "fstrd" } } */ + diff --git a/gcc/testsuite/gcc.target/csky/fpuv3/fldr64_fstr64.c b/gcc/testsuite/gcc.target/csky/fpuv3/fldr64_fstr64.c new file mode 100644 index 00000000000..cd367e50865 --- /dev/null +++ b/gcc/testsuite/gcc.target/csky/fpuv3/fldr64_fstr64.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-skip-if "test is specific to ck860f" { csky-*-* } { "*" } { "-mcpu=ck860*f* -mfloat-abi=hard" "-mcpu=ck860*f* -mhard-float" } } */ +/* { dg-options "-O1 -mfpu=fpv3" } */ + +double fldr64 (double *pd, int index) +{ + return pd[index]; +} + +/* { dg-final { scan-assembler "fldr.64" } } */ + +void fstr64 (double *pd, int index, double d) +{ + pd[index] = d; +} + +/* { dg-final { scan-assembler "fstr.64" } } */ +