[PATCH v2] [SPARC] Add -mfsmuld option

[PATCH v2] [SPARC] Add -mfsmuld option

[Sebastian Huber]

Add the -mfsmuld option to control the generation of the FsMULd
instruction.  In general, this instruction is available in architecture
version V8 and V9 CPUs with FPU.  Some CPUs of this category do not
support this instruction properly, e.g. AT697E, AT697F and UT699.  Some
CPUs of this category do not implement it in hardware, e.g. LEON3/4 with
GRFPU-lite.

gcc/
	* config/sparc/sparc.c (dump_target_flag_bits): Dump MASK_FSMULD.
	(sparc_option_override): Honour MASK_FSMULD.
	* config/sparc/sparc.h (MASK_FEATURES): Add MASK_FSMULD.
	* config/sparc/sparc.md (muldf3_extend): Use TARGET_FSMULD.
	* config/sparc/sparc.opt (mfsmuld): New option.
	* doc/invoke.texi (mfsmuld): Document option.
---
 gcc/config/sparc/sparc.c   | 30 ++++++++++++++++++++----------
 gcc/config/sparc/sparc.h   |  3 ++-
 gcc/config/sparc/sparc.md  |  2 +-
 gcc/config/sparc/sparc.opt |  4 ++++
 gcc/doc/invoke.texi        | 11 ++++++++++-
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 674a3823cb9..8eed2fc5621 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -1304,6 +1304,8 @@ dump_target_flag_bits (const int flags)
     fprintf (stderr, "FLAT ");
   if (flags & MASK_FMAF)
     fprintf (stderr, "FMAF ");
+  if (flags & MASK_FSMULD)
+    fprintf (stderr, "FSMULD ");
   if (flags & MASK_FPU)
     fprintf (stderr, "FPU ");
   if (flags & MASK_HARD_QUAD)
@@ -1403,24 +1405,24 @@ sparc_option_override (void)
     const int disable;
     const int enable;
   } const cpu_table[] = {
-    { "v7",		MASK_ISA, 0 },
-    { "cypress",	MASK_ISA, 0 },
+    { "v7",		MASK_ISA|MASK_FSMULD, 0 },
+    { "cypress",	MASK_ISA|MASK_FSMULD, 0 },
     { "v8",		MASK_ISA, MASK_V8 },
     /* TI TMS390Z55 supersparc */
     { "supersparc",	MASK_ISA, MASK_V8 },
     { "hypersparc",	MASK_ISA, MASK_V8 },
-    { "leon",		MASK_ISA, MASK_V8|MASK_LEON },
+    { "leon",		MASK_ISA|MASK_FSMULD, MASK_V8|MASK_LEON },
     { "leon3",		MASK_ISA, MASK_V8|MASK_LEON3 },
-    { "leon3v7",	MASK_ISA, MASK_LEON3 },
-    { "sparclite",	MASK_ISA, MASK_SPARCLITE },
+    { "leon3v7",	MASK_ISA|MASK_FSMULD, MASK_LEON3 },
+    { "sparclite",	MASK_ISA|MASK_FSMULD, MASK_SPARCLITE },
     /* The Fujitsu MB86930 is the original sparclite chip, with no FPU.  */
     { "f930",		MASK_ISA|MASK_FPU, MASK_SPARCLITE },
     /* The Fujitsu MB86934 is the recent sparclite chip, with an FPU.  */
-    { "f934",		MASK_ISA, MASK_SPARCLITE },
+    { "f934",		MASK_ISA|MASK_FSMULD, MASK_SPARCLITE },
     { "sparclite86x",	MASK_ISA|MASK_FPU, MASK_SPARCLITE },
-    { "sparclet",	MASK_ISA, MASK_SPARCLET },
+    { "sparclet",	MASK_ISA|MASK_FSMULD, MASK_SPARCLET },
     /* TEMIC sparclet */
-    { "tsc701",		MASK_ISA, MASK_SPARCLET },
+    { "tsc701",		MASK_ISA|MASK_FSMULD, MASK_SPARCLET },
     { "v9",		MASK_ISA, MASK_V9 },
     /* UltraSPARC I, II, IIi */
     { "ultrasparc",	MASK_ISA,
@@ -1511,6 +1513,11 @@ sparc_option_override (void)
       target_flags |= MASK_LONG_DOUBLE_128;
     }
 
+  /* Enable the FSMULD instruction by default if not explicitly configured by
+     the user.  It may be later disabled by the CPU target flags or if
+     !TARGET_FPU.  */
+  target_flags |= MASK_FSMULD & ~target_flags_explicit;
+
   /* Code model selection.  */
   sparc_cmodel = SPARC_DEFAULT_CMODEL;
 
@@ -1603,11 +1610,11 @@ sparc_option_override (void)
   if (TARGET_VIS4B)
     target_flags |= MASK_VIS4 | MASK_VIS3 | MASK_VIS2 | MASK_VIS;
 
-  /* Don't allow -mvis, -mvis2, -mvis3, -mvis4, -mvis4b and -mfmaf if
+  /* Don't allow -mvis, -mvis2, -mvis3, -mvis4, -mvis4b, -mfmaf and -mfsmuld if
      FPU is disabled.  */
   if (! TARGET_FPU)
     target_flags &= ~(MASK_VIS | MASK_VIS2 | MASK_VIS3 | MASK_VIS4
-		      | MASK_VIS4B | MASK_FMAF);
+		      | MASK_VIS4B | MASK_FMAF | MASK_FSMULD);
 
   /* -mvis assumes UltraSPARC+, so we are sure v9 instructions
      are available; -m64 also implies v9.  */
