]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
AArch64: Fix options canonicanization for assembler
authorTamar Christina <tamar.christina@arm.com>
Mon, 20 Apr 2020 10:43:43 +0000 (11:43 +0100)
committerTamar Christina <tamar.christina@arm.com>
Mon, 20 Apr 2020 10:44:33 +0000 (11:44 +0100)
It is currently impossible to use fp16 on any architecture higher than Armv8.3-a
due to a bug in options canonization.  This bug results in the fp16 flag not
being emitted in the assembly when it should have been.

This is caused by a complicated architectural requirement at Armv8.4-a.  On
Armv8.2-a and Armv8.3-a fp16fml is an optional extension and turning it on turns
on both fp and fp16.  However starting with Armv8.4-a fp16fml is mandatory if
fp16 is available, otherwise it's optional.

In short this means that to enable fp16fml the smallest option that needs to
passed to the assembler is Armv8.4-a+fp16.

The fix in this patch takes into account that an option may be on by default in
an architecture, but that not all the bits required to use it are on by default
in an architecture.  In such cases the difference between the two are still
emitted to the assembler.

gcc/ChangeLog:

PR target/94396
* common/config/aarch64/aarch64-common.c
(aarch64_get_extension_string_for_isa_flags): Handle default flags.

gcc/testsuite/ChangeLog:

PR target/94396
* gcc.target/aarch64/options_set_11.c: New test.
* gcc.target/aarch64/options_set_12.c: New test.
* gcc.target/aarch64/options_set_13.c: New test.
* gcc.target/aarch64/options_set_14.c: New test.
* gcc.target/aarch64/options_set_15.c: New test.
* gcc.target/aarch64/options_set_16.c: New test.
* gcc.target/aarch64/options_set_17.c: New test.
* gcc.target/aarch64/options_set_18.c: New test.
* gcc.target/aarch64/options_set_19.c: New test.
* gcc.target/aarch64/options_set_20.c: New test.
* gcc.target/aarch64/options_set_21.c: New test.
* gcc.target/aarch64/options_set_22.c: New test.
* gcc.target/aarch64/options_set_23.c: New test.
* gcc.target/aarch64/options_set_24.c: New test.
* gcc.target/aarch64/options_set_25.c: New test.
* gcc.target/aarch64/options_set_26.c: New test.

19 files changed:
gcc/ChangeLog
gcc/common/config/aarch64/aarch64-common.c
gcc/testsuite/ChangeLog
gcc/testsuite/gcc.target/aarch64/options_set_11.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_12.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_13.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_14.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_15.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_16.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_17.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_18.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_19.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_20.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_21.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_22.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_23.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_24.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_25.c [new file with mode: 0644]
gcc/testsuite/gcc.target/aarch64/options_set_26.c [new file with mode: 0644]

index ff0cc6373fe955b79dc34b0a364812954544719a..4b29a54e90a54eb3228e2fb9558eac9d93172d87 100644 (file)
@@ -1,3 +1,12 @@
+2020-04-20  Tamar Christina  <tamar.christina@arm.com>
+
+       Backport from mainline.
+       2020-04-03  Tamar Christina  <tamar.christina@arm.com>
+
+       PR target/94396
+       * common/config/aarch64/aarch64-common.c
+       (aarch64_get_extension_string_for_isa_flags): Handle default flags.
+
 2020-04-20  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline
index bab3ab3fa36c66906d1b4367e2b7bfb1bf6aa08c..db9842b1ea6f0e3573c98beacd7d1dc237bed9f9 100644 (file)
@@ -433,7 +433,22 @@ aarch64_get_extension_string_for_isa_flags (unsigned long isa_flags,
        /* We remove all the dependent bits, to prevent them from being turned
           on twice.  This only works because we assume that all there are
           individual options to set all bits standalone.  */
-       isa_flag_bits &= ~opt->flags_on;
+
+       /* PR target/94396.
+
+          For flags which would already imply a bit that's on by default (e.g
+          fp16fml which implies +fp,+fp16) we must emit the flags that are not
+          on by default.  i.e. in Armv8.4-a +fp16fml is default if +fp16.  So
+          if a user passes armv8.4-a+fp16 (or +fp16fml) then we need to emit
+          +fp16.  But if +fp16fml is used in an architecture where it is
+          completely optional we only have to emit the canonical flag.  */
+       uint64_t toggle_bits = opt->flags_on & default_arch_flags;
+       /* Now check to see if the canonical flag is on by default.  If it
+          is not then enabling it will enable all bits in flags_on.  */
+       if ((opt->flag_canonical & default_arch_flags) == 0)
+         toggle_bits = opt->flags_on;
+
+       isa_flag_bits &= ~toggle_bits;
        isa_flag_bits |= opt->flag_canonical;
       }
     }
