https://github.com/MacDue updated https://github.com/llvm/llvm-project/pull/124750
>From cb83182da6b017397111be606c88a4eeecb4ce9d Mon Sep 17 00:00:00 2001 From: Benjamin Maxwell <benjamin.maxw...@arm.com> Date: Tue, 28 Jan 2025 13:34:54 +0000 Subject: [PATCH 1/3] [clang][SME] Account for C++ lambdas in SME builtin diagnostics A C++ lambda does not inherit attributes from the parent function. So the SME builtin diagnostics should look at the lambda's attributes, not the parent function's. The fix is very simple and just adds the missing "AllowLambda" flag to the function decl lookups. --- clang/lib/Sema/SemaARM.cpp | 9 ++-- .../aarch64-incompat-sm-builtin-calls.cpp | 47 +++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp diff --git a/clang/lib/Sema/SemaARM.cpp b/clang/lib/Sema/SemaARM.cpp index 2620bbc97ba02a..df865d1b7df8c1 100644 --- a/clang/lib/Sema/SemaARM.cpp +++ b/clang/lib/Sema/SemaARM.cpp @@ -650,7 +650,8 @@ static ArmSMEState getSMEState(unsigned BuiltinID) { bool SemaARM::CheckSMEBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) { - if (const FunctionDecl *FD = SemaRef.getCurFunctionDecl()) { + if (const FunctionDecl *FD = + SemaRef.getCurFunctionDecl(/*AllowLambda=*/true)) { std::optional<ArmStreamingType> BuiltinType; switch (BuiltinID) { @@ -690,7 +691,8 @@ bool SemaARM::CheckSMEBuiltinFunctionCall(unsigned BuiltinID, bool SemaARM::CheckSVEBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) { - if (const FunctionDecl *FD = SemaRef.getCurFunctionDecl()) { + if (const FunctionDecl *FD = + SemaRef.getCurFunctionDecl(/*AllowLambda=*/true)) { std::optional<ArmStreamingType> BuiltinType; switch (BuiltinID) { @@ -719,7 +721,8 @@ bool SemaARM::CheckSVEBuiltinFunctionCall(unsigned BuiltinID, bool SemaARM::CheckNeonBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID, CallExpr *TheCall) { - if (const FunctionDecl *FD = SemaRef.getCurFunctionDecl()) { + if (const FunctionDecl *FD = + SemaRef.getCurFunctionDecl(/*AllowLambda=*/true)) { switch (BuiltinID) { default: diff --git a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp new file mode 100644 index 00000000000000..12ef7ad06b68b1 --- /dev/null +++ b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp @@ -0,0 +1,47 @@ +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve \ +// RUN: -target-feature +sme -target-feature +neon -x c++ -std=c++20 -Waarch64-sme-attributes -fsyntax-only -verify %s + +// REQUIRES: aarch64-registered-target + +#include <arm_sme.h> +#include <arm_neon.h> + +void use_streaming_builtin_in_lambda(uint32_t slice_base, svbool_t pg, const void *ptr) __arm_streaming __arm_out("za") +{ + [&]{ + /// The lambda is its own function and does not inherit the SME attributes (so this should error). + // expected-error@+1 {{builtin can only be called from a streaming function}} + svld1_hor_za64(0, slice_base, pg, ptr); + }(); +} + +void use_streaming_builtin(uint32_t slice_base, svbool_t pg, const void *ptr) __arm_streaming __arm_out("za") +{ + /// Without the lambda the same builtin is okay (as the SME attributes apply). + svld1_hor_za64(0, slice_base, pg, ptr); +} + +int16x8_t use_neon_builtin_sm(int16x8_t splat) __arm_streaming_compatible { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); +} + +int16x8_t use_neon_builtin_sm_in_lambda(int16x8_t splat) __arm_streaming_compatible { + return [&]{ + /// This should not error (as we switch out of streaming mode to execute the lambda). + /// Note: The result int16x8_t is spilled and reloaded as a q-register. + return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); + }(); +} + +float use_incomp_sve_builtin_sm() __arm_streaming { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return svadda(svptrue_b32(), 0, svdup_f32(1)); +} + +float incomp_sve_sm_fadda_sm_in_lambda(void) __arm_streaming { + return [&]{ + /// This should work like the Neon builtin. + return svadda(svptrue_b32(), 0, svdup_f32(1)); + }(); +} >From 0a525bec8ee682a220414025f251413bdade1df4 Mon Sep 17 00:00:00 2001 From: Benjamin Maxwell <benjamin.maxw...@arm.com> Date: Tue, 28 Jan 2025 15:07:22 +0000 Subject: [PATCH 2/3] Fixups --- .../Sema/aarch64-incompat-sm-builtin-calls.c | 128 ----------------- .../aarch64-incompat-sm-builtin-calls.cpp | 129 +++++++++++++++++- 2 files changed, 126 insertions(+), 131 deletions(-) delete mode 100644 clang/test/Sema/aarch64-incompat-sm-builtin-calls.c diff --git a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.c b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.c deleted file mode 100644 index 27fa8f7c9dccb2..00000000000000 --- a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.c +++ /dev/null @@ -1,128 +0,0 @@ -// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve \ -// RUN: -target-feature +bf16 -target-feature +sve -target-feature +sme -target-feature +sme2 -target-feature +sve2 -target-feature +neon -Waarch64-sme-attributes -fsyntax-only -verify %s - -// REQUIRES: aarch64-registered-target - -#include "arm_neon.h" -#include "arm_sme.h" -#include "arm_sve.h" - -int16x8_t incompat_neon_sm(int16x8_t splat) __arm_streaming { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); -} - -__arm_locally_streaming int16x8_t incompat_neon_ls(int16x8_t splat) { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); -} - -int16x8_t incompat_neon_smc(int16x8_t splat) __arm_streaming_compatible { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); -} - -void incompat_sme_smc(svbool_t pg, void const *ptr) __arm_streaming_compatible __arm_inout("za") { - // expected-error@+1 {{builtin can only be called from a streaming function}} - return __builtin_sme_svld1_hor_za128(0, 0, pg, ptr); -} - -float incomp_sve_sm_fadda_sm(void) __arm_streaming { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return svadda(svptrue_b32(), 0, svdup_f32(1)); -} - -float incomp_sve_sm_fadda_smc(void) __arm_streaming_compatible { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return svadda(svptrue_b32(), 0, svdup_f32(1)); -} - -svuint32_t incompat_sve_sm(svbool_t pg, svuint32_t a, int16_t b) __arm_streaming { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return __builtin_sve_svld1_gather_u32base_index_u32(pg, a, b); -} - -// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -__arm_locally_streaming svuint32_t incompat_sve_ls(svbool_t pg, svuint32_t a, int64_t b) { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return __builtin_sve_svld1_gather_u32base_index_u32(pg, a, b); -} - -svuint32_t incompat_sve_smc(svbool_t pg, svuint32_t a, int64_t b) __arm_streaming_compatible { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return __builtin_sve_svld1_gather_u32base_index_u32(pg, a, b); -} - -svuint32_t incompat_sve2_sm(svbool_t pg, svuint32_t a, int64_t b) __arm_streaming { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return __builtin_sve_svldnt1_gather_u32base_index_u32(pg, a, b); -} - -// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -__arm_locally_streaming svuint32_t incompat_sve2_ls(svbool_t pg, svuint32_t a, int64_t b) { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return __builtin_sve_svldnt1_gather_u32base_index_u32(pg, a, b); -} - -svuint32_t incompat_sve2_smc(svbool_t pg, svuint32_t a, int64_t b) __arm_streaming_compatible { - // expected-error@+1 {{builtin can only be called from a non-streaming function}} - return __builtin_sve_svldnt1_gather_u32base_index_u32(pg, a, b); -} - -void incompat_sme_sm(svbool_t pn, svbool_t pm, svfloat32_t zn, svfloat32_t zm) __arm_inout("za") { - // expected-error@+1 {{builtin can only be called from a streaming function}} - svmops_za32_f32_m(0, pn, pm, zn, zm); -} - -svfloat64_t streaming_caller_sve(svbool_t pg, svfloat64_t a, float64_t b) __arm_streaming { - return svadd_n_f64_m(pg, a, b); -} - -// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -__arm_locally_streaming svfloat64_t locally_streaming_caller_sve(svbool_t pg, svfloat64_t a, float64_t b) { - return svadd_n_f64_m(pg, a, b); -} - -svfloat64_t streaming_compatible_caller_sve(svbool_t pg, svfloat64_t a, float64_t b) __arm_streaming_compatible { - return svadd_n_f64_m(pg, a, b); -} - -svint16_t streaming_caller_sve2(svint16_t op1, svint16_t op2) __arm_streaming { - return svmul_lane_s16(op1, op2, 0); -} - -// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} -__arm_locally_streaming svint16_t locally_streaming_caller_sve2(svint16_t op1, svint16_t op2) { - return svmul_lane_s16(op1, op2, 0); -} - -svint16_t streaming_compatible_caller_sve2(svint16_t op1, svint16_t op2) __arm_streaming_compatible { - return svmul_lane_s16(op1, op2, 0); -} - -svbool_t streaming_caller_ptrue(void) __arm_streaming { - return svand_z(svptrue_b16(), svptrue_pat_b16(SV_ALL), svptrue_pat_b16(SV_VL4)); -} - -svint8_t missing_za(svint8_t zd, svbool_t pg, uint32_t slice_base) __arm_streaming { - // expected-warning@+1 {{builtin call is not valid when calling from a function without active ZA state}} - return svread_hor_za8_s8_m(zd, pg, 0, slice_base); -} - -__arm_new("za") -svint8_t new_za(svint8_t zd, svbool_t pg, uint32_t slice_base) __arm_streaming { - return svread_hor_za8_s8_m(zd, pg, 0, slice_base); -} - -void missing_zt0(void) __arm_streaming { - // expected-warning@+1 {{builtin call is not valid when calling from a function without active ZT0 state}} - svzero_zt(0); -} - -__arm_new("zt0") -void new_zt0(void) __arm_streaming { svzero_zt(0); } diff --git a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp index 12ef7ad06b68b1..8f53686a140a25 100644 --- a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp +++ b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp @@ -1,10 +1,133 @@ +// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py // RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve \ -// RUN: -target-feature +sme -target-feature +neon -x c++ -std=c++20 -Waarch64-sme-attributes -fsyntax-only -verify %s +// RUN: -target-feature +bf16 -target-feature +sve -target-feature +sme -target-feature +sme2 -target-feature +sve2 -target-feature +neon -Waarch64-sme-attributes -fsyntax-only -verify %s // REQUIRES: aarch64-registered-target -#include <arm_sme.h> -#include <arm_neon.h> +#include "arm_neon.h" +#include "arm_sme.h" +#include "arm_sve.h" + +int16x8_t incompat_neon_sm(int16x8_t splat) __arm_streaming { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); +} + +__arm_locally_streaming int16x8_t incompat_neon_ls(int16x8_t splat) { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); +} + +int16x8_t incompat_neon_smc(int16x8_t splat) __arm_streaming_compatible { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); +} + +void incompat_sme_smc(svbool_t pg, void const *ptr) __arm_streaming_compatible __arm_inout("za") { + // expected-error@+1 {{builtin can only be called from a streaming function}} + return __builtin_sme_svld1_hor_za128(0, 0, pg, ptr); +} + +float incomp_sve_sm_fadda_sm(void) __arm_streaming { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return svadda(svptrue_b32(), 0, svdup_f32(1)); +} + +float incomp_sve_sm_fadda_smc(void) __arm_streaming_compatible { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return svadda(svptrue_b32(), 0, svdup_f32(1)); +} + +svuint32_t incompat_sve_sm(svbool_t pg, svuint32_t a, int16_t b) __arm_streaming { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return __builtin_sve_svld1_gather_u32base_index_u32(pg, a, b); +} + +// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +__arm_locally_streaming svuint32_t incompat_sve_ls(svbool_t pg, svuint32_t a, int64_t b) { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return __builtin_sve_svld1_gather_u32base_index_u32(pg, a, b); +} + +svuint32_t incompat_sve_smc(svbool_t pg, svuint32_t a, int64_t b) __arm_streaming_compatible { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return __builtin_sve_svld1_gather_u32base_index_u32(pg, a, b); +} + +svuint32_t incompat_sve2_sm(svbool_t pg, svuint32_t a, int64_t b) __arm_streaming { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return __builtin_sve_svldnt1_gather_u32base_index_u32(pg, a, b); +} + +// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +__arm_locally_streaming svuint32_t incompat_sve2_ls(svbool_t pg, svuint32_t a, int64_t b) { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return __builtin_sve_svldnt1_gather_u32base_index_u32(pg, a, b); +} + +svuint32_t incompat_sve2_smc(svbool_t pg, svuint32_t a, int64_t b) __arm_streaming_compatible { + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return __builtin_sve_svldnt1_gather_u32base_index_u32(pg, a, b); +} + +void incompat_sme_sm(svbool_t pn, svbool_t pm, svfloat32_t zn, svfloat32_t zm) __arm_inout("za") { + // expected-error@+1 {{builtin can only be called from a streaming function}} + svmops_za32_f32_m(0, pn, pm, zn, zm); +} + +svfloat64_t streaming_caller_sve(svbool_t pg, svfloat64_t a, float64_t b) __arm_streaming { + return svadd_n_f64_m(pg, a, b); +} + +// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +__arm_locally_streaming svfloat64_t locally_streaming_caller_sve(svbool_t pg, svfloat64_t a, float64_t b) { + return svadd_n_f64_m(pg, a, b); +} + +svfloat64_t streaming_compatible_caller_sve(svbool_t pg, svfloat64_t a, float64_t b) __arm_streaming_compatible { + return svadd_n_f64_m(pg, a, b); +} + +svint16_t streaming_caller_sve2(svint16_t op1, svint16_t op2) __arm_streaming { + return svmul_lane_s16(op1, op2, 0); +} + +// expected-warning@+2 {{returning a VL-dependent argument from a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +// expected-warning@+1 {{passing a VL-dependent argument to a locally streaming function is undefined behaviour when the streaming and non-streaming vector lengths are different at runtime}} +__arm_locally_streaming svint16_t locally_streaming_caller_sve2(svint16_t op1, svint16_t op2) { + return svmul_lane_s16(op1, op2, 0); +} + +svint16_t streaming_compatible_caller_sve2(svint16_t op1, svint16_t op2) __arm_streaming_compatible { + return svmul_lane_s16(op1, op2, 0); +} + +svbool_t streaming_caller_ptrue(void) __arm_streaming { + return svand_z(svptrue_b16(), svptrue_pat_b16(SV_ALL), svptrue_pat_b16(SV_VL4)); +} + +svint8_t missing_za(svint8_t zd, svbool_t pg, uint32_t slice_base) __arm_streaming { + // expected-warning@+1 {{builtin call is not valid when calling from a function without active ZA state}} + return svread_hor_za8_s8_m(zd, pg, 0, slice_base); +} + +__arm_new("za") +svint8_t new_za(svint8_t zd, svbool_t pg, uint32_t slice_base) __arm_streaming { + return svread_hor_za8_s8_m(zd, pg, 0, slice_base); +} + +void missing_zt0(void) __arm_streaming { + // expected-warning@+1 {{builtin call is not valid when calling from a function without active ZT0 state}} + svzero_zt(0); +} + +__arm_new("zt0") +void new_zt0(void) __arm_streaming { svzero_zt(0); } + +/// C++ lambda tests: void use_streaming_builtin_in_lambda(uint32_t slice_base, svbool_t pg, const void *ptr) __arm_streaming __arm_out("za") { >From 70dc8dfe639250b6d5976ce0034cfcf6b679e587 Mon Sep 17 00:00:00 2001 From: Benjamin Maxwell <benjamin.maxw...@arm.com> Date: Wed, 29 Jan 2025 13:57:19 +0000 Subject: [PATCH 3/3] More tests --- .../aarch64-incompat-sm-builtin-calls.cpp | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp index 8f53686a140a25..3fbcaf4a13d67c 100644 --- a/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp +++ b/clang/test/Sema/aarch64-incompat-sm-builtin-calls.cpp @@ -1,5 +1,5 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve \ +// RUN: %clang_cc1 -std=c++23 -triple aarch64-none-linux-gnu -target-feature +sve \ // RUN: -target-feature +bf16 -target-feature +sve -target-feature +sme -target-feature +sme2 -target-feature +sve2 -target-feature +neon -Waarch64-sme-attributes -fsyntax-only -verify %s // REQUIRES: aarch64-registered-target @@ -168,3 +168,27 @@ float incomp_sve_sm_fadda_sm_in_lambda(void) __arm_streaming { return svadda(svptrue_b32(), 0, svdup_f32(1)); }(); } + +void use_streaming_builtin_in_streaming_lambda(uint32_t slice_base, const void *ptr) +{ + [&] __arm_new("za") () __arm_streaming { + // Here the lambda is streaming with ZA state, so this is okay. + svld1_hor_za64(0, slice_base, svptrue_b64(), ptr); + }(); +} + +int16x8_t use_neon_builtin_in_streaming_lambda(int16x8_t splat) { + return [&]() __arm_streaming_compatible { + /// This should error as the lambda is streaming-compatible. + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)splat, (int8x16_t)splat, 33); + }(); +} + +float incomp_sve_fadda_in_streaming_lambda(void) { + return [&]() __arm_streaming { + // Should error (like the Neon case above). + // expected-error@+1 {{builtin can only be called from a non-streaming function}} + return svadda(svptrue_b32(), 0, svdup_f32(1)); + }(); +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits