Skip to content

Commit 10ab3ac

Browse files
committed
self-review: missed clean-up
1 parent 062c7b6 commit 10ab3ac

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

llvm/docs/DirectX/DXILArchitecture.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ are grouped into two flows:
113113

114114
The passes to generate DXIL IR follow the flow:
115115

116-
DXILOpLowering -> DXILPrepare -> DXILTranslateMetadata -> DXILValidateMetadata
116+
DXILOpLowering -> DXILPrepare -> DXILTranslateMetadata
117117

118118
Each of these passes has a defined responsibility:
119119

@@ -122,8 +122,6 @@ Each of these passes has a defined responsibility:
122122
namely removing attributes, and inserting bitcasts to allow typed pointers
123123
to be inserted.
124124
#. DXILTranslateMetadata transforms and emits all recognized DXIL Metadata.
125-
#. DXILValidateMetadata validates that all emitted DXIL metadata structures
126-
conform to DXIL validation.
127125

128126
The passes to encode DXIL to binary in the DX Container follow the flow:
129127

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -504,13 +504,12 @@ static void translateGlobalMetadata(Module &M, DXILResourceMap &DRM,
504504
EntryShaderFlags = ShaderFlags.getFunctionFlags(EntryProp.Entry);
505505
if (EntryProp.ShaderStage != MMDI.ShaderProfile)
506506
reportError(
507-
M,
508-
"Shader stage '" +
509-
Twine(Twine(getShortShaderStage(EntryProp.ShaderStage)) +
510-
"' for entry '" + Twine(EntryProp.Entry->getName()) +
511-
"' different from specified target profile '" +
512-
Twine(Triple::getEnvironmentTypeName(MMDI.ShaderProfile) +
513-
"'")));
507+
M, "Shader stage '" +
508+
Twine(getShortShaderStage(EntryProp.ShaderStage)) +
509+
"' for entry '" + Twine(EntryProp.Entry->getName()) +
510+
"' different from specified target profile '" +
511+
Twine(Triple::getEnvironmentTypeName(MMDI.ShaderProfile) +
512+
"'"));
514513
}
515514

516515
EntryFnMDNodes.emplace_back(emitEntryMD(EntryProp, Signatures, ResourceMD,

llvm/lib/Target/DirectX/DirectX.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ void initializeDXILTranslateMetadataLegacyPass(PassRegistry &);
9090
/// Pass to emit metadata for DXIL.
9191
ModulePass *createDXILTranslateMetadataLegacyPass();
9292

93-
/// Initializer for DXILValidateMetadata.
94-
void initializeDXILValidateMetadataLegacyPass(PassRegistry &);
95-
96-
/// Pass to validate metadata for DXIL.
97-
ModulePass *createDXILValidateMetadataLegacyPass();
98-
9993
/// Pass to pretty print DXIL metadata.
10094
ModulePass *createDXILPrettyPrinterLegacyPass(raw_ostream &OS);
10195

0 commit comments

Comments
 (0)