[SYCL][UR][CMake] Stop creating debug library builds on Windows during release builds #18200

steffenlarsen · 2025-04-25T15:51:28Z

Currently the SYCL library and its constituents build both a release build and a debug build (/MDd) on Windows, no matter what the build type is. This PR changes the build to only build in the mode specified by the CMAKE_BUILD_TYPE, meaning that packaging of release builds must build both explicitly and copy the files into the packages.

To allow parity with old builds, the -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL can be used during configuration to use the debug UCRT in release mode, generating "d"-suffixed libraries. This can also be controlled in the configure.py script using the --use-debug-crt-dll option.

Additionally, this PR adds a new test that checks that library files in build mode all have the required postfix ("d" or "d-preview") when they link with Windows debug URCT, and the release variant if not.

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

…ble_build

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

…ble_build

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen · 2025-06-05T12:42:24Z

unified-runtime/cmake/FetchLevelZero.cmake

@@ -55,9 +55,6 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
    # Prevent L0 loader from exporting extra symbols
    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)

-    set(CMAKE_MSVC_RUNTIME_LIBRARY_BAK "${CMAKE_MSVC_RUNTIME_LIBRARY}")
-    # UMF has not yet been able to build as static


@kbenzie - Do you know if this is still a problem? I was able to build in static configuration locally without any issues.

I think that's a question for a UMF maintainer @bratpiorka

I'm not sure what is behind this comment, but since everything is working now, that's great

…ble_build

KseniyaTikhomirova · 2025-07-02T11:24:41Z

sycl/source/CMakeLists.txt

    endif()
    if (SYCL_ENABLE_XPTI_TRACING)
-      target_link_libraries(${LIB_NAME} PRIVATE ${CMAKE_DL_LIBS})
+      target_link_libraries(${LIB_TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS})
    endif()


l201. should it be LIB_TARGET_NAME too?

Yes! Good catch.

KseniyaTikhomirova · 2025-07-02T11:30:52Z

sycl/source/CMakeLists.txt

 # Version-agnostic name of the import library, has effect on Windows only.
 set(IMPLIB_NAME "sycl")
+set(IMPLIB_PREVIEW_NAME "${IMPLIB_NAME}-preview")
+if (CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_MSVC_RUNTIME_LIBRARY STREQUAL MultiThreadedDebugDLL)


do we not have "if (WIN32)" or similar check here because we apply this setting in add_sycl_rt_library for windows only? can we just set IMPLIB_* vars at l348 and do changes in the win path together with other name related vars?

do we not have "if (WIN32)" or similar check here because we apply this setting in add_sycl_rt_library for windows only?

Exactly!

can we just set IMPLIB_* vars at l348 and do changes in the win path together with other name related vars?

We could, e.g. by moving the first sets here to before the if (WIN32), but it does make the fact that this just appends a d to the names a little less obvious. If you think it is better I will happily do it though. 👍

steffenlarsen added 3 commits April 11, 2025 06:13

[SYCL] Stop building Windows debug variants in release mode

ece7f97

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Merge remote-tracking branch 'intel/sycl' into steffen/remove_win_dou…

a3e8edd

…ble_build

Add ucrt checks

e43a28c

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 25, 2025 15:51 — with GitHub Actions Error

Fix formatting

93ec50c

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 25, 2025 16:05 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 25, 2025 16:45 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 25, 2025 16:53 — with GitHub Actions Failure

steffenlarsen added 2 commits April 27, 2025 21:56

Fix formatting

89652ef

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Fix windows sycl lib install target

78c2798

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 07:27 — with GitHub Actions Error

Revert clang toolchain changes

2c9712c

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 07:53 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 08:16 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 08:25 — with GitHub Actions Failure

steffenlarsen added 3 commits April 28, 2025 01:38

Remove xptifwd target

598d724

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Revert MSVC toolchain changes

29ab725

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Fix formatting

