On 02/15/16 04:53, James Greenhalgh wrote:
On Thu, Jan 21, 2016 at 04:55:40PM -0600, Evandro Menezes wrote:
Got it.

Let me try this again:

    Add support for the FCCMP insn types

    2016-01-21  Evandro Menezes  <e.mene...@samsung.com>

    gcc/
             * config/aarch64/aarch64.md (fccmp): Change insn type.
             (fccmpe): Likewise.
             * config/aarch64/thunderx.md (thunderx_fcmp): Add
    "fccmp{s,d}" types.
             * config/arm/cortex-a53.md (cortex_a53_fpalu): Likewise.
             * config/arm/cortex-a57.md (cortex_a57_fp_cmp): Likewise.
             * config/arm/xgene1.md (xgene1_fcmp): Likewise.
             * config/arm/exynos-m1.md (exynos_m1_fp_ccmp): New insn
    reservation.
             * config/arm/types.md (fccmps): Add new insn type.
             (fccmpd): Likewise.


This is OK. Sorry to have left it waiting so long.

Thanks,
James


 From 14874dec3257c7b59aed4b7c610305f76bbbcf33 Mon Sep 17 00:00:00 2001
From: Evandro Menezes <e.mene...@samsung.com>
Date: Mon, 4 Jan 2016 18:44:30 -0600
Subject: [PATCH] Add support for the FCCMP insn types

2016-01-21  Evandro Menezes  <e.mene...@samsung.com>

gcc/
        * config/aarch64/aarch64.md (fccmp): Change insn type.
        (fccmpe): Likewise.
        * config/aarch64/thunderx.md (thunderx_fcmp): Add "fccmp{s,d}" types.
        * config/arm/cortex-a53.md (cortex_a53_fpalu): Likewise.
        * config/arm/cortex-a57.md (cortex_a57_fp_cmp): Likewise.
        * config/arm/xgene1.md (xgene1_fcmp): Likewise.
        * config/arm/exynos-m1.md (exynos_m1_fp_ccmp): New insn reservation.
        * config/arm/types.md (fccmps): Add new insn type.
        (fccmpd): Likewise.
---
  gcc/config/aarch64/aarch64.md  | 4 ++--
  gcc/config/aarch64/thunderx.md | 2 +-
  gcc/config/arm/cortex-a53.md   | 4 ++--
  gcc/config/arm/cortex-a57.md   | 2 +-
  gcc/config/arm/exynos-m1.md    | 5 +++++
  gcc/config/arm/types.md        | 3 +++
  gcc/config/arm/xgene1.md       | 2 +-
  7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index 2f543aa..032b342 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -301,7 +301,7 @@
          (match_operand 5 "immediate_operand")))]
    "TARGET_FLOAT"
    "fccmp\\t%<s>2, %<s>3, %k5, %m4"
-  [(set_attr "type" "fcmp<s>")]
+  [(set_attr "type" "fccmp<s>")]
  )
(define_insn "fccmpe<mode>"
@@ -316,7 +316,7 @@
          (match_operand 5 "immediate_operand")))]
    "TARGET_FLOAT"
    "fccmpe\\t%<s>2, %<s>3, %k5, %m4"
-  [(set_attr "type" "fcmp<s>")]
+  [(set_attr "type" "fccmp<s>")]
  )
;; Expansion of signed mod by a power of 2 using CSNEG.
diff --git a/gcc/config/aarch64/thunderx.md b/gcc/config/aarch64/thunderx.md
index 922df39..058713a 100644
--- a/gcc/config/aarch64/thunderx.md
+++ b/gcc/config/aarch64/thunderx.md
@@ -156,7 +156,7 @@
(define_insn_reservation "thunderx_fcmp" 3
    (and (eq_attr "tune" "thunderx")
-       (eq_attr "type" "fcmps,fcmpd"))
+       (eq_attr "type" "fcmps,fcmpd,fccmps,fccmpd"))
    "thunderx_pipe1")