index 3df9dd78d0cfbbf4cb212c7693e46391ffa9f149..5a52e97da05f6d5d6b708b01990f38a4e14be857 100644 (file)
@@ -1,3 +1,26 @@
+2020-04-20  Tamar Christina  <tamar.christina@arm.com>
+
+       Backport from mainline.
+       2020-04-03  Tamar Christina  <tamar.christina@arm.com>
+
+       PR target/94396
+       * gcc.target/aarch64/options_set_11.c: New test.
+       * gcc.target/aarch64/options_set_12.c: New test.
+       * gcc.target/aarch64/options_set_13.c: New test.
+       * gcc.target/aarch64/options_set_14.c: New test.
+       * gcc.target/aarch64/options_set_15.c: New test.
+       * gcc.target/aarch64/options_set_16.c: New test.
+       * gcc.target/aarch64/options_set_17.c: New test.
+       * gcc.target/aarch64/options_set_18.c: New test.
+       * gcc.target/aarch64/options_set_19.c: New test.
+       * gcc.target/aarch64/options_set_20.c: New test.
+       * gcc.target/aarch64/options_set_21.c: New test.
+       * gcc.target/aarch64/options_set_22.c: New test.
+       * gcc.target/aarch64/options_set_23.c: New test.
+       * gcc.target/aarch64/options_set_24.c: New test.
+       * gcc.target/aarch64/options_set_25.c: New test.
+       * gcc.target/aarch64/options_set_26.c: New test.
+
 2020-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from master
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_11.c b/gcc/testsuite/gcc.target/aarch64/options_set_11.c
new file mode 100644 (file)
index 0000000..d083bfd
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc} } } */
+
+ /* FP is default on, no need to pass on to assembler.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_12.c b/gcc/testsuite/gcc.target/aarch64/options_set_12.c
new file mode 100644 (file)
index 0000000..58a09fd
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+fp16" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc\+fp16} } } */
+
+ /* fp16 not default, should be emitted.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_13.c b/gcc/testsuite/gcc.target/aarch64/options_set_13.c
new file mode 100644 (file)
index 0000000..2a517ec
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+fp16+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc\+fp16} } } */
+
+ /* FP is part of FP16, don't emit it.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_14.c b/gcc/testsuite/gcc.target/aarch64/options_set_14.c
new file mode 100644 (file)
index 0000000..c192bf6
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+fp16fml" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc\+fp16fml} } } */
+
+ /* fmp16fml is smallest option to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_15.c b/gcc/testsuite/gcc.target/aarch64/options_set_15.c
new file mode 100644 (file)
index 0000000..32ec3ea
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+fp16fml+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc\+fp16fml*} } } */
+
+ /* fp included in fp16fml, only emit latter.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_16.c b/gcc/testsuite/gcc.target/aarch64/options_set_16.c
new file mode 100644 (file)
index 0000000..b45c01a
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+fp16fml+fp16+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc\+fp16fml} } } */
+
+ /* fp16fml is smallest options to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_17.c b/gcc/testsuite/gcc.target/aarch64/options_set_17.c
new file mode 100644 (file)
index 0000000..c490e1f
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.2-a+dotprod" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.2-a\+crc\+dotprod} } } */
+
+ /* dotprod needs to be emitted pre armv8.4.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_18.c b/gcc/testsuite/gcc.target/aarch64/options_set_18.c
new file mode 100644 (file)
index 0000000..61587db
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+dotprod" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc} } } */
+
+ /* dotprod is default in armv8.4-a, don't emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_19.c b/gcc/testsuite/gcc.target/aarch64/options_set_19.c
new file mode 100644 (file)
index 0000000..72b5812
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc} } } */
+
+ /* fp default, don't emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_20.c b/gcc/testsuite/gcc.target/aarch64/options_set_20.c
new file mode 100644 (file)
index 0000000..b383e0a
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_21.c b/gcc/testsuite/gcc.target/aarch64/options_set_21.c
new file mode 100644 (file)
index 0000000..19fcd6f
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_22.c b/gcc/testsuite/gcc.target/aarch64/options_set_22.c
new file mode 100644 (file)
index 0000000..77ae408
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16fml" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_23.c b/gcc/testsuite/gcc.target/aarch64/options_set_23.c
new file mode 100644 (file)
index 0000000..dee637c
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16fml+fp" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_24.c b/gcc/testsuite/gcc.target/aarch64/options_set_24.c
new file mode 100644 (file)
index 0000000..54b0e3d
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16fml+fp16" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_25.c b/gcc/testsuite/gcc.target/aarch64/options_set_25.c
new file mode 100644 (file)
index 0000000..a3b2d63
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16fml+fp+fp16" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */
diff --git a/gcc/testsuite/gcc.target/aarch64/options_set_26.c b/gcc/testsuite/gcc.target/aarch64/options_set_26.c
new file mode 100644 (file)
index 0000000..b383e0a
--- /dev/null
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-march=armv8.4-a+fp16" } */
+
+int main ()
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler {\.arch armv8\.4-a\+crc\+fp16} } } */
+
+ /* fp16 smallest set to emit.  */