Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CMake gen when HLSL_BUILD_DXILCONV=0 #6911

Closed
wants to merge 3 commits into from
Closed

Fix CMake gen when HLSL_BUILD_DXILCONV=0 #6911

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
016b47f
Fix CMake gen when HLSL_BUILD_DXILCONV=0
amaiorano Sep 12, 2024
a46498a
Add HLSL_BUILD_DXILDLL
amaiorano Sep 12, 2024
3ddb8b4
Fixes
amaiorano Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/clang/tools/dxildll/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ target_link_libraries(dxildll PRIVATE
dxcvalidator
)

if (WIN32)
if (WIN32 AND HLSL_BUILD_DXILCONV)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dxildll does use DxcRuntimeEtw and DxcEtw.
Maybe we should always enable DxcRuntimeEtw and DxcEtw instead of guard it with HLSL_BUILD_DXILCONV on WIN32.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We currently disable HLSL_BUILD_DXILCONV in our build as we don't need it, and it speeds up our builds at Google. I would rather we keep this guard.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only DxcRuntimeEtw is guard by HLSL_BUILD_DXILCONV currently because dxcetw is used by dxcompiler.
But dxildll does use DxcRuntimeEtw, without it dxildll will get error for cannot find DxcRuntimeEtw.h.

Maybe we should add HLSL_BUILD_DXILDLL, and guard DxcRuntimeEtw with (HLSL_BUILD_DXILCONV or HLSL_BUILD_DXILDLL)?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I pushed too early. Still fixing this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I pushed what I think you asked for. However, I'm not sure if adding HLSL_BUILD_DXILDLL is what we want. This is perhaps a maintenance burden that isn't warranted for DXC.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we always build dxildll, then there's no need to guard DxcRuntimeEtw since it will be required by dxildll.
That will be another way to fix this issue.
Let's see how others feel about it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, exactly what I was thinking! I just pushed #6912 which does exactly that.

add_dependencies(dxildll
${DXCDependencies}
DxcEtw
Expand Down
Loading