Improve warning message for deprecated -fsycl-targets arguments.

Author: bader

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -295,9 +295,6 @@ def err_drv_fsycl_with_c_type : Error<
 def warn_drv_sycl_offload_target_duplicate : Warning<
   "SYCL offloading target '%0' is similar to target '%1' already specified; "
   "will be ignored">, InGroup<SyclTarget>;
-def warn_drv_sycl_deprecated_triple_component : Warning<"'%0' component of '%1'"
-  " SYCL offloading target triple is deprecated; using '%2' instead">,
-  InGroup<SyclTarget>;
 def err_drv_omp_offload_target_missingbcruntime : Error<
   "No library '%0' found in the default clang lib directory or in LIBRARY_PATH. Please use --libomptarget-%1-bc-path to specify %1 bitcode library.">;
 def err_drv_omp_offload_target_bcruntime_not_found : Error<"Bitcode library '%0' does not exist.">;

clang/lib/Driver/Driver.cpp

@@ -925,13 +925,13 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
 
           // Warn about deprecated `sycldevice` environment component.
           if (TT.getEnvironmentName() == "sycldevice") {
+            Diag(clang::diag::warn_drv_deprecated_arg)
+                << TT.str() << TT.getArchName();
+            // Drop environment component.
             std::string EffectiveTriple =
                 Twine(TT.getArchName() + "-" + TT.getVendorName() + "-" +
                       TT.getOSName())
                     .str();
-            Diag(clang::diag::warn_drv_sycl_deprecated_triple_component)
-                << TT.getEnvironmentName() << TT.str() << EffectiveTriple;
-            // Drop environment component.
             TT.setTriple(EffectiveTriple);
           }
 

clang/test/Driver/sycl.c

@@ -29,7 +29,7 @@
 // DISABLED-NOT: "-fsycl-std-layout-kernel-params"
 
 // RUN: %clangxx -fsycl -fsycl-targets=spir64-unknown-unknown-sycldevice -c %s 2>&1 | FileCheck %s --check-prefix=CHECK_WARNING
-// CHECK_WARNING: 'sycldevice' component of 'spir64-unknown-unknown-sycldevice' SYCL offloading target triple is deprecated; using 'spir64-unknown-unknown' instead
+// CHECK_WARNING: argument 'spir64-unknown-unknown-sycldevice' is deprecated, use 'spir64' instead
 
 // RUN: %clang -### -fsycl-device-only -c %s 2>&1 | FileCheck %s --check-prefix=DEFAULT
 // RUN: %clang -### -fsycl-device-only %s 2>&1 | FileCheck %s --check-prefix=DEFAULT