This is an archive of the discontinued LLVM Phabricator instance.

Differential D104539

[Sema][SVE] Properly match builtin ID when using aux target
ClosedPublic

Authored by bsmith on Jun 18 2021, 7:40 AM.

Details

Reviewers
paulwalker-arm
peterwaller-arm
joechrisellis
sdesmalen
efriedma
aaron.ballman
jdoerfert
Commits
rG325b6707942d: [Sema][SVE] Properly match builtin ID when using aux target

Diff Detail

Unit TestsFailed

TimeTest
1,890 msx64 debian > libFuzzer.libFuzzer::dataflow.test
112,440 msx64 debian > libFuzzer.libFuzzer::only-some-bytes-fork.test
8,600 msx64 debian > libFuzzer.libFuzzer::only-some-bytes.test

Event Timeline

bsmith created this revision.Jun 18 2021, 7:40 AM
Herald added a reviewer: efriedma. · View Herald TranscriptJun 18 2021, 7:40 AM
Herald added a reviewer: aaron.ballman. · View Herald Transcript
Herald added subscribers: psnobl, tschuett. · View Herald Transcript
bsmith requested review of this revision.Jun 18 2021, 7:40 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 18 2021, 7:40 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: cfe-commits, sstefan1. · View Herald Transcript
sdesmalen accepted this revision.Jun 18 2021, 8:08 AM

LGTM!

This revision is now accepted and ready to land.Jun 18 2021, 8:08 AM
Matt added a subscriber: Matt.Jun 18 2021, 12:12 PM
Harbormaster completed remote builds in B109932: Diff 353002.Jun 19 2021, 1:36 AM
This revision was landed with ongoing or failed builds.Jun 21 2021, 4:52 AM
Closed by commit rG325b6707942d: [Sema][SVE] Properly match builtin ID when using aux target (authored by bsmith). · Explain Why
This revision was automatically updated to reflect the committed changes.
bsmith added a commit: rG325b6707942d: [Sema][SVE] Properly match builtin ID when using aux target.

Revision Contents

PathSize
clang/
lib/
Sema/
8 lines
test/
Sema/
4 lines

Diff 353002