@@ -1641,6 +1648,9 @@ sparc_option_override (void)
   if (sparc_fix_ut699 || sparc_fix_ut700 || sparc_fix_gr712rc)
     sparc_fix_b2bst = 1;
 
+  if (sparc_fix_ut699)
+    target_flags &= ~MASK_FSMULD;
+
   /* Supply a default value for align_functions.  */
   if (align_functions == 0)
     {
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index d7c617e06c3..15a62179af5 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -438,7 +438,8 @@ extern enum cmodel sparc_cmodel;
 /* Mask of all CPU feature flags.  */
 #define MASK_FEATURES						\
   (MASK_FPU + MASK_HARD_QUAD + MASK_VIS + MASK_VIS2 + MASK_VIS3	\
-   + MASK_VIS4 + MASK_CBCOND + MASK_FMAF + MASK_POPC + MASK_SUBXC)
+   + MASK_VIS4 + MASK_CBCOND + MASK_FMAF + MASK_FSMULD		\
+   + MASK_POPC + MASK_SUBXC)
  
 /* TARGET_HARD_MUL: Use 32-bit hardware multiply instructions but not %y.  */
 #define TARGET_HARD_MUL				\
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index b154003c54a..751bacdbcac 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -6121,7 +6121,7 @@ visl")
   [(set (match_operand:DF 0 "register_operand" "=e")
 	(mult:DF (float_extend:DF (match_operand:SF 1 "register_operand" "f"))
 		 (float_extend:DF (match_operand:SF 2 "register_operand" "f"))))]
-  "(TARGET_V8 || TARGET_V9) && TARGET_FPU && !sparc_fix_ut699"
+  "TARGET_FSMULD"
   "fsmuld\t%1, %2, %0"
   [(set_attr "type" "fpmul")
    (set_attr "fptype" "double")])
diff --git a/gcc/config/sparc/sparc.opt b/gcc/config/sparc/sparc.opt
index ae63d2018e3..22267f50e90 100644
--- a/gcc/config/sparc/sparc.opt
+++ b/gcc/config/sparc/sparc.opt
@@ -93,6 +93,10 @@ mfmaf
 Target Report Mask(FMAF)
 Use UltraSPARC Fused Multiply-Add extensions.
 
+mfsmuld
+Target Report Mask(FSMULD)
+Use Floating-point Multiply Single to Double (FsMULd) instruction.
+
 mpopc
 Target Report Mask(POPC)
 Use UltraSPARC Population-Count instruction.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index a6da37c8203..6e174c5b3ff 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1124,7 +1124,7 @@ See RS/6000 and PowerPC Options.
 -mv8plus  -mno-v8plus  -mvis  -mno-vis @gol
 -mvis2  -mno-vis2  -mvis3  -mno-vis3 @gol
 -mvis4 -mno-vis4 -mvis4b -mno-vis4b @gol
