From ceb2d59f8c6e2ab12e7c010880595919ed8fdcf2 Mon Sep 17 00:00:00 2001
From: Graham Stott <grahams@gcc.gnu.org>
Date: Wed, 10 Jul 2013 09:26:13 +0000
Subject: [PATCH] mips.c (mips_rtx_costs): Very slightly increase the cost of
 MULT when optimizing for size.

	* config/mips/mips.c (mips_rtx_costs): Very slightly increase
	the cost of MULT when optimizing for size.

	* gcc.target/mips/mulsize-1.c: New.
	* gcc.target/mips/mulsize-2.c: New.
	* gcc.target/mips/mulsize-3.c: New.
	* gcc.target/mips/mulsize-4.c: New.

From-SVN: r200867
---
 gcc/ChangeLog                             |  4 ++++
 gcc/config/mips/mips.c                    |  2 +-
 gcc/testsuite/ChangeLog                   |  6 ++++++
 gcc/testsuite/gcc.target/mips/mulsize-1.c |  9 +++++++++
 gcc/testsuite/gcc.target/mips/mulsize-2.c |  9 +++++++++
 gcc/testsuite/gcc.target/mips/mulsize-3.c | 12 ++++++++++++
 gcc/testsuite/gcc.target/mips/mulsize-4.c | 11 +++++++++++
 7 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.target/mips/mulsize-1.c
 create mode 100644 gcc/testsuite/gcc.target/mips/mulsize-2.c
 create mode 100644 gcc/testsuite/gcc.target/mips/mulsize-3.c
 create mode 100644 gcc/testsuite/gcc.target/mips/mulsize-4.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a26cf21509..19016a2016a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-10  Graham Stott  <graham.stott@btinternet.com>
+	* config/mips/mips.c (mips_rtx_costs): Very slightly increase
+	the cost of MULT when optimizing for size.
+
 2013-07-10  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* config/cr16/cr16-protos.h: Don't include target.h.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index bd1d10b0e4e..3c5469b4b16 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -3944,7 +3944,7 @@ mips_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED,
 		  ? mips_cost->int_mult_si * 3 + 6
 		  : COSTS_N_INSNS (ISA_HAS_MUL3 ? 7 : 9));
       else if (!speed)
-	*total = COSTS_N_INSNS (ISA_HAS_MUL3 ? 1 : 2);
+	*total = COSTS_N_INSNS (ISA_HAS_MUL3 ? 1 : 2) + 1;
       else if (mode == DImode)
 	*total = mips_cost->int_mult_di;
       else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a9b8829d24c..1b4e046c439 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-10  Graham Stott  <grahams@btinternet.com>
+	* gcc.target/mips/mulsize-1.c: New.
+	* gcc.target/mips/mulsize-2.c: New.
+	* gcc.target/mips/mulsize-3.c: New.
+	* gcc.target/mips/mulsize-4.c: New.
+
 2013-07-09  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR c++/53094
diff --git a/gcc/testsuite/gcc.target/mips/mulsize-1.c b/gcc/testsuite/gcc.target/mips/mulsize-1.c
new file mode 100644
index 00000000000..4dd5a19a985
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/mulsize-1.c
@@ -0,0 +1,9 @@
+/* { dg-final { scan-assembler "\t.globl\tf7" } } */
+/* { dg-final { scan-assembler "\tsubu\t" } } */
+/* { dg-final { scan-assembler-not "\tli\t" } } */
+/* { dg-final { scan-assembler-not "\tmul\t" } } */
+int
+f7(int x)
+{
+  return x * 7;
+}
diff --git a/gcc/testsuite/gcc.target/mips/mulsize-2.c b/gcc/testsuite/gcc.target/mips/mulsize-2.c
new file mode 100644
index 00000000000..c427bfa78f1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/mulsize-2.c
@@ -0,0 +1,9 @@
+/* { dg-final { scan-assembler "\t.globl\tf9" } } */
+/* { dg-final { scan-assembler "\tsubu\t" } } */
+/* { dg-final { scan-assembler-not "\tli\t" } } */
+/* { dg-final { scan-assembler-not "\tmul\t" } } */
+int
+f9(int x)
+{
+  return x * 9;
+}
diff --git a/gcc/testsuite/gcc.target/mips/mulsize-3.c b/gcc/testsuite/gcc.target/mips/mulsize-3.c
new file mode 100644
index 00000000000..552d8c99dfa
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/mulsize-3.c
@@ -0,0 +1,12 @@
+/* { dg-final { scan-assembler "\t.globl\tf15" } } */
+/* { dg-final { scan-assembler "\tsll\t" } } */
+/* { dg-final { scan-assembler "\tsubu\t" } } */
+/* { dg-final { scan-assembler-not "\tli\t" } } */
+/* { dg-final { scan-assembler-not "\tmul\t" } } */
+int
+f15(int x)
+{
+  return x * 15;
+}
+
+				    
\ No newline at end of file
diff --git a/gcc/testsuite/gcc.target/mips/mulsize-4.c b/gcc/testsuite/gcc.target/mips/mulsize-4.c
new file mode 100644
index 00000000000..7694d2c03dc
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/mulsize-4.c
@@ -0,0 +1,11 @@
+/* { dg-final { scan-assembler "\t.globl\tf17" } } */
+/* { dg-final { scan-assembler "\tsll\t" } } */
+/* { dg-final { scan-assembler "\taddu\t" } } */
+/* { dg-final { scan-assembler-not "\tli\t" } } */
+/* { dg-final { scan-assembler-not "\tmul\t" } } */
+int
+f17(int x)
+{
+  return x * 17;
+}
+				    
\ No newline at end of file
-- 
2.30.2