(define_insn_reservation "thunderx_fmul" 6
diff --git a/gcc/config/arm/cortex-a53.md b/gcc/config/arm/cortex-a53.md
index c1eeedb..fc60bc2 100644
--- a/gcc/config/arm/cortex-a53.md
+++ b/gcc/config/arm/cortex-a53.md
@@ -508,8 +508,8 @@
  (define_insn_reservation "cortex_a53_fpalu" 5
    (and (eq_attr "tune" "cortexa53")
        (eq_attr "type" "ffariths, fadds, ffarithd, faddd, fmov,
-                       f_cvt, fcmps, fcmpd, fcsel, f_rints, f_rintd,
-                       f_minmaxs, f_minmaxd"))
+                       f_cvt, fcmps, fcmpd, fccmps, fccmpd, fcsel,
+                       f_rints, f_rintd, f_minmaxs, f_minmaxd"))
    "cortex_a53_slot_any,cortex_a53_fp_alu")
(define_insn_reservation "cortex_a53_fconst" 3
diff --git a/gcc/config/arm/cortex-a57.md b/gcc/config/arm/cortex-a57.md
index 0d28951..f4c112c 100644
--- a/gcc/config/arm/cortex-a57.md
+++ b/gcc/config/arm/cortex-a57.md
@@ -716,7 +716,7 @@
(define_insn_reservation "cortex_a57_fp_cmp" 7
    (and (eq_attr "tune" "cortexa57")
-       (eq_attr "type" "fcmps,fcmpd"))
+       (eq_attr "type" "fcmps,fcmpd,fccmps,fccmpd"))
    "ca57_cx2")
(define_insn_reservation "cortex_a57_fp_arith" 4
diff --git a/gcc/config/arm/exynos-m1.md b/gcc/config/arm/exynos-m1.md
index 0448073..973c8a9 100644
--- a/gcc/config/arm/exynos-m1.md
+++ b/gcc/config/arm/exynos-m1.md
@@ -823,6 +823,11 @@
         (eq_attr "type" "fcmps, fcmpd"))
    "em1_nmisc")
+(define_insn_reservation "exynos_m1_fp_ccmp" 7
+  (and (eq_attr "tune" "exynosm1")
+       (eq_attr "type" "fccmps, fccmpd"))
+  "em1_st, em1_nmisc")
+
  (define_insn_reservation "exynos_m1_fp_sel" 4
    (and (eq_attr "tune" "exynosm1")
         (eq_attr "type" "fcsel"))
diff --git a/gcc/config/arm/types.md b/gcc/config/arm/types.md
index 321ff89..25f79b4 100644
--- a/gcc/config/arm/types.md
+++ b/gcc/config/arm/types.md
@@ -70,6 +70,7 @@
  ; f_rint[d,s]        double/single floating point rount to integral.
  ; f_store[d,s]       double/single store to memory.  Used for VFP unit.
  ; fadd[d,s]          double/single floating-point scalar addition.
+; fccmp[d,s]         From ARMv8-A: floating-point conditional compare.
  ; fcmp[d,s]          double/single floating-point compare.
  ; fconst[d,s]        double/single load immediate.
  ; fcsel              From ARMv8-A: Floating-point conditional select.
@@ -582,6 +583,8 @@
    f_stores,\
    faddd,\
    fadds,\
+  fccmpd,\
+  fccmps,\
    fcmpd,\
    fcmps,\
    fconstd,\
diff --git a/gcc/config/arm/xgene1.md b/gcc/config/arm/xgene1.md
index 8dfd8a1..b7aeac6 100644
--- a/gcc/config/arm/xgene1.md
+++ b/gcc/config/arm/xgene1.md
@@ -154,7 +154,7 @@
(define_insn_reservation "xgene1_fcmp" 10
    (and (eq_attr "tune" "xgene1")
-       (eq_attr "type" "fcmpd,fcmps"))
+       (eq_attr "type" "fcmpd,fcmps,fccmpd,fccmps"))
    "xgene1_decode1op,xgene1_fsu+xgene1_fcmp*3")
(define_insn_reservation "xgene1_fcsel" 3
--
2.6.3




Committed as r233432.

Thank you,

--
Evandro Menezes

Reply via email to