clang/lib/Sema/SemaDeclAttr.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 5,157 Lines • ▼ Show 20 Lines#include "clang/Basic/arm_mve_builtin_aliases.inc"
return ArmBuiltinAliasValid(BuiltinID, AliasName, Map, IntrinNames); return ArmBuiltinAliasValid(BuiltinID, AliasName, Map, IntrinNames);
} }
static bool ArmCdeAliasValid(unsigned BuiltinID, StringRef AliasName) { static bool ArmCdeAliasValid(unsigned BuiltinID, StringRef AliasName) {
#include "clang/Basic/arm_cde_builtin_aliases.inc" #include "clang/Basic/arm_cde_builtin_aliases.inc"
return ArmBuiltinAliasValid(BuiltinID, AliasName, Map, IntrinNames); return ArmBuiltinAliasValid(BuiltinID, AliasName, Map, IntrinNames);
} }
static bool ArmSveAliasValid(unsigned BuiltinID, StringRef AliasName) { static bool ArmSveAliasValid(ASTContext &Context, unsigned BuiltinID, StringRef AliasName) {
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-static bool ArmSveAliasValid(ASTContext &Context, unsigned BuiltinID, StringRef AliasName) {
+static bool ArmSveAliasValid(ASTContext &Context, unsigned BuiltinID,
+                             StringRef AliasName) {
Lint: Pre-merge checks: clang-format: please reformat the code ``` -static bool ArmSveAliasValid(ASTContext &Context…
if (Context.BuiltinInfo.isAuxBuiltinID(BuiltinID))
BuiltinID = Context.BuiltinInfo.getAuxBuiltinID(BuiltinID);
return BuiltinID >= AArch64::FirstSVEBuiltin && return BuiltinID >= AArch64::FirstSVEBuiltin &&
BuiltinID <= AArch64::LastSVEBuiltin; BuiltinID <= AArch64::LastSVEBuiltin;
} }
static void handleArmBuiltinAliasAttr(Sema &S, Decl *D, const ParsedAttr &AL) { static void handleArmBuiltinAliasAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
if (!AL.isArgIdent(0)) { if (!AL.isArgIdent(0)) {
S.Diag(AL.getLoc(), diag::err_attribute_argument_n_type) S.Diag(AL.getLoc(), diag::err_attribute_argument_n_type)
<< AL << 1 << AANT_ArgumentIdentifier; << AL << 1 << AANT_ArgumentIdentifier;
return; return;
} }
IdentifierInfo *Ident = AL.getArgAsIdent(0)->Ident; IdentifierInfo *Ident = AL.getArgAsIdent(0)->Ident;
unsigned BuiltinID = Ident->getBuiltinID(); unsigned BuiltinID = Ident->getBuiltinID();
StringRef AliasName = cast<FunctionDecl>(D)->getIdentifier()->getName(); StringRef AliasName = cast<FunctionDecl>(D)->getIdentifier()->getName();
bool IsAArch64 = S.Context.getTargetInfo().getTriple().isAArch64(); bool IsAArch64 = S.Context.getTargetInfo().getTriple().isAArch64();
if ((IsAArch64 && !ArmSveAliasValid(BuiltinID, AliasName)) || if ((IsAArch64 && !ArmSveAliasValid(S.Context, BuiltinID, AliasName)) ||
(!IsAArch64 && !ArmMveAliasValid(BuiltinID, AliasName) && (!IsAArch64 && !ArmMveAliasValid(BuiltinID, AliasName) &&
!ArmCdeAliasValid(BuiltinID, AliasName))) { !ArmCdeAliasValid(BuiltinID, AliasName))) {
S.Diag(AL.getLoc(), diag::err_attribute_arm_builtin_alias); S.Diag(AL.getLoc(), diag::err_attribute_arm_builtin_alias);
return; return;
} }
D->addAttr(::new (S.Context) ArmBuiltinAliasAttr(S.Context, AL, Ident)); D->addAttr(::new (S.Context) ArmBuiltinAliasAttr(S.Context, AL, Ident));
} }
Show All 13 Linesstatic void handleBuiltinAliasAttr(Sema &S, Decl *D,
IdentifierInfo *Ident = AL.getArgAsIdent(0)->Ident; IdentifierInfo *Ident = AL.getArgAsIdent(0)->Ident;
unsigned BuiltinID = Ident->getBuiltinID(); unsigned BuiltinID = Ident->getBuiltinID();
StringRef AliasName = cast<FunctionDecl>(D)->getIdentifier()->getName(); StringRef AliasName = cast<FunctionDecl>(D)->getIdentifier()->getName();
bool IsAArch64 = S.Context.getTargetInfo().getTriple().isAArch64(); bool IsAArch64 = S.Context.getTargetInfo().getTriple().isAArch64();
bool IsARM = S.Context.getTargetInfo().getTriple().isARM(); bool IsARM = S.Context.getTargetInfo().getTriple().isARM();
bool IsRISCV = S.Context.getTargetInfo().getTriple().isRISCV(); bool IsRISCV = S.Context.getTargetInfo().getTriple().isRISCV();
if ((IsAArch64 && !ArmSveAliasValid(BuiltinID, AliasName)) || if ((IsAArch64 && !ArmSveAliasValid(S.Context, BuiltinID, AliasName)) ||
(IsARM && !ArmMveAliasValid(BuiltinID, AliasName) && (IsARM && !ArmMveAliasValid(BuiltinID, AliasName) &&
!ArmCdeAliasValid(BuiltinID, AliasName)) || !ArmCdeAliasValid(BuiltinID, AliasName)) ||
(IsRISCV && !RISCVAliasValid(BuiltinID, AliasName)) || (IsRISCV && !RISCVAliasValid(BuiltinID, AliasName)) ||
(!IsAArch64 && !IsARM && !IsRISCV)) { (!IsAArch64 && !IsARM && !IsRISCV)) {
S.Diag(AL.getLoc(), diag::err_attribute_builtin_alias) << AL; S.Diag(AL.getLoc(), diag::err_attribute_builtin_alias) << AL;
return; return;
} }
▲ Show 20 Lines • Show All 3,502 Lines • Show Last 20 Lines

clang/test/Sema/aarch64-sve-alias-attribute.c

  • This file was added.
// RUN: %clang_cc1 -triple aarch64-unknown-linux-gnu -aux-triple aarch64-none-unknown-eabi -target-feature +sve -fopenmp-is-device -fopenmp -verify -fsyntax-only %s
static __inline__ __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabd_n_f64_m))) // expected-no-diagnostics
void nop(void);