From 48b2123f6336ba6c06846d7c8b60bd14eaeae7ec Mon Sep 17 00:00:00 2001 From: Mihailo Stojanovic Date: Mon, 28 Oct 2019 19:17:58 +0000 Subject: [PATCH] re PR target/82981 (unnecessary __multi3 call for mips64r6 linux kernel) PR target/82981 * config/mips/mips.md (mulditi3): Generate patterns for high doubleword and low doubleword result of multiplication on MIPS64R6. * gcc.target/mips/mips64r6-ti-mult.c: New test. From-SVN: r277537 --- gcc/ChangeLog | 5 +++++ gcc/config/mips/mips.md | 15 ++++++++++++--- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/gcc.target/mips/mips64r6-ti-mult.c | 16 ++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/mips/mips64r6-ti-mult.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0dfda997c44..691128e806c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2019-10-28 Mihailo Stojanovic + PR target/82981 + * config/mips/mips.md (mulditi3): Generate patterns for high + doubleword and low doubleword result of multiplication on + MIPS64R6. + * config/mips/mips.c (DIRECT_BUILTIN_PURE): New macro. Add a pure qualifier to the built-in. (MSA_BUILTIN_PURE): New macro. Add a pure qualifier to the MSA diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md index 4ad5c62c9a3..658f5e62b84 100644 --- a/gcc/config/mips/mips.md +++ b/gcc/config/mips/mips.md @@ -2464,9 +2464,11 @@ [(set (match_operand:TI 0 "register_operand") (mult:TI (any_extend:TI (match_operand:DI 1 "register_operand")) (any_extend:TI (match_operand:DI 2 "register_operand"))))] - "ISA_HAS_DMULT && !( == ZERO_EXTEND && TARGET_FIX_VR4120)" + "ISA_HAS_R6DMUL + || (ISA_HAS_DMULT + && !( == ZERO_EXTEND && TARGET_FIX_VR4120))" { - rtx hilo; + rtx hilo, hi, lo; if (TARGET_MIPS16) { @@ -2476,9 +2478,16 @@ } else if (TARGET_FIX_R4000) emit_insn (gen_mulditi3_r4000 (operands[0], operands[1], operands[2])); - else + else if (ISA_HAS_DMULT) emit_insn (gen_mulditi3_internal (operands[0], operands[1], operands[2])); + else + { + hi = mips_subword (operands[0], 1); + lo = mips_subword (operands[0], 0); + emit_insn (gen_muldi3_mul3_nohilo (lo, operands[1], operands[2])); + emit_insn (gen_muldi3_highpart_r6 (hi, operands[1], operands[2])); + } DONE; }) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 06ca68ae9da..76f14712579 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2019-10-28 Mihailo Stojanovic + PR target/82981 + * gcc.target/mips/mips64r6-ti-mult.c: New test. + * gcc.target/mips/mips-builtins-pure.c: New test. * gcc.target/mips/msa-insert-split.c: New test. diff --git a/gcc/testsuite/gcc.target/mips/mips64r6-ti-mult.c b/gcc/testsuite/gcc.target/mips/mips64r6-ti-mult.c new file mode 100644 index 00000000000..f969e76b9a8 --- /dev/null +++ b/gcc/testsuite/gcc.target/mips/mips64r6-ti-mult.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-mabi=64 -march=mips64r6" } */ +/* { dg-skip-if "code quality test" { *-*-* } { "-O0" } } */ + +typedef unsigned __int128 u128; +typedef unsigned long long u64; + +u128 +test (u64 a, u64 b) +{ + return (u128)a * (u128)b; +} + +/* { dg-final { scan-assembler-not "__multi3" } } */ +/* { dg-final { scan-assembler "dmul" } } */ +/* { dg-final { scan-assembler "dmuhu" } } */ -- 2.30.2