From ff63d754c170a5540fd48fa76428da3fc9e0c073 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Fri, 19 Aug 2011 14:41:34 +0000 Subject: [PATCH] tree-ssa-math-opts.c (is_widening_mult_p): Remove FIXME. 2011-08-19 Andrew Stubbs gcc/ * tree-ssa-math-opts.c (is_widening_mult_p): Remove FIXME. Ensure the the larger type is the first operand. gcc/testsuite/ * gcc.target/arm/wmul-7.c: New file. From-SVN: r177906 --- gcc/ChangeLog | 5 +++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.target/arm/wmul-7.c | 11 +++++++++++ gcc/tree-ssa-math-opts.c | 14 +++++++++++--- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/arm/wmul-7.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 75b3db4e0ad3..a9e1be91004d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-08-19 Andrew Stubbs + + * tree-ssa-math-opts.c (is_widening_mult_p): Remove FIXME. + Ensure the the larger type is the first operand. + 2011-08-19 Andrew Stubbs * tree-ssa-math-opts.c (convert_mult_to_widen): Convert diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 96cb09463430..a495ef45041e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-08-19 Andrew Stubbs + + * gcc.target/arm/wmul-7.c: New file. + 2011-08-19 Andrew Stubbs * gcc.target/arm/wmul-6.c: New file. diff --git a/gcc/testsuite/gcc.target/arm/wmul-7.c b/gcc/testsuite/gcc.target/arm/wmul-7.c new file mode 100644 index 000000000000..2db4ad4e10d5 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/wmul-7.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ +/* { dg-require-effective-target arm_dsp } */ + +unsigned long long +foo (unsigned long long a, unsigned char *b, unsigned short *c) +{ + return a + *b * *c; +} + +/* { dg-final { scan-assembler "umlal" } } */ diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c index 0505603ed2f3..cc0da2982ece 100644 --- a/gcc/tree-ssa-math-opts.c +++ b/gcc/tree-ssa-math-opts.c @@ -2054,9 +2054,17 @@ is_widening_mult_p (gimple stmt, *type2_out = *type1_out; } - /* FIXME: remove this restriction. */ - if (TYPE_PRECISION (*type1_out) != TYPE_PRECISION (*type2_out)) - return false; + /* Ensure that the larger of the two operands comes first. */ + if (TYPE_PRECISION (*type1_out) < TYPE_PRECISION (*type2_out)) + { + tree tmp; + tmp = *type1_out; + *type1_out = *type2_out; + *type2_out = tmp; + tmp = *rhs1_out; + *rhs1_out = *rhs2_out; + *rhs2_out = tmp; + } return true; }