[04/30] Changes to arc

Message ID f77c3c5af663484daba20ceaf0efabd8611ab02d.1561408899.git.acsawdey@linux.ibm.com
State New
Headers show
Series
  • Rename movmem pattern to cpymem
Related show

Commit Message

Aaron Sawdey June 25, 2019, 8:22 p.m.
From: Aaron Sawdey <acsawdey@linux.ibm.com>


	* config/arc/arc-protos.h: Change movmem to cpymem.
	* config/arc/arc.c (arc_expand_movmem): Change movmem to cpymem.
	* config/arc/arc.h: Change movmem to cpymem in comment.
	* config/arc/arc.md (movmemsi): Change movmem to cpymem.
---
 gcc/config/arc/arc-protos.h | 2 +-
 gcc/config/arc/arc.c        | 6 +++---
 gcc/config/arc/arc.h        | 2 +-
 gcc/config/arc/arc.md       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

-- 
2.7.4

Comments

Andrew Burgess July 1, 2019, 11:30 a.m. | #1
* acsawdey@linux.ibm.com <acsawdey@linux.ibm.com> [2019-06-25 15:22:13 -0500]:

> From: Aaron Sawdey <acsawdey@linux.ibm.com>

> 

> 	* config/arc/arc-protos.h: Change movmem to cpymem.

> 	* config/arc/arc.c (arc_expand_movmem): Change movmem to cpymem.

> 	* config/arc/arc.h: Change movmem to cpymem in comment.

> 	* config/arc/arc.md (movmemsi): Change movmem to cpymem.


OK for ARC.

Thanks,
Andrew

> ---

>  gcc/config/arc/arc-protos.h | 2 +-

>  gcc/config/arc/arc.c        | 6 +++---

>  gcc/config/arc/arc.h        | 2 +-

>  gcc/config/arc/arc.md       | 4 ++--

>  4 files changed, 7 insertions(+), 7 deletions(-)

> 

> diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h

> index f501bc3..74e5247 100644

> --- a/gcc/config/arc/arc-protos.h

> +++ b/gcc/config/arc/arc-protos.h

> @@ -35,7 +35,7 @@ extern void arc_final_prescan_insn (rtx_insn *, rtx *, int);

>  extern const char *arc_output_libcall (const char *);

>  extern int arc_output_addsi (rtx *operands, bool, bool);

>  extern int arc_output_commutative_cond_exec (rtx *operands, bool);

> -extern bool arc_expand_movmem (rtx *operands);

> +extern bool arc_expand_cpymem (rtx *operands);

>  extern bool prepare_move_operands (rtx *operands, machine_mode mode);

>  extern void emit_shift (enum rtx_code, rtx, rtx, rtx);

>  extern void arc_expand_atomic_op (enum rtx_code, rtx, rtx, rtx, rtx, rtx);

> diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c

> index 89f69c79..23171d2 100644

> --- a/gcc/config/arc/arc.c

> +++ b/gcc/config/arc/arc.c

> @@ -8883,7 +8883,7 @@ arc_output_commutative_cond_exec (rtx *operands, bool output_p)

>    return 8;

>  }

>  

> -/* Helper function of arc_expand_movmem.  ADDR points to a chunk of memory.

> +/* Helper function of arc_expand_cpymem.  ADDR points to a chunk of memory.

>     Emit code and return an potentially modified address such that offsets

>     up to SIZE are can be added to yield a legitimate address.

>     if REUSE is set, ADDR is a register that may be modified.  */

> @@ -8917,7 +8917,7 @@ force_offsettable (rtx addr, HOST_WIDE_INT size, bool reuse)

>     offset ranges.  Return true on success.  */

>  

>  bool

> -arc_expand_movmem (rtx *operands)

> +arc_expand_cpymem (rtx *operands)

