[SYCL][Device libs][New offload] Add missing fallback SYCL device library files (#13869)

This change is made to align the list of SYCL device library files used
in the new offload model with that of the old offload model. A gap in
implementation was identified and this PR fixes this gap.

Signed-off-by: Arvind Sudarsanam <[email protected]>

Author: asudarsa

clang/lib/Driver/ToolChains/Clang.cpp

@@ -11014,8 +11014,14 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("--triple=spirv64");
 
     SmallVector<std::string, 8> SYCLDeviceLibs;
-    SYCLDeviceLibs = SYCL::getDeviceLibraries(C, TargetTriple,
-                                              /*IsSpirvAOT=*/false);
+    auto IsSPIR = TargetTriple.isSPIROrSPIRV();
+    bool IsSpirvAOT = TargetTriple.isSPIRAOT();
+    bool UseJitLink =
+        IsSPIR &&
+        Args.hasFlag(options::OPT_fsycl_device_lib_jit_link,
+                     options::OPT_fno_sycl_device_lib_jit_link, false);
+    bool UseAOTLink = IsSPIR && (IsSpirvAOT || !UseJitLink);
+    SYCLDeviceLibs = SYCL::getDeviceLibraries(C, TargetTriple, UseAOTLink);
     // Create a comma separated list to pass along to the linker wrapper.
     SmallString<256> LibList;
     for (const auto &AddLib : SYCLDeviceLibs) {

clang/test/Driver/sycl-offload-new-driver.c

@@ -35,7 +35,7 @@
 // RUN:          --sysroot=%S/Inputs/SYCL -### %s 2>&1 \
 // RUN:   | FileCheck -check-prefix WRAPPER_OPTIONS %s
 // WRAPPER_OPTIONS: clang-linker-wrapper{{.*}} "--triple=spir64"
-// WRAPPER_OPTIONS-SAME: "-sycl-device-libraries=libsycl-crt.new.o,libsycl-complex.new.o,libsycl-complex-fp64.new.o,libsycl-cmath.new.o,libsycl-cmath-fp64.new.o,libsycl-imf.new.o,libsycl-imf-fp64.new.o,libsycl-imf-bf16.new.o,libsycl-itt-user-wrappers.new.o,libsycl-itt-compiler-wrappers.new.o,libsycl-itt-stubs.new.o"
+// WRAPPER_OPTIONS-SAME: "-sycl-device-libraries=libsycl-crt.new.o,libsycl-complex.new.o,libsycl-complex-fp64.new.o,libsycl-cmath.new.o,libsycl-cmath-fp64.new.o,libsycl-imf.new.o,libsycl-imf-fp64.new.o,libsycl-imf-bf16.new.o,libsycl-fallback-cassert.new.o,libsycl-fallback-cstring.new.o,libsycl-fallback-complex.new.o,libsycl-fallback-complex-fp64.new.o,libsycl-fallback-cmath.new.o,libsycl-fallback-cmath-fp64.new.o,libsycl-fallback-imf.new.o,libsycl-fallback-imf-fp64.new.o,libsycl-fallback-imf-bf16.new.o,libsycl-itt-user-wrappers.new.o,libsycl-itt-compiler-wrappers.new.o,libsycl-itt-stubs.new.o"
 // WRAPPER_OPTIONS-SAME: "-sycl-device-library-location={{.*}}/lib"
 
 /// Verify phases used to generate SPIR-V instead of LLVM-IR