[llvm] [DirectX] use DXILMetadataAnalysis to build PSVRuntimeInfo (PR #107101)
Justin Bogner via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 4 12:17:31 PDT 2024
================
@@ -143,23 +145,35 @@ void DXContainerGlobals::addPipelineStateValidationInfo(
SmallString<256> Data;
raw_svector_ostream OS(Data);
PSVRuntimeInfo PSV;
- Triple TT(M.getTargetTriple());
PSV.BaseData.MinimumWaveLaneCount = 0;
PSV.BaseData.MaximumWaveLaneCount = std::numeric_limits<uint32_t>::max();
+
+ dxil::ModuleMetadataInfo &MMI =
+ getAnalysis<DXILMetadataAnalysisWrapperPass>().getModuleMetadata();
+ assert(MMI.EntryPropertyVec.size() != 0 ||
+ MMI.ShaderStage == Triple::Library);
PSV.BaseData.ShaderStage =
- static_cast<uint8_t>(TT.getEnvironment() - Triple::Pixel);
+ static_cast<uint8_t>(MMI.ShaderStage - Triple::Pixel);
// Hardcoded values here to unblock loading the shader into D3D.
//
// TODO: Lots more stuff to do here!
//
// See issue https://github.com/llvm/llvm-project/issues/96674.
- PSV.BaseData.NumThreadsX = 1;
- PSV.BaseData.NumThreadsY = 1;
- PSV.BaseData.NumThreadsZ = 1;
- PSV.EntryName = "main";
+ switch (MMI.ShaderStage) {
+ case Triple::Compute:
+ PSV.BaseData.NumThreadsX = MMI.EntryPropertyVec[0].NumThreadsX;
+ PSV.BaseData.NumThreadsY = MMI.EntryPropertyVec[0].NumThreadsY;
+ PSV.BaseData.NumThreadsZ = MMI.EntryPropertyVec[0].NumThreadsZ;
+ break;
+ default:
+ break;
+ }
+
+ if (MMI.ShaderStage != Triple::Library)
+ PSV.EntryName = MMI.EntryPropertyVec[0].Entry->getName();
----------------
bogner wrote:
It seems pretty unfortunate that we need to know which fields are valid in the analysis result based on what stage it is - I see you made a [similar comment on the metadata analysis PR](https://github.com/llvm/llvm-project/pull/105728#discussion_r1727957043), but I didn't notice it at the time. We should probably have a discussion on what the API of the metadata analysis should look like (cc @bharadwajy).
https://github.com/llvm/llvm-project/pull/107101
More information about the llvm-commits
mailing list