--mcbcond  -mno-cbcond  -mfmaf  -mno-fmaf  @gol
+-mcbcond  -mno-cbcond  -mfmaf  -mno-fmaf  -mfsmuld  -mno-fsmuld  @gol
 -mpopc  -mno-popc  -msubxc  -mno-subxc @gol
 -mfix-at697f  -mfix-ut699  -mfix-ut700  -mfix-gr712rc @gol
 -mlra  -mno-lra}
@@ -24069,6 +24069,15 @@ Fused Multiply-Add Floating-point instructions.  The default is @option{-mfmaf}
 when targeting a CPU that supports such instructions, such as Niagara-3 and
 later.
 
+@item -mfsmuld
+@itemx -mno-fsmuld
+@opindex mfsmuld
+@opindex mno-fsmuld
+With @option{-mfsmuld}, GCC generates code that takes advantage of the
+Floating-point Multiply Single to Double (FsMULd) instruction.  The default is
+@option{-mfsmuld} when targeting a CPU supporting the architecture versions V8
+or V9 with FPU except @option{-mcpu=leon}.
+
 @item -mpopc
 @itemx -mno-popc
 @opindex mpopc
-- 
2.12.3

Re: [PATCH v2] [SPARC] Add -mfsmuld option

[Eric Botcazou]

> Add the -mfsmuld option to control the generation of the FsMULd
> instruction.  In general, this instruction is available in architecture
> version V8 and V9 CPUs with FPU.  Some CPUs of this category do not
> support this instruction properly, e.g. AT697E, AT697F and UT699.  Some
> CPUs of this category do not implement it in hardware, e.g. LEON3/4 with
> GRFPU-lite.
> 
> gcc/
> 	* config/sparc/sparc.c (dump_target_flag_bits): Dump MASK_FSMULD.
> 	(sparc_option_override): Honour MASK_FSMULD.
> 	* config/sparc/sparc.h (MASK_FEATURES): Add MASK_FSMULD.
> 	* config/sparc/sparc.md (muldf3_extend): Use TARGET_FSMULD.
> 	* config/sparc/sparc.opt (mfsmuld): New option.
> 	* doc/invoke.texi (mfsmuld): Document option.

OK for mainline and 7 branch modulo:

> @@ -1511,6 +1513,11 @@ sparc_option_override (void)
>        target_flags |= MASK_LONG_DOUBLE_128;
>      }
> 
> +  /* Enable the FSMULD instruction by default if not explicitly configured
> by +     the user.  It may be later disabled by the CPU target flags or if
> +     !TARGET_FPU.  */
> +  target_flags |= MASK_FSMULD & ~target_flags_explicit;

I think that:

  if (!(target_flags_explicit & MASK_FSMULD))
    target_flags |= MASK_FSMULD;

is easier to grasp (and there is a precedent with MASK_LRA a few lines below).

>    /* Code model selection.  */
>    sparc_cmodel = SPARC_DEFAULT_CMODEL;
> 
> @@ -1603,11 +1610,11 @@ sparc_option_override (void)
>    if (TARGET_VIS4B)
>      target_flags |= MASK_VIS4 | MASK_VIS3 | MASK_VIS2 | MASK_VIS;
> 
> -  /* Don't allow -mvis, -mvis2, -mvis3, -mvis4, -mvis4b and -mfmaf if
> +  /* Don't allow -mvis, -mvis2, -mvis3, -mvis4, -mvis4b, -mfmaf and
> -mfsmuld if FPU is disabled.  */
>    if (! TARGET_FPU)
>      target_flags &= ~(MASK_VIS | MASK_VIS2 | MASK_VIS3 | MASK_VIS4
> -		      | MASK_VIS4B | MASK_FMAF);
> +		      | MASK_VIS4B | MASK_FMAF | MASK_FSMULD);
> 
>    /* -mvis assumes UltraSPARC+, so we are sure v9 instructions
>       are available; -m64 also implies v9.  */
> @@ -1641,6 +1648,9 @@ sparc_option_override (void)
>    if (sparc_fix_ut699 || sparc_fix_ut700 || sparc_fix_gr712rc)
>      sparc_fix_b2bst = 1;
> 
> +  if (sparc_fix_ut699)
> +    target_flags &= ~MASK_FSMULD;

