Skip to content

[TargetVersion] Only enable on RISC-V and AArch64 #115991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BeMg merged 8 commits into from
Nov 21, 2024
Merged

[TargetVersion] Only enable on RISC-V and AArch64 #115991

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28f7a2a
[TargetVersion] Only enable on RISC-V and AArch64
BeMg Nov 13, 2024
5355896
Add testcase
BeMg Nov 14, 2024
659b628
in this target -> on this target
BeMg Nov 14, 2024
5f7a3eb
Using the TargetSpecificAttr instead of InheritableAttr
BeMg Nov 15, 2024
a92daf6
Drop blank line
BeMg Nov 15, 2024
182e79f
Update clang/test/Sema/attr-target-version-unsupported.c
BeMg Nov 18, 2024
1d60b21
Update ReleaseNotes.rst
BeMg Nov 18, 2024
132ea98
Merge remote-tracking branch 'origin/main' into PR-fix-x86-target-ver…
BeMg Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions clang/include/clang/Basic/DiagnosticSemaKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,6 +3282,8 @@ def warn_unsupported_target_attribute
"attribute string; '%select{target|target_clones|target_version}3' "
"attribute ignored">,
InGroup<IgnoredAttributes>;
def err_target_version_unsupported
: Error<"target_version attribute is not supported on this target">;
def err_attribute_unsupported
: Error<"%0 attribute is not supported on targets missing %1;"
" specify an appropriate -march= or -mcpu=">;
Expand Down
5 changes: 5 additions & 0 deletions clang/lib/Sema/SemaDeclAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3040,6 +3040,11 @@ bool Sema::checkTargetVersionAttr(SourceLocation LiteralLoc, Decl *D,
enum FirstParam { Unsupported };
enum SecondParam { None };
enum ThirdParam { Target, TargetClones, TargetVersion };

Copy link
Collaborator

@topperc topperc Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop this change?

Copy link
Contributor Author

@BeMg BeMg Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch. Dropped.

if (!Context.getTargetInfo().getTriple().isRISCV() &&
!Context.getTargetInfo().getTriple().isAArch64())
return Diag(LiteralLoc, diag::err_target_version_unsupported);
Copy link
Collaborator

@AaronBallman AaronBallman Nov 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A better way to handle this is to use TargetSpecificAttr for TargetVersion in Attr.td (instead of InheritableAttr). That should automatically handle performing this check and you won't need to add a custom diagnostic.

Copy link
Contributor Author

@BeMg BeMg Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great idea. This patch now uses the TargetSpecificAttr to enable target_version for AArch64 and RISC-V.


llvm::SmallVector<StringRef, 8> Features;
if (Context.getTargetInfo().getTriple().isRISCV()) {
llvm::SmallVector<StringRef, 8> AttrStrs;
Expand Down
4 changes: 4 additions & 0 deletions clang/test/Sema/attr-target-version-unsupported.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify %s

//expected-error@+1 {{target_version attribute is not supported on this target}}
int __attribute__((target_version("aes"))) foo(void) { return 3; }
Loading