Author: Eli Friedman Date: 2025-07-03T13:44:38-07:00 New Revision: 2aa0f0a3bd541278b04efcc717e7aa94ef4c1308
URL: https://github.com/llvm/llvm-project/commit/2aa0f0a3bd541278b04efcc717e7aa94ef4c1308 DIFF: https://github.com/llvm/llvm-project/commit/2aa0f0a3bd541278b04efcc717e7aa94ef4c1308.diff LOG: [AArch64] Add option -msve-streaming-vector-bits= . (#144611) This is similar to -msve-vector-bits, but for streaming mode: it constrains the legal values of "vscale", allowing optimizations based on that constraint. This also fixes conversions between SVE vectors and fixed-width vectors in streaming functions with -msve-vector-bits and -msve-streaming-vector-bits. This rejects any use of arm_sve_vector_bits types in streaming functions; if it becomes relevant, we could add arm_sve_streaming_vector_bits types in the future. This doesn't touch the __ARM_FEATURE_SVE_BITS define. Added: clang/test/SemaCXX/aarch64-streaming-sve-vector-conversions.cpp Modified: clang/docs/ReleaseNotes.rst clang/include/clang/Basic/DiagnosticSemaKinds.td clang/include/clang/Basic/LangOptions.def clang/include/clang/Basic/TargetInfo.h clang/include/clang/Driver/Options.td clang/lib/AST/ASTContext.cpp clang/lib/AST/ItaniumMangle.cpp clang/lib/Basic/Targets/AArch64.cpp clang/lib/Basic/Targets/AArch64.h clang/lib/Basic/Targets/RISCV.cpp clang/lib/Basic/Targets/RISCV.h clang/lib/CodeGen/CodeGenFunction.cpp clang/lib/CodeGen/Targets/RISCV.cpp clang/lib/Driver/ToolChains/Clang.cpp clang/lib/Frontend/CompilerInvocation.cpp clang/lib/Sema/Sema.cpp clang/lib/Sema/SemaARM.cpp clang/lib/Sema/SemaType.cpp clang/test/CodeGen/arm-sve-vector-bits-vscale-range.c clang/test/Driver/aarch64-sve-vector-bits.c clang/test/Sema/attr-arm-sve-vector-bits.c Removed: ################################################################################ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 023f8ff7951d3..73a80b6272d84 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -972,6 +972,8 @@ Arm and AArch64 Support - For AArch64, added support for generating executable-only code sections by using the ``-mexecute-only`` or ``-mpure-code`` compiler flags. (#GH125688) +- Added ``-msve-streaming-vector-bits=`` flag, which allows specifying the + SVE vector width in streaming mode. Android Support ^^^^^^^^^^^^^^^ diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 36f279fb663bb..968edd967e0c5 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -3332,6 +3332,9 @@ def err_sve_vector_in_non_sve_target : Error< "SVE vector type %0 cannot be used in a target without sve">; def err_sve_vector_in_non_streaming_function : Error< "SVE vector type %0 cannot be used in a non-streaming function">; +def err_sve_fixed_vector_in_streaming_function + : Error<"fixed width SVE vector type %0 cannot be used in a " + "%select{streaming|streaming-compatible}1 function">; def err_attribute_riscv_rvv_bits_unsupported : Error< "%0 is only supported when '-mrvv-vector-bits=<bits>' is specified with a " "value of \"zvl\" or a power 2 in the range [64,65536]">; diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def index 789761c1f3647..8054be1bb4e88 100644 --- a/clang/include/clang/Basic/LangOptions.def +++ b/clang/include/clang/Basic/LangOptions.def @@ -503,6 +503,9 @@ LANGOPT(OmitVTableRTTI, 1, 0, LANGOPT(VScaleMin, 32, 0, "Minimum vscale value") LANGOPT(VScaleMax, 32, 0, "Maximum vscale value") +LANGOPT(VScaleStreamingMin, 32, 0, "Minimum streaming vscale value") +LANGOPT(VScaleStreamingMax, 32, 0, "Maximum streaming vscale value") + ENUM_LANGOPT(ExtendIntArgs, ExtendArgsKind, 1, ExtendArgsKind::ExtendTo32, "Controls how scalar integer arguments are extended in calls " "to unprototyped and varargs functions") diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index 5c9031cc69dbb..c2c8cc3804e7f 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -1034,9 +1034,15 @@ class TargetInfo : public TransferrableTargetInfo, /// set of primary and secondary targets. virtual llvm::SmallVector<Builtin::InfosShard> getTargetBuiltins() const = 0; + enum class ArmStreamingKind { + NotStreaming, + StreamingCompatible, + Streaming, + }; + /// Returns target-specific min and max values VScale_Range. virtual std::optional<std::pair<unsigned, unsigned>> - getVScaleRange(const LangOptions &LangOpts, bool IsArmStreamingFunction, + getVScaleRange(const LangOptions &LangOpts, ArmStreamingKind Mode, llvm::StringMap<bool> *FeatureMap = nullptr) const { return std::nullopt; } diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 697117c06a6b2..483516cf1b13d 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -5218,6 +5218,14 @@ def msve_vector_bits_EQ : Joined<["-"], "msve-vector-bits=">, Group<m_aarch64_Fe Visibility<[ClangOption, FlangOption]>, HelpText<"Specify the size in bits of an SVE vector register. Defaults to the" " vector length agnostic value of \"scalable\". (AArch64 only)">; +def msve_streaming_vector_bits_EQ + : Joined<["-"], "msve-streaming-vector-bits=">, + Group<m_aarch64_Features_Group>, + Visibility<[ClangOption, FlangOption]>, + HelpText< + "Specify the size in bits of an SVE vector register in streaming " + "mode. Defaults to the vector length agnostic value of " + "\"scalable\". (AArch64 only)">; } // let Flags = [TargetSpecific] def mvscale_min_EQ : Joined<["-"], "mvscale-min=">, @@ -5229,6 +5237,17 @@ def mvscale_max_EQ : Joined<["-"], "mvscale-max=">, HelpText<"Specify the vscale maximum. Defaults to the" " vector length agnostic value of \"0\". (AArch64/RISC-V only)">, MarshallingInfoInt<LangOpts<"VScaleMax">>; +def mvscale_streaming_min_EQ + : Joined<["-"], "mvscale-streaming-min=">, + Visibility<[CC1Option, FC1Option]>, + HelpText<"Specify the vscale minimum. Defaults to \"1\". (AArch64 only)">, + MarshallingInfoInt<LangOpts<"VScaleStreamingMin">>; +def mvscale_streaming_max_EQ + : Joined<["-"], "mvscale-streaming-max=">, + Visibility<[CC1Option, FC1Option]>, + HelpText<"Specify the vscale maximum. Defaults to the" + " vector length agnostic value of \"0\". (AArch64 only)">, + MarshallingInfoInt<LangOpts<"VScaleStreamingMax">>; def msign_return_address_EQ : Joined<["-"], "msign-return-address=">, Visibility<[ClangOption, CC1Option]>, diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index b13bdd5642977..679812adcdf12 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -10513,8 +10513,8 @@ bool ASTContext::areCompatibleVectorTypes(QualType FirstVec, /// getRVVTypeSize - Return RVV vector register size. static uint64_t getRVVTypeSize(ASTContext &Context, const BuiltinType *Ty) { assert(Ty->isRVVVLSBuiltinType() && "Invalid RVV Type"); - auto VScale = - Context.getTargetInfo().getVScaleRange(Context.getLangOpts(), false); + auto VScale = Context.getTargetInfo().getVScaleRange( + Context.getLangOpts(), TargetInfo::ArmStreamingKind::NotStreaming); if (!VScale) return 0; diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp index 84936b72bb4fa..8a1d4e8313e28 100644 --- a/clang/lib/AST/ItaniumMangle.cpp +++ b/clang/lib/AST/ItaniumMangle.cpp @@ -4273,7 +4273,8 @@ void CXXNameMangler::mangleRISCVFixedRVVVectorType(const VectorType *T) { // Apend the LMUL suffix. auto VScale = getASTContext().getTargetInfo().getVScaleRange( - getASTContext().getLangOpts(), false); + getASTContext().getLangOpts(), + TargetInfo::ArmStreamingKind::NotStreaming); unsigned VLen = VScale->first * llvm::RISCV::RVVBitsPerBlock; if (T->getVectorKind() == VectorKind::RVVFixedLengthData) { diff --git a/clang/lib/Basic/Targets/AArch64.cpp b/clang/lib/Basic/Targets/AArch64.cpp index e57feafe3ae24..72d2e5fcf4619 100644 --- a/clang/lib/Basic/Targets/AArch64.cpp +++ b/clang/lib/Basic/Targets/AArch64.cpp @@ -750,16 +750,36 @@ AArch64TargetInfo::getTargetBuiltins() const { std::optional<std::pair<unsigned, unsigned>> AArch64TargetInfo::getVScaleRange(const LangOptions &LangOpts, - bool IsArmStreamingFunction, + ArmStreamingKind Mode, llvm::StringMap<bool> *FeatureMap) const { - if (LangOpts.VScaleMin || LangOpts.VScaleMax) + if (Mode == ArmStreamingKind::NotStreaming && + (LangOpts.VScaleMin || LangOpts.VScaleMax)) return std::pair<unsigned, unsigned>( - LangOpts.VScaleMin ? LangOpts.VScaleMin : 1, LangOpts.VScaleMax); + LangOpts.VScaleMin ? LangOpts.VScaleMin : 1, + LangOpts.VScaleMax ? LangOpts.VScaleMax : 16); + + if (Mode == ArmStreamingKind::Streaming && + (LangOpts.VScaleStreamingMin || LangOpts.VScaleStreamingMax)) + return std::pair<unsigned, unsigned>( + LangOpts.VScaleStreamingMin ? LangOpts.VScaleStreamingMin : 1, + LangOpts.VScaleStreamingMax ? LangOpts.VScaleStreamingMax : 16); + + if (Mode == ArmStreamingKind::StreamingCompatible && + ((LangOpts.VScaleMin && LangOpts.VScaleStreamingMin) || + (LangOpts.VScaleMax && LangOpts.VScaleStreamingMax))) { + unsigned Min = + std::min(LangOpts.VScaleMin ? LangOpts.VScaleMin : 1, + LangOpts.VScaleStreamingMin ? LangOpts.VScaleStreamingMin : 1); + unsigned Max = std::max( + LangOpts.VScaleMax ? LangOpts.VScaleMax : 16, + LangOpts.VScaleStreamingMax ? LangOpts.VScaleStreamingMax : 16); + return std::pair(Min, Max); + } if (hasFeature("sve") || (FeatureMap && (FeatureMap->lookup("sve")))) return std::pair<unsigned, unsigned>(1, 16); - if (IsArmStreamingFunction && + if (Mode == ArmStreamingKind::Streaming && (hasFeature("sme") || (FeatureMap && (FeatureMap->lookup("sme"))))) return std::pair<unsigned, unsigned>(1, 16); diff --git a/clang/lib/Basic/Targets/AArch64.h b/clang/lib/Basic/Targets/AArch64.h index 56adfa97efb1a..f4277e95b19be 100644 --- a/clang/lib/Basic/Targets/AArch64.h +++ b/clang/lib/Basic/Targets/AArch64.h @@ -196,7 +196,7 @@ class LLVM_LIBRARY_VISIBILITY AArch64TargetInfo : public TargetInfo { llvm::SmallVector<Builtin::InfosShard> getTargetBuiltins() const override; std::optional<std::pair<unsigned, unsigned>> - getVScaleRange(const LangOptions &LangOpts, bool IsArmStreamingFunction, + getVScaleRange(const LangOptions &LangOpts, ArmStreamingKind Mode, llvm::StringMap<bool> *FeatureMap = nullptr) const override; bool doesFeatureAffectCodeGen(StringRef Name) const override; bool validateCpuSupports(StringRef FeatureStr) const override; diff --git a/clang/lib/Basic/Targets/RISCV.cpp b/clang/lib/Basic/Targets/RISCV.cpp index 2098449dd83a3..8a28c0788aad7 100644 --- a/clang/lib/Basic/Targets/RISCV.cpp +++ b/clang/lib/Basic/Targets/RISCV.cpp @@ -222,7 +222,7 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts, // Currently we support the v1.0 RISC-V V intrinsics. Builder.defineMacro("__riscv_v_intrinsic", Twine(getVersionValue(1, 0))); - auto VScale = getVScaleRange(Opts, false); + auto VScale = getVScaleRange(Opts, ArmStreamingKind::NotStreaming); if (VScale && VScale->first && VScale->first == VScale->second) Builder.defineMacro("__riscv_v_fixed_vlen", Twine(VScale->first * llvm::RISCV::RVVBitsPerBlock)); @@ -367,7 +367,7 @@ bool RISCVTargetInfo::initFeatureMap( std::optional<std::pair<unsigned, unsigned>> RISCVTargetInfo::getVScaleRange(const LangOptions &LangOpts, - bool IsArmStreamingFunction, + ArmStreamingKind IsArmStreamingFunction, llvm::StringMap<bool> *FeatureMap) const { // RISCV::RVVBitsPerBlock is 64. unsigned VScaleMin = ISAInfo->getMinVLen() / llvm::RISCV::RVVBitsPerBlock; diff --git a/clang/lib/Basic/Targets/RISCV.h b/clang/lib/Basic/Targets/RISCV.h index 0b36c9d5d9cc8..8d629abab7bec 100644 --- a/clang/lib/Basic/Targets/RISCV.h +++ b/clang/lib/Basic/Targets/RISCV.h @@ -99,7 +99,7 @@ class RISCVTargetInfo : public TargetInfo { const std::vector<std::string> &FeaturesVec) const override; std::optional<std::pair<unsigned, unsigned>> - getVScaleRange(const LangOptions &LangOpts, bool IsArmStreamingFunction, + getVScaleRange(const LangOptions &LangOpts, ArmStreamingKind Mode, llvm::StringMap<bool> *FeatureMap = nullptr) const override; bool hasFeature(StringRef Feature) const override; diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 70a09795d02fe..776a646ceb32f 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -1109,10 +1109,16 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy, // Add vscale_range attribute if appropriate. llvm::StringMap<bool> FeatureMap; - bool IsArmStreaming = false; + auto IsArmStreaming = TargetInfo::ArmStreamingKind::NotStreaming; if (FD) { getContext().getFunctionFeatureMap(FeatureMap, FD); - IsArmStreaming = IsArmStreamingFunction(FD, true); + if (const auto *T = FD->getType()->getAs<FunctionProtoType>()) + if (T->getAArch64SMEAttributes() & + FunctionType::SME_PStateSMCompatibleMask) + IsArmStreaming = TargetInfo::ArmStreamingKind::StreamingCompatible; + + if (IsArmStreamingFunction(FD, true)) + IsArmStreaming = TargetInfo::ArmStreamingKind::Streaming; } std::optional<std::pair<unsigned, unsigned>> VScaleRange = getContext().getTargetInfo().getVScaleRange(getLangOpts(), IsArmStreaming, diff --git a/clang/lib/CodeGen/Targets/RISCV.cpp b/clang/lib/CodeGen/Targets/RISCV.cpp index 14d4cee7c61d3..cc3d487da83b5 100644 --- a/clang/lib/CodeGen/Targets/RISCV.cpp +++ b/clang/lib/CodeGen/Targets/RISCV.cpp @@ -544,7 +544,7 @@ ABIArgInfo RISCVABIInfo::coerceVLSVector(QualType Ty, unsigned ABIVLen) const { assert(VT->getElementType()->isBuiltinType() && "expected builtin type!"); auto VScale = getContext().getTargetInfo().getVScaleRange( - getContext().getLangOpts(), false); + getContext().getLangOpts(), TargetInfo::ArmStreamingKind::NotStreaming); unsigned NumElts = VT->getNumElements(); llvm::Type *EltType = llvm::Type::getInt1Ty(getVMContext()); diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 42323b2fe63bc..71d4f0af47179 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -1668,7 +1668,8 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args, } // Handle -msve_vector_bits=<bits> - if (Arg *A = Args.getLastArg(options::OPT_msve_vector_bits_EQ)) { + auto HandleVectorBits = [&](Arg *A, StringRef VScaleMin, + StringRef VScaleMax) { StringRef Val = A->getValue(); const Driver &D = getToolChain().getDriver(); if (Val == "128" || Val == "256" || Val == "512" || Val == "1024" || @@ -1676,22 +1677,31 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args, Val == "1024+" || Val == "2048+") { unsigned Bits = 0; if (!Val.consume_back("+")) { - bool Invalid = Val.getAsInteger(10, Bits); (void)Invalid; + bool Invalid = Val.getAsInteger(10, Bits); + (void)Invalid; assert(!Invalid && "Failed to parse value"); CmdArgs.push_back( - Args.MakeArgString("-mvscale-max=" + llvm::Twine(Bits / 128))); + Args.MakeArgString(VScaleMax + llvm::Twine(Bits / 128))); } - bool Invalid = Val.getAsInteger(10, Bits); (void)Invalid; + bool Invalid = Val.getAsInteger(10, Bits); + (void)Invalid; assert(!Invalid && "Failed to parse value"); + CmdArgs.push_back( - Args.MakeArgString("-mvscale-min=" + llvm::Twine(Bits / 128))); - // Silently drop requests for vector-length agnostic code as it's implied. - } else if (Val != "scalable") + Args.MakeArgString(VScaleMin + llvm::Twine(Bits / 128))); + } else if (Val == "scalable") { + // Silently drop requests for vector-length agnostic code as it's implied. + } else { // Handle the unsupported values passed to msve-vector-bits. D.Diag(diag::err_drv_unsupported_option_argument) << A->getSpelling() << Val; - } + } + }; + if (Arg *A = Args.getLastArg(options::OPT_msve_vector_bits_EQ)) + HandleVectorBits(A, "-mvscale-min=", "-mvscale-max="); + if (Arg *A = Args.getLastArg(options::OPT_msve_streaming_vector_bits_EQ)) + HandleVectorBits(A, "-mvscale-streaming-min=", "-mvscale-streaming-max="); AddAAPCSVolatileBitfieldArgs(Args, CmdArgs); diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 0a9e3649b386b..9b3200bc8a091 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -4620,6 +4620,11 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args, if (StringRef(A->getValue()).getAsInteger(10, VScaleMin) || VScaleMin == 0) Diags.Report(diag::err_cc1_unbounded_vscale_min); } + if (Arg *A = Args.getLastArg(options::OPT_mvscale_streaming_min_EQ)) { + unsigned VScaleMin; + if (StringRef(A->getValue()).getAsInteger(10, VScaleMin) || VScaleMin == 0) + Diags.Report(diag::err_cc1_unbounded_vscale_min); + } if (const Arg *A = Args.getLastArg(OPT_frandomize_layout_seed_file_EQ)) { std::ifstream SeedFile(A->getValue(0)); diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index dfc5a2767f579..56608e990fd50 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -2261,6 +2261,24 @@ void Sema::checkTypeSupport(QualType Ty, SourceLocation Loc, ValueDecl *D) { } } } + + if (auto *VT = Ty->getAs<VectorType>(); + VT && FD && + (VT->getVectorKind() == VectorKind::SveFixedLengthData || + VT->getVectorKind() == VectorKind::SveFixedLengthPredicate) && + (LangOpts.VScaleMin != LangOpts.VScaleStreamingMin || + LangOpts.VScaleMax != LangOpts.VScaleStreamingMax)) { + if (IsArmStreamingFunction(FD, /*IncludeLocallyStreaming=*/true)) { + Diag(Loc, diag::err_sve_fixed_vector_in_streaming_function) + << Ty << /*Streaming*/ 0; + } else if (const auto *FTy = FD->getType()->getAs<FunctionProtoType>()) { + if (FTy->getAArch64SMEAttributes() & + FunctionType::SME_PStateSMCompatibleMask) { + Diag(Loc, diag::err_sve_fixed_vector_in_streaming_function) + << Ty << /*StreamingCompatible*/ 1; + } + } + } }; CheckType(Ty); diff --git a/clang/lib/Sema/SemaARM.cpp b/clang/lib/Sema/SemaARM.cpp index b7dca8d090949..76318a068ce6a 100644 --- a/clang/lib/Sema/SemaARM.cpp +++ b/clang/lib/Sema/SemaARM.cpp @@ -1410,21 +1410,41 @@ void SemaARM::CheckSMEFunctionDefAttributes(const FunctionDecl *FD) { } /// getSVETypeSize - Return SVE vector or predicate register size. -static uint64_t getSVETypeSize(ASTContext &Context, const BuiltinType *Ty) { +static uint64_t getSVETypeSize(ASTContext &Context, const BuiltinType *Ty, + bool IsStreaming) { assert(Ty->isSveVLSBuiltinType() && "Invalid SVE Type"); + uint64_t VScale = IsStreaming ? Context.getLangOpts().VScaleStreamingMin + : Context.getLangOpts().VScaleMin; if (Ty->getKind() == BuiltinType::SveBool || Ty->getKind() == BuiltinType::SveCount) - return (Context.getLangOpts().VScaleMin * 128) / Context.getCharWidth(); - return Context.getLangOpts().VScaleMin * 128; + return (VScale * 128) / Context.getCharWidth(); + return VScale * 128; } bool SemaARM::areCompatibleSveTypes(QualType FirstType, QualType SecondType) { - auto IsValidCast = [this](QualType FirstType, QualType SecondType) { + bool IsStreaming = false; + if (getLangOpts().VScaleMin != getLangOpts().VScaleStreamingMin || + getLangOpts().VScaleMax != getLangOpts().VScaleStreamingMax) { + if (const FunctionDecl *FD = + SemaRef.getCurFunctionDecl(/*AllowLambda=*/true)) { + // For streaming-compatible functions, we don't know vector length. + if (const auto *T = FD->getType()->getAs<FunctionProtoType>()) { + if (T->getAArch64SMEAttributes() & + FunctionType::SME_PStateSMCompatibleMask) + return false; + } + + if (IsArmStreamingFunction(FD, /*IncludeLocallyStreaming=*/true)) + IsStreaming = true; + } + } + + auto IsValidCast = [&](QualType FirstType, QualType SecondType) { if (const auto *BT = FirstType->getAs<BuiltinType>()) { if (const auto *VT = SecondType->getAs<VectorType>()) { - ASTContext &Context = getASTContext(); // Predicates have the same representation as uint8 so we also have to // check the kind to make these types incompatible. + ASTContext &Context = getASTContext(); if (VT->getVectorKind() == VectorKind::SveFixedLengthPredicate) return BT->getKind() == BuiltinType::SveBool; else if (VT->getVectorKind() == VectorKind::SveFixedLengthData) @@ -1432,7 +1452,7 @@ bool SemaARM::areCompatibleSveTypes(QualType FirstType, QualType SecondType) { FirstType->getSveEltType(Context); else if (VT->getVectorKind() == VectorKind::Generic) return Context.getTypeSize(SecondType) == - getSVETypeSize(Context, BT) && + getSVETypeSize(Context, BT, IsStreaming) && Context.hasSameType( VT->getElementType(), Context.getBuiltinVectorTypeInfo(BT).ElementType); @@ -1447,7 +1467,23 @@ bool SemaARM::areCompatibleSveTypes(QualType FirstType, QualType SecondType) { bool SemaARM::areLaxCompatibleSveTypes(QualType FirstType, QualType SecondType) { - auto IsLaxCompatible = [this](QualType FirstType, QualType SecondType) { + bool IsStreaming = false; + if (getLangOpts().VScaleMin != getLangOpts().VScaleStreamingMin || + getLangOpts().VScaleMax != getLangOpts().VScaleStreamingMax) { + if (const FunctionDecl *FD = + SemaRef.getCurFunctionDecl(/*AllowLambda=*/true)) { + // For streaming-compatible functions, we don't know vector length. + if (const auto *T = FD->getType()->getAs<FunctionProtoType>()) + if (T->getAArch64SMEAttributes() & + FunctionType::SME_PStateSMCompatibleMask) + return false; + + if (IsArmStreamingFunction(FD, /*IncludeLocallyStreaming=*/true)) + IsStreaming = true; + } + } + + auto IsLaxCompatible = [&](QualType FirstType, QualType SecondType) { const auto *BT = FirstType->getAs<BuiltinType>(); if (!BT) return false; @@ -1471,7 +1507,8 @@ bool SemaARM::areLaxCompatibleSveTypes(QualType FirstType, // ACLE Spec Version 00bet6, 3.7.3.2. Behavior common to vectors and // predicates. if (VecTy->getVectorKind() == VectorKind::Generic && - Context.getTypeSize(SecondType) != getSVETypeSize(Context, BT)) + Context.getTypeSize(SecondType) != + getSVETypeSize(Context, BT, IsStreaming)) return false; // If -flax-vector-conversions=all is specified, the types are diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index 785d7b89e778e..88aa63d3b9e83 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -8522,8 +8522,8 @@ static void HandleRISCVRVVVectorBitsTypeAttr(QualType &CurType, return; } - auto VScale = - S.Context.getTargetInfo().getVScaleRange(S.getLangOpts(), false); + auto VScale = S.Context.getTargetInfo().getVScaleRange( + S.getLangOpts(), TargetInfo::ArmStreamingKind::NotStreaming); if (!VScale || !VScale->first || VScale->first != VScale->second) { S.Diag(Attr.getLoc(), diag::err_attribute_riscv_rvv_bits_unsupported) << Attr; diff --git a/clang/test/CodeGen/arm-sve-vector-bits-vscale-range.c b/clang/test/CodeGen/arm-sve-vector-bits-vscale-range.c index bd424172a1865..98548749a04d6 100644 --- a/clang/test/CodeGen/arm-sve-vector-bits-vscale-range.c +++ b/clang/test/CodeGen/arm-sve-vector-bits-vscale-range.c @@ -1,22 +1,66 @@ -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=1 -mvscale-max=1 -emit-llvm -o - %s | FileCheck %s -D#VBITS=1 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=2 -mvscale-max=2 -emit-llvm -o - %s | FileCheck %s -D#VBITS=2 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=4 -mvscale-max=4 -emit-llvm -o - %s | FileCheck %s -D#VBITS=4 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=8 -mvscale-max=8 -emit-llvm -o - %s | FileCheck %s -D#VBITS=8 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=16 -mvscale-max=16 -emit-llvm -o - %s | FileCheck %s -D#VBITS=16 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve2 -mvscale-min=1 -mvscale-max=1 -emit-llvm -o - %s | FileCheck %s -D#VBITS=1 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve2 -mvscale-min=2 -mvscale-max=2 -emit-llvm -o - %s | FileCheck %s -D#VBITS=2 -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=1 -emit-llvm -o - %s | FileCheck %s -D#VBITS=1 --check-prefix=CHECK-NOMAX -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=2 -emit-llvm -o - %s | FileCheck %s -D#VBITS=2 --check-prefix=CHECK-NOMAX -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=4 -emit-llvm -o - %s | FileCheck %s -D#VBITS=4 --check-prefix=CHECK-NOMAX -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=8 -emit-llvm -o - %s | FileCheck %s -D#VBITS=8 --check-prefix=CHECK-NOMAX -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=16 -emit-llvm -o - %s | FileCheck %s -D#VBITS=16 --check-prefix=CHECK-NOMAX -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve2 -mvscale-min=1 -mvscale-max=0 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-UNBOUNDED -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -mvscale-min=1 -mvscale-max=0 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-UNBOUNDED -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-NONE +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=1 -mvscale-max=1 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=1 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=2 -mvscale-max=2 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=2 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=4 -mvscale-max=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=4 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=8 -mvscale-max=8 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=8 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=16 -mvscale-max=16 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=16 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve2 -target-feature +sme -mvscale-min=1 -mvscale-max=1 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=1 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve2 -target-feature +sme -mvscale-min=2 -mvscale-max=2 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=2 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=1 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=1 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=2 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=2 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=4 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=8 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=8 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=16 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMAX,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE -D#VBITS=16 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve2 -target-feature +sme -mvscale-min=1 -mvscale-max=0 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-UNBOUNDED,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=1 -mvscale-max=0 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-UNBOUNDED,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NONE,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NONE,CHECK-NOSTREAMING,CHECK-NOCOMPATIBLE +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme -mvscale-streaming-min=1 -mvscale-streaming-max=1 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NONE,CHECK-STREAMING,CHECK-NOCOMPATIBLE -D#STREAMINGVBITS=1 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme -mvscale-streaming-min=4 -mvscale-streaming-max=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NONE,CHECK-STREAMING,CHECK-NOCOMPATIBLE -D#STREAMINGVBITS=4 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme -mvscale-streaming-min=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NONE,CHECK-STREAMING-NOMAX,CHECK-NOCOMPATIBLE -D#STREAMINGVBITS=4 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme -mvscale-min=2 -mvscale-streaming-min=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMAX,CHECK-STREAMING-NOMAX,CHECK-COMPATIBLE-NOMAX -D#VBITS=2 -D#STREAMINGVBITS=4 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme -mvscale-max=2 -mvscale-streaming-max=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-NOMIN,CHECK-STREAMING-NOMIN,CHECK-COMPATIBLE-NOMIN -D#VBITS=2 -D#STREAMINGVBITS=4 +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -target-feature +sme \ +// RUN: -mvscale-min=2 -mvscale-streaming-min=4 -mvscale-max=2 -mvscale-streaming-max=4 -emit-llvm -o - %s | \ +// RUN: FileCheck %s --check-prefixes=CHECK,CHECK-MINMAX,CHECK-STREAMING,CHECK-COMPATIBLE -D#VBITS=2 -D#STREAMINGVBITS=4 + // CHECK-LABEL: @func() #0 -// CHECK: attributes #0 = { {{.*}} vscale_range([[#VBITS]],[[#VBITS]]) {{.*}} } -// CHECK-NOMAX: attributes #0 = { {{.*}} vscale_range([[#VBITS]],0) {{.*}} } -// CHECK-UNBOUNDED: attributes #0 = { {{.*}} vscale_range(1,0) {{.*}} } +// CHECK-LABEL: @func2() #1 +// CHECK-LABEL: @func3() #2 +// CHECK-MINMAX: attributes #0 = { {{.*}} vscale_range([[#VBITS]],[[#VBITS]]) {{.*}} } +// CHECK-NOMAX: attributes #0 = { {{.*}} vscale_range([[#VBITS]],16) {{.*}} } +// CHECK-NOMIN: attributes #0 = { {{.*}} vscale_range(1,[[#VBITS]]) {{.*}} } +// CHECK-UNBOUNDED: attributes #0 = { {{.*}} vscale_range(1,16) {{.*}} } // CHECK-NONE: attributes #0 = { {{.*}} vscale_range(1,16) {{.*}} } +// CHECK-STREAMING: attributes #1 = { {{.*}} vscale_range([[#STREAMINGVBITS]],[[#STREAMINGVBITS]]) +// CHECK-STREAMING-NOMAX: attributes #1 = { {{.*}} vscale_range([[#STREAMINGVBITS]],16) +// CHECK-STREAMING-NOMIN: attributes #1 = { {{.*}} vscale_range(1,[[#STREAMINGVBITS]]) {{.*}} } +// CHECK-NOSTREAMING: attributes #1 = { {{.*}} vscale_range(1,16) {{.*}} } +// CHECK-NOCOMPATIBLE: attributes #2 = { {{.*}} vscale_range(1,16) {{.*}} } +// CHECK-COMPATIBLE: attributes #2 = { {{.*}} vscale_range([[#VBITS]],[[#STREAMINGVBITS]]) {{.*}} } +// CHECK-COMPATIBLE-NOMAX: attributes #2 = { {{.*}} vscale_range([[#VBITS]],16) {{.*}} } +// CHECK-COMPATIBLE-NOMIN: attributes #2 = { {{.*}} vscale_range(1,[[#STREAMINGVBITS]]) {{.*}} } void func(void) {} +__arm_locally_streaming void func2(void) {} +void func3(void) __arm_streaming_compatible {} diff --git a/clang/test/Driver/aarch64-sve-vector-bits.c b/clang/test/Driver/aarch64-sve-vector-bits.c index 535b0f157019a..f54cd94764bfb 100644 --- a/clang/test/Driver/aarch64-sve-vector-bits.c +++ b/clang/test/Driver/aarch64-sve-vector-bits.c @@ -24,6 +24,8 @@ // RUN: -msve-vector-bits=2048+ 2>&1 | FileCheck --check-prefix=CHECK-2048P %s // RUN: %clang -c %s -### --target=aarch64-none-linux-gnu -march=armv8-a+sve \ // RUN: -msve-vector-bits=scalable 2>&1 | FileCheck --check-prefix=CHECK-SCALABLE %s +// RUN: %clang -c %s -### --target=aarch64-none-linux-gnu -march=armv8-a+sve+sme \ +// RUN: -msve-streaming-vector-bits=128 2>&1 | FileCheck --check-prefix=STREAMING-128 %s // CHECK-128: "-mvscale-max=1" "-mvscale-min=1" // CHECK-256: "-mvscale-max=2" "-mvscale-min=2" @@ -44,6 +46,8 @@ // CHECK-SCALABLE-NOT: "-mvscale-min= // CHECK-SCALABLE-NOT: "-mvscale-max= +// STREAMING-128: "-mvscale-streaming-max=1" "-mvscale-streaming-min=1" + // Error out if an unsupported value is passed to -msve-vector-bits. // ----------------------------------------------------------------------------- // RUN: not %clang -c %s -### --target=aarch64-none-linux-gnu -march=armv8-a+sve \ diff --git a/clang/test/Sema/attr-arm-sve-vector-bits.c b/clang/test/Sema/attr-arm-sve-vector-bits.c index d34b13a74df6d..447addb4d5d33 100644 --- a/clang/test/Sema/attr-arm-sve-vector-bits.c +++ b/clang/test/Sema/attr-arm-sve-vector-bits.c @@ -1,8 +1,8 @@ -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -ffreestanding -fsyntax-only -verify -mvscale-min=1 -mvscale-max=1 %s -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -ffreestanding -fsyntax-only -verify -mvscale-min=2 -mvscale-max=2 %s -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -ffreestanding -fsyntax-only -verify -mvscale-min=4 -mvscale-max=4 %s -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -ffreestanding -fsyntax-only -verify -mvscale-min=8 -mvscale-max=8 %s -// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -ffreestanding -fsyntax-only -verify -mvscale-min=16 -mvscale-max=16 %s +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -target-feature +sme -ffreestanding -fsyntax-only -verify=expected,streaming diff erent -mvscale-min=1 -mvscale-max=1 %s +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -target-feature +sme -ffreestanding -fsyntax-only -verify=expected,streaming diff erent -mvscale-min=2 -mvscale-max=2 -mvscale-streaming-min=2 %s +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -target-feature +sme -ffreestanding -fsyntax-only -verify=expected -mvscale-min=4 -mvscale-max=4 -mvscale-streaming-min=4 -mvscale-streaming-max=4 %s +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -target-feature +sme -ffreestanding -fsyntax-only -verify=expected,streaming diff erent -mvscale-min=8 -mvscale-max=8 -mvscale-streaming-min=4 -mvscale-streaming-max=8 %s +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +bf16 -target-feature +sme -ffreestanding -fsyntax-only -verify=expected,streaming diff erent -mvscale-min=16 -mvscale-max=16 %s #include <stdint.h> @@ -382,3 +382,24 @@ TEST_INT_OPS(fixed_uint64_t) TEST_OPS(fixed_float16_t) TEST_OPS(fixed_float32_t) TEST_OPS(fixed_float64_t) + +// --------------------------------------------------------------------------// +// Streaming +__arm_locally_streaming void locally_streaming() { + svint8_t t1 = extern_int8; // streaming diff erent-error {{cannot be used in a streaming function}} + svbool_t t2 = extern_bool; // streaming diff erent-error {{cannot be used in a streaming function}} + void* t3 = extern_int8_ptr; +} +void streaming(void) __arm_streaming { + svint8_t t1 = extern_int8; // streaming diff erent-error {{cannot be used in a streaming function}} + svbool_t t2 = extern_bool; // streaming diff erent-error {{cannot be used in a streaming function}} + void* t3 = extern_int8_ptr; +} +void streaming_compatible(void) __arm_streaming_compatible { + svint8_t t1 = extern_int8; // streaming diff erent-error {{cannot be used in a streaming-compatible function}} \ + // streaming diff erent-error {{initializing}} + svbool_t t2 = extern_bool; // streaming diff erent-error {{cannot be used in a streaming-compatible function}} \ + // streaming diff erent-error {{initializing}} + void* t3 = extern_int8_ptr; +} +__arm_locally_streaming void locally_streaming_arg(fixed_int8_t x) {} // streaming diff erent-error {{cannot be used in a streaming function}} diff --git a/clang/test/SemaCXX/aarch64-streaming-sve-vector-conversions.cpp b/clang/test/SemaCXX/aarch64-streaming-sve-vector-conversions.cpp new file mode 100644 index 0000000000000..1520e2b572ce6 --- /dev/null +++ b/clang/test/SemaCXX/aarch64-streaming-sve-vector-conversions.cpp @@ -0,0 +1,69 @@ +// RUN: %clang_cc1 -triple aarch64-none-linux-gnu -target-feature +sve -target-feature +sme -mvscale-min=1 -mvscale-max=1 -mvscale-streaming-min=2 -mvscale-streaming-max=2 -flax-vector-conversions=integer -ffreestanding -fsyntax-only -verify %s +// REQUIRES: aarch64-registered-target + +#include <arm_sve.h> + +#define SVE_BITS 128 +#define SVE_FIXED_ATTR __attribute__((arm_sve_vector_bits(SVE_BITS))) +#define GNU_FIXED_ATTR __attribute__((vector_size(SVE_BITS / 8))) +#define GNU_BOOL_FIXED_ATTR __attribute__((vector_size(SVE_BITS / 64))) +#define STREAMING_BITS 256 +#define GNU_FIXED_STREAMING_ATTR __attribute__((vector_size(STREAMING_BITS / 8))) +#define GNU_BOOL_FIXED_STREAMING_ATTR __attribute__((vector_size(STREAMING_BITS / 64))) + +typedef svfloat32_t sve_fixed_float32_t SVE_FIXED_ATTR; +typedef svint32_t sve_fixed_int32_t SVE_FIXED_ATTR; +typedef svbool_t sve_fixed_bool_t SVE_FIXED_ATTR; +typedef float gnu_fixed_float32_t GNU_FIXED_ATTR; +typedef int gnu_fixed_int32_t GNU_FIXED_ATTR; +typedef int8_t gnu_fixed_bool_t GNU_BOOL_FIXED_ATTR; + +typedef float gnu_fixed_float32_t_streaming GNU_FIXED_STREAMING_ATTR; +typedef int gnu_fixed_int32_t_streaming GNU_FIXED_STREAMING_ATTR; +typedef int8_t gnu_fixed_bool_t_streaming GNU_BOOL_FIXED_STREAMING_ATTR; + +void sve_fixed() { + gnu_fixed_int32_t fi; + gnu_fixed_float32_t_streaming fi_wrong; + gnu_fixed_float32_t ff; + gnu_fixed_float32_t_streaming ff_wrong; + gnu_fixed_bool_t fb; + gnu_fixed_bool_t_streaming fb_wrong; + *(volatile svint32_t*)0 = fi; + *(volatile svint32_t*)0 = fi_wrong; // expected-error {{incompatible}} + *(volatile svfloat32_t*)0 = ff; + *(volatile svfloat32_t*)0 = ff_wrong; // expected-error {{incompatible}} + *(volatile svbool_t*)0 = fb; + *(volatile svbool_t*)0 = fb_wrong; // expected-error {{incompatible}} +} + +__arm_locally_streaming void streaming_fixed() { + gnu_fixed_int32_t_streaming fi; + gnu_fixed_float32_t fi_wrong; + gnu_fixed_float32_t_streaming ff; + gnu_fixed_float32_t ff_wrong; + gnu_fixed_bool_t_streaming fb; + gnu_fixed_bool_t fb_wrong; + *(volatile svint32_t*)0 = fi; + *(volatile svint32_t*)0 = fi_wrong; // expected-error {{incompatible}} + *(volatile svfloat32_t*)0 = ff; + *(volatile svfloat32_t*)0 = ff_wrong; // expected-error {{incompatible}} + *(volatile svbool_t*)0 = fb; + *(volatile svbool_t*)0 = fb_wrong; // expected-error {{incompatible}} +} + +void streaming_compatible() __arm_streaming_compatible { + gnu_fixed_int32_t fi_ns; + gnu_fixed_float32_t_streaming fi_s; + gnu_fixed_float32_t ff_ns; + gnu_fixed_float32_t_streaming ff_s; + gnu_fixed_bool_t fb_ns; + gnu_fixed_bool_t_streaming fb_s; + *(volatile svint32_t*)0 = fi_ns; // expected-error {{incompatible}} + *(volatile svint32_t*)0 = fi_s; // expected-error {{incompatible}} + *(volatile svfloat32_t*)0 = ff_ns; // expected-error {{incompatible}} + *(volatile svfloat32_t*)0 = ff_s; // expected-error {{incompatible}} + *(volatile svbool_t*)0 = fb_ns; // expected-error {{incompatible}} + *(volatile svbool_t*)0 = fb_s; // expected-error {{incompatible}} +} + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
