[Driver][SYCL] Update sycl lib linking with -fms-runtime-lib #19380
Conversation
The usage of `-fms-runtime-lib=val` will pull in the default libraries for MSVC linking as well as the dependent SYCL libraries when using the Linux based driver with the MSVC target triple. There are special interactions with the --dependent-lib=msvcrtd library we have that control the inclusion of sycl.lib to prevent linktime problems. Extend these behaviors to usage of `-fms-runtime-lib=dll_dbg`, preventing duplicate instances of the sycl.lib in the --dependent-lib usage as well as when performing the final link.
|
@intel/dpcpp-clang-driver-reviewers please take a look. |
| // equivalent. Do not add the -defaultlib as it conflicts. | ||
| if (!isDependentLibAdded(Args, "msvcrtd")) { | ||
| // When msvcrtd is added via --dependent-lib or -fms-runtime-lib=dll_dbg we | ||
| // add the sycld equivalent. Do not add the -defaultlib as it conflicts. |
There was a problem hiding this comment.
There was a problem hiding this comment.
The reference here should be sycld as given the conditions the sycld library will already have been added via different means, so we do not want to add the sycl variant as it will conflict.
|
@srividya-sundaram, any other review comments? |
|
Were you able to view my past comments? What is the behavior if --offload-new-driver is not passed? I was waiting for your response. |
I don't see any other comments other than your |
| // equivalent. Do not add the -defaultlib as it conflicts. | ||
| if (!isDependentLibAdded(Args, "msvcrtd")) { | ||
| // When msvcrtd is added via --dependent-lib or -fms-runtime-lib=dll_dbg we | ||
| // add the sycld equivalent. Do not add the -defaultlib as it conflicts. |
There was a problem hiding this comment.
| // CHECK-LINK-SYCL-DEBUG: "--dependent-lib=sycl{{[0-9]*}}d" | ||
| // CHECK-LINK-SYCL-DEBUG-NOT: "-defaultlib:sycl{{[0-9]*}}.lib" | ||
|
|
||
| /// Only a single instance of sycld should be pulled in when both the | ||
| /// -Xclang --dependent-lib=msvcrtd and -fms-runtime-lib=dll_dbg is used. | ||
| // RUN: %clangxx -fsycl --offload-new-driver -fms-runtime-lib=dll_dbg -Xclang \ |
There was a problem hiding this comment.
Is this supported in clang_cl mode?
| @@ -292,9 +292,21 @@ | |||
| // RUN: %clangxx -fsycl --offload-new-driver -Xclang --dependent-lib=msvcrtd \ | |||
| // RUN: -target x86_64-unknown-windows-msvc -### %s 2>&1 \ | |||
| // RUN: | FileCheck -check-prefix=CHECK-LINK-SYCL-DEBUG %s | |||
| /// Check sycld.lib is pulled in with -fms-runtime-lib=dll_dbg | |||
| // RUN: %clangxx -fsycl --offload-new-driver -fms-runtime-lib=dll_dbg \ | |||
There was a problem hiding this comment.
What is the behavior if --offload-new-driver is not passed?
|
@intel/llvm-gatekeepers, this is ready for merge - thanks! |
The usage of
-fms-runtime-lib=valwill pull in the default libraries for MSVC linking as well as the dependent SYCL libraries when using the Linux based driver with the MSVC target triple. There are special interactions with the --dependent-lib=msvcrtd library we have that control the inclusion of sycl.lib to prevent linktime problems.Extend these behaviors to usage of
-fms-runtime-lib=dll_dbg, preventing duplicate instances of the sycl.lib in the --dependent-lib usage as well as when performing the final link.