138 lines
6.2 KiB
Diff
138 lines
6.2 KiB
Diff
|
From c0badff223a1f5ea5a0f75df72f5d0138d94d8e6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Richard Sandiford <richard.sandiford@arm.com>
|
||
|
|
Date: Tue, 5 Dec 2023 10:11:19 +0000
|
||
|
|
Subject: [PATCH 064/157] [Backport][SME] aarch64: Make AARCH64_FL_SVE
|
||
|
|
requirements explicit
|
||
|
|
|
||
|
|
Reference: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=dd7aaef62a43efe52eece525eea4d7d252b0c148
|
||
|
|
|
||
|
|
So far, all intrinsics covered by the aarch64-sve-builtins*
|
||
|
|
framework have (naturally enough) required at least SVE.
|
||
|
|
However, arm_sme.h defines a couple of intrinsics that can
|
||
|
|
be called by any code. It's therefore necessary to make
|
||
|
|
the implicit SVE requirement explicit.
|
||
|
|
|
||
|
|
gcc/
|
||
|
|
* config/aarch64/aarch64-sve-builtins.cc (function_groups): Remove
|
||
|
|
implied requirement on SVE.
|
||
|
|
* config/aarch64/aarch64-sve-builtins-base.def: Explicitly require SVE.
|
||
|
|
* config/aarch64/aarch64-sve-builtins-sve2.def: Likewise.
|
||
|
|
---
|
||
|
|
.../aarch64/aarch64-sve-builtins-base.def | 10 +++++-----
|
||
|
|
.../aarch64/aarch64-sve-builtins-sve2.def | 18 +++++++++++++-----
|
||
|
|
gcc/config/aarch64/aarch64-sve-builtins.cc | 2 +-
|
||
|
|
3 files changed, 19 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.def b/gcc/config/aarch64/aarch64-sve-builtins-base.def
|
||
|
|
index ffdf7cb4c..3a58f76c3 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64-sve-builtins-base.def
|
||
|
|
+++ b/gcc/config/aarch64/aarch64-sve-builtins-base.def
|
||
|
|
@@ -17,7 +17,7 @@
|
||
|
|
along with GCC; see the file COPYING3. If not see
|
||
|
|
<http://www.gnu.org/licenses/>. */
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS 0
|
||
|
|
+#define REQUIRED_EXTENSIONS AARCH64_FL_SVE
|
||
|
|
DEF_SVE_FUNCTION (svabd, binary_opt_n, all_arith, mxz)
|
||
|
|
DEF_SVE_FUNCTION (svabs, unary, all_float_and_signed, mxz)
|
||
|
|
DEF_SVE_FUNCTION (svacge, compare_opt_n, all_float, implicit)
|
||
|
|
@@ -318,7 +318,7 @@ DEF_SVE_FUNCTION (svzip2, binary, all_data, none)
|
||
|
|
DEF_SVE_FUNCTION (svzip2, binary_pred, all_pred, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS AARCH64_FL_BF16
|
||
|
|
+#define REQUIRED_EXTENSIONS AARCH64_FL_SVE | AARCH64_FL_BF16
|
||
|
|
DEF_SVE_FUNCTION (svbfdot, ternary_bfloat_opt_n, s_float, none)
|
||
|
|
DEF_SVE_FUNCTION (svbfdot_lane, ternary_bfloat_lanex2, s_float, none)
|
||
|
|
DEF_SVE_FUNCTION (svbfmlalb, ternary_bfloat_opt_n, s_float, none)
|
||
|
|
@@ -330,7 +330,7 @@ DEF_SVE_FUNCTION (svcvt, unary_convert, cvt_bfloat, mxz)
|
||
|
|
DEF_SVE_FUNCTION (svcvtnt, unary_convert_narrowt, cvt_bfloat, mx)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS AARCH64_FL_I8MM
|
||
|
|
+#define REQUIRED_EXTENSIONS AARCH64_FL_SVE | AARCH64_FL_I8MM
|
||
|
|
DEF_SVE_FUNCTION (svmmla, mmla, s_integer, none)
|
||
|
|
DEF_SVE_FUNCTION (svusmmla, ternary_uintq_intq, s_signed, none)
|
||
|
|
DEF_SVE_FUNCTION (svsudot, ternary_intq_uintq_opt_n, s_signed, none)
|
||
|
|
@@ -339,11 +339,11 @@ DEF_SVE_FUNCTION (svusdot, ternary_uintq_intq_opt_n, s_signed, none)
|
||
|
|
DEF_SVE_FUNCTION (svusdot_lane, ternary_uintq_intq_lane, s_signed, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS AARCH64_FL_F32MM
|
||
|
|
+#define REQUIRED_EXTENSIONS AARCH64_FL_SVE | AARCH64_FL_F32MM
|
||
|
|
DEF_SVE_FUNCTION (svmmla, mmla, s_float, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS AARCH64_FL_F64MM
|
||
|
|
+#define REQUIRED_EXTENSIONS AARCH64_FL_SVE | AARCH64_FL_F64MM
|
||
|
|
DEF_SVE_FUNCTION (svld1ro, load_replicate, all_data, implicit)
|
||
|
|
DEF_SVE_FUNCTION (svmmla, mmla, d_float, none)
|
||
|
|
DEF_SVE_FUNCTION (svtrn1q, binary, all_data, none)
|
||
|
|
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.def b/gcc/config/aarch64/aarch64-sve-builtins-sve2.def
|
||
|
|
index 635089ffc..d5f23a887 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.def
|
||
|
|
+++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.def
|
||
|
|
@@ -17,7 +17,7 @@
|
||
|
|
along with GCC; see the file COPYING3. If not see
|
||
|
|
<http://www.gnu.org/licenses/>. */
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS AARCH64_FL_SVE2
|
||
|
|
+#define REQUIRED_EXTENSIONS AARCH64_FL_SVE | AARCH64_FL_SVE2
|
||
|
|
DEF_SVE_FUNCTION (svaba, ternary_opt_n, all_integer, none)
|
||
|
|
DEF_SVE_FUNCTION (svabalb, ternary_long_opt_n, hsd_integer, none)
|
||
|
|
DEF_SVE_FUNCTION (svabalt, ternary_long_opt_n, hsd_integer, none)
|
||
|
|
@@ -189,7 +189,9 @@ DEF_SVE_FUNCTION (svwhilewr, compare_ptr, all_data, none)
|
||
|
|
DEF_SVE_FUNCTION (svxar, ternary_shift_right_imm, all_integer, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE2 | AARCH64_FL_SVE2_AES)
|
||
|
|
+#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE \
|
||
|
|
+ | AARCH64_FL_SVE2 \
|
||
|
|
+ | AARCH64_FL_SVE2_AES)
|
||
|
|
DEF_SVE_FUNCTION (svaesd, binary, b_unsigned, none)
|
||
|
|
DEF_SVE_FUNCTION (svaese, binary, b_unsigned, none)
|
||
|
|
DEF_SVE_FUNCTION (svaesmc, unary, b_unsigned, none)
|
||
|
|
@@ -198,17 +200,23 @@ DEF_SVE_FUNCTION (svpmullb_pair, binary_opt_n, d_unsigned, none)
|
||
|
|
DEF_SVE_FUNCTION (svpmullt_pair, binary_opt_n, d_unsigned, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE2 | AARCH64_FL_SVE2_BITPERM)
|
||
|
|
+#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE \
|
||
|
|
+ | AARCH64_FL_SVE2 \
|
||
|
|
+ | AARCH64_FL_SVE2_BITPERM)
|
||
|
|
DEF_SVE_FUNCTION (svbdep, binary_opt_n, all_unsigned, none)
|
||
|
|
DEF_SVE_FUNCTION (svbext, binary_opt_n, all_unsigned, none)
|
||
|
|
DEF_SVE_FUNCTION (svbgrp, binary_opt_n, all_unsigned, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE2 | AARCH64_FL_SVE2_SHA3)
|
||
|
|
+#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE \
|
||
|
|
+ | AARCH64_FL_SVE2 \
|
||
|
|
+ | AARCH64_FL_SVE2_SHA3)
|
||
|
|
DEF_SVE_FUNCTION (svrax1, binary, d_integer, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
|
||
|
|
-#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE2 | AARCH64_FL_SVE2_SM4)
|
||
|
|
+#define REQUIRED_EXTENSIONS (AARCH64_FL_SVE \
|
||
|
|
+ | AARCH64_FL_SVE2 \
|
||
|
|
+ | AARCH64_FL_SVE2_SM4)
|
||
|
|
DEF_SVE_FUNCTION (svsm4e, binary, s_unsigned, none)
|
||
|
|
DEF_SVE_FUNCTION (svsm4ekey, binary, s_unsigned, none)
|
||
|
|
#undef REQUIRED_EXTENSIONS
|
||
|
|
diff --git a/gcc/config/aarch64/aarch64-sve-builtins.cc b/gcc/config/aarch64/aarch64-sve-builtins.cc
|
||
|
|
index 7924cdf0f..dde01f676 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64-sve-builtins.cc
|
||
|
|
+++ b/gcc/config/aarch64/aarch64-sve-builtins.cc
|
||
|
|
@@ -525,7 +525,7 @@ static const predication_index preds_z[] = { PRED_z, NUM_PREDS };
|
||
|
|
static CONSTEXPR const function_group_info function_groups[] = {
|
||
|
|
#define DEF_SVE_FUNCTION(NAME, SHAPE, TYPES, PREDS) \
|
||
|
|
{ #NAME, &functions::NAME, &shapes::SHAPE, types_##TYPES, preds_##PREDS, \
|
||
|
|
- REQUIRED_EXTENSIONS | AARCH64_FL_SVE },
|
||
|
|
+ REQUIRED_EXTENSIONS },
|
||
|
|
#include "aarch64-sve-builtins.def"
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|