From 103d91c7cb36eaba7728a3550f77dd1f50fdfc29 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 23 May 2019 21:46:56 +0200
Subject: [PATCH] re PR target/90552 (attribute((optimize(3))) not overriding
 -Os)

	PR target/90552
	* config/i386/i386.c (gen_rtx_cost):
	Use ix86_tune_cost instead of ix86_cost.

testsuite/ChangeLog:

	PR target/90552
	* gcc.target/i386/pr90552.c: New test.

From-SVN: r271576
---
 gcc/ChangeLog                           |  6 ++++++
 gcc/config/i386/i386.c                  |  3 ++-
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/gcc.target/i386/pr90552.c | 11 +++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.target/i386/pr90552.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f183fb14277..4956f15102fa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-23  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/90552
+	* config/i386/i386.c (gen_rtx_cost):
+	Use ix86_tune_cost instead of ix86_cost.
+
 2019-05-23  Bill Schmidt  <wschmidt@linux.ibm.com>
 	    Michael Meissner  <meissner@linux.ibm.com>
 	    Segher Boessenkool  <segher@kernel.crashing.org>
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 463e78112f06..79fcb5c4e570 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -19124,7 +19124,8 @@ ix86_rtx_costs (rtx x, machine_mode mode, int outer_code_i, int opno,
   rtx mask;
   enum rtx_code code = GET_CODE (x);
   enum rtx_code outer_code = (enum rtx_code) outer_code_i;
-  const struct processor_costs *cost = speed ? ix86_cost : &ix86_size_cost;
+  const struct processor_costs *cost
+    = speed ? ix86_tune_cost : &ix86_size_cost;
   int src_cost;
 
   switch (code)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f659e4593540..e3d9041604e7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-23  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/90552
+	* gcc.target/i386/pr90552.c: New test.
+
 2019-05-23  Mark Eggleston  <mark.eggleston@codethink.com>
 
 	* gfortran.dg/fmt_f_default_field_width_1.f90: Hide REAL(16) behind
diff --git a/gcc/testsuite/gcc.target/i386/pr90552.c b/gcc/testsuite/gcc.target/i386/pr90552.c
new file mode 100644
index 000000000000..59b7e847700e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr90552.c
@@ -0,0 +1,11 @@
+/* PR target/90552 *
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+
+__attribute__((optimize(2)))
+int foo (int x)
+{
+  return x / 3;
+}
+
+/* { dg-final { scan-assembler-not "idiv" } } */
-- 
GitLab