>  {

>    rtx dst = operands[0];

>    rtx src = operands[1];

> @@ -10427,7 +10427,7 @@ arc_use_by_pieces_infrastructure_p (unsigned HOST_WIDE_INT size,

>  				    enum by_pieces_operation op,

>  				    bool speed_p)

>  {

> -  /* Let the movmem expander handle small block moves.  */

> +  /* Let the cpymem expander handle small block moves.  */

>    if (op == MOVE_BY_PIECES)

>      return false;

>  

> diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h

> index 80dead9..4a9dd07 100644

> --- a/gcc/config/arc/arc.h

> +++ b/gcc/config/arc/arc.h

> @@ -1423,7 +1423,7 @@ do { \

>     in one reasonably fast instruction.  */

>  #define MOVE_MAX 4

>  

> -/* Undo the effects of the movmem pattern presence on STORE_BY_PIECES_P .  */

> +/* Undo the effects of the cpymem pattern presence on STORE_BY_PIECES_P .  */

>  #define MOVE_RATIO(SPEED) ((SPEED) ? 15 : 3)

>  

>  /* Define this to be nonzero if shift instructions ignore all but the

> diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md

> index 528e344..ba595dd 100644

> --- a/gcc/config/arc/arc.md

> +++ b/gcc/config/arc/arc.md

> @@ -5122,13 +5122,13 @@ core_3, archs4x, archs4xd, archs4xd_slow"

>     (set_attr "type" "loop_end")

>     (set_attr "length" "4,20")])

>  

> -(define_expand "movmemsi"

> +(define_expand "cpymemsi"

>    [(match_operand:BLK 0 "" "")

>     (match_operand:BLK 1 "" "")

>     (match_operand:SI 2 "nonmemory_operand" "")

>     (match_operand 3 "immediate_operand" "")]

>    ""

> -  "if (arc_expand_movmem (operands)) DONE; else FAIL;")

> +  "if (arc_expand_cpymem (operands)) DONE; else FAIL;")

>  

>  ;; Close http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35803 if this works

>  ;; to the point that we can generate cmove instructions.

> -- 

> 2.7.4

>

Patch

diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h
index f501bc3..74e5247 100644
--- a/gcc/config/arc/arc-protos.h
+++ b/gcc/config/arc/arc-protos.h
@@ -35,7 +35,7 @@  extern void arc_final_prescan_insn (rtx_insn *, rtx *, int);
 extern const char *arc_output_libcall (const char *);
 extern int arc_output_addsi (rtx *operands, bool, bool);
 extern int arc_output_commutative_cond_exec (rtx *operands, bool);
-extern bool arc_expand_movmem (rtx *operands);
+extern bool arc_expand_cpymem (rtx *operands);
 extern bool prepare_move_operands (rtx *operands, machine_mode mode);
 extern void emit_shift (enum rtx_code, rtx, rtx, rtx);
 extern void arc_expand_atomic_op (enum rtx_code, rtx, rtx, rtx, rtx, rtx);
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 89f69c79..23171d2 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -8883,7 +8883,7 @@  arc_output_commutative_cond_exec (rtx *operands, bool output_p)
   return 8;
 }
 
-/* Helper function of arc_expand_movmem.  ADDR points to a chunk of memory.
+/* Helper function of arc_expand_cpymem.  ADDR points to a chunk of memory.
    Emit code and return an potentially modified address such that offsets
    up to SIZE are can be added to yield a legitimate address.
    if REUSE is set, ADDR is a register that may be modified.  */
@@ -8917,7 +8917,7 @@  force_offsettable (rtx addr, HOST_WIDE_INT size, bool reuse)
    offset ranges.  Return true on success.  */
 
 bool
-arc_expand_movmem (rtx *operands)
+arc_expand_cpymem (rtx *operands)
 {
   rtx dst = operands[0];
   rtx src = operands[1];
@@ -10427,7 +10427,7 @@  arc_use_by_pieces_infrastructure_p (unsigned HOST_WIDE_INT size,
 				    enum by_pieces_operation op,
 				    bool speed_p)
 {
-  /* Let the movmem expander handle small block moves.  */
+  /* Let the cpymem expander handle small block moves.  */
   if (op == MOVE_BY_PIECES)
     return false;
 
diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h
index 80dead9..4a9dd07 100644
--- a/gcc/config/arc/arc.h
+++ b/gcc/config/arc/arc.h
@@ -1423,7 +1423,7 @@  do { \
    in one reasonably fast instruction.  */
 #define MOVE_MAX 4
 
-/* Undo the effects of the movmem pattern presence on STORE_BY_PIECES_P .  */
+/* Undo the effects of the cpymem pattern presence on STORE_BY_PIECES_P .  */
 #define MOVE_RATIO(SPEED) ((SPEED) ? 15 : 3)
 
 /* Define this to be nonzero if shift instructions ignore all but the
diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md
index 528e344..ba595dd 100644
--- a/gcc/config/arc/arc.md
+++ b/gcc/config/arc/arc.md
@@ -5122,13 +5122,13 @@  core_3, archs4x, archs4xd, archs4xd_slow"
    (set_attr "type" "loop_end")
    (set_attr "length" "4,20")])
 
-(define_expand "movmemsi"
+(define_expand "cpymemsi"
   [(match_operand:BLK 0 "" "")
    (match_operand:BLK 1 "" "")
    (match_operand:SI 2 "nonmemory_operand" "")
    (match_operand 3 "immediate_operand" "")]
   ""
-  "if (arc_expand_movmem (operands)) DONE; else FAIL;")
+  "if (arc_expand_cpymem (operands)) DONE; else FAIL;")
 
 ;; Close http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35803 if this works
 ;; to the point that we can generate cmove instructions.