Add a stupid comment line here, something like:

"Disable FsMULd for the UT699 since it doesn't work correctly."

-- 
Eric Botcazou

Re: [PATCH v2] [SPARC] Add -mfsmuld option

[Sebastian Huber]

On 26/07/17 14:13, Eric Botcazou wrote:

>> Add the -mfsmuld option to control the generation of the FsMULd
>> instruction.  In general, this instruction is available in architecture
>> version V8 and V9 CPUs with FPU.  Some CPUs of this category do not
>> support this instruction properly, e.g. AT697E, AT697F and UT699.  Some
>> CPUs of this category do not implement it in hardware, e.g. LEON3/4 with
>> GRFPU-lite.
>>
>> gcc/
>> 	* config/sparc/sparc.c (dump_target_flag_bits): Dump MASK_FSMULD.
>> 	(sparc_option_override): Honour MASK_FSMULD.
>> 	* config/sparc/sparc.h (MASK_FEATURES): Add MASK_FSMULD.
>> 	* config/sparc/sparc.md (muldf3_extend): Use TARGET_FSMULD.
>> 	* config/sparc/sparc.opt (mfsmuld): New option.
>> 	* doc/invoke.texi (mfsmuld): Document option.
> OK for mainline and 7 branch modulo:
>

Thanks for your quick review. I am really glad that we can now use the 
upcoming GCC 7.2 release.

I checked it in as r250570 and r250571.

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber@embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

Re: [PATCH v2] [SPARC] Add -mfsmuld option

[Sebastian Huber]

On 26/07/17 14:44, Sebastian Huber wrote:

> On 26/07/17 14:13, Eric Botcazou wrote:
>
>>> Add the -mfsmuld option to control the generation of the FsMULd
>>> instruction.  In general, this instruction is available in architecture
>>> version V8 and V9 CPUs with FPU.  Some CPUs of this category do not
>>> support this instruction properly, e.g. AT697E, AT697F and UT699.  Some
>>> CPUs of this category do not implement it in hardware, e.g. LEON3/4 
>>> with
>>> GRFPU-lite.
>>>
>>> gcc/
>>>     * config/sparc/sparc.c (dump_target_flag_bits): Dump MASK_FSMULD.
>>>     (sparc_option_override): Honour MASK_FSMULD.
>>>     * config/sparc/sparc.h (MASK_FEATURES): Add MASK_FSMULD.
>>>     * config/sparc/sparc.md (muldf3_extend): Use TARGET_FSMULD.
>>>     * config/sparc/sparc.opt (mfsmuld): New option.
>>>     * doc/invoke.texi (mfsmuld): Document option.
>> OK for mainline and 7 branch modulo:
>>
>
> Thanks for your quick review. I am really glad that we can now use the 
> upcoming GCC 7.2 release.
>
> I checked it in as r250570 and r250571.
>

I would like to add this to the web site:

Index: htdocs/gcc-7/changes.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/gcc-7/changes.html,v
retrieving revision 1.88
diff -r1.88 changes.html
1248a1249,1251
 >     <li>Use of the Floating-point Multiply Single to Double (FsMULd)
 >         instruction can now be controlled by the 
<code>-mfsmuld</code> and
 >         <code>-fno-fsmuld</code> options.</li>
cvs diff: Diffing htdocs/gcc-8
Index: htdocs/gcc-8/changes.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/gcc-8/changes.html,v
retrieving revision 1.7
diff -r1.7 changes.html
148,149c148,153
< <!-- <h3 id="sparc">SPARC</h3> -->
<
---
 > <h3 id="sparc">SPARC</h3>
 > <ul>
 >   <li>Use of the Floating-point Multiply Single to Double (FsMULd) 
