Supports option 2 of ARM-software/acle#403

depends on option 1 #146092

Author: labrinea

clang/include/clang/Sema/Sema.h

@@ -4911,7 +4911,8 @@ class Sema final : public SemaBase {
   bool checkTargetAttr(SourceLocation LiteralLoc, StringRef Str);
 
   /// Check Target Version attrs
-  bool checkTargetVersionAttr(SourceLocation Loc, Decl *D, StringRef Str);
+  bool checkTargetVersionAttr(SourceLocation Loc, Decl *D, StringRef Str,
+                              SmallString<64> &);
   bool checkTargetClonesAttrString(
       SourceLocation LiteralLoc, StringRef Str, const StringLiteral *Literal,
       Decl *D, bool &HasDefault, bool &HasCommas, bool &HasNotDefault,

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3279,7 +3279,7 @@ bool Sema::checkTargetAttr(SourceLocation LiteralLoc, StringRef AttrStr) {
 }
 
 bool Sema::checkTargetVersionAttr(SourceLocation LiteralLoc, Decl *D,
-                                  StringRef AttrStr) {
+                                  StringRef AttrStr, SmallString<64> &NewStr) {
   enum FirstParam { Unsupported };
   enum SecondParam { None };
   enum ThirdParam { Target, TargetClones, TargetVersion };
@@ -3330,11 +3330,19 @@ bool Sema::checkTargetVersionAttr(SourceLocation LiteralLoc, Decl *D,
       return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
              << Unsupported << None << AttrStr << TargetVersion;
 
+    NewStr = AttrStr;
     return false;
   }
-  AttrStr.split(Features, "+");
+
+  auto [LHS, RHS] = AttrStr.split(';');
+  LHS.split(Features, '+');
+  if (!RHS.empty())
+    RHS.split(Features, '+');
   for (auto &CurFeature : Features) {
     CurFeature = CurFeature.trim();
+    if (!NewStr.empty())
+      NewStr.append("+");
+    NewStr.append(CurFeature);
     if (CurFeature == "default")
       continue;
     if (!Context.getTargetInfo().validateCpuSupports(CurFeature))
@@ -3346,12 +3354,13 @@ bool Sema::checkTargetVersionAttr(SourceLocation LiteralLoc, Decl *D,
 
 static void handleTargetVersionAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   StringRef Str;
+  SmallString<64> NewStr;
   SourceLocation LiteralLoc;
   if (!S.checkStringLiteralArgumentAttr(AL, 0, Str, &LiteralLoc) ||
-      S.checkTargetVersionAttr(LiteralLoc, D, Str))
+      S.checkTargetVersionAttr(LiteralLoc, D, Str, NewStr))
     return;
   TargetVersionAttr *NewAttr =
-      ::new (S.Context) TargetVersionAttr(S.Context, AL, Str);
+      ::new (S.Context) TargetVersionAttr(S.Context, AL, NewStr);
   D->addAttr(NewAttr);
 }
 
@@ -3404,6 +3413,19 @@ bool Sema::checkTargetClonesAttrString(
         else
           StringsBuffer.push_back(Cur);
       } else {
+        auto [LHS, RHS] = Cur.split(';');
+        StringRef Priority;
+        if (LHS.starts_with("priority")) {
+          Priority = LHS;
+          Cur = !RHS.empty() ? RHS : LHS;
+        } else if (RHS.starts_with("priority")) {
+          Priority = RHS;
+          Cur = LHS;
+        }
+        if (!Priority.empty() && !TInfo.validateCpuSupports(Priority))
+          Diag(CurLoc, diag::warn_unsupported_target_attribute)
+              << Unsupported << None << Priority << TargetClones;
+
         std::pair<StringRef, StringRef> CurParts = {{}, Cur};
         llvm::SmallVector<StringRef, 8> CurFeatures;
         while (!CurParts.second.empty()) {
@@ -3426,6 +3448,10 @@ bool Sema::checkTargetClonesAttrString(
             Res.append("+");
           Res.append(CurFeat);
         }
+        if (!Res.empty() && !Priority.empty()) {
+          Res.append("+");
+          Res.append(Priority);
+        }
         if (llvm::is_contained(StringsBuffer, Res) || DefaultIsDupe)
           Diag(CurLoc, diag::warn_target_clone_duplicate_options);
         else if (!HasCodeGenImpact)

clang/test/AST/attr-target-version.c

@@ -3,6 +3,6 @@
 int __attribute__((target_version("sve2-bitperm + sha2"))) foov(void) { return 1; }
 int __attribute__((target_clones(" lse + fp + sha3 ", "default"))) fooc(void) { return 2; }
 // CHECK: TargetVersionAttr
-// CHECK: sve2-bitperm + sha2
+// CHECK: sve2-bitperm+sha2
 // CHECK: TargetClonesAttr
 // CHECK: fp+lse+sha3 default

clang/test/CodeGen/AArch64/fmv-duplicate-mangled-name.c

@@ -28,13 +28,13 @@ __attribute__((target_clones("aes", "lse", "default"))) int explicit_default_bad
 __attribute__((target_version("aes"))) int explicit_version_priority(void) { return 0; }
 // expected-error@+2 {{definition with same mangled name 'explicit_version_priority._Maes' as another definition}}
 // expected-note@-2 {{previous definition is here}}
-__attribute__((target_version("priority1+aes"))) int explicit_version_priority(void) { return 1; }
+__attribute__((target_version("priority1;aes"))) int explicit_version_priority(void) { return 1; }
 
 #elif defined(CHECK_EXPLICIT_CLONES_PRIORITY)
 
-__attribute__((target_version("aes+priority2"))) int explicit_clones_priority(void) { return 0; }
+__attribute__((target_version("aes;priority2"))) int explicit_clones_priority(void) { return 0; }
 // expected-error@+2 {{definition with same mangled name 'explicit_clones_priority._Maes' as another definition}}
 // expected-note@-2 {{previous definition is here}}
-__attribute__((target_clones("priority1+aes", "lse"))) int explicit_clones_priority(void) { return 1; }
+__attribute__((target_clones("priority1;aes", "lse"))) int explicit_clones_priority(void) { return 1; }
 
 #endif

clang/test/CodeGen/AArch64/fmv-explicit-priority.c

@@ -1,17 +1,17 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature --check-attributes --check-globals --include-generated-funcs
 // RUN: %clang_cc1 -triple aarch64-none-linux-gnu -O3 -fno-inline -emit-llvm -o - %s | FileCheck %s
 
-__attribute__((target_version("priority1+lse"))) int foo(void) { return 1; }
-__attribute__((target_version("priority2+sve2"))) int foo(void) { return 2; }
-__attribute__((target_version("priority3+sve"))) int foo(void) { return 3; }
+__attribute__((target_version("priority1;lse"))) int foo(void) { return 1; }
+__attribute__((target_version("priority2;sve2"))) int foo(void) { return 2; }
+__attribute__((target_version("priority3;sve"))) int foo(void) { return 3; }
 __attribute__((target_version( "default"))) int foo(void) { return 0; }
 
-__attribute__((target_clones("priority1+lse+sve2", "priority2+lse", "priority3+sve", "default")))
+__attribute__((target_clones("priority1;lse+sve2", "priority2;lse", "priority3;sve", "default")))
 int fmv_caller(void) { return foo(); }
 
 
 __attribute__((target_version("aes"))) int bar(void) { return 1; }
-__attribute__((target_version("priority1+sm4"))) int bar(void) { return 2; }
+__attribute__((target_version("priority1;sm4"))) int bar(void) { return 2; }
 __attribute__((target_version("default"))) int bar(void) { return 0; }
 
 __attribute__((target("aes"))) int regular_caller_aes() { return bar(); }