code clean up and resolve CI failure

Author: YixingZhang007

clang/lib/Driver/Driver.cpp

@@ -1556,9 +1556,9 @@ static void appendOneArg(InputArgList &Args, const Arg *Opt) {
   }
 }
 
-  /// Utility function to parse all devices passed via -fsycl-targets.
-  /// Return 'true' for JIT, AOT Intel CPU/GPUs and NVidia/AMD targets.
-  /// Otherwise return 'false'.
+// Utility function to parse all devices passed via -fsycl-targets.
+// Return 'true' for JIT, AOT Intel CPU/GPUs and NVidia/AMD targets.
+// Otherwise return 'false'.
 bool Driver::GetUseNewOffloadDriverForSYCLOffload(Compilation &C,
                                                   const ArgList &Args) const {
   // Check only if enabled with -fsycl

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -700,7 +700,7 @@ getDeviceLibrariesLegacy(const Compilation &C, const llvm::Triple &TargetTriple,
   StringRef LibSuffix = ".bc";
   if (IsNewOffload)
     // For new offload model, we use packaged .bc files.
-    LibSuffix = IsWindowsMSVCEnv ? ".new.obj" : ".new.o";
+    LibSuffix = IsWindowsMSVCEnv ? ".obj" : ".o";
   auto addLibraries = [&](const SYCLDeviceLibsList &LibsList) {
     for (const DeviceLibOptInfo &Lib : LibsList) {
       if (!DeviceLibLinkInfo[Lib.DeviceLibOption])
@@ -807,7 +807,7 @@ SYCL::getDeviceLibraries(const Compilation &C, const llvm::Triple &TargetTriple,
   StringRef LibSuffix = ".bc";
   if (IsNewOffload)
     // For new offload model, we use packaged .bc files.
-    LibSuffix = IsWindowsMSVCEnv ? ".new.obj" : ".new.o";
+    LibSuffix = IsWindowsMSVCEnv ? ".obj" : ".o";
   auto addLibraries = [&](const SYCLDeviceLibsList &LibsList) {
     for (const StringRef &Lib : LibsList) {
       LibraryList.push_back(Args.MakeArgString(Twine(Lib) + LibSuffix));
@@ -1024,10 +1024,10 @@ const char *SYCL::Linker::constructLLVMLinkCommand(
       const bool IsSYCLNativeCPU =
           this->getToolChain().getTriple().isNativeCPU();
       StringRef LibPostfix = ".bc";
-      StringRef NewLibPostfix = ".new.o";
+      StringRef NewLibPostfix = ".o";
       if (HostTC->getTriple().isWindowsMSVCEnvironment() &&
           C.getDriver().IsCLMode())
-        NewLibPostfix = ".new.obj";
+        NewLibPostfix = ".obj";
       std::string FileName = this->getToolChain().getInputFilename(II);
       StringRef InputFilename = llvm::sys::path::filename(FileName);
       // NativeCPU links against libclc (libspirv)

sycl/test-e2e/Config/kernel_from_file.cpp

@@ -15,7 +15,8 @@
 // RUN: %clangxx -Wno-error=ignored-attributes %sycl_include -DSYCL_DISABLE_FALLBACK_ASSERT %cxx_std_optionc++17 %include_option %t.h %s -o %t.out %sycl_options -Xclang -verify-ignore-unexpected=note,warning %if preview-mode %{-Wno-unused-command-line-argument%}
 // RUN: env SYCL_USE_KERNEL_SPV=%t.spv %{run} %t.out
 
-// Check backward compatibility: verify that SYCL object files can be unbundled to extract device code as in old-offloading-model workflows.
+// Check backward compatibility: verify that SYCL object files can be unbundled
+// to extract device code as in old-offloading-model workflows.
 // >> ---- unbundle compiler wrapper and asan device objects
 // RUN: clang-offload-bundler -type=o -targets=sycl-spir64-unknown-unknown -input=%sycl_static_libs_dir/libsycl-itt-compiler-wrappers.old%obj_ext -output=%t_compiler_wrappers.old.bc -unbundle
 // RUN: %if linux %{ clang-offload-bundler -type=o -targets=sycl-spir64-unknown-unknown -input=%sycl_static_libs_dir/libsycl-asan.old%obj_ext -output=%t_asan.old.bc -unbundle %}
@@ -27,7 +28,6 @@
 // RUN: llvm-spirv -o %t.old.spv %t_app.old.bc
 // RUN: env SYCL_USE_KERNEL_SPV=%t.old.spv %{run} %t.out
 
-
 #include <iostream>
 #include <sycl/detail/core.hpp>
 

sycl/test-e2e/SeparateCompile/test.cpp

@@ -37,7 +37,8 @@
 // RUN: %clangxx wrapper.o a.o b.o -Wno-unused-command-line-argument -o app.exe %sycl_options
 // RUN: %{run} ./app.exe
 
-// Check backward compatibility: verify that SYCL object files can be unbundled to extract device code as in old-offloading-model workflows.
+// Check backward compatibility: verify that SYCL object files can be unbundled
+// to extract device code as in old-offloading-model workflows.
 // >> ---- bundle .o with .spv
 // >> run bundler
 // RUN: clang-offload-bundler -type=o -targets=host-x86_64,sycl-spir64-pc-linux-gnu -input=a.o -input=a_kernel.bc -output=a_fat.old.o