f2c032d

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 09:41 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 09:54 — with GitHub Actions Error

Fix more formatting

68889c0

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 09:55 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 10:09 — with GitHub Actions Error

One more formatting patch

3f6639d

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 10:13 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 10:44 — with GitHub Actions Failure

steffenlarsen had a problem deploying to WindowsCILock April 28, 2025 10:59 — with GitHub Actions Failure

Make suffix config-independent

9c47487

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen temporarily deployed to WindowsCILock June 3, 2025 09:01 — with GitHub Actions Inactive

steffenlarsen temporarily deployed to WindowsCILock June 3, 2025 09:28 — with GitHub Actions Inactive

Merge remote-tracking branch 'intel/sycl' into steffen/remove_win_dou…

55264d7

…ble_build

steffenlarsen temporarily deployed to WindowsCILock June 5, 2025 06:23 — with GitHub Actions Inactive

steffenlarsen temporarily deployed to WindowsCILock June 5, 2025 06:50 — with GitHub Actions Inactive

Configure CRT for xpti again

dfb5a66

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock June 5, 2025 11:16 — with GitHub Actions Failure

steffenlarsen temporarily deployed to WindowsCILock June 5, 2025 11:47 — with GitHub Actions Inactive

Stop forcing CRT if unset

73f0ea8

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

steffenlarsen had a problem deploying to WindowsCILock June 5, 2025 12:40 — with GitHub Actions Failure

steffenlarsen commented Jun 5, 2025

View reviewed changes

steffenlarsen temporarily deployed to WindowsCILock June 5, 2025 13:46 — with GitHub Actions Inactive

Merge branch 'sycl' into steffen/remove_win_double_build

218d108

steffenlarsen temporarily deployed to WindowsCILock June 17, 2025 04:55 — with GitHub Actions Inactive

steffenlarsen temporarily deployed to WindowsCILock June 17, 2025 05:20 — with GitHub Actions Inactive

Merge remote-tracking branch 'intel/sycl' into steffen/remove_win_dou…

4c5173c

…ble_build

steffenlarsen temporarily deployed to WindowsCILock June 25, 2025 06:21 — with GitHub Actions Inactive

steffenlarsen temporarily deployed to WindowsCILock June 25, 2025 06:48 — with GitHub Actions Inactive

KseniyaTikhomirova reviewed Jul 2, 2025

View reviewed changes

Update CMakeLists.txt

50e6aed

steffenlarsen had a problem deploying to WindowsCILock July 2, 2025 12:08 — with GitHub Actions Failure

steffenlarsen temporarily deployed to WindowsCILock July 2, 2025 13:46 — with GitHub Actions Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[SYCL][UR][CMake] Stop creating debug library builds on Windows during release builds #18200

[SYCL][UR][CMake] Stop creating debug library builds on Windows during release builds #18200

steffenlarsen commented Apr 25, 2025 •

edited

Loading

Uh oh!

steffenlarsen Jun 5, 2025

Uh oh!

kbenzie Jun 5, 2025

Uh oh!

bratpiorka Jul 3, 2025

Uh oh!

KseniyaTikhomirova Jul 2, 2025

Uh oh!

steffenlarsen Jul 2, 2025

Uh oh!

KseniyaTikhomirova Jul 2, 2025

Uh oh!

steffenlarsen Jul 2, 2025

Uh oh!

Uh oh!

[SYCL][UR][CMake] Stop creating debug library builds on Windows during release builds #18200

Are you sure you want to change the base?

[SYCL][UR][CMake] Stop creating debug library builds on Windows during release builds #18200

Conversation

steffenlarsen commented Apr 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

steffenlarsen Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

kbenzie Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

bratpiorka Jul 3, 2025

Choose a reason for hiding this comment

Uh oh!

KseniyaTikhomirova Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

steffenlarsen Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

KseniyaTikhomirova Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

steffenlarsen Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

steffenlarsen commented Apr 25, 2025 •

edited

Loading