instruction
 >       can now be controlled by the <code>-mfsmuld</code> and
 >       <code>-fno-fsmuld</code> options.</li>
 > </ul>

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber@embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

Re: [PATCH v2] [SPARC] Add -mfsmuld option

[Eric Botcazou]

> I would like to add this to the web site:
> 
> Index: htdocs/gcc-7/changes.html
> ===================================================================
> RCS file: /cvs/gcc/wwwdocs/htdocs/gcc-7/changes.html,v
> retrieving revision 1.88
> diff -r1.88 changes.html
> 1248a1249,1251
> 
>  >     <li>Use of the Floating-point Multiply Single to Double (FsMULd)
>  >     
>  >         instruction can now be controlled by the
> 
> <code>-mfsmuld</code> and
> 
>  >         <code>-fno-fsmuld</code> options.</li>
> 

We document changes for only one release so the above is sufficient and OK.

-- 
Eric Botcazou

Re: [PATCH v2] [SPARC] Add -mfsmuld option

[Eric Botcazou]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

> Thanks for your quick review. I am really glad that we can now use the
> upcoming GCC 7.2 release.

You"re welcome.  I just realized that FSMULD would pop up out of nowhere in 
the log displayed by -mdebug=options so I have installed the attached fixlet.


2017-07-27  Eric Botcazou  <ebotcazou@adacore.com>

	* config/sparc/sparc.c (sparc_option_override): Set MASK_FSMULD flag
	earlier and only if MASK_FPU is set.  Adjust formatting.
	

-- 
Eric Botcazou

[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 5131 bytes --]

Index: config/sparc/sparc.c
===================================================================
--- config/sparc/sparc.c	(revision 250609)
+++ config/sparc/sparc.c	(working copy)
@@ -1449,8 +1449,7 @@ sparc_option_override (void)
       MASK_V9|MASK_POPC|MASK_VIS4|MASK_FMAF|MASK_CBCOND|MASK_SUBXC },
     /* UltraSPARC M8 */
     { "m8",		MASK_ISA,
-      MASK_V9|MASK_POPC|MASK_VIS4|MASK_FMAF|MASK_CBCOND|MASK_SUBXC
-      |MASK_VIS4B }
+      MASK_V9|MASK_POPC|MASK_VIS4|MASK_FMAF|MASK_CBCOND|MASK_SUBXC|MASK_VIS4B }
   };
   const struct cpu_table *cpu;
   unsigned int i;
@@ -1489,6 +1488,11 @@ sparc_option_override (void)
 	}
     }
 
+  /* Enable the FsMULd instruction by default if not explicitly specified by
+     the user.  It may be later disabled by the CPU (explicitly or not).  */
+  if (TARGET_FPU && !(target_flags_explicit & MASK_FSMULD))
+    target_flags |= MASK_FSMULD;
+
   if (TARGET_DEBUG_OPTIONS)
     {
       dump_target_flags("Initial target_flags", target_flags);
@@ -1513,12 +1517,6 @@ sparc_option_override (void)
       target_flags |= MASK_LONG_DOUBLE_128;
     }
 
-  /* Enable the FsMULd instruction by default if not explicitly configured by
-     the user.  It may be later disabled by the CPU target flags or if
-     !TARGET_FPU.  */
-  if (!(target_flags_explicit & MASK_FSMULD))
-    target_flags |= MASK_FSMULD;
-
   /* Code model selection.  */
   sparc_cmodel = SPARC_DEFAULT_CMODEL;
 
@@ -1540,7 +1538,7 @@ sparc_option_override (void)
 	    sparc_cmodel = cmodel->value;
 	}
       else
-	error ("-mcmodel= is not supported on 32 bit systems");
+	error ("-mcmodel= is not supported on 32-bit systems");
     }
 
   /* Check that -fcall-saved-REG wasn't specified for out registers.  */
@@ -1551,7 +1549,7 @@ sparc_option_override (void)
         call_used_regs [i] = 1;
       }
 
