From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from nh605-vm7.bullet.mail.ssk.yahoo.co.jp (nh605-vm7.bullet.mail.ssk.yahoo.co.jp [182.22.90.80]) by sourceware.org (Postfix) with SMTP id BCE453858C2D for ; Thu, 8 Sep 2022 21:38:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BCE453858C2D Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=yahoo.co.jp Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=yahoo.co.jp Received: from [182.22.66.105] by nh605.bullet.mail.ssk.yahoo.co.jp with NNFMP; 08 Sep 2022 21:38:24 -0000 Received: from [182.22.91.131] by t603.bullet.mail.ssk.yahoo.co.jp with NNFMP; 08 Sep 2022 21:38:24 -0000 Received: from [127.0.0.1] by omp604.mail.ssk.yahoo.co.jp with NNFMP; 08 Sep 2022 21:38:24 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 452697.94362.bm@omp604.mail.ssk.yahoo.co.jp Received: (qmail 47081 invoked by alias); 8 Sep 2022 21:38:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.jp; s=yj20110701; t=1662673104; bh=olwfJ4oBDnkT25iOLKfjhVtAF2Il+lbH1diAL/hkiBA=; h=Received:X-YMail-JAS:X-Apparently-From:X-YMail-OSG:Message-ID:Date:MIME-Version:User-Agent:To:Cc:From:Subject:Content-Type:Content-Transfer-Encoding; b=UiuwRFxLkR6UI8mph3p7FvuWRu5JsPtpmXnfpvTgconRPPMxpya/tD3qBSTgDqEscgvowbHZr6wUZPNK2X58FGHmqjVxO1OJWhqWmJ6dPKoJ5w2vSZztTrrAKTVrA7/LaM8H/LNPvs12XhfSzQi6OFPC2RfTUeGDUIBeR1i3b8w= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=yj20110701; d=yahoo.co.jp; h=Received:X-YMail-JAS:X-Apparently-From:X-YMail-OSG:Message-ID:Date:MIME-Version:User-Agent:To:Cc:From:Subject:Content-Type:Content-Transfer-Encoding; b=DqCGyrIK/aGFLYb0ZFHIxtcP3EjfcKXwYIDkO5DmuCoVj98vBFunG9B/ohnYaYQzJAozHRGSvLvQS8u/Ew5NTChm4mM1J5EeRyYJhJBTWhS/cTGRSNOJOACWOGirPl0f88ksw+XixWxAG2qZB1gNPpAP/2dpQlO8oBHFRqp+8yQ= ; Received: from unknown (HELO ?192.168.150.80?) (183.77.162.93 with ) by smtp6009.mail.ssk.ynwp.yahoo.co.jp with SMTP; 8 Sep 2022 21:38:23 -0000 X-YMail-JAS: 4LJoiT0VM1nHDUZ9wsj8IZ6lyeBC4EzcTDho2YNXjpZSD.xx0kqOj7swMpnzaC9l_L0zGTvazKvxiRATxMI53cnia71eWtFo.HcOymGwU4adk0gfQjrRnnIq0N01l8PMvU36K75ztQ-- X-Apparently-From: X-YMail-OSG: vq49YEUVM1m60He31NJY2ZiVQZVEKL4GTboFe74cFRc7239 w4b4KiMUQ9FlRe02RMdB33Y7.m.kL5Kipl8AYzHWGjHrdAI0.2ZfFSaQrx6N 5Ql0VxhwAMN9JwsQmydqWlrmAl4H2spGaLJh5ZlMeeebtHB7r5o4oR_IZmIz GOxs4WEg4BHfTyG3E72ri1iz.xm2ALtbr4zM7M3cpMHAO.c3mnJSHAZqYRtT 0H3qTia7QE4O2ywE9DZqAc4ZjGpxsDn.16idTFdg55OyJqt75aooLXIhLqAv f7fj6SXJZtTRJwReHhu08ZXbXJJDAimOBfeeD2zkeWgrF1aBJNIDOeibyo1M ItA6i1tQPKos_Q9SCnElqtwtgI6ihiTXoDbCTThVIKb.AmUsan9q_Hq7nbXB 34kvOBPSvRRxwhN_N7F.UdB1lUThQv4qipw7SCZHBPBLSfEMk3EdlQyJWhun yxPD0xGsYmNSXfmJ164bXcitB0Aqm2ifJgXF4k.573JcDvX0jVzw_raTDe6. Ra6NBzf8StwanMzc7GHBLEyNXDUaf4kBQXObJqGcvYKRxMXYpXrYEjxohUuX _uSkd3Mc4FwkJNkNLwkyeITNJ3cvoVFq83zTSVKIGCHi2DQWI6Uui2042lSz 9ptDUJRwgrI5J5b5RxtVluvItWlNeWa97RalPgWSPVIN7hu5AHKYdMxSyOJR .pMzKHCcsQODzx0AjvBcJW8Nlf2sAOhFRL6k.E56Xv7sSR9BLQgB19IwA0IN FzAKjvWI6h1yhlVNhADpsX3y6LR941nLJIagcTbd3Jm9v_JWeJq6iPhDvCVY Lra01uVYAQw6Jetmx4OW1I70ux8MX_aqIThiZ71dlgGBcEeJBTyxB2hMttP2 yRbj3bbG2GdFWOY7CDK14IYBqynIRh1zMXonUJ.hQJntdfAer04pIX.nI85X vBRo0ttxpX7SqaNif Message-ID: <58b7fe91-a678-0cfd-9697-aa565bda0d68@yahoo.co.jp> Date: Fri, 9 Sep 2022 06:16:31 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 To: GCC Patches Cc: Max Filippov From: Takayuki 'January June' Suwa Subject: [PATCH v4 1/2] xtensa: Eliminate unused stack frame allocation/freeing Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Changes from v3: (xtensa_expand_prologue): Changed to exclude debug insns from DF use chain analysis. --- In the example below, 'x' is once placed on the stack frame and then read into registers as the argument value of bar(): /* example */ struct foo { int a, b; }; extern struct foo bar(struct foo); struct foo test(void) { struct foo x = { 0, 1 }; return bar(x); } Thanks to the dead store elimination, the initialization of 'x' turns into merely loading the immediates to registers, but corresponding stack frame growth is not rolled back. As a result: ;; prereq: the CALL0 ABI ;; before test: addi sp, sp, -16 // unused stack frame allocation/freeing movi.n a2, 0 movi.n a3, 1 addi sp, sp, 16 // because no instructions that refer to j.l bar, a9 // the stack pointer between the two This patch eliminates such unused stack frame allocation/freeing: ;; after test: movi.n a2, 0 movi.n a3, 1 j.l bar, a9 gcc/ChangeLog: * config/xtensa/xtensa.cc (machine_function): New boolean member as a flag that controls whether to emit the insns for stack pointer adjustment inside of the pro/epilogue. (xtensa_emit_adjust_stack_ptr): New function to share the common codes and to emit insns if not inhibited. (xtensa_expand_epilogue): Change to use the function mentioned above when using the CALL0 ABI. (xtensa_expand_prologue): Ditto. And also change to set the inhibit flag used by xtensa_emit_adjust_stack_ptr() to true if the stack pointer is only used for its own adjustment. --- gcc/config/xtensa/xtensa.cc | 164 ++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 84 deletions(-) diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc index 93ac6562b22..0f586b09dfb 100644 --- a/gcc/config/xtensa/xtensa.cc +++ b/gcc/config/xtensa/xtensa.cc @@ -102,6 +102,7 @@ struct GTY(()) machine_function int callee_save_size; bool frame_laid_out; bool epilogue_done; + bool inhibit_logues_a1_adjusts; }; /* Vector, indexed by hard register number, which contains 1 for a @@ -3048,7 +3049,7 @@ xtensa_output_literal (FILE *file, rtx x, machine_mode mode, int labelno) } static bool -xtensa_call_save_reg(int regno) +xtensa_call_save_reg (int regno) { if (TARGET_WINDOWED_ABI) return false; @@ -3084,7 +3085,7 @@ compute_frame_size (poly_int64 size) cfun->machine->callee_save_size = 0; for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno) { - if (xtensa_call_save_reg(regno)) + if (xtensa_call_save_reg (regno)) cfun->machine->callee_save_size += UNITS_PER_WORD; } @@ -3139,6 +3140,49 @@ xtensa_initial_elimination_offset (int from, int to ATTRIBUTE_UNUSED) return offset; } +#define ADJUST_SP_NONE 0x0 +#define ADJUST_SP_NEED_NOTE 0x1 +#define ADJUST_SP_FRAME_PTR 0x2 +static void +xtensa_emit_adjust_stack_ptr (HOST_WIDE_INT offset, int flags) +{ + rtx_insn *insn; + rtx ptr = (flags & ADJUST_SP_FRAME_PTR) ? hard_frame_pointer_rtx + : stack_pointer_rtx; + + if (cfun->machine->inhibit_logues_a1_adjusts) + return; + + if (xtensa_simm8 (offset) + || xtensa_simm8x256 (offset)) + insn = emit_insn (gen_addsi3 (stack_pointer_rtx, ptr, GEN_INT (offset))); + else + { + rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); + + if (offset < 0) + { + emit_move_insn (tmp_reg, GEN_INT (-offset)); + insn = emit_insn (gen_subsi3 (stack_pointer_rtx, ptr, tmp_reg)); + } + else + { + emit_move_insn (tmp_reg, GEN_INT (offset)); + insn = emit_insn (gen_addsi3 (stack_pointer_rtx, ptr, tmp_reg)); + } + } + + if (flags & ADJUST_SP_NEED_NOTE) + { + rtx note_rtx = gen_rtx_SET (stack_pointer_rtx, + plus_constant (Pmode, stack_pointer_rtx, + offset)); + + RTX_FRAME_RELATED_P (insn) = 1; + add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); + } +} + /* minimum frame = reg save area (4 words) plus static chain (1 word) and the total number of words must be a multiple of 128 bits. */ #define MIN_FRAME_SIZE (8 * UNITS_PER_WORD) @@ -3174,17 +3218,30 @@ xtensa_expand_prologue (void) int regno; HOST_WIDE_INT offset = 0; int callee_save_size = cfun->machine->callee_save_size; + df_ref ref; + bool stack_pointer_needed = frame_pointer_needed + || crtl->calls_eh_return; + + /* Check if the function body really needs the stack pointer. */ + if (!stack_pointer_needed) + for (ref = DF_REG_USE_CHAIN (A1_REG); + ref; ref = DF_REF_NEXT_REG (ref)) + if (DF_REF_CLASS (ref) == DF_REF_REGULAR + && NONJUMP_INSN_P (DF_REF_INSN (ref))) + stack_pointer_needed = true; + /* Check if callee-saved registers really need saving to the stack. */ + if (!stack_pointer_needed) + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno) + if (xtensa_call_save_reg (regno)) + stack_pointer_needed = true; + + cfun->machine->inhibit_logues_a1_adjusts = !stack_pointer_needed; /* -128 is a limit of single addi instruction. */ if (IN_RANGE (total_size, 1, 128)) { - insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, - GEN_INT (-total_size))); - RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, - -total_size)); - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); + xtensa_emit_adjust_stack_ptr (-total_size, + ADJUST_SP_NEED_NOTE); offset = total_size - UNITS_PER_WORD; } else if (callee_save_size) @@ -3194,33 +3251,14 @@ xtensa_expand_prologue (void) * move it to its final location. */ if (total_size > 1024) { - insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, - GEN_INT (-callee_save_size))); - RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, - -callee_save_size)); - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); + xtensa_emit_adjust_stack_ptr (-callee_save_size, + ADJUST_SP_NEED_NOTE); offset = callee_save_size - UNITS_PER_WORD; } else { - if (xtensa_simm8x256 (-total_size)) - insn = emit_insn (gen_addsi3 (stack_pointer_rtx, - stack_pointer_rtx, - GEN_INT (-total_size))); - else - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, GEN_INT (total_size)); - insn = emit_insn (gen_subsi3 (stack_pointer_rtx, - stack_pointer_rtx, tmp_reg)); - } - RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, - -total_size)); - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); + xtensa_emit_adjust_stack_ptr (-total_size, + ADJUST_SP_NEED_NOTE); offset = total_size - UNITS_PER_WORD; } } @@ -3242,27 +3280,8 @@ xtensa_expand_prologue (void) } if (total_size > 1024 || (!callee_save_size && total_size > 128)) - { - if (xtensa_simm8x256 (callee_save_size - total_size)) - insn = emit_insn (gen_addsi3 (stack_pointer_rtx, - stack_pointer_rtx, - GEN_INT (callee_save_size - - total_size))); - else - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, GEN_INT (total_size - - callee_save_size)); - insn = emit_insn (gen_subsi3 (stack_pointer_rtx, - stack_pointer_rtx, tmp_reg)); - } - RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, - callee_save_size - - total_size)); - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); - } + xtensa_emit_adjust_stack_ptr (callee_save_size - total_size, + ADJUST_SP_NEED_NOTE); } if (frame_pointer_needed) @@ -3329,21 +3348,11 @@ xtensa_expand_epilogue (bool sibcall_p) if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024)) { - if (xtensa_simm8x256 (cfun->machine->current_frame_size - - cfun->machine->callee_save_size)) - emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ? - hard_frame_pointer_rtx : stack_pointer_rtx, - GEN_INT (cfun->machine->current_frame_size - - cfun->machine->callee_save_size))); - else - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size - - cfun->machine->callee_save_size)); - emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ? - hard_frame_pointer_rtx : stack_pointer_rtx, - tmp_reg)); - } + xtensa_emit_adjust_stack_ptr (cfun->machine->current_frame_size - + cfun->machine->callee_save_size, + frame_pointer_needed + ? ADJUST_SP_FRAME_PTR + : ADJUST_SP_NONE); offset = cfun->machine->callee_save_size - UNITS_PER_WORD; } else @@ -3384,24 +3393,11 @@ xtensa_expand_epilogue (bool sibcall_p) else offset = cfun->machine->callee_save_size; if (offset) - emit_insn (gen_addsi3 (stack_pointer_rtx, - stack_pointer_rtx, - GEN_INT (offset))); + xtensa_emit_adjust_stack_ptr (offset, ADJUST_SP_NONE); } else - { - if (xtensa_simm8x256 (cfun->machine->current_frame_size)) - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, - GEN_INT (cfun->machine->current_frame_size))); - else - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, - GEN_INT (cfun->machine->current_frame_size)); - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, - tmp_reg)); - } - } + xtensa_emit_adjust_stack_ptr (cfun->machine->current_frame_size, + ADJUST_SP_NONE); } if (crtl->calls_eh_return) -- 2.20.1