Augment existing Make SYCL triple function instead of creating new

Author: mdtoguchi

clang/lib/Driver/Driver.cpp

@@ -706,18 +706,6 @@ static bool isValidSYCLTriple(llvm::Triple T) {
   return true;
 }
 
-// Create a triple based off of the input provided.  Allow for short aliases
-// of known arch strings, which will be expanded to the full triple for usage
-// during the compilation.
-static llvm::Triple resolveSYCLTriple(Compilation &C, StringRef TripleStr) {
-  SmallVector<StringRef, 4> SYCLAlias = {"spir64", "spir64_fpga",
-                                         "spir64_x86_64", "spir64_gen"};
-  if (std::find(SYCLAlias.begin(), SYCLAlias.end(), TripleStr) !=
-      SYCLAlias.end())
-    return C.getDriver().MakeSYCLDeviceTriple(TripleStr);
-  return llvm::Triple(TripleStr);
-}
-
 void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
                                               InputList &Inputs) {
 
@@ -909,7 +897,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
     if (SYCLTargetsValues) {
       if (SYCLTargetsValues->getNumValues()) {
         for (StringRef Val : SYCLTargetsValues->getValues()) {
-          llvm::Triple TT(resolveSYCLTriple(C, Val));
+          llvm::Triple TT(MakeSYCLDeviceTriple(Val));
           if (!isValidSYCLTriple(TT)) {
             Diag(clang::diag::err_drv_invalid_sycl_target) << Val;
             continue;
@@ -1858,12 +1846,18 @@ void Driver::PrintHelp(bool ShowHidden) const {
 }
 
 llvm::Triple Driver::MakeSYCLDeviceTriple(StringRef TargetArch) const {
-  llvm::Triple TT;
-  TT.setArchName(TargetArch);
-  TT.setVendor(llvm::Triple::UnknownVendor);
-  TT.setOS(llvm::Triple::UnknownOS);
-  TT.setEnvironment(llvm::Triple::SYCLDevice);
-  return TT;
+  SmallVector<StringRef, 5> SYCLAlias = {"spir", "spir64", "spir64_fpga",
+                                         "spir64_x86_64", "spir64_gen"};
+  if (std::find(SYCLAlias.begin(), SYCLAlias.end(), TargetArch) !=
+      SYCLAlias.end()) {
+    llvm::Triple TT;
+    TT.setArchName(TargetArch);
+    TT.setVendor(llvm::Triple::UnknownVendor);
+    TT.setOS(llvm::Triple::UnknownOS);
+    TT.setEnvironment(llvm::Triple::SYCLDevice);
+    return TT;
+  }
+  return llvm::Triple(TargetArch);
 }
 
 // Print the help from any of the given tools which are used for AOT
@@ -4577,7 +4571,7 @@ class OffloadingActionBuilder final {
         if (SYCLTargets) {
           llvm::StringMap<StringRef> FoundNormalizedTriples;
           for (const char *Val : SYCLTargets->getValues()) {
-            llvm::Triple TT(resolveSYCLTriple(C, Val));
+            llvm::Triple TT(C.getDriver().MakeSYCLDeviceTriple(Val));
             std::string NormalizedName = TT.normalize();
 
             // Make sure we don't have a duplicate triple.