[DirectX backend] emit metadata for DXIL version

[python3kgae]

Summary

New named metadata created with name "dx.version".
The content is shader model major - 5 and shader model minor.
sm6.0 will get dxil version 1.0.
sm6.6 will get dxil version 6.6.

[python3kgae]

Fix clang-format missed by arc lint.

[python3kgae]

Squash 2 commits.

[beanz]

llvm/lib/Target/DirectX/DXILMetadata.h

35

Since these are unrelated metadata entries, it makes more sense to do them in separate methods.

llvm/lib/Target/DirectX/DXILMetadata.h

 public:
   ValidatorVersionMD(Module &M);
 
   void update(VersionTuple ValidatorVer);
 
   bool isEmpty();
 };
 
-void createShaderModelMD(Module &M);
+void createShaderModelAndDXILVersionMD(Module &M);
 void createEntryMD(Module &M, const uint64_t ShaderFlags);
 
 } // namespace dxil
 } // namespace llvm
 
 #endif // LLVM_TARGET_DIRECTX_DXILMETADATA_H

llvm/lib/Target/DirectX/DXILMetadata.cpp

case Triple::Amplification:
     return "as";
   default:
     break;
   }
   llvm_unreachable("Unsupported environment for DXIL generation.");
   return "";
 }
 
-void dxil::createShaderModelMD(Module &M) {
+void dxil::createShaderModelAndDXILVersionMD(Module &M) {
   NamedMDNode *Entry = M.getOrInsertNamedMetadata("dx.shaderModel");
   Triple TT(M.getTargetTriple());
   VersionTuple Ver = TT.getOSVersion();
   LLVMContext &Ctx = M.getContext();
   IRBuilder<> B(Ctx);
 
   Metadata *Vals[3];
   Vals[0] = MDString::get(Ctx, getShortShaderStage(TT.getEnvironment()));
   Vals[1] = ConstantAsMetadata::get(B.getInt32(Ver.getMajor()));
   Vals[2] = ConstantAsMetadata::get(B.getInt32(Ver.getMinor().value_or(0)));
   Entry->addOperand(MDNode::get(Ctx, Vals));
+
+  // DXIL Version is just shader model major - 5. sm6.0-> dxil version 1.0.
+  NamedMDNode *DXILVerEntry = M.getOrInsertNamedMetadata("dx.version");
+  Metadata *DXILVerVals[2];
+  DXILVerVals[0] = ConstantAsMetadata::get(B.getInt32(Ver.getMajor() - 5));
+  DXILVerVals[1] =
+      ConstantAsMetadata::get(B.getInt32(Ver.getMinor().value_or(0)));
+  DXILVerEntry->addOperand(MDNode::get(Ctx, DXILVerVals));
 }
 
 static uint32_t getShaderStage(Triple::EnvironmentType Env) {
   return (uint32_t)Env - (uint32_t)llvm::Triple::Pixel;
 }
 
 namespace {
 

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

 
 } // namespace
 
 bool DXILTranslateMetadata::runOnModule(Module &M) {
 
   dxil::ValidatorVersionMD ValVerMD(M);
   if (ValVerMD.isEmpty())
     ValVerMD.update(VersionTuple(1, 0));
-  dxil::createShaderModelMD(M);
+  dxil::createShaderModelAndDXILVersionMD(M);
 
   const dxil::Resources &Res =
       getAnalysis<DXILResourceWrapper>().getDXILResource();
   Res.write(M);
 
   const uint64_t Flags =
       (uint64_t)(getAnalysis<ShaderFlagsAnalysisWrapper>().getShaderFlags());
   dxil::createEntryMD(M, Flags);

llvm/test/CodeGen/DirectX/Metadata/dxil_version.ll

+; RUN: opt -S --mtriple=dxil-pc-shadermodel6.0-compute -dxil-metadata-emit %s | FileCheck %s --check-prefixes=SM60,CHECK
+; RUN: opt -S --mtriple=dxil-pc-shadermodel6.6-compute -dxil-metadata-emit %s | FileCheck %s --check-prefixes=SM66,CHECK
+
+; CHECK: !dx.shaderModel = !{![[SM:[0-9]+]]}
+; CHECK: !dx.version = !{![[DXIL_VERSION:[0-9]+]]}
+
+; SM60-DAG: ![[SM]] = !{!"cs", i32 6, i32 0}
+; SM60-DAG: ![[DXIL_VERSION]] = !{i32 1, i32 0}
+
+; SM66-DAG: ![[SM]] = !{!"cs", i32 6, i32 6}
+; SM66-DAG: ![[DXIL_VERSION]] = !{i32 1, i32 6}
+
+define void @entry() #0 {
+entry:
+  ret void
+}
+
+attributes #0 = { noinline nounwind "hlsl.numthreads"="1,2,1" "hlsl.shader"="compute" }