diff mbox

[AArch64,1/5] Implement TARGET_SCHED_MACRO_FUSION_PAIR_P

Message ID 546B207F.8090708@arm.com
State New
Headers show

Commit Message

Kyrylo Tkachov Nov. 18, 2014, 10:33 a.m. UTC
Hi all,

This is another iteration of this patch posted earlier with a bug fixed 
pointed out by Andrew
It implements the target hooks for macro fusion and implements fusion of 
MOV+MOVK instructions
and enables them for cores that support these fusions.
Bootstrapped and tested aarch64-none-elf.

Ok for trunk?

Thanks,
Kyrill

2014-11-18  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

     * config/aarch64/aarch64-protos.h (struct tune_params): Add
     fuseable_ops field.
     * config/aarch64/aarch64.c (generic_tunings): Specify fuseable_ops.
     (cortexa53_tunings): Likewise.
     (cortexa57_tunings): Likewise.
     (thunderx_tunings): Likewise.
     (aarch64_macro_fusion_p): New function.
     (aarch_macro_fusion_pair_p): Likewise.
     (TARGET_SCHED_MACRO_FUSION_P): Define.
     (TARGET_SCHED_MACRO_FUSION_PAIR_P): Likewise.
     (AARCH64_FUSE_MOV_MOVK): Likewise.
     (AARCH64_FUSE_NOTHING): Likewise.

Comments

Kyrylo Tkachov Nov. 18, 2014, 12:20 p.m. UTC | #1
On 18/11/14 10:33, Kyrill Tkachov wrote:
> diff --git a/gcc/config/arm/aarch-common-protos.h b/gcc/config/arm/aarch-common-protos.h
> index 264bf01..ad7ec43c 100644
> --- a/gcc/config/arm/aarch-common-protos.h
> +++ b/gcc/config/arm/aarch-common-protos.h
> @@ -36,7 +36,6 @@ extern int arm_no_early_alu_shift_value_dep (rtx, rtx);
>   extern int arm_no_early_mul_dep (rtx, rtx);
>   extern int arm_no_early_store_addr_dep (rtx, rtx);
>   extern bool arm_rtx_shift_left_p (rtx);
> -
>   /* RTX cost table definitions.  These are used when tuning for speed rather
>      than for size and should reflect the_additional_  cost over the cost
>      of the fastest instruction in the machine, which is COSTS_N_INSNS (1).

This hunk should not be here. I'll remove it when I commit if approved...
Sorry for that.

Kyrill
Marcus Shawcroft Nov. 21, 2014, 4:54 p.m. UTC | #2
On 18 November 2014 12:20, Kyrill Tkachov <kyrylo.tkachov@arm.com> wrote:
>
> On 18/11/14 10:33, Kyrill Tkachov wrote:
>>
>> diff --git a/gcc/config/arm/aarch-common-protos.h
>> b/gcc/config/arm/aarch-common-protos.h
>> index 264bf01..ad7ec43c 100644
>> --- a/gcc/config/arm/aarch-common-protos.h
>> +++ b/gcc/config/arm/aarch-common-protos.h
>> @@ -36,7 +36,6 @@ extern int arm_no_early_alu_shift_value_dep (rtx, rtx);
>>   extern int arm_no_early_mul_dep (rtx, rtx);
>>   extern int arm_no_early_store_addr_dep (rtx, rtx);
>>   extern bool arm_rtx_shift_left_p (rtx);
>> -
>>   /* RTX cost table definitions.  These are used when tuning for speed
>> rather
>>      than for size and should reflect the_additional_  cost over the cost
>>      of the fastest instruction in the machine, which is COSTS_N_INSNS
>> (1).
>
>
> This hunk should not be here. I'll remove it when I commit if approved...
> Sorry for that.
>
> Kyrill
>

Ok, with that hunk dropped. /Marcus
diff mbox

Patch

commit e9d650bc71fe7549765f750fcdb47a759658c21f
Author: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Date:   Tue Oct 21 10:36:48 2014 +0100

    [AArch64] Implement TARGET_MACRO_FUSION

diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
index 470b9eb..9e0ff8c 100644
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -170,6 +170,7 @@  struct tune_params
   const struct cpu_vector_cost *const vec_costs;
   const int memmov_cost;
   const int issue_rate;
+  const unsigned int fuseable_ops;
 };
 
 HOST_WIDE_INT aarch64_initial_elimination_offset (unsigned, unsigned);
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 07f75e1..5ece23a 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -302,6 +302,9 @@  static const struct cpu_vector_cost cortexa57_vector_cost =
   NAMED_PARAM (cond_not_taken_branch_cost, 1)
 };
 
+#define AARCH64_FUSE_NOTHING	(0)
+#define AARCH64_FUSE_MOV_MOVK	(1 << 0)
+
 #if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007
 __extension__
 #endif
@@ -312,7 +315,8 @@  static const struct tune_params generic_tunings =
   &generic_regmove_cost,
   &generic_vector_cost,
   NAMED_PARAM (memmov_cost, 4),
-  NAMED_PARAM (issue_rate, 2)
+  NAMED_PARAM (issue_rate, 2),
+  NAMED_PARAM (fuseable_ops, AARCH64_FUSE_NOTHING)
 };
 
 static const struct tune_params cortexa53_tunings =
@@ -322,7 +326,8 @@  static const struct tune_params cortexa53_tunings =
   &cortexa53_regmove_cost,
   &generic_vector_cost,
   NAMED_PARAM (memmov_cost, 4),
-  NAMED_PARAM (issue_rate, 2)
+  NAMED_PARAM (issue_rate, 2),
+  NAMED_PARAM (fuseable_ops, AARCH64_FUSE_MOV_MOVK)
 };
 
 static const struct tune_params cortexa57_tunings =
@@ -332,7 +337,8 @@  static const struct tune_params cortexa57_tunings =
   &cortexa57_regmove_cost,
   &cortexa57_vector_cost,
   NAMED_PARAM (memmov_cost, 4),
-  NAMED_PARAM (issue_rate, 3)
+  NAMED_PARAM (issue_rate, 3),
+  NAMED_PARAM (fuseable_ops, AARCH64_FUSE_MOV_MOVK)
 };
 
 static const struct tune_params thunderx_tunings =
@@ -342,7 +348,8 @@  static const struct tune_params thunderx_tunings =
   &thunderx_regmove_cost,
   &generic_vector_cost,
   NAMED_PARAM (memmov_cost, 6),
-  NAMED_PARAM (issue_rate, 2)
+  NAMED_PARAM (issue_rate, 2),
+  NAMED_PARAM (fuseable_ops, AARCH64_FUSE_NOTHING)
 };
 
 /* A processor implementing AArch64.  */
