[xpupti] Fix Windows build support for xpupti tests and multi-config generators. - #1394
Merged
Merged
Conversation
* Refactor test/xpupti/CMakeLists.txt to handle Windows and
multi-config generators (VS, Ninja Multi-Config):
- Force Ninja as the inner ExternalProject generator on Windows
and propagate $<CONFIG> via CONFIGURE_COMMAND for multi-config
- Use WINDOWS_EXPORT_ALL_SYMBOLS and /FORCE:UNRESOLVED so the
shared test library can build against ComputeOnXpu defined in
the compute executable
- Pass LINK_LIBRARY_NAME/LINK_LIBRARY_DIR instead of a hardcoded
lib<name>.so path; inner project resolves via find_library with
config-aware PATH_SUFFIXES
- Forward SYCL lib path to the inner linker on Windows
- Skip -Wl,--export-dynamic on Windows in compute/CMakeLists.txt
* Add XpuptiActivityHandlersTest executable (unit test that does
not require the SYCL compute ExternalProject); rename make_test
to make_sycl_test to reflect the remaining SYCL-based tests.
* Fix XPUPTI_BUILD_FLAG so -DHAS_XPUPTI is visible in both the
current and parent scopes (was only set in PARENT_SCOPE).
* Reorder id/linked/metadata assignments in
XpuptiActivityProfilerSession::handleRuntimeKernelMemcpyMemsetActivities
and inline the linkedActivity lookup — no behavior change.
* Include src/ActivityBuffers.h in XpuptiTestUtilities.cpp and
hoist iterator declarations out of the for-init to satisfy MSVC.
Contributor
Author
|
@gujinghui please review it. |
xpupti files including into compilation is handled in cmakefiles
Contributor
Author
|
DONE |
gujinghui
reviewed
Jun 2, 2026
gujinghui
approved these changes
Jun 3, 2026
|
@divyanshk @scotts This PR is ready for your review. Thanks. |
tsocha
changed the title
tsocha
changed the title
|
@ryanzhang22 @scotts |
|
@ryanzhang22 has imported this pull request. If you are a Meta employee, you can view this in D111713633. |
ryanzhang22
reviewed
Jul 13, 2026
| POSITION_INDEPENDENT_CODE ON | ||
| WINDOWS_EXPORT_ALL_SYMBOLS ON | ||
| ) | ||
| # On Windows, DLLs must resolve all symbols at link time (unlike Linux .so). |
Contributor
There was a problem hiding this comment.
for my understanding: I see that the build is forced to progress despite the error with this flag enabled, but how does this end up producing a valid binary?
Contributor
Author
There was a problem hiding this comment.
It is caused by circular dependency.
The library is compiled with a missing symbol and during program loading this symbol is provided by the test .exe file, as it exports all of its symbols.
|
|
Contributor
Author
|
@ryanzhang22 I have included a change from @aostrowski-hbn Circular dependency has been resolved and CMake is cleaner now. |
|
@ryanzhang22 The issue has been addressed. Could you please review the PR? Thanks. |
Contributor
|
Taking a look |
Contributor
|
Do you know if the XPU CI failure is related? |
Contributor
Author
I don't think it's related to my change. |
ryanzhang22
approved these changes
Jul 28, 2026
pytorchmergebot
pushed a commit
to pytorch/pytorch
that referenced
this pull request
Jul 30, 2026
Includes the following commits: - Clean up dtypes for metadata fields (pytorch/kineto#1499) 6f446fe - [xpupti] Fix Windows build support for xpupti tests and multi-config generators. (pytorch/kineto#1394) 9e826ca - Test ConfigLoader on-demand daemon poll ingress (pytorch/kineto#1504) 7674d28 - Remove comment about documentation (pytorch/kineto#1503) eeb3db9 - Remove HTA from README (pytorch/kineto#1502) 46b1c63 - Catch config-update exceptions so the poll thread can't crash the process (pytorch/kineto#1498) be334e1 - Drop EventProfiler config kind from ConfigLoader (pytorch/kineto#1496) e7c97a6 - Remove event-only config surface from Config (pytorch/kineto#1495) a3a0566 - Remove dead event profiler: runtime, CUPTI backends, build wiring (pytorch/kineto#1494) 36c2e05 - Decompose libkineto_defs.bzl source lists into atoms (pytorch/kineto#1493) 328fa51 - Add XPU synchronization events to XPUPTI profiler (pytorch/kineto#1395) 8285e5b - Re-enable CI linting and lint all C++ (pytorch/kineto#1489) 2c41c01 - Test ConfigLoader handler fan-out (pytorch/kineto#1487) cccc5d1 - Update C++ lint tooling (pytorch/kineto#1488) 57e59e6 Pull Request resolved: #191526 Approved by: https://github.com/scotts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It's a part of #1335 1/3
Refactor test/xpupti/CMakeLists.txt to handle Windows and multi-config generators (VS, Ninja Multi-Config):
Rename make_test to make_sycl_test to reflect SYCL-based tests.
Fix XPUPTI_BUILD_FLAG so -DHAS_XPUPTI is visible in both the current and parent scopes (was only set in PARENT_SCOPE).
Reorder id/linked/metadata assignments in XpuptiActivityProfilerSession::handleRuntimeKernelMemcpyMemsetActivities and inline the linkedActivity lookup — no behavior change.
Include src/ActivityBuffers.h in XpuptiTestUtilities.cpp and hoist iterator declarations out of the for-init to satisfy MSVC.