OpenRISC updates for 10 (fpu, fixes)
v3 cover OpenRISC updates for 10 (fpu, fixes)
Hello,
New since v2:
- Fix comment formatting pointed out by Segher in valatile patch
- Fix issue and add test for rotrsi3 options pointed out by Segher
- Fix issue with reg mask for doubles being backwards Pointed out by Segher and Richard.
New since v1:
- Changed 64-bit FPU operations to use explicit register pairs as per spec revision suggested by Richard Henderson.
- Added patch for new -mrori option
- Added patch for msoft-div fix from other series (no changes)
- Fixed volatile spelling pointed out by Bernhard Reutner-Fischer <[email protected]>
This is a set of patches to bring FPU support to the OpenRISC backend. The backend also add support for 64-bit floating point operations on 32-bit cores using register pairs, see orfpx64a32 [0].
This binutils patches are already upstream.
The toolchain has been tested using the gcc and binutils testsuites as well as floating point test suites running on sim and an fpga soft core or1k_marocchino.
[1]
I have also included a few fixes to PRs:
- 90362 or1k: Soft divide does not work correctly
- 90363 or1k: Extra mask insn after load from memory
This whole patch series can be found on my github repo [2] as well.
If all is OK, I plan to commit these to master (gcc 10). Then back port the PR fixes to the GCC 9 branch, I will ask for guidance when I start to do the backporting.
-Stafford
[0] https://openrisc.io/proposals/orfpx64a32
[1] https://github.com/openrisc/or1k_marocchino
[2] git at github.com:stffrdhrn/gcc.git or1k-fpu-3
*** BLURB HERE ***
Stafford Horne (5):
or1k: Fix code quality for volatile memory loads
or1k: Fix issues with msoft-div
or1k: Add mrori option, fix option docs
or1k: Initial support for FPU
or1k: only force reg for immediates
gcc/config.gcc | 2 + gcc/config/or1k/constraints.md | 4 + gcc/config/or1k/elf.opt | 6 +- gcc/config/or1k/or1k.c | 50 +++++++-- gcc/config/or1k/or1k.h | 3 + gcc/config/or1k/or1k.md | 131 ++++++++++++++++++++-- gcc/config/or1k/or1k.opt | 78 +++++++++---- gcc/config/or1k/predicates.md | 30 +++++ gcc/doc/invoke.texi | 77 ++++++++----- gcc/testsuite/gcc.target/or1k/div-mul-3.c | 31 +++++ gcc/testsuite/gcc.target/or1k/ror-4.c | 8 ++ gcc/testsuite/gcc.target/or1k/ror-5.c | 9 ++ gcc/testsuite/gcc.target/or1k/shftimm-1.c | 8 +- gcc/testsuite/gcc.target/or1k/swap-1.c | 70 ++++++++++++ gcc/testsuite/gcc.target/or1k/swap-2.c | 47 ++++++++ libgcc/config/or1k/lib1funcs.S | 6 +- 16 files changed, 484 insertions(+), 76 deletions(-) create mode 100644 gcc/testsuite/gcc.target/or1k/div-mul-3.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-4.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-5.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-1.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-2.c
Signature · 1 line
2.21.0
PATCH v3 1/5 or1k: Fix code quality for volatile memory loads
Volatile memory does not match the memory_operand predicate. This causes extra extend/mask instructions instructions when reading from volatile memory. On OpenRISC loading volatile memory can be treated the same as regular memory loads which supports combined sign/zero extends. Fixing this eliminates the need for extra extend/mask instructions.
This also adds a test provided by Richard Selvaggi which uncovered the issue while we were looking into another issue.
gcc/ChangeLog:
PR target/90363
* config/or1k/or1k.md (zero_extend<mode>si2): Update predicate. (extend<mode>si2): Update predicate.
* gcc/config/or1k/predicates.md (volatile_mem_operand): New. (reg_or_mem_operand): New.
gcc/testsuite/ChangeLog:
PR target/90363
* gcc.target/or1k/swap-1.c: New test.
* gcc.target/or1k/swap-2.c: New test.
---
Changes since v2:
- Fix comment format issue, pointed out by Segher
gcc/config/or1k/or1k.md | 6 +-- gcc/config/or1k/predicates.md | 18 +++++++ gcc/testsuite/gcc.target/or1k/swap-1.c | 70 ++++++++++++++++++++++++++ gcc/testsuite/gcc.target/or1k/swap-2.c | 47 +++++++++++++++++ 4 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/or1k/swap-1.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-2.c
gcc/config/or1k/or1k.md +3 -3
@@ -328,11 +328,11 @@ ;; Sign Extending ;; ------------------------------------------------------------------------- -;; Zero extension can always be done with AND and an extending load. +;; Zero extension can always be done with AND or an extending load. (define_insn "zero_extend<mode>si2" [(set (match_operand:SI 0 "register_operand" "=r,r") - (zero_extend:SI (match_operand:I12 1 "nonimmediate_operand" "r,m")))] + (zero_extend:SI (match_operand:I12 1 "reg_or_mem_operand" "r,m")))] "" "@ l.andi\t%0, %1, <zext_andi>
@@ -344,7 +344,7 @@ (define_insn "extend<mode>si2" [(set (match_operand:SI 0 "register_operand" "=r,r") - (sign_extend:SI (match_operand:I12 1 "nonimmediate_operand" "r,m")))] + (sign_extend:SI (match_operand:I12 1 "reg_or_mem_operand" "r,m")))] "TARGET_SEXT" "@ l.ext<ldst>s\t%0, %1
gcc/config/or1k/predicates.md +18 -0
@@ -82,3 +82,21 @@ (define_predicate "equality_comparison_operator" (match_code "ne,eq")) + +;; Borrowed from rs6000 +;; Return true if the operand is in volatile memory. Note that during the +;; RTL generation phase, memory_operand does not return TRUE for volatile +;; memory references. So this function allows us to recognize volatile +;; references where it's safe. +(define_predicate "volatile_mem_operand" + (and (match_code "mem") + (match_test "MEM_VOLATILE_P (op)") + (if_then_else (match_test "reload_completed") + (match_operand 0 "memory_operand") + (match_test "memory_address_p (mode, XEXP (op, 0))")))) + +;; Return true if the operand is a register or memory; including volatile +;; memory. +(define_predicate "reg_or_mem_operand" + (ior (match_operand 0 "nonimmediate_operand") + (match_operand 0 "volatile_mem_operand")))
gcc/testsuite/gcc.target/or1k/swap-1.c new file +70 -0
70 lines not on this page · raw message
gcc/testsuite/gcc.target/or1k/swap-2.c new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v3 2/5 or1k: Fix issues with msoft-div
In reply to Stafford HorneFixes bad assembly logic with software divide as reported by Richard Selvaggi. Also, add a basic test to verify the soft math works when enabled.
gcc/testsuite/ChangeLog:
PR target/90362 * gcc.target/or1k/div-mul-3.c: New test.
libgcc/ChangeLog:
PR target/90362
* config/or1k/lib1funcs.S (__udivsi3): Change l.sfeqi to l.sfeq and l.sfltsi to l.sflts equivalents as the immediate instructions are not available on every processor. Change a l.bnf to l.bf to fix logic issue.
--- gcc/testsuite/gcc.target/or1k/div-mul-3.c | 31 +++++++++++++++++++++++ libgcc/config/or1k/lib1funcs.S | 6 ++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/or1k/div-mul-3.c
gcc/testsuite/gcc.target/or1k/div-mul-3.c new file +31 -0
@@ -0,0 +1,31 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -msoft-div -msoft-mul" } */ + +struct testcase { +int a; +int b; +int c; +int expected; +}; + +struct testcase tests[] = { + {2 ,200 ,3 ,133 }, + {3 ,300 ,3 ,300 }, + {2 ,500 ,3 ,333 }, + {4 ,250 ,3 ,333 }, + {0 ,0 ,0 ,0 } +}; + +int calc (int a,int b,int c) { +return a * b / c; +} + +int main () { +int fail =0 ; +struct testcase *tc; + +for (int i =0 ; (tc = &tests[i], tc->c); i++) + fail |= (calc (tc->a, tc->b, tc->c) != tc->expected); + +return fail; +}
libgcc/config/or1k/lib1funcs.S +3 -3
@@ -68,18 +68,18 @@ __udivmodsi3_internal: is not clobbered by this routine, and use that as to save a return address without creating a stack frame. */ - l.sfeqi r4, 0 /* division by zero; return 0. */ + l.sfeq r4, r0 /* division by zero; return 0. */ l.ori r11, r0, 0 /* initial quotient */ l.bf 9f l.ori r12, r3, 0 /* initial remainder */ /* Given X/Y, shift Y left until Y >= X. */ l.ori r6, r0, 1 /* mask = 1 */ -1: l.sfltsi r4, 0 /* y has msb set */ +1: l.sflts r4, r0 /* y has msb set */ l.bf 2f l.sfltu r4, r12 /* y < x */ l.add r4, r4, r4 /* y <<= 1 */ - l.bnf 1b + l.bf 1b l.add r6, r6, r6 /* mask <<= 1 */ /* Shift Y back to the right again, subtracting from X. */
Signature · 1 line
2.21.0
PATCH v3 3/5 or1k: Add mrori option, fix option docs
In reply to Stafford Hornegcc/ChangeLog:
* config.gcc (or1k*-*-*): Add mrori and mror to validation.
* doc/invoke.texi (OpenRISC Options): Add mrori option, rewrite all documenation to be more clear.
* config/or1k/elf.opt (mboard=, mnewlib): Rewrite documentation to be more clear.
* config/or1k/or1k.opt (mrori): New option.
(mhard-div, msoft-div, mhard-mul, msoft-mul, mcmov, mror, msext, msfimm, mshftimm): Rewrite documentation to be more clear.
* config/or1k/predicates.md (ror_reg_or_u6_operand): New predicate.
* config/or1k/or1k.md (insn_support): Add ror and rori. (enabled): Add conditions for ror and rori.
(rotrsi3): Replace condition for shftimm with ror and rori.
gcc/testsuite/ChangeLog:
* gcc.target/or1k/ror-4.c: New file.
* gcc.target/or1k/ror-5.c: New file.
* gcc.target/or1k/shftimm-1.c: Update test from rotate to shift as the shftimm option no longer controls rotate.
---
Changes since v2:
- Fix issue with ror predicate pointed out by Segher.
- Added ror-5.c test to confirm/fix ICE.
gcc/config.gcc | 1 + gcc/config/or1k/elf.opt | 6 +-- gcc/config/or1k/or1k.md | 14 ++++-- gcc/config/or1k/or1k.opt | 56 +++++++++++++---------- gcc/config/or1k/predicates.md | 7 +++ gcc/doc/invoke.texi | 56 +++++++++++++---------- gcc/testsuite/gcc.target/or1k/ror-4.c | 8 ++++ gcc/testsuite/gcc.target/or1k/ror-5.c | 9 ++++ gcc/testsuite/gcc.target/or1k/shftimm-1.c | 8 ++-- 9 files changed, 104 insertions(+), 61 deletions(-) create mode 100644 gcc/testsuite/gcc.target/or1k/ror-4.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-5.c
gcc/config.gcc +1 -0
@@ -2578,6 +2578,7 @@ or1k*-*-*) for or1k_multilib in ${or1k_multilibs}; do case ${or1k_multilib} in mcmov | msext | msfimm | \ + mror | mrori | \ mhard-div | mhard-mul | \ msoft-div | msoft-mul ) TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},${or1k_multilib}"
gcc/config/or1k/elf.opt +3 -3
@@ -25,9 +25,9 @@ mboard= Target RejectNegative Joined -Configure board specific runtime. +Configure the newlib board specific runtime. The default is or1ksim. mnewlib Target RejectNegative -For compatibility, it's always newlib for elf now. - +This option is ignored; it is provided for compatibility purposes only. This +used to select linker and preprocessor options for use with newlib.
gcc/config/or1k/or1k.md +9 -5
@@ -63,7 +63,7 @@ "alu,st,ld,control,multi" (const_string "alu")) -(define_attr "insn_support" "class1,sext,sfimm,shftimm" (const_string "class1")) +(define_attr "insn_support" "class1,sext,sfimm,shftimm,ror,rori" (const_string "class1")) (define_attr "enabled" "" (cond [(eq_attr "insn_support" "class1") (const_int 1)
@@ -72,7 +72,11 @@ (and (eq_attr "insn_support" "sfimm") (ne (symbol_ref "TARGET_SFIMM") (const_int 0))) (const_int 1) (and (eq_attr "insn_support" "shftimm") - (ne (symbol_ref "TARGET_SHFTIMM") (const_int 0))) (const_int 1)] + (ne (symbol_ref "TARGET_SHFTIMM") (const_int 0))) (const_int 1) + (and (eq_attr "insn_support" "ror") + (ne (symbol_ref "TARGET_ROR") (const_int 0))) (const_int 1) + (and (eq_attr "insn_support" "rori") + (ne (symbol_ref "TARGET_RORI") (const_int 0))) (const_int 1)] (const_int 0))) ;; Describe a user's asm statement.
@@ -178,12 +182,12 @@ (define_insn "rotrsi3" [(set (match_operand:SI 0 "register_operand" "=r,r") (rotatert:SI (match_operand:SI 1 "register_operand" "r,r") - (match_operand:SI 2 "reg_or_u6_operand" "r,n")))] - "TARGET_ROR" + (match_operand:SI 2 "ror_reg_or_u6_operand" "r,n")))] + "TARGET_ROR || TARGET_RORI" "@ l.ror\t%0, %1, %2 l.rori\t%0, %1, %2" - [(set_attr "insn_support" "*,shftimm")]) + [(set_attr "insn_support" "ror,rori")]) (define_insn "andsi3" [(set (match_operand:SI 0 "register_operand" "=r,r")
gcc/config/or1k/or1k.opt +32 -24
79 lines not on this page · raw message
gcc/config/or1k/predicates.md +7 -0
@@ -53,6 +53,13 @@ (match_test "INTVAL (op) >= -32768 && INTVAL (op) <= 32767") (match_operand 0 "register_operand"))) +(define_predicate "ror_reg_or_u6_operand" + (if_then_else (match_code "const_int") + (and (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 0x3f") + (match_test "TARGET_RORI")) + (and (match_operand 0 "register_operand") + (match_test "TARGET_ROR")))) + (define_predicate "call_insn_operand" (ior (match_code "symbol_ref") (match_operand 0 "register_operand")))
gcc/doc/invoke.texi +31 -25
88 lines not on this page · raw message
gcc/testsuite/gcc.target/or1k/ror-4.c new file +8 -0
@@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-options "-mrori -O2" } */ + +unsigned int rotate6 (unsigned int a) { +return ( a >>6 ) | ( a << (32 -6 ) ); +} + +/* { dg-final { scan-assembler "l.rori" } } */
gcc/testsuite/gcc.target/or1k/ror-5.c new file +9 -0
@@ -0,0 +1,9 @@ +/* { dg-do compile } */ +/* { dg-options "-mrori -O2" } */ +/* { dg-skip-if "" { *-*-* } { "-mror" } { "" } } */ + +unsigned int rotate (unsigned int a,int b) { +return ( a >> b ) | ( a << (32 - b ) ); +} + +/* { dg-final { scan-assembler-not "l.ror" } } */
gcc/testsuite/gcc.target/or1k/shftimm-1.c +4 -4
@@ -1,8 +1,8 @@/* { dg-do compile } */ -/* { dg-options "-mror -mshftimm -O2" } */ +/* { dg-options "-mshftimm -O2" } */ -unsigned int rotate6 (unsigned int a) { -return ( a >>6 ) | ( a << (32 -6 ) ); +unsigned int shift6 (unsigned int a) { +return a <<6 ; } -/* { dg-final { scan-assembler "l.rori" } } */ +/* { dg-final { scan-assembler "l.slli" } } */
Signature · 1 line
2.21.0
PATCH v3 4/5 or1k: Initial support for FPU
In reply to Stafford HorneThis adds support for OpenRISC hardware floating point instructions. This is enabled with the -mhard-float option.
Double-prevision floating point operations work using register pairing as specified in: https://openrisc.io/proposals/orfpx64a32. This has just been added in the OpenRISC architecture specification 1.3.
This is enabled with the -mdouble-float option.
Not all architectures support unordered comparisons so an option, -munordered-float is added.
Currently OpenRISC does not support sf/df or df/sf conversions, but this has also just been added in architecture specification 1.3.
gcc/ChangeLog:
* config.gcc (or1k*-*-*): Add mhard-float, mdouble-float, msoft-float and munordered-float validations.
* config/or1k/constraints.md (d): New register constraint.
* config/or1k/predicates.md (fp_comparison_operator): New.
* config/or1k/or1k.c (or1k_print_operand): Add support for printing 'd' operands.
(or1k_expand_compare): Normalize unordered comparisons.
* config/or1k/or1k.h (reg_class): Define DOUBLE_REGS. (REG_CLASS_NAMES): Add "DOUBLE_REGS". (REG_CLASS_CONTENTS): Add contents for DOUBLE_REGS.
* config/or1k/or1k.md (type): Add fpu.
(fpu): New instruction reservation.
(F, f, fr, fi, FI, FOP, fop): New.
(<fop><F:mode>3): New ALU instruction definition. (float<fi><F:mode>2): New conversion instruction definition. (fix_trunc<F:mode><fi>2): New conversion instruction definition. (fpcmpcc): New code iterator.
(*sf_fp_insn): New instruction definition. (cstore<F:mode>4): New expand definition. (cbranch<F:mode>4): New expand definition.
* config/or1k/or1k.opt (msoft-float, mhard-float, mdouble-float, munordered-float): New options.
* doc/invoke.texi: Document msoft-float, mhard-float, mdouble-float and munordered-float.
---
Changes since v2:
- Fix wrong order in double reg mask.
gcc/config.gcc | 1 + gcc/config/or1k/constraints.md | 4 ++ gcc/config/or1k/or1k.c | 38 ++++++++++- gcc/config/or1k/or1k.h | 3 + gcc/config/or1k/or1k.md | 111 ++++++++++++++++++++++++++++++++- gcc/config/or1k/or1k.opt | 22 +++++++ gcc/config/or1k/predicates.md | 5 ++ gcc/doc/invoke.texi | 21 +++++++ 8 files changed, 201 insertions(+), 4 deletions(-)
gcc/config.gcc +1 -0
@@ -2579,6 +2579,7 @@ or1k*-*-*) case ${or1k_multilib} in mcmov | msext | msfimm | \ mror | mrori | \ + mhard-float | mdouble-float | munordered-float | msoft-float | \ mhard-div | mhard-mul | \ msoft-div | msoft-mul ) TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},${or1k_multilib}"
gcc/config/or1k/constraints.md +4 -0
@@ -24,6 +24,7 @@ ; We use: ; c - sibcall registers +; d - double pair base registers (excludes r0, r30 and r31 which overflow) ; I - constant signed 16-bit ; K - constant unsigned 16-bit ; M - constant signed 16-bit shifted left 16-bits (l.movhi)
@@ -32,6 +33,9 @@ (define_register_constraint "c" "SIBCALL_REGS" "Registers which can hold a sibling call address") +(define_register_constraint "d" "DOUBLE_REGS" + "Registers which can be used for double reg pairs.") + ;; Immediates (define_constraint "I" "A signed 16-bit immediate in the range -32768 to 32767."
gcc/config/or1k/or1k.c +36 -2
@@ -1226,6 +1226,19 @@ or1k_print_operand (FILE *file, rtx x, int code)output_operand_lossage ("invalid %%H value" );break ; +case 'd' : +if (REG_P (x)) + { +if (GET_MODE (x) == DFmode ||GET_MODE (x) == DImode) +fprintf (file,"%s,%s" , reg_names[REGNO (operand)], + reg_names[REGNO (operand) +1 ]); +else +fprintf (file,"%s" , reg_names[REGNO (operand)]); + } +else +output_operand_lossage ("invalid %%d value" ); +break ; +case 'h' :print_reloc (file, x,0 ,RKIND_HI );break ;
@@ -1435,21 +1448,42 @@ void or1k_expand_compare (rtx *operands) {rtx sr_f =gen_rtx_REG (BImode,SR_F_REGNUM ); +rtx_code cmp_code =GET_CODE (operands[0 ]); +bool flag_check_ne = true;/* The RTL may receive an immediate in argument 1 of the compare, this is not supported unless we have l.sf*i instructions, force them into registers. */ if (!TARGET_SFIMM )XEXP (operands[0 ],1 ) =force_reg (SImode,XEXP (operands[0 ],1 )); +/* Normalize comparison operators to ones OpenRISC support. */ +switch (cmp_code) + { +case LTGT : + cmp_code =UNEQ ; + flag_check_ne = false; +break ; + +case ORDERED : + cmp_code =UNORDERED ; + flag_check_ne = false; +break ; + +default : +break ; + } +/* Emit the given comparison into the Flag bit. */ PUT_MODE (operands[0 ], BImode); +PUT_CODE (operands[0 ], cmp_code);emit_insn (gen_rtx_SET (sr_f, operands[0 ]));/* Adjust the operands for use in the caller. */ - operands[0 ] =gen_rtx_NE (VOIDmode, sr_f, const0_rtx); + operands[0 ] = flag_check_ne ?gen_rtx_NE (VOIDmode, sr_f, const0_rtx) + :gen_rtx_EQ (VOIDmode, sr_f, const0_rtx); operands[1 ] = sr_f; operands[2 ] = const0_rtx; -} + }/* Expand the patterns "call", "sibcall", "call_value" and "sibcall_value". Expands a function call where argument RETVAL is an optional RTX providing
gcc/config/or1k/or1k.h +3 -0
@@ -189,6 +189,7 @@ enum reg_class {NO_REGS ,SIBCALL_REGS , +DOUBLE_REGS ,GENERAL_REGS ,FLAG_REGS , ALL_REGS,
@@ -200,6 +201,7 @@ enum reg_class#define REG_CLASS_NAMES { \ "NO_REGS", \ "SIBCALL_REGS", \ + "DOUBLE_REGS", \ "GENERAL_REGS", \ "FLAG_REGS", \ "ALL_REGS" }
@@ -212,6 +214,7 @@ enum reg_class#define REG_CLASS_CONTENTS \ { { 0x00000000, 0x00000000 }, \ { SIBCALL_REGS_MASK, 0 }, \ + { 0x7f7ffffe, 0x00000000 }, \ { 0xffffffff, 0x00000003 }, \ { 0x00000000, 0x00000004 }, \ { 0xffffffff, 0x00000007 } \
gcc/config/or1k/or1k.md +109 -2
153 lines not on this page · raw message
gcc/config/or1k/or1k.opt +22 -0
@@ -41,6 +41,28 @@ Target RejectNegative Mask(SOFT_MUL). Enable generation of binaries which use functions from libgcc to perform multiply operations. The default is -mhard-mul. +msoft-float +Target RejectNegative InverseMask(HARD_FLOAT) +Enable generation of binaries which use functions from libgcc to perform +floating point operations. This is the default; use -mhard-float to override. + +mhard-float +Target RejectNegative Mask(HARD_FLOAT) +Enable generation of hardware floating point instructions. The default is +-msoft-float. + +mdouble-float +Target Mask(DOUBLE_FLOAT) +When -mhard-float is selected, enables generation of double-precision floating +point instructions. By default functions from libgcc are used to perform +double-precision floating point operations. + +munordered-float +Target RejectNegative Mask(FP_UNORDERED) +When -mhard-float is selected, enables generation of unordered floating point +compare and set flag (lf.sfun*) instructions. By default functions from libgcc +are used to perform unordered floating point compare and set flag operations. + mcmov Target RejectNegative Mask(CMOV) Enable generation of conditional move (l.cmov) instructions. By default the
gcc/config/or1k/predicates.md +5 -0
@@ -90,6 +90,11 @@ (define_predicate "equality_comparison_operator" (match_code "ne,eq")) +(define_predicate "fp_comparison_operator" + (if_then_else (match_test "TARGET_FP_UNORDERED") + (match_operand 0 "comparison_operator") + (match_operand 0 "ordered_comparison_operator"))) + ;; Borrowed from rs6000 ;; Return true if the operand is in volatile memory. Note that during the ;; RTL generation phase, memory_operand does not return TRUE for volatile
gcc/doc/invoke.texi +21 -0
@@ -1033,6 +1033,7 @@ Objective-C and Objective-C++ Dialects}. @emph{OpenRISC Options} @gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol -msoft-mul -msoft-div @gol +-msoft-float -mhard-float -mdouble-float -munordered-float @gol -mcmov -mror -mrori -msext -msfimm -mshftimm} @emph{PDP-11 Options}
@@ -23649,6 +23650,26 @@ This default is hardware divide. Select software or hardware multiply (@code{l.mul}, @code{l.muli}) instructions. This default is hardware multiply. + at item -msoft-float + at itemx -mhard-float + at opindex msoft-float + at opindex mhard-float +Select software or hardware for floating point operations. +The default is software. + + at item -mdouble-float + at opindex mdouble-float +When @option{-mhard-float} is selected, enables generation of double-precision +floating point instructions. By default functions from @file{libgcc} are used +to perform double-precision floating point operations. + + at item -munordered-float + at opindex munordered-float +When @option{-mhard-float} is selected, enables generation of unordered +floating point compare and set flag (@code{lf.sfun*}) instructions. By default +functions from @file{libgcc} are used to perform unordered floating point +compare and set flag operations. + @item -mcmov @opindex mcmov Enable generation of conditional move (@code{l.cmov}) instructions. By
Signature · 1 line
2.21.0
PATCH v3 5/5 or1k: only force reg for immediates
In reply to Stafford HorneThe force_reg in or1k_expand_compare is hard coded for SImode, which is fine as this used to only be used on SI expands. However, with FP support this will cause issues. In general we should only force the right hand operand to a register if its an immediate. This patch adds an condition to check for that.
gcc/ChangeLog:
* config/or1k/or1k.c (or1k_expand_compare): Check for int before force_reg.
--- gcc/config/or1k/or1k.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
gcc/config/or1k/or1k.c +6 -4
@@ -1448,13 +1448,15 @@ void or1k_expand_compare (rtx *operands) {rtx sr_f =gen_rtx_REG (BImode,SR_F_REGNUM ); +rtx righthand_op =XEXP (operands[0 ],1 );rtx_code cmp_code =GET_CODE (operands[0 ]);bool flag_check_ne = true; -/* The RTL may receive an immediate in argument 1 of the compare, this is not -supported unless we have l.sf*i instructions, force them into registers. */ -if (!TARGET_SFIMM ) -XEXP (operands[0 ],1 ) =force_reg (SImode,XEXP (operands[0 ],1 )); +/* Integer RTL may receive an immediate in argument 1 of the compare, this is +not supported unless we have l.sf*i instructions, force them into +registers. */ +if (!TARGET_SFIMM &&CONST_INT_P (righthand_op)) +XEXP (operands[0 ],1 ) =force_reg (SImode, righthand_op);/* Normalize comparison operators to ones OpenRISC support. */ switch (cmp_code)
Signature · 1 line
2.21.0
v3 cover OpenRISC updates for 10 (fpu, fixes)
In reply to Stafford HorneQuoted 28 lines · Stafford Horne
Hello,
New since v2:
- Fix comment formatting pointed out by Segher in valatile patch
- Fix issue and add test for rotrsi3 options pointed out by Segher
- Fix issue with reg mask for doubles being backwards Pointed out by Segher and Richard.New since v1:
- Changed 64-bit FPU operations to use explicit register pairs as per spec revision suggested by Richard Henderson.
- Added patch for new -mrori option
- Added patch for msoft-div fix from other series (no changes)
- Fixed volatile spelling pointed out by Bernhard Reutner-Fischer <[email protected]>This is a set of patches to bring FPU support to the OpenRISC backend. The backend also add support for 64-bit floating point operations on 32-bit cores using register pairs, see orfpx64a32 [0].
This binutils patches are already upstream.
The toolchain has been tested using the gcc and binutils testsuites as well as floating point test suites running on sim and an fpga soft core
or1k_marocchino.
[1]I have also included a few fixes to PRs:
Quoted 8 lines
- 90362 or1k: Soft divide does not work correctly
- 90363 or1k: Extra mask insn after load from memoryThis whole patch series can be found on my github repo [2] as well.
If all is OK, I plan to commit these to master (gcc 10). Then back port the PR fixes to the GCC 9 branch, I will ask for guidance when I start to do the backporting.
Hello,
Is there any concern if I commit these?
-Stafford
Quoted 42 lines
-Stafford
[0] https://openrisc.io/proposals/orfpx64a32
[1] https://github.com/openrisc/or1k_marocchino
[2] git at github.com:stffrdhrn/gcc.git or1k-fpu-3*** BLURB HERE ***
Stafford Horne (5):
or1k: Fix code quality for volatile memory loads
or1k: Fix issues with msoft-div
or1k: Add mrori option, fix option docs
or1k: Initial support for FPU
or1k: only force reg for immediatesgcc/config.gcc | 2 + gcc/config/or1k/constraints.md | 4 + gcc/config/or1k/elf.opt | 6 +- gcc/config/or1k/or1k.c | 50 +++++++-- gcc/config/or1k/or1k.h | 3 + gcc/config/or1k/or1k.md | 131 ++++++++++++++++++++-- gcc/config/or1k/or1k.opt | 78 +++++++++---- gcc/config/or1k/predicates.md | 30 +++++ gcc/doc/invoke.texi | 77 ++++++++----- gcc/testsuite/gcc.target/or1k/div-mul-3.c | 31 +++++ gcc/testsuite/gcc.target/or1k/ror-4.c | 8 ++ gcc/testsuite/gcc.target/or1k/ror-5.c | 9 ++ gcc/testsuite/gcc.target/or1k/shftimm-1.c | 8 +- gcc/testsuite/gcc.target/or1k/swap-1.c | 70 ++++++++++++ gcc/testsuite/gcc.target/or1k/swap-2.c | 47 ++++++++ libgcc/config/or1k/lib1funcs.S | 6 +- 16 files changed, 484 insertions(+), 76 deletions(-) create mode 100644 gcc/testsuite/gcc.target/or1k/div-mul-3.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-4.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-5.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-1.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-2.cSignature · 1 line
2.21.0
v3 cover OpenRISC updates for 10 (fpu, fixes)
In reply to Stafford HorneHi All,
This is all upstream now. Thank you for the reviews.
Quoted 79 lines · Stafford Horne
Hello,
New since v2:
- Fix comment formatting pointed out by Segher in valatile patch
- Fix issue and add test for rotrsi3 options pointed out by Segher
- Fix issue with reg mask for doubles being backwards Pointed out by Segher and Richard.New since v1:
- Changed 64-bit FPU operations to use explicit register pairs as per spec revision suggested by Richard Henderson.
- Added patch for new -mrori option
- Added patch for msoft-div fix from other series (no changes)
- Fixed volatile spelling pointed out by Bernhard Reutner-Fischer <[email protected]>This is a set of patches to bring FPU support to the OpenRISC backend. The backend also add support for 64-bit floating point operations on 32-bit cores using register pairs, see orfpx64a32 [0].
This binutils patches are already upstream.
The toolchain has been tested using the gcc and binutils testsuites as well as floating point test suites running on sim and an fpga soft core
or1k_marocchino.
[1]I have also included a few fixes to PRs:
- 90362 or1k: Soft divide does not work correctly
- 90363 or1k: Extra mask insn after load from memoryThis whole patch series can be found on my github repo [2] as well.
If all is OK, I plan to commit these to master (gcc 10). Then back port the PR fixes to the GCC 9 branch, I will ask for guidance when I start to do the backporting.
-Stafford
[0] https://openrisc.io/proposals/orfpx64a32
[1] https://github.com/openrisc/or1k_marocchino
[2] git at github.com:stffrdhrn/gcc.git or1k-fpu-3*** BLURB HERE ***
Stafford Horne (5):
or1k: Fix code quality for volatile memory loads
or1k: Fix issues with msoft-div
or1k: Add mrori option, fix option docs
or1k: Initial support for FPU
or1k: only force reg for immediatesgcc/config.gcc | 2 + gcc/config/or1k/constraints.md | 4 + gcc/config/or1k/elf.opt | 6 +- gcc/config/or1k/or1k.c | 50 +++++++-- gcc/config/or1k/or1k.h | 3 + gcc/config/or1k/or1k.md | 131 ++++++++++++++++++++-- gcc/config/or1k/or1k.opt | 78 +++++++++---- gcc/config/or1k/predicates.md | 30 +++++ gcc/doc/invoke.texi | 77 ++++++++----- gcc/testsuite/gcc.target/or1k/div-mul-3.c | 31 +++++ gcc/testsuite/gcc.target/or1k/ror-4.c | 8 ++ gcc/testsuite/gcc.target/or1k/ror-5.c | 9 ++ gcc/testsuite/gcc.target/or1k/shftimm-1.c | 8 +- gcc/testsuite/gcc.target/or1k/swap-1.c | 70 ++++++++++++ gcc/testsuite/gcc.target/or1k/swap-2.c | 47 ++++++++ libgcc/config/or1k/lib1funcs.S | 6 +- 16 files changed, 484 insertions(+), 76 deletions(-) create mode 100644 gcc/testsuite/gcc.target/or1k/div-mul-3.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-4.c create mode 100644 gcc/testsuite/gcc.target/or1k/ror-5.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-1.c create mode 100644 gcc/testsuite/gcc.target/or1k/swap-2.cSignature · 1 line
2.21.0