[gcc r13-783] xtensa: Fix instruction counting regarding block move expansion

[gcc r13-783] xtensa: Fix instruction counting regarding block move expansion

[Max Filippov]

https://gcc.gnu.org/g:3397563ad6c8fc5d9675faf507e52dd2ed284202

commit r13-783-g3397563ad6c8fc5d9675faf507e52dd2ed284202
Author: Takayuki 'January June' Suwa <jjsuwa_sys3175@yahoo.co.jp>
Date:   Fri May 13 22:29:22 2022 +0900

    xtensa: Fix instruction counting regarding block move expansion
    
    This patch makes counting the number of instructions of the remainder
    (modulo 4) part more accurate.
    
    gcc/ChangeLog:
    
            * config/xtensa/xtensa.cc (xtensa_expand_block_move):
            Make instruction counting more accurate, and simplify emitting insns.

Diff:
---
 gcc/config/xtensa/xtensa.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc
index c5518ff9549..d2aabf38339 100644
--- a/gcc/config/xtensa/xtensa.cc
+++ b/gcc/config/xtensa/xtensa.cc
@@ -1313,7 +1313,7 @@ xtensa_expand_block_move (rtx *operands)
   move_ratio = 4;
   if (optimize > 2)
     move_ratio = LARGEST_MOVE_RATIO;
-  num_pieces = (bytes / align) + (bytes % align); /* Close enough anyway.  */
+  num_pieces = (bytes / align) + ((bytes % align + 1) / 2);
   if (num_pieces > move_ratio)
     return 0;
 
@@ -1350,7 +1350,7 @@ xtensa_expand_block_move (rtx *operands)
 	  temp[next] = gen_reg_rtx (mode[next]);
 
 	  x = adjust_address (src_mem, mode[next], offset_ld);
-	  emit_insn (gen_rtx_SET (temp[next], x));
+	  emit_move_insn (temp[next], x);
 
 	  offset_ld += next_amount;
 	  bytes -= next_amount;
@@ -1360,9 +1360,9 @@ xtensa_expand_block_move (rtx *operands)
       if (active[phase])
 	{
 	  active[phase] = false;
-	  
+
 	  x = adjust_address (dst_mem, mode[phase], offset_st);
-	  emit_insn (gen_rtx_SET (x, temp[phase]));
+	  emit_move_insn (x, temp[phase]);
 
 	  offset_st += amount[phase];
 	}