@@ -9979,6 +9986,59 @@  aarch64_use_by_pieces_infrastructure_p (unsigned int size,
   return default_use_by_pieces_infrastructure_p (size, align, op, speed_p);
 }
 
+/* Implement TARGET_SCHED_MACRO_FUSION_P.  Return true if target supports
+   instruction fusion of some sort.  */
+
+static bool
+aarch64_macro_fusion_p (void)
+{
+  return aarch64_tune_params->fuseable_ops != AARCH64_FUSE_NOTHING;
+}
+
+
+/* Implement TARGET_SCHED_MACRO_FUSION_PAIR_P.  Return true if PREV and CURR
+   should be kept together during scheduling.  */
+
+static bool
+aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr)
+{
+  rtx set_dest;
+  rtx prev_set = single_set (prev);
+  rtx curr_set = single_set (curr);
+  /* prev and curr are simple SET insns i.e. no flag setting or branching.  */
+  bool simple_sets_p = prev_set && curr_set && !any_condjump_p (curr);
+
+  if (!aarch64_macro_fusion_p ())
+    return false;
+
+  if (simple_sets_p
+      && (aarch64_tune_params->fuseable_ops & AARCH64_FUSE_MOV_MOVK))
+    {
+      /* We are trying to match:
+         prev (mov)  == (set (reg r0) (const_int imm16))
+         curr (movk) == (set (zero_extract (reg r0)
+                                           (const_int 16)
+                                           (const_int 16))
+                             (const_int imm16_1))  */
+
+      set_dest = SET_DEST (curr_set);
+
+      if (GET_CODE (set_dest) == ZERO_EXTRACT
+          && CONST_INT_P (SET_SRC (curr_set))
+          && CONST_INT_P (SET_SRC (prev_set))
+          && CONST_INT_P (XEXP (set_dest, 2))
+          && INTVAL (XEXP (set_dest, 2)) == 16
+          && REG_P (XEXP (set_dest, 0))
+          && REG_P (SET_DEST (prev_set))
+          && REGNO (XEXP (set_dest, 0)) == REGNO (SET_DEST (prev_set)))
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
 #undef TARGET_ADDRESS_COST
 #define TARGET_ADDRESS_COST aarch64_address_cost
 
@@ -10235,6 +10295,12 @@  aarch64_use_by_pieces_infrastructure_p (unsigned int size,
 #define TARGET_USE_BY_PIECES_INFRASTRUCTURE_P \
   aarch64_use_by_pieces_infrastructure_p
 
+#undef TARGET_SCHED_MACRO_FUSION_P
+#define TARGET_SCHED_MACRO_FUSION_P aarch64_macro_fusion_p
+
+#undef TARGET_SCHED_MACRO_FUSION_PAIR_P
+#define TARGET_SCHED_MACRO_FUSION_PAIR_P aarch_macro_fusion_pair_p
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-aarch64.h"
diff --git a/gcc/config/arm/aarch-common-protos.h b/gcc/config/arm/aarch-common-protos.h
index 264bf01..ad7ec43c 100644
--- a/gcc/config/arm/aarch-common-protos.h
+++ b/gcc/config/arm/aarch-common-protos.h
@@ -36,7 +36,6 @@  extern int arm_no_early_alu_shift_value_dep (rtx, rtx);
 extern int arm_no_early_mul_dep (rtx, rtx);
 extern int arm_no_early_store_addr_dep (rtx, rtx);
 extern bool arm_rtx_shift_left_p (rtx);
-
 /* RTX cost table definitions.  These are used when tuning for speed rather
    than for size and should reflect the _additional_ cost over the cost
    of the fastest instruction in the machine, which is COSTS_N_INSNS (1).