-  /* Set the default CPU.  */
+  /* Set the default CPU if no -mcpu option was specified.  */
   if (!global_options_set.x_sparc_cpu_and_features)
     {
       for (def = &cpu_default[0]; def->cpu != -1; ++def)
@@ -1561,6 +1559,7 @@ sparc_option_override (void)
       sparc_cpu_and_features = def->processor;
     }
 
+  /* Set the default CPU if no -mtune option was specified.  */
   if (!global_options_set.x_sparc_cpu)
     sparc_cpu = sparc_cpu_and_features;
 
@@ -1569,8 +1568,6 @@ sparc_option_override (void)
   if (TARGET_DEBUG_OPTIONS)
     {
       fprintf (stderr, "sparc_cpu_and_features: %s\n", cpu->name);
-      fprintf (stderr, "sparc_cpu: %s\n",
-	       cpu_table[(int) sparc_cpu].name);
       dump_target_flags ("cpu->disable", cpu->disable);
       dump_target_flags ("cpu->enable", cpu->enable);
     }
@@ -1613,7 +1610,7 @@ sparc_option_override (void)
 
   /* Don't allow -mvis, -mvis2, -mvis3, -mvis4, -mvis4b, -mfmaf and -mfsmuld if
      FPU is disabled.  */
-  if (! TARGET_FPU)
+  if (!TARGET_FPU)
     target_flags &= ~(MASK_VIS | MASK_VIS2 | MASK_VIS3 | MASK_VIS4
 		      | MASK_VIS4B | MASK_FMAF | MASK_FSMULD);
 
@@ -1626,18 +1623,18 @@ sparc_option_override (void)
     }
 
   /* -mvis also implies -mv8plus on 32-bit.  */
-  if (TARGET_VIS && ! TARGET_ARCH64)
+  if (TARGET_VIS && !TARGET_ARCH64)
     target_flags |= MASK_V8PLUS;
 
-  /* Use the deprecated v8 insns for sparc64 in 32 bit mode.  */
+  /* Use the deprecated v8 insns for sparc64 in 32-bit mode.  */
   if (TARGET_V9 && TARGET_ARCH32)
     target_flags |= MASK_DEPRECATED_V8_INSNS;
 
-  /* V8PLUS requires V9, makes no sense in 64 bit mode.  */
-  if (! TARGET_V9 || TARGET_ARCH64)
+  /* V8PLUS requires V9 and makes no sense in 64-bit mode.  */
+  if (!TARGET_V9 || TARGET_ARCH64)
     target_flags &= ~MASK_V8PLUS;
 
-  /* Don't use stack biasing in 32 bit mode.  */
+  /* Don't use stack biasing in 32-bit mode.  */
   if (TARGET_ARCH32)
     target_flags &= ~MASK_STACK_BIAS;
 
@@ -4975,7 +4972,7 @@ enum sparc_mode_class {
    ??? Note that, despite the settings, non-double-aligned parameter
    registers can hold double-word quantities in 32-bit mode.  */
 
-/* This points to either the 32 bit or the 64 bit version.  */
+/* This points to either the 32-bit or the 64-bit version.  */
 const int *hard_regno_mode_classes;
 
 static const int hard_32bit_mode_classes[] = {
@@ -7309,7 +7306,7 @@ sparc_function_arg_advance (cumulative_args_t cum_
 }
 
 /* Handle the FUNCTION_ARG_PADDING macro.
-   For the 64 bit ABI structs are always stored left shifted in their
+   For the 64-bit ABI structs are always stored left shifted in their
    argument slot.  */
 
 enum direction
@@ -8428,7 +8425,7 @@ output_v9branch (rtx op, rtx dest, int reg, int la
   if (reversed ^ far)
     code = reverse_condition (code);
 
-  /* Only 64 bit versions of these instructions exist.  */
+  /* Only 64-bit versions of these instructions exist.  */
   gcc_assert (mode == DImode);
 
   /* Start by writing the branch condition.  */
@@ -8857,7 +8854,7 @@ mems_ok_for_ldd_peep (rtx mem1, rtx mem2, rtx depe
     return 0;
 
   /* The first offset must be evenly divisible by 8 to ensure the
-     address is 64 bit aligned.  */
+     address is 64-bit aligned.  */
   if (offset1 % 8 != 0)
     return 0;