aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog15
-rw-r--r--gcc/common/config/epiphany/epiphany-common.c2
-rw-r--r--gcc/config/epiphany/epiphany.c18
-rw-r--r--gcc/config/epiphany/epiphany.h11
-rw-r--r--gcc/config/epiphany/epiphany.md4
-rw-r--r--gcc/config/epiphany/predicates.md5
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.target/epiphany/t1068-2.c53
8 files changed, 109 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9ecf69..6b5e623 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,20 @@
2014-04-11 Joern Rennecke <joern.rennecke@embecosm.com>
+ * common/config/epiphany/epiphany-common.c
+ (epiphany_option_optimization_table): Enable section anchors by
+ default at -O1 or higher.
+ * config/epiphany/epiphany.c (TARGET_MAX_ANCHOR_OFFSET): Define.
+ (TARGET_MIN_ANCHOR_OFFSET): Likewise.
+ (epiphany_rtx_costs) <SET>: For binary operators, the set as such
+ carries no extra cost.
+ (epiphany_legitimate_address_p): For BLKmode, apply SImode check.
+ * config/epiphany/epiphany.h (ASM_OUTPUT_DEF): Define.
+ * config/epiphany/predicates.md (memclob_operand): New predicate.
+ * config/epiphany/epiphany.md (stack_adjust_add, stack_adjust_str):
+ Use memclob_operand predicate and X constraint for operand 3.
+
+2014-04-11 Joern Rennecke <joern.rennecke@embecosm.com>
+
* config/epiphany/epiphany.c (epiphany_rtx_cost): Compare
with CC_N_NE / CC_C_LTU / CC_C_GTU carries no extra cost for
its operands.
diff --git a/gcc/common/config/epiphany/epiphany-common.c b/gcc/common/config/epiphany/epiphany-common.c
index 725dfb8..23d372e 100644
--- a/gcc/common/config/epiphany/epiphany-common.c
+++ b/gcc/common/config/epiphany/epiphany-common.c
@@ -39,6 +39,8 @@ along with GCC; see the file COPYING3. If not see
static const struct default_options epiphany_option_optimization_table[] =
{
{ OPT_LEVELS_1_PLUS, OPT_fomit_frame_pointer, NULL, 1 },
+ /* Enable section anchors by default at -O1 or higher. */
+ { OPT_LEVELS_1_PLUS, OPT_fsection_anchors, NULL, 1 },
{ OPT_LEVELS_NONE, 0, NULL, 0 }
};
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index 8e45ea7..f3955b9 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.c
@@ -145,6 +145,13 @@ static rtx frame_insn (rtx);
hook_bool_const_tree_hwi_hwi_const_tree_true
#define TARGET_ASM_OUTPUT_MI_THUNK epiphany_output_mi_thunk
+/* ??? we can use larger offsets for wider-mode sized accesses, but there
+ is no concept of anchors being dependent on the modes that they are used
+ for, so we can only use an offset range that would suit all modes. */
+#define TARGET_MAX_ANCHOR_OFFSET (optimize_size ? 31 : 2047)
+/* We further restrict the minimum to be a multiple of eight. */
+#define TARGET_MIN_ANCHOR_OFFSET (optimize_size ? 0 : -2040)
+
#include "target-def.h"
#undef TARGET_ASM_ALIGNED_HI_OP
@@ -776,6 +783,15 @@ epiphany_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED,
return false;
}
+
+ case SET:
+ {
+ rtx src = SET_SRC (x);
+ if (BINARY_P (src))
+ *total = 0;
+ return false;
+ }
+
default:
return false;
}
@@ -2016,7 +2032,7 @@ epiphany_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
&& LEGITIMATE_OFFSET_ADDRESS_P (mode, XEXP ((x), 1)))
return true;
if (mode == BLKmode)
- return true;
+ return epiphany_legitimate_address_p (SImode, x, strict);
return false;
}
diff --git a/gcc/config/epiphany/epiphany.h b/gcc/config/epiphany/epiphany.h
index cffb00c..1ca92e0 100644
--- a/gcc/config/epiphany/epiphany.h
+++ b/gcc/config/epiphany/epiphany.h
@@ -942,4 +942,15 @@ extern rtl_opt_pass *make_pass_resolve_sw_modes (gcc::context *ctxt);
#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \
epiphany_start_function ((FILE), (NAME), (DECL))
+/* This is how we tell the assembler that two symbols have the same value. */
+#define ASM_OUTPUT_DEF(FILE, NAME1, NAME2) \
+ do \
+ { \
+ assemble_name (FILE, NAME1); \
+ fputs (" = ", FILE); \
+ assemble_name (FILE, NAME2); \
+ fputc ('\n', FILE); \
+ } \
+ while (0)
+
#endif /* !GCC_EPIPHANY_H */
diff --git a/gcc/config/epiphany/epiphany.md b/gcc/config/epiphany/epiphany.md
index 2844eee..d8d5555 100644
--- a/gcc/config/epiphany/epiphany.md
+++ b/gcc/config/epiphany/epiphany.md
@@ -2380,7 +2380,7 @@
(plus:SI (reg:SI GPR_SP) (match_operand:SI 0 "arith_operand" "rL")))
(clobber (reg:CC CC_REGNUM))
(clobber (reg:SI STATUS_REGNUM))
- (clobber (match_operand:BLK 1 "memory_operand" "=m"))]
+ (clobber (match_operand:BLK 1 "memclob_operand" "=X"))]
"reload_completed"
"add sp,sp,%0")
@@ -2396,7 +2396,7 @@
(match_operand 1 "any_gpr_operand" "r"))
(set (reg:SI GPR_SP)
(plus:SI (reg:SI GPR_SP) (match_operand:SI 2 "nonmemory_operand" "rn")))
- (clobber (match_operand:BLK 3 "memory_operand" "=m"))]
+ (clobber (match_operand:BLK 3 "memclob_operand" "=X"))]
"reload_completed"
{
return (GET_MODE_SIZE (GET_MODE (operands[0])) <= 4
diff --git a/gcc/config/epiphany/predicates.md b/gcc/config/epiphany/predicates.md
index fb8fd88..fb5ee12 100644
--- a/gcc/config/epiphany/predicates.md
+++ b/gcc/config/epiphany/predicates.md
@@ -358,6 +358,11 @@
(and (match_code "mem")
(match_test "post_modify_address (XEXP (op, 0), Pmode)")))
+; used in the memory clobber of stack_adjust_str, allows addresses with
+; large offsets.
+(define_predicate "memclob_operand"
+ (match_code "mem"))
+
(define_predicate "nonsymbolic_immediate_operand"
(ior (match_test "immediate_operand (op, mode)")
(match_code "const_vector"))) /* Is this specific enough? */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c3c3e4..9e89527 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2014-04-11 Joern Rennecke <joern.rennecke@embecosm.com>
+ * gcc.target/epiphany/t1068-2.c: New file.
+
+2014-04-11 Joern Rennecke <joern.rennecke@embecosm.com>
+
* gcc.target/epiphany/btst-1.c: New test.
2014-04-11 Joern Rennecke <joern.rennecke@embecosm.com>
diff --git a/gcc/testsuite/gcc.target/epiphany/t1068-2.c b/gcc/testsuite/gcc.target/epiphany/t1068-2.c
new file mode 100644
index 0000000..3baefcb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/epiphany/t1068-2.c
@@ -0,0 +1,53 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fno-common" } */
+/* ??? we should be able to get down to 4 movt, but first we'll have to
+ teach mov2add about flag handling. Maybe add the code that was removed in
+ r144425 from regmove to postreload; epiphany needs tweaks to the addsi3
+ expander to generate a CC reg clobber in the pass. */
+/* { dg-final { scan-assembler-times "movt" 6 } } */
+
+typedef unsigned int uint32_t;
+typedef unsigned int uint16_t;
+
+struct dma_desc {
+ uint32_t config;
+ uint32_t inner_stride;
+ uint32_t count;
+ uint32_t outer_stride;
+ void *src_addr;
+ void *dst_addr;
+};
+typedef struct dma_desc e_dma_desc_t;
+
+e_dma_desc_t dma;
+int a;
+int id[8];
+#define NULL ((void *)0)
+
+static inline void _ez_dma_set(register e_dma_desc_t *dma,
+ uint32_t config,
+ e_dma_desc_t *next,
+ uint16_t inner_src, uint16_t inner_dst,
+ uint16_t inner_count, uint16_t outer_count,
+ uint16_t outer_src, uint16_t outer_dst,
+ void *src, void*dst) {
+ //register e_dma_desc_t *dmap = dma;
+
+ dma->config = config | (((uint32_t)next)<<16);
+ dma->inner_stride = (inner_dst << 16) | inner_src;
+ dma->count = (inner_count << 16) | outer_count;
+ dma->outer_stride = (outer_dst << 16) | outer_src;
+ dma->src_addr = src;
+ dma->dst_addr = dst;
+}
+
+void __attribute__((section(".text.ds1")))
+dmas_inline1(void) {
+ register e_dma_desc_t *dmap = &dma;
+
+ _ez_dma_set(dmap, 3, NULL,
+ 1, 2,
+ 12, 13,
+ 5, 1,
+ id, &a);
+}
generated by cgit v1.1 at 2024-11-04 17:57:03 +0000