Add SME2 builtins for pfalse and ptrue #71953

MDevereau · 2023-11-10T16:19:29Z

Extend pfalse and ptrue builtins with svcount_t return types to be enabled for sve2p1 and sme2

See ARM-software/acle#217

llvmbot · 2023-11-10T16:20:02Z

@llvm/pr-subscribers-clang

Author: Matthew Devereau (MDevereau)

Changes

Extend pfalse and ptrue builtins with svcount_t return types to be enabled for sve2p1 and sme2

Full diff: https://github.com/llvm/llvm-project/pull/71953.diff

3 Files Affected:

(modified) clang/include/clang/Basic/arm_sve.td (+5-2)
(modified) clang/lib/Sema/Sema.cpp (+2-1)
(added) clang/test/CodeGen/aarch64-sme2-intrinsics/acle_sme2_ptrue_pfalse_attr.c (+34)

diff --git a/clang/include/clang/Basic/arm_sve.td b/clang/include/clang/Basic/arm_sve.td
index 3d4c2129565903d..eccf87ac94abb3f 100644
--- a/clang/include/clang/Basic/arm_sve.td
+++ b/clang/include/clang/Basic/arm_sve.td
@@ -1861,8 +1861,6 @@ def SVBGRP_N : SInst<"svbgrp[_n_{d}]", "dda", "UcUsUiUl", MergeNone, "aarch64_sv
 
 let TargetGuard = "sve2p1" in {
 def SVFCLAMP   : SInst<"svclamp[_{d}]", "dddd", "hfd", MergeNone, "aarch64_sve_fclamp", [], []>;
-def SVPTRUE_COUNT  : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone], []>;
-def SVPFALSE_COUNT_ALIAS : SInst<"svpfalse_c", "}v", "", MergeNone, "", [IsOverloadNone]>;
 
 def SVPEXT_SINGLE : SInst<"svpext_lane_{d}", "P}i", "QcQsQiQl", MergeNone, "aarch64_sve_pext", [], [ImmCheck<1, ImmCheck0_3>]>;
 def SVPEXT_X2     : SInst<"svpext_lane_{d}_x2", "2.P}i", "QcQsQiQl", MergeNone, "aarch64_sve_pext_x2", [], [ImmCheck<1, ImmCheck0_1>]>;
@@ -1981,6 +1979,11 @@ def SVCNTP_COUNT : SInst<"svcntp_{d}", "n}i", "QcQsQiQl", MergeNone, "aarch64_sv
 defm SVREVD : SInstZPZ<"svrevd", "csilUcUsUiUl", "aarch64_sve_revd">;
 }
 
+let TargetGuard = "sve2p1|sme2" in {
+  def SVPTRUE_COUNT  : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone], []>;
+  def SVPFALSE_COUNT_ALIAS : SInst<"svpfalse_c", "}v", "", MergeNone, "", [IsOverloadNone]>;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // SME2
 
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index d7d8d2eaa37e1d6..e4f6a291a869c27 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -2084,7 +2084,8 @@ void Sema::checkTypeSupport(QualType Ty, SourceLocation Loc, ValueDecl *D) {
       llvm::StringMap<bool> CallerFeatureMap;
       Context.getFunctionFeatureMap(CallerFeatureMap, FD);
       if (!Builtin::evaluateRequiredTargetFeatures(
-          "sve", CallerFeatureMap))
+          "sve", CallerFeatureMap) && !Builtin::evaluateRequiredTargetFeatures(
+          "sme", CallerFeatureMap))
         Diag(D->getLocation(), diag::err_sve_vector_in_non_sve_target) << Ty;
     }
   };
diff --git a/clang/test/CodeGen/aarch64-sme2-intrinsics/acle_sme2_ptrue_pfalse_attr.c b/clang/test/CodeGen/aarch64-sme2-intrinsics/acle_sme2_ptrue_pfalse_attr.c
new file mode 100644
index 000000000000000..90d9434d87cf4a0
--- /dev/null
+++ b/clang/test/CodeGen/aarch64-sme2-intrinsics/acle_sme2_ptrue_pfalse_attr.c
@@ -0,0 +1,34 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
+// REQUIRES: aarch64-registered-target
+// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sme2 -S -disable-O0-optnone -Werror -Wall -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sme2 -S -disable-O0-optnone -Werror -Wall -emit-llvm -o - -x c++ %s | FileCheck %s -check-prefix=CPP-CHECK
+// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sme2 -S -disable-O0-optnone -Werror -Wall -o /dev/null %s
+#include <arm_sve.h>
+
+// CHECK-LABEL: @test_svptrue_c8_attr(
+// CHECK-NEXT:  entry:
+// CHECK-NEXT:    [[TMP0:%.*]] = call target("aarch64.svcount") @llvm.aarch64.sve.ptrue.c8()
+// CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
+//
+// CPP-CHECK-LABEL: @_Z20test_svptrue_c8_attrv(
+// CPP-CHECK-NEXT:  entry:
+// CPP-CHECK-NEXT:    [[TMP0:%.*]] = call target("aarch64.svcount") @llvm.aarch64.sve.ptrue.c8()
+// CPP-CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
+//
+svcount_t test_svptrue_c8_attr(void) __arm_streaming {
+  return svptrue_c8();
+}
+
+// CHECK-LABEL: @test_svptrue_c(
+// CHECK-NEXT:  entry:
+// CHECK-NEXT:    [[TMP0:%.*]] = call target("aarch64.svcount") @llvm.aarch64.sve.convert.from.svbool.taarch64.svcountt(<vscale x 16 x i1> zeroinitializer)
+// CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
+//
+// CPP-CHECK-LABEL: @_Z14test_svptrue_cv(
+// CPP-CHECK-NEXT:  entry:
+// CPP-CHECK-NEXT:    [[TMP0:%.*]] = call target("aarch64.svcount") @llvm.aarch64.sve.convert.from.svbool.taarch64.svcountt(<vscale x 16 x i1> zeroinitializer)
+// CPP-CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
+//
+svcount_t test_svptrue_c(void) __arm_streaming {
+  return svpfalse_c();
+}

github-actions · 2023-11-10T16:28:33Z

✅ With the latest revision this PR passed the C/C++ code formatter.

kmclaughlin-arm · 2023-11-10T17:43:14Z

clang/include/clang/Basic/arm_sve.td

@@ -1981,6 +1979,11 @@ def SVCNTP_COUNT : SInst<"svcntp_{d}", "n}i", "QcQsQiQl", MergeNone, "aarch64_sv
 defm SVREVD : SInstZPZ<"svrevd", "csilUcUsUiUl", "aarch64_sve_revd">;
 }

+let TargetGuard = "sve2p1|sme2" in {
+  def SVPTRUE_COUNT  : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone], []>;
+  def SVPFALSE_COUNT_ALIAS : SInst<"svpfalse_c", "}v", "", MergeNone, "", [IsOverloadNone]>;


The streaming mode attributes can now be added to these, I believe they are IsStreaming for ptrue and IsStreamingCompatible for pfalse.

kmclaughlin-arm · 2023-11-10T17:47:19Z

clang/test/CodeGen/aarch64-sme2-intrinsics/acle_sme2_ptrue_pfalse_attr.c

+// CPP-CHECK-NEXT:    [[TMP0:%.*]] = call target("aarch64.svcount") @llvm.aarch64.sve.ptrue.c8()
+// CPP-CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
+//
+svcount_t test_svptrue_c8_attr(void) __arm_streaming {


There are already tests for these builtins in acle_sve2p1_ptrue.c & acle_sve2p1_pfalse.c, so I think you can just add more RUN lines to these for SME2.

As discussed we might be missing an HasSVE2p1OrSME2 target guard which is currently stopping me from doing this in this patch due to the __arm_streaming and __arm_streaming_compatible function attributes which I've added to the tests

If you make the intrinsic IsStreamingCompatible, you should be able to add the RUN lines I think?

sdesmalen-arm · 2023-12-06T13:16:06Z

clang/include/clang/Basic/arm_sve.td

@@ -1981,6 +1979,11 @@ def SVCNTP_COUNT : SInst<"svcntp_{d}", "n}i", "QcQsQiQl", MergeNone, "aarch64_sv
 defm SVREVD : SInstZPZ<"svrevd", "csilUcUsUiUl", "aarch64_sve_revd">;
 }

+let TargetGuard = "sve2p1|sme2" in {
+  def SVPTRUE_COUNT  : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone, IsStreaming], []>;


Suggested change

def SVPTRUE_COUNT : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone, IsStreaming], []>;

def SVPTRUE_COUNT : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone, IsStreamingCompatible], []>;

As pointed out here, this will need an attribute like IsStreamingOrHasSVE2p1, for which the compiler will give a diagnostic when compiling for +sme2 and the function is not in streaming mode.

To move this patch forward without that diagnostic, you could make this IsStreamingCompatible for now. Can you also add a FIXME to say we need to change this later?

sdesmalen-arm · 2023-12-06T13:16:49Z

clang/test/CodeGen/aarch64-sme2-intrinsics/acle_sme2_ptrue_pfalse_attr.c

+// CPP-CHECK-NEXT:    [[TMP0:%.*]] = call target("aarch64.svcount") @llvm.aarch64.sve.ptrue.c8()
+// CPP-CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
+//
+svcount_t test_svptrue_c8_attr(void) __arm_streaming {


If you make the intrinsic IsStreamingCompatible, you should be able to add the RUN lines I think?

Extend pfalse and ptrue builtins with svcount_t return types to be enabled for sve2p1 and sme2

sdesmalen-arm · 2023-12-06T15:33:59Z

clang/test/CodeGen/aarch64-sve2p1-intrinsics/acle_sve2p1_ptrue.c

@@ -15,7 +17,7 @@
 // CPP-CHECK-NEXT:    [[TMP0:%.*]] = tail call target("aarch64.svcount") @llvm.aarch64.sve.ptrue.c8()
 // CPP-CHECK-NEXT:    ret target("aarch64.svcount") [[TMP0]]
 //
-svcount_t test_svptrue_c8(void) {
+svcount_t test_svptrue_c8(void) __arm_streaming_compatible {


Can you rewrite the tests in such a way that we do test for the two different configurations:

For SVE2p1: no attribute

For SME2: __arm_streaming

You can do something with macros, so that you replace __arm_streaming_compatible here with ATTR and then do something like:

#ifndef TEST_SME #define ATTR #else #define ATTR __arm_streaming #endif

and then for the +sme2 RUN line you'd add -DTEST_SME.

That way, we're sure to test for the correct mode when we update the builtin to use a different attribute than __arm_streaming_compatible.

I've called the #if guard TEST_SME2, but done

sdesmalen-arm

LGTM, thanks!

MDevereau requested review from SamTebbs33, momchil-velikov, dtemirbulatov, CarolineConcatto and kmclaughlin-arm November 10, 2023 16:19

llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Nov 10, 2023

SamTebbs33 approved these changes Nov 10, 2023

View reviewed changes

kmclaughlin-arm reviewed Nov 10, 2023

View reviewed changes

MDevereau requested a review from sdesmalen-arm December 6, 2023 11:36

sdesmalen-arm reviewed Dec 6, 2023

View reviewed changes

MDevereau added 3 commits December 6, 2023 14:37

Add SME2 builtins for pfalse and ptrue

cb6e6b5

Extend pfalse and ptrue builtins with svcount_t return types to be enabled for sve2p1 and sme2

Update test

78f60b7

Update SVPTRUE_COUNT to use IsStreamingCompatible, delete new file added

768f316

MDevereau force-pushed the builtins-ptrue-pfalse branch from 00cbdbc to 768f316 Compare December 6, 2023 15:26

sdesmalen-arm reviewed Dec 6, 2023

View reviewed changes

Use -DTEST_SME2 to test attribute on svptrue tests

8f1e389

sdesmalen-arm approved these changes Dec 6, 2023

View reviewed changes

MDevereau merged commit 2f62037 into llvm:main Dec 6, 2023
4 checks passed

MDevereau deleted the builtins-ptrue-pfalse branch December 6, 2023 19:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add SME2 builtins for pfalse and ptrue #71953

Add SME2 builtins for pfalse and ptrue #71953

MDevereau commented Nov 10, 2023 •

edited

llvmbot commented Nov 10, 2023

github-actions bot commented Nov 10, 2023 •

edited

kmclaughlin-arm Nov 10, 2023

MDevereau Nov 15, 2023

kmclaughlin-arm Nov 10, 2023

MDevereau Nov 15, 2023 •

edited

sdesmalen-arm Dec 6, 2023

MDevereau Dec 6, 2023

sdesmalen-arm Dec 6, 2023

MDevereau Dec 6, 2023

sdesmalen-arm Dec 6, 2023

sdesmalen-arm Dec 6, 2023

MDevereau Dec 6, 2023

sdesmalen-arm left a comment

	def SVPTRUE_COUNT : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone, IsStreaming], []>;
	def SVPTRUE_COUNT : SInst<"svptrue_{d}", "}v", "QcQsQiQl", MergeNone, "aarch64_sve_ptrue_{d}", [IsOverloadNone, IsStreamingCompatible], []>;

Add SME2 builtins for pfalse and ptrue #71953

Add SME2 builtins for pfalse and ptrue #71953

Conversation

MDevereau commented Nov 10, 2023 • edited

llvmbot commented Nov 10, 2023

github-actions bot commented Nov 10, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MDevereau Nov 15, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sdesmalen-arm left a comment

Choose a reason for hiding this comment

MDevereau commented Nov 10, 2023 •

edited

github-actions bot commented Nov 10, 2023 •

edited

MDevereau Nov 15, 2023 •

edited