[gcc(refs/users/meissner/heads/work121)] PR target/105325, Rewrite genfusion.pl's gen_ld_cmpi_p10 function.
Michael Meissner
meissner@gcc.gnu.org
Wed May 10 15:20:15 GMT 2023
https://gcc.gnu.org/g:e44dcee02d21b314007d4cc06fc87552bfdd9bdc
commit e44dcee02d21b314007d4cc06fc87552bfdd9bdc
Author: Michael Meissner <meissner@linux.ibm.com>
Date: Wed May 10 11:17:58 2023 -0400
PR target/105325, Rewrite genfusion.pl's gen_ld_cmpi_p10 function.
This patch rewrites the gen_ld_cmpi_p10 function in genfusion.pl to be clearer.
The resulting fusion.md file that this patch generates is exactly the same
output that the previous version of genfusion.pl generated. The next patch in
this series will fix PR target/105325 (provide correct predicates and
constraints for power10 fusion of load and compare immediate).
This patch has been tested on:
* Little endian power9 with both IEEE and IBM long double
* Little endian power10
* Big endian power8 using both 32-bit and 64-bit code generation.
Can I check this into the master branch? Assuming I can check this in, I will
also commit to the active GCC branches.
2023-05-10 Michael Meissner <meissner@linux.ibm.com>
gcc/
PR target/105325
* config/rs6000/genfusion.pl (mode_to_ldst_char): Delete.
(print_ld_cmpi_p10): New function, split off from gen_ld_cmpi_p10.
(gen_ld_cmpi_p10): Rewrite completely.
Diff:
---
gcc/config/rs6000/genfusion.pl | 248 ++++++++++++++++++++++++++---------------
1 file changed, 157 insertions(+), 91 deletions(-)
diff --git a/gcc/config/rs6000/genfusion.pl b/gcc/config/rs6000/genfusion.pl
index e4db352e0ce..81ba4b33940 100755
--- a/gcc/config/rs6000/genfusion.pl
+++ b/gcc/config/rs6000/genfusion.pl
@@ -45,103 +45,169 @@ print <<'EOF';
EOF
-sub mode_to_ldst_char
+# Print the insns for load and compare with -1/0/1.
+# Arguments:
+# lmode -- Integer mode ("DI", "SI", "HI", or "QI").
+# result -- "clobber", "GPR", or $lmode
+# ccmode -- Sign vs. unsigned ("CC" or "CCUNS").
+# mem_format -- Memory format ("d" or "ds").
+# cmpl -- Suffix for compare ("l" or "")
+# const_pred -- Predicate for constant (i.e. -1/0/1 or 0/1).
+# extend -- "sign", "zero", or "none".
+# echr -- Suffix for load ("a", "z", or "").
+# load -- Load instruction (i.e. "ld", "lwa", "lwz", etc.)
+# np -- enum non_prefixed_form for memory type
+# constraint -- constraint to use
+# mem_pred -- predicate for the memory operation
+
+sub print_ld_cmpi_p10
{
- my ($mode) = @_;
- my %x = (DI => 'd', SI => 'w', HI => 'h', QI => 'b');
- return $x{$mode} if exists $x{$mode};
- return '?';
+ my ($lmode, $result, $ccmode, $cmpl, $const_pred,
+ $extend, $load, $np, $constraint, $mem_pred) = @_;
+
+ # For clobber, we need a SI/DI reg in case we split because we have to
+ # sign/zero extend.
+ my $clobbermode = ($lmode =~ m/^[HQ]I$/) ? "GPR" : $lmode;
+
+ # Break long print statements into smaller lines.
+ my $info = join (" ",
+ "load mode is ${lmode} result mode is ${result}",
+ "compare mode is ${ccmode} extend is ${extend}");
+
+ my $name = join ("",
+ "${load}_cmp${cmpl}di_cr0_${lmode}",
+ "_${result}_${ccmode}_${extend}");
+
+ my $cmp_op1 = "(match_operand:${lmode} 1 \"${mem_pred}\" \"${constraint}\")";
+
+ my $spaces = " " x (length ($ccmode) + 18);
+
+ print ";; load-cmpi fusion pattern generated by gen_ld_cmpi_p10\n";
+ print ";; ${info}\n";
+ print "(define_insn_and_split \"*${name}\"\n";
+ print " [(set (match_operand:${ccmode} 2 \"cc_reg_operand\" \"=x\")\n";
+ print " (compare:${ccmode} ${cmp_op1}\n";
+ print "${spaces}(match_operand:${lmode} 3 \"${const_pred}\" \"n\")))\n";
+
+ if ($result eq "clobber")
+ {
+ print " (clobber (match_scratch:${clobbermode} 0 \"=r\"))]\n";
+ }
+
+ else
+ {
+ my $load_op0 = "(match_operand:${result} 0 \"gpc_reg_operand\" \"=r\")";
+ my $load_op1 = (($result eq $lmode)
+ ? "(match_dup 1)"
+ : "(${extend}_extend:${result} (match_dup 1))");
+ print " (set ${load_op0} ${load_op1})]\n";
+ }
+
+ # Do not match prefixed loads. The machine only fuses non-prefixed loads
+ # with compare immediate. Take into account whether the load is a ds-form
+ # or a d-form instruction.
+ print " \"(TARGET_P10_FUSION)\"\n";
+ print " \"${load}%X1 %0,%1\\;cmp${cmpl}di %2,%0,%3\"\n";
+ print " \"&& reload_completed\n";
+ print " && (cc_reg_not_cr0_operand (operands[2], CCmode)\n";
+ print " || !address_is_non_pfx_d_or_x (XEXP (operands[1], 0),\n";
+ print " ${lmode}mode, ${np}))\"\n";
+
+ if ($extend eq "none")
+ {
+ print " [(set (match_dup 0) (match_dup 1))\n";
+ }
+
+ else
+ {
+ my $resultmode = ($result eq "clobber") ? $clobbermode : $result;
+ print " [(set (match_dup 0) (${extend}_extend:${resultmode} (match_dup 1)))\n";
+ }
+
+ print " (set (match_dup 2)\n";
+ print " (compare:${ccmode} (match_dup 0) (match_dup 3)))]\n";
+ print " \"\"\n";
+ print " [(set_attr \"type\" \"fused_load_cmpi\")\n";
+ print " (set_attr \"cost\" \"8\")\n";
+ print " (set_attr \"length\" \"8\")])\n";
+ print "\n";
}
sub gen_ld_cmpi_p10
{
- my ($lmode, $ldst, $clobbermode, $result, $cmpl, $echr, $constpred,
- $mempred, $ccmode, $np, $extend, $resultmode);
- LMODE: foreach $lmode ('DI','SI','HI','QI') {
- $ldst = mode_to_ldst_char($lmode);
- $clobbermode = $lmode;
- # For clobber, we need a SI/DI reg in case we
- # split because we have to sign/zero extend.
- if ($lmode eq 'HI' || $lmode eq 'QI') { $clobbermode = "GPR"; }
- RESULT: foreach $result ('clobber', $lmode, "EXT".$lmode) {
- # EXTDI does not exist, and we cannot directly produce HI/QI results.
- next RESULT if $result eq "EXTDI" || $result eq "HI" || $result eq "QI";
- # Don't allow EXTQI because that would allow HI result which we can't do.
- $result = "GPR" if $result eq "EXTQI";
- CCMODE: foreach $ccmode ('CC','CCUNS') {
- $np = "NON_PREFIXED_D";
- $mempred = "non_update_memory_operand";
- if ( $ccmode eq 'CC' ) {
- next CCMODE if $lmode eq 'QI';
- if ( $lmode eq 'DI' || $lmode eq 'SI' ) {
- # ld and lwa are both DS-FORM.
- $np = "NON_PREFIXED_DS";
- $mempred = "ds_form_mem_operand";
- }
- $cmpl = "";
- $echr = "a";
- $constpred = "const_m1_to_1_operand";
- } else {
- if ( $lmode eq 'DI' ) {
- # ld is DS-form, but lwz is not.
- $np = "NON_PREFIXED_DS";
- $mempred = "ds_form_mem_operand";
- }
- $cmpl = "l";
- $echr = "z";
- $constpred = "const_0_to_1_operand";
- }
- if ($lmode eq 'DI') { $echr = ""; }
- if ($result =~ m/^EXT/ || $result eq 'GPR' || $clobbermode eq 'GPR') {
- # We always need extension if result > lmode.
- if ( $ccmode eq 'CC' ) {
- $extend = "sign";
- } else {
- $extend = "zero";
- }
- } else {
- # Result of SI/DI does not need sign extension.
- $extend = "none";
- }
- print ";; load-cmpi fusion pattern generated by gen_ld_cmpi_p10\n";
- print ";; load mode is $lmode result mode is $result compare mode is $ccmode extend is $extend\n";
-
- print "(define_insn_and_split \"*l${ldst}${echr}_cmp${cmpl}di_cr0_${lmode}_${result}_${ccmode}_${extend}\"\n";
- print " [(set (match_operand:${ccmode} 2 \"cc_reg_operand\" \"=x\")\n";
- print " (compare:${ccmode} (match_operand:${lmode} 1 \"${mempred}\" \"m\")\n";
- if ($ccmode eq 'CCUNS') { print " "; }
- print " (match_operand:${lmode} 3 \"${constpred}\" \"n\")))\n";
- if ($result eq 'clobber') {
- print " (clobber (match_scratch:${clobbermode} 0 \"=r\"))]\n";
- } elsif ($result eq $lmode) {
- print " (set (match_operand:${result} 0 \"gpc_reg_operand\" \"=r\") (match_dup 1))]\n";
- } else {
- print " (set (match_operand:${result} 0 \"gpc_reg_operand\" \"=r\") (${extend}_extend:${result} (match_dup 1)))]\n";
- }
- print " \"(TARGET_P10_FUSION)\"\n";
- print " \"l${ldst}${echr}%X1 %0,%1\\;cmp${cmpl}di %2,%0,%3\"\n";
- print " \"&& reload_completed\n";
- print " && (cc_reg_not_cr0_operand (operands[2], CCmode)\n";
- print " || !address_is_non_pfx_d_or_x (XEXP (operands[1], 0),\n";
- print " ${lmode}mode, ${np}))\"\n";
-
- if ($extend eq "none") {
- print " [(set (match_dup 0) (match_dup 1))\n";
- } else {
- $resultmode = $result;
- if ( $result eq 'clobber' ) { $resultmode = $clobbermode }
- print " [(set (match_dup 0) (${extend}_extend:${resultmode} (match_dup 1)))\n";
- }
- print " (set (match_dup 2)\n";
- print " (compare:${ccmode} (match_dup 0) (match_dup 3)))]\n";
- print " \"\"\n";
- print " [(set_attr \"type\" \"fused_load_cmpi\")\n";
- print " (set_attr \"cost\" \"8\")\n";
- print " (set_attr \"length\" \"8\")])\n";
- print "\n";
- }
+ my ($lmode, $result, $mem_format, $extend);
+
+ # Map mode to load instruction
+ my %signed_load = ("DI" => "ld",
+ "SI" => "lwa",
+ "HI" => "lha");
+
+ my %unsigned_load = ("DI" => "ld",
+ "SI" => "lwz",
+ "HI" => "lhz",
+ "QI" => "lbz");
+
+ # Memory predicate to use.
+ my %signed_memory_predicate = ("DI" => "ds_form_mem_operand",
+ "SI" => "ds_form_mem_operand",
+ "HI" => "non_update_memory_operand");
+
+ my %unsigned_memory_predicate = ("DI" => "ds_form_mem_operand",
+ "SI" => "non_update_memory_operand",
+ "HI" => "non_update_memory_operand",
+ "QI" => "non_update_memory_operand");
+
+ # Internal format of the memory instruction (enum non_prefixed_form) to use.
+ my %np = ("ds" => "NON_PREFIXED_DS",
+ "d" => "NON_PREFIXED_D");
+
+ # Result modes to use. Clobber is used when you are comparing the load to
+ # -1/0/1, but you are not using it otherwise. EXTDI does not exist. We
+ # cannot directly use HI/QI results because we only have word and double word
+ # compared. For promotion, don't allow EXTQI because that would allow HI
+ # results which we can't do (use GPR instead).
+ my %result_modes = ("DI" => ["clobber", "DI"],
+ "SI" => ["clobber", "SI", "EXTSI" ],
+ "HI" => ["clobber", "EXTHI" ],
+ "QI" => ["clobber", "GPR" ]);
+
+ foreach $lmode ("DI", "SI", "HI", "QI")
+ {
+ foreach $result (@{ $result_modes{$lmode} })
+ {
+ # Handle CCmode (sign extended compares to -1, 0, or 1). We don't
+ # have a LBA instruction, so skip QImode. Both LD and LWA are
+ # DS-form instructions for signed loads.
+ if ($lmode ne "QI")
+ {
+ $mem_format = ($lmode =~ m/^[DS]I$/) ? "ds" : "d";
+ $extend = (($lmode eq "DI"
+ || $lmode eq $result
+ || ($lmode eq "SI" && $result eq "clobber"))
+ ? "none"
+ : "sign");
+
+ print_ld_cmpi_p10 ($lmode, $result, "CC", "",
+ "const_m1_to_1_operand", $extend,
+ $signed_load{$lmode}, $np{$mem_format}, "m",
+ $signed_memory_predicate{$lmode});
+ }
+
+ # Handle CCUNS mode (zero extended compares to 0 or 1.
+ # LD is DS-form, but LWZ is not for unsigned loads.
+ $mem_format = ($lmode eq "DI") ? "ds" : "d";
+ $extend = (($lmode eq "DI"
+ || $lmode eq $result
+ || ($lmode eq "SI" && $result eq "clobber"))
+ ? "none"
+ : "zero");
+
+ print_ld_cmpi_p10 ($lmode, $result, "CCUNS", "l",
+ "const_0_to_1_operand", $extend,
+ $unsigned_load{$lmode}, $np{$mem_format}, "m",
+ $unsigned_memory_predicate{$lmode});
+ }
}
- }
}
sub gen_logical_addsubf
More information about the Gcc-cvs
mailing list