[Clang][Sema] Emit diagnostic for __builtin_vectorelements(<SVEType>) when SVE is not available. #168097
+83
−22
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-backend-aarch64 Author: Paul Walker (paulwalker-arm) ChangesAs is done for other targets, I've moved the target type checking code into SemaARM and migrated existing uses. Fixes #155736 Full diff: https://github.com/llvm/llvm-project/pull/168097.diff 5 Files Affected:
diff --git a/clang/include/clang/Sema/SemaARM.h b/clang/include/clang/Sema/SemaARM.h
index 104992e8826c3..1e8941a381dc5 100644
--- a/clang/include/clang/Sema/SemaARM.h
+++ b/clang/include/clang/Sema/SemaARM.h
@@ -96,6 +96,9 @@ class SemaARM : public SemaBase {
bool checkTargetClonesAttr(SmallVectorImpl<StringRef> &Params,
SmallVectorImpl<SourceLocation> &Locs,
SmallVectorImpl<SmallString<64>> &NewParams);
+ bool checkSVETypeSupport(QualType Ty, SourceLocation Loc,
+ const FunctionDecl *FD,
+ const llvm::StringMap<bool> &FeatureMap);
};
SemaARM::ArmStreamingType getArmStreamingFnType(const FunctionDecl *FD);
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 46addea232b03..1541b2cc95d8c 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -2254,16 +2254,10 @@ void Sema::checkTypeSupport(QualType Ty, SourceLocation Loc, ValueDecl *D) {
}
// Don't allow SVE types in functions without a SVE target.
- if (Ty->isSVESizelessBuiltinType() && FD && !FD->getType().isNull()) {
+ if (Ty->isSVESizelessBuiltinType() && FD) {
llvm::StringMap<bool> CallerFeatureMap;
Context.getFunctionFeatureMap(CallerFeatureMap, FD);
- if (!Builtin::evaluateRequiredTargetFeatures("sve", CallerFeatureMap)) {
- if (!Builtin::evaluateRequiredTargetFeatures("sme", CallerFeatureMap))
- Diag(Loc, diag::err_sve_vector_in_non_sve_target) << Ty;
- else if (!IsArmStreamingFunction(FD,
- /*IncludeLocallyStreaming=*/true))
- Diag(Loc, diag::err_sve_vector_in_non_streaming_function) << Ty;
- }
+ ARM().checkSVETypeSupport(Ty, Loc, FD, CallerFeatureMap);
}
if (auto *VT = Ty->getAs<VectorType>();
diff --git a/clang/lib/Sema/SemaARM.cpp b/clang/lib/Sema/SemaARM.cpp
index ab37394cd5f98..0a96f4f3bd170 100644
--- a/clang/lib/Sema/SemaARM.cpp
+++ b/clang/lib/Sema/SemaARM.cpp
@@ -1685,4 +1685,24 @@ bool SemaARM::checkTargetClonesAttr(
return false;
}
+bool SemaARM::checkSVETypeSupport(QualType Ty, SourceLocation Loc,
+ const FunctionDecl *FD,
+ const llvm::StringMap<bool> &FeatureMap) {
+ if (!Ty->isSVESizelessBuiltinType())
+ return false;
+
+ if (FeatureMap.lookup("sve"))
+ return false;
+
+ // No SVE environment available.
+ if (!FeatureMap.lookup("sme"))
+ return Diag(Loc, diag::err_sve_vector_in_non_sve_target) << Ty;
+
+ // SVE environment only available to streaming functions.
+ if (FD && !FD->getType().isNull() &&
+ !IsArmStreamingFunction(FD, /*IncludeLocallyStreaming=*/true))
+ return Diag(Loc, diag::err_sve_vector_in_non_streaming_function) << Ty;
+
+ return false;
+}
} // namespace clang
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 086dd8ba1c670..cef1a5c4b24f6 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -9125,20 +9125,10 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
const FunctionDecl *FD = cast<FunctionDecl>(CurContext);
llvm::StringMap<bool> CallerFeatureMap;
Context.getFunctionFeatureMap(CallerFeatureMap, FD);
-
- if (!Builtin::evaluateRequiredTargetFeatures("sve", CallerFeatureMap)) {
- if (!Builtin::evaluateRequiredTargetFeatures("sme", CallerFeatureMap)) {
- Diag(NewVD->getLocation(), diag::err_sve_vector_in_non_sve_target) << T;
- NewVD->setInvalidDecl();
- return;
- } else if (!IsArmStreamingFunction(FD,
- /*IncludeLocallyStreaming=*/true)) {
- Diag(NewVD->getLocation(),
- diag::err_sve_vector_in_non_streaming_function)
- << T;
- NewVD->setInvalidDecl();
- return;
- }
+ if (ARM().checkSVETypeSupport(T, NewVD->getLocation(), FD,
+ CallerFeatureMap)) {
+ NewVD->setInvalidDecl();
+ return;
}
}
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 2159a0dc2a5d7..b17402ecc2e68 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -4189,6 +4189,14 @@ static bool CheckVectorElementsTraitOperandType(Sema &S, QualType T,
<< ""
<< "__builtin_vectorelements" << T << ArgRange;
+ if (auto *FD = dyn_cast<FunctionDecl>(S.CurContext)) {
+ if (T->isSVESizelessBuiltinType()) {
+ llvm::StringMap<bool> CallerFeatureMap;
+ S.Context.getFunctionFeatureMap(CallerFeatureMap, FD);
+ return S.ARM().checkSVETypeSupport(T, Loc, FD, CallerFeatureMap);
+ }
+ }
+
return false;
}
|
Member
|
@llvm/pr-subscribers-backend-arm Author: Paul Walker (paulwalker-arm) ChangesAs is done for other targets, I've moved the target type checking code into SemaARM and migrated existing uses. Fixes #155736 Full diff: https://github.com/llvm/llvm-project/pull/168097.diff 5 Files Affected:
diff --git a/clang/include/clang/Sema/SemaARM.h b/clang/include/clang/Sema/SemaARM.h
index 104992e8826c3..1e8941a381dc5 100644
--- a/clang/include/clang/Sema/SemaARM.h
+++ b/clang/include/clang/Sema/SemaARM.h
@@ -96,6 +96,9 @@ class SemaARM : public SemaBase {
bool checkTargetClonesAttr(SmallVectorImpl<StringRef> &Params,
SmallVectorImpl<SourceLocation> &Locs,
SmallVectorImpl<SmallString<64>> &NewParams);
+ bool checkSVETypeSupport(QualType Ty, SourceLocation Loc,
+ const FunctionDecl *FD,
+ const llvm::StringMap<bool> &FeatureMap);
};
SemaARM::ArmStreamingType getArmStreamingFnType(const FunctionDecl *FD);
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 46addea232b03..1541b2cc95d8c 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -2254,16 +2254,10 @@ void Sema::checkTypeSupport(QualType Ty, SourceLocation Loc, ValueDecl *D) {
}
// Don't allow SVE types in functions without a SVE target.
- if (Ty->isSVESizelessBuiltinType() && FD && !FD->getType().isNull()) {
+ if (Ty->isSVESizelessBuiltinType() && FD) {
llvm::StringMap<bool> CallerFeatureMap;
Context.getFunctionFeatureMap(CallerFeatureMap, FD);
- if (!Builtin::evaluateRequiredTargetFeatures("sve", CallerFeatureMap)) {
- if (!Builtin::evaluateRequiredTargetFeatures("sme", CallerFeatureMap))
- Diag(Loc, diag::err_sve_vector_in_non_sve_target) << Ty;
- else if (!IsArmStreamingFunction(FD,
- /*IncludeLocallyStreaming=*/true))
- Diag(Loc, diag::err_sve_vector_in_non_streaming_function) << Ty;
- }
+ ARM().checkSVETypeSupport(Ty, Loc, FD, CallerFeatureMap);
}
if (auto *VT = Ty->getAs<VectorType>();
diff --git a/clang/lib/Sema/SemaARM.cpp b/clang/lib/Sema/SemaARM.cpp
index ab37394cd5f98..0a96f4f3bd170 100644
--- a/clang/lib/Sema/SemaARM.cpp
+++ b/clang/lib/Sema/SemaARM.cpp
@@ -1685,4 +1685,24 @@ bool SemaARM::checkTargetClonesAttr(
return false;
}
+bool SemaARM::checkSVETypeSupport(QualType Ty, SourceLocation Loc,
+ const FunctionDecl *FD,
+ const llvm::StringMap<bool> &FeatureMap) {
+ if (!Ty->isSVESizelessBuiltinType())
+ return false;
+
+ if (FeatureMap.lookup("sve"))
+ return false;
+
+ // No SVE environment available.
+ if (!FeatureMap.lookup("sme"))
+ return Diag(Loc, diag::err_sve_vector_in_non_sve_target) << Ty;
+
+ // SVE environment only available to streaming functions.
+ if (FD && !FD->getType().isNull() &&
+ !IsArmStreamingFunction(FD, /*IncludeLocallyStreaming=*/true))
+ return Diag(Loc, diag::err_sve_vector_in_non_streaming_function) << Ty;
+
+ return false;
+}
} // namespace clang
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 086dd8ba1c670..cef1a5c4b24f6 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -9125,20 +9125,10 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
const FunctionDecl *FD = cast<FunctionDecl>(CurContext);
llvm::StringMap<bool> CallerFeatureMap;
Context.getFunctionFeatureMap(CallerFeatureMap, FD);
-
- if (!Builtin::evaluateRequiredTargetFeatures("sve", CallerFeatureMap)) {
- if (!Builtin::evaluateRequiredTargetFeatures("sme", CallerFeatureMap)) {
- Diag(NewVD->getLocation(), diag::err_sve_vector_in_non_sve_target) << T;
- NewVD->setInvalidDecl();
- return;
- } else if (!IsArmStreamingFunction(FD,
- /*IncludeLocallyStreaming=*/true)) {
- Diag(NewVD->getLocation(),
- diag::err_sve_vector_in_non_streaming_function)
- << T;
- NewVD->setInvalidDecl();
- return;
- }
+ if (ARM().checkSVETypeSupport(T, NewVD->getLocation(), FD,
+ CallerFeatureMap)) {
+ NewVD->setInvalidDecl();
+ return;
}
}
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 2159a0dc2a5d7..b17402ecc2e68 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -4189,6 +4189,14 @@ static bool CheckVectorElementsTraitOperandType(Sema &S, QualType T,
<< ""
<< "__builtin_vectorelements" << T << ArgRange;
+ if (auto *FD = dyn_cast<FunctionDecl>(S.CurContext)) {
+ if (T->isSVESizelessBuiltinType()) {
+ llvm::StringMap<bool> CallerFeatureMap;
+ S.Context.getFunctionFeatureMap(CallerFeatureMap, FD);
+ return S.ARM().checkSVETypeSupport(T, Loc, FD, CallerFeatureMap);
+ }
+ }
+
return false;
}
|
… when SVE is not available. As is done for other targets, I've moved the target type checking code into SemaARM and migrated existing uses. Fixes llvm#155736
paulwalker-arm
force-pushed
the
sve-acle-builtin_vectorelements
branch
from
b29ffcc to
0accf99
Compare
labrinea
approved these changes
Nov 24, 2025
Collaborator
labrinea
left a comment
labrinea
left a comment
There was a problem hiding this comment.
LGTM, with minor comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As is done for other targets, I've moved the target type checking code into SemaARM and migrated existing uses.
Fixes #155736