From 0bcd172e9d3dd38b4dff32f089e943da293682ff Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Sat, 2 Dec 2017 02:33:39 +0100 Subject: [PATCH] rs6000: Improve fusion assembler output This improves the output for load and store fusion a little. In most cases it removes the comment output, because that makes the generated assembler code hard to read, and equivalent info is available with -dp anyway. For the vector loads it puts the comment on the second insn, where it doesn't interfere with other debug comments. * config/rs6000/rs6000-protos.h (emit_fusion_addis): Remove last two parameters from prototype. * config/rs6000/rs6000.c (emit_fusion_addis): Remove last two parameters. Don't print a comment. (emit_fusion_gpr_load): Adjust. (emit_fusion_load_store): Adjust. * config/rs6000/rs6000.md (*fusion_p9__constant): Adjust. * config/rs6000/vsx.md (two peepholes): Print the "vector load fusion" comment on the second line. gcc/testsuite/ * gcc.target/powerpc/fusion.c: Add -dp to options. Adjust the expected output. * gcc.target/powerpc/fusion3.c: Ditto. * gcc.target/powerpc/fusion4.c: Ditto. From-SVN: r255350 --- gcc/ChangeLog | 12 +++++++++++ gcc/config/rs6000/rs6000-protos.h | 2 +- gcc/config/rs6000/rs6000.c | 23 +++++----------------- gcc/config/rs6000/rs6000.md | 2 +- gcc/config/rs6000/vsx.md | 4 ++-- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.target/powerpc/fusion.c | 4 ++-- gcc/testsuite/gcc.target/powerpc/fusion3.c | 10 +++++----- gcc/testsuite/gcc.target/powerpc/fusion4.c | 5 ++--- 9 files changed, 37 insertions(+), 32 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index da0c32e9a6d..3795d2c23bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2017-12-01 Segher Boessenkool + + * config/rs6000/rs6000-protos.h (emit_fusion_addis): Remove last two + parameters from prototype. + * config/rs6000/rs6000.c (emit_fusion_addis): Remove last two + parameters. Don't print a comment. + (emit_fusion_gpr_load): Adjust. + (emit_fusion_load_store): Adjust. + * config/rs6000/rs6000.md (*fusion_p9__constant): Adjust. + * config/rs6000/vsx.md (two peepholes): Print the "vector load fusion" + comment on the second line. + 2017-12-01 Segher Boessenkool PR target/43871 diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h index 07288000705..9264aa2fd26 100644 --- a/gcc/config/rs6000/rs6000-protos.h +++ b/gcc/config/rs6000/rs6000-protos.h @@ -96,7 +96,7 @@ extern bool quad_address_p (rtx, machine_mode, bool); extern bool quad_load_store_p (rtx, rtx); extern bool fusion_gpr_load_p (rtx, rtx, rtx, rtx); extern void expand_fusion_gpr_load (rtx *); -extern void emit_fusion_addis (rtx, rtx, const char *, const char *); +extern void emit_fusion_addis (rtx, rtx); extern void emit_fusion_load_store (rtx, rtx, rtx, const char *); extern const char *emit_fusion_gpr_load (rtx, rtx); extern bool fusion_p9_p (rtx, rtx, rtx, rtx); diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 2adf406aac7..ed668d05eea 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -38630,16 +38630,10 @@ expand_fusion_gpr_load (rtx *operands) sequence. */ void -emit_fusion_addis (rtx target, rtx addis_value, const char *comment, - const char *mode_name) +emit_fusion_addis (rtx target, rtx addis_value) { rtx fuse_ops[10]; - char insn_template[80]; const char *addis_str = NULL; - const char *comment_str = ASM_COMMENT_START; - - if (*comment_str == ' ') - comment_str++; /* Emit the addis instruction. */ fuse_ops[0] = target; @@ -38719,9 +38713,7 @@ emit_fusion_addis (rtx target, rtx addis_value, const char *comment, if (!addis_str) fatal_insn ("Could not generate addis value for fusion", addis_value); - sprintf (insn_template, "%s\t\t%s %s, type %s", addis_str, comment_str, - comment, mode_name); - output_asm_insn (insn_template, fuse_ops); + output_asm_insn (addis_str, fuse_ops); } /* Emit a D-form load or store instruction that is the second instruction @@ -38854,7 +38846,6 @@ emit_fusion_gpr_load (rtx target, rtx mem) rtx addr; rtx load_offset; const char *load_str = NULL; - const char *mode_name = NULL; machine_mode mode; if (GET_CODE (mem) == ZERO_EXTEND) @@ -38870,25 +38861,21 @@ emit_fusion_gpr_load (rtx target, rtx mem) switch (mode) { case E_QImode: - mode_name = "char"; load_str = "lbz"; break; case E_HImode: - mode_name = "short"; load_str = "lhz"; break; case E_SImode: case E_SFmode: - mode_name = (mode == SFmode) ? "float" : "int"; load_str = "lwz"; break; case E_DImode: case E_DFmode: gcc_assert (TARGET_POWERPC64); - mode_name = (mode == DFmode) ? "double" : "long"; load_str = "ld"; break; @@ -38897,7 +38884,7 @@ emit_fusion_gpr_load (rtx target, rtx mem) } /* Emit the addis instruction. */ - emit_fusion_addis (target, addis_value, "gpr load fusion", mode_name); + emit_fusion_addis (target, addis_value); /* Emit the D-form load instruction. */ emit_fusion_load_store (target, target, load_offset, load_str); @@ -39166,7 +39153,7 @@ emit_fusion_p9_load (rtx reg, rtx mem, rtx tmp_reg) fusion_split_address (addr, &hi, &lo); /* Emit the addis instruction. */ - emit_fusion_addis (tmp_reg, hi, "power9 load fusion", GET_MODE_NAME (mode)); + emit_fusion_addis (tmp_reg, hi); /* Emit the D-form load instruction. */ emit_fusion_load_store (reg, tmp_reg, lo, load_string); @@ -39253,7 +39240,7 @@ emit_fusion_p9_store (rtx mem, rtx reg, rtx tmp_reg) fusion_split_address (addr, &hi, &lo); /* Emit the addis instruction. */ - emit_fusion_addis (tmp_reg, hi, "power9 store fusion", GET_MODE_NAME (mode)); + emit_fusion_addis (tmp_reg, hi); /* Emit the D-form load instruction. */ emit_fusion_load_store (reg, tmp_reg, lo, store_string); diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index f8c91c72704..56be70373e4 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -14110,7 +14110,7 @@ UNSPEC_FUSION_P9))] "TARGET_P9_FUSION" { - emit_fusion_addis (operands[0], operands[1], "constant", ""); + emit_fusion_addis (operands[0], operands[1]); return "ori %0,%0,%2"; } [(set_attr "type" "two") diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md index 00d76563f37..f6f2bd48363 100644 --- a/gcc/config/rs6000/vsx.md +++ b/gcc/config/rs6000/vsx.md @@ -4160,7 +4160,7 @@ (mem:VSX_M (plus:P (match_dup 0) (match_operand:P 3 "int_reg_operand" ""))))] "TARGET_VSX && TARGET_P8_FUSION && !TARGET_P9_VECTOR" - "li %0,%1\t\t\t# vector load fusion\;lxx %x2,%0,%3" + "li %0,%1\;lxx %x2,%0,%3\t\t\t# vector load fusion" [(set_attr "length" "8") (set_attr "type" "vecload")]) @@ -4171,7 +4171,7 @@ (mem:VSX_M (plus:P (match_operand:P 3 "int_reg_operand" "") (match_dup 0))))] "TARGET_VSX && TARGET_P8_FUSION && !TARGET_P9_VECTOR" - "li %0,%1\t\t\t# vector load fusion\;lxx %x2,%0,%3" + "li %0,%1\;lxx %x2,%0,%3\t\t\t# vector load fusion" [(set_attr "length" "8") (set_attr "type" "vecload")]) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dadd4c95da1..8133e8af91a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-12-01 Segher Boessenkool + + * gcc.target/powerpc/fusion.c: Add -dp to options. Adjust the expected + output. + * gcc.target/powerpc/fusion3.c: Ditto. + * gcc.target/powerpc/fusion4.c: Ditto. + 2017-12-01 Michael Meissner PR target/81959 diff --git a/gcc/testsuite/gcc.target/powerpc/fusion.c b/gcc/testsuite/gcc.target/powerpc/fusion.c index 83dbddc3116..3c75be4a292 100644 --- a/gcc/testsuite/gcc.target/powerpc/fusion.c +++ b/gcc/testsuite/gcc.target/powerpc/fusion.c @@ -2,7 +2,7 @@ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */ -/* { dg-options "-mcpu=power7 -mtune=power8 -O3" } */ +/* { dg-options "-mcpu=power7 -mtune=power8 -O3 -dp" } */ #define LARGE 0x12345 @@ -13,7 +13,7 @@ int fusion_short (short *p){ return p[LARGE]; } int fusion_int (int *p){ return p[LARGE]; } unsigned fusion_uns (unsigned *p){ return p[LARGE]; } -/* { dg-final { scan-assembler-times "gpr load fusion" 6 } } */ +/* { dg-final { scan-assembler-times "fusion_gpr_load" 6 } } */ /* { dg-final { scan-assembler-times "lbz" 2 } } */ /* { dg-final { scan-assembler-times "extsb" 1 } } */ /* { dg-final { scan-assembler-times "lhz" 2 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fusion3.c b/gcc/testsuite/gcc.target/powerpc/fusion3.c index bb35ccdec94..0d9f3182586 100644 --- a/gcc/testsuite/gcc.target/powerpc/fusion3.c +++ b/gcc/testsuite/gcc.target/powerpc/fusion3.c @@ -2,7 +2,7 @@ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p9vector_ok } */ /* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */ -/* { dg-options "-mcpu=power7 -mtune=power9 -O3" } */ +/* { dg-options "-mcpu=power7 -mtune=power9 -O3 -dp" } */ #define LARGE 0x12345 @@ -12,7 +12,7 @@ int fusion_double_read (double *p){ return p[LARGE]; } void fusion_float_write (float *p, float f){ p[LARGE] = f; } void fusion_double_write (double *p, double d){ p[LARGE] = d; } -/* { dg-final { scan-assembler "load fusion, type SF" } } */ -/* { dg-final { scan-assembler "load fusion, type DF" } } */ -/* { dg-final { scan-assembler "store fusion, type SF" } } */ -/* { dg-final { scan-assembler "store fusion, type DF" } } */ +/* { dg-final { scan-assembler {fusion_vsx_[sd]i_sf_load} } } */ +/* { dg-final { scan-assembler {fusion_vsx_[sd]i_df_load} } } */ +/* { dg-final { scan-assembler {fusion_vsx_[sd]i_sf_store} } } */ +/* { dg-final { scan-assembler {fusion_vsx_[sd]i_df_store} } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/fusion4.c b/gcc/testsuite/gcc.target/powerpc/fusion4.c index 2f3ad128813..703c06cbfa4 100644 --- a/gcc/testsuite/gcc.target/powerpc/fusion4.c +++ b/gcc/testsuite/gcc.target/powerpc/fusion4.c @@ -1,8 +1,7 @@ -/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p9vector_ok } */ /* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */ -/* { dg-options "-mcpu=power7 -mtune=power9 -O3 -msoft-float" } */ +/* { dg-options "-mcpu=power7 -mtune=power9 -O3 -msoft-float -dp" } */ #define LARGE 0x12345 @@ -10,4 +9,4 @@ float fusion_float_read (float *p){ return p[LARGE]; } void fusion_float_write (float *p, float f){ p[LARGE] = f; } -/* { dg-final { scan-assembler "store fusion, type SF" } } */ +/* { dg-final { scan-assembler {fusion_gpr_[sd]i_sf_store} } } */ -- 2.30.2