Address PR feedback

Author: bharadwajy

llvm/include/llvm/Analysis/DXILMetadataAnalysis.h

@@ -23,7 +23,7 @@ namespace dxil {
 struct EntryProperties {
   const Function *Entry{nullptr};
   // Specific target shader stage may be specified for entry functions
-  Triple::EnvironmentType ShaderStage = Triple::UnknownEnvironment;
+  Triple::EnvironmentType ShaderStage{Triple::UnknownEnvironment};
   unsigned NumThreadsX{0}; // X component
   unsigned NumThreadsY{0}; // Y component
   unsigned NumThreadsZ{0}; // Z component
@@ -34,7 +34,7 @@ struct EntryProperties {
 struct ModuleMetadataInfo {
   VersionTuple DXILVersion{};
   VersionTuple ShaderModelVersion{};
-  Triple::EnvironmentType ShaderProfile = Triple::UnknownEnvironment;
+  Triple::EnvironmentType ShaderProfile{Triple::UnknownEnvironment};
   VersionTuple ValidatorVersion{};
   SmallVector<EntryProperties> EntryPropertyVec{};
   void print(raw_ostream &OS) const;

llvm/lib/Target/DirectX/DXILPrepare.cpp

@@ -248,10 +248,7 @@ class DXILPrepareModule : public ModulePass {
   DXILPrepareModule() : ModulePass(ID) {}
   void getAnalysisUsage(AnalysisUsage &AU) const override {
     AU.setPreservesAll();
-    AU.addPreserved<ShaderFlagsAnalysisWrapper>();
-    AU.addPreserved<DXILResourceMDWrapper>();
     AU.addRequired<DXILMetadataAnalysisWrapperPass>();
-    AU.addPreserved<DXILResourceWrapperPass>();
   }
   static char ID; // Pass identification.
 };

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

@@ -24,6 +24,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/InitializePasses.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/VersionTuple.h"
 #include "llvm/TargetParser/Triple.h"
 #include <cstdint>
@@ -34,7 +35,7 @@ using namespace llvm::dxil;
 /// A simple Wrapper DiagnosticInfo that generates Module-level diagnostic
 class DiagnosticInfoModuleFormat : public DiagnosticInfo {
 private:
-  Twine Msg;
+  const Twine Msg;
   const Module &Mod;
 
 public:
@@ -45,12 +46,6 @@ class DiagnosticInfoModuleFormat : public DiagnosticInfo {
                              DiagnosticSeverity Severity = DS_Error)
       : DiagnosticInfo(DK_Unsupported, Severity), Msg(Msg), Mod(M) {}
 
-  static bool classof(const DiagnosticInfo *DI) {
-    return DI->getKind() == DK_Unsupported;
-  }
-
-  const Twine &getMessage() const { return Msg; }
-
   void print(DiagnosticPrinter &DP) const override {
     std::string Str;
     raw_string_ostream OS(Str);
@@ -166,7 +161,7 @@ getTagValueAsMetadata(EntryPropsTag Tag, uint64_t Value, LLVMContext &Ctx) {
         ConstantInt::get(Type::getInt32Ty(Ctx), Value)));
     break;
   default:
-    assert(false && "NYI: Unhandled entry property tag");
+    llvm_unreachable("NYI: Unhandled entry property tag");
   }
   return MDVals;
 }
@@ -191,13 +186,12 @@ getEntryPropAsMetadata(const EntryProperties &EP, uint64_t EntryShaderFlags,
     if (EP.ShaderStage == Triple::EnvironmentType::Compute) {
       MDVals.emplace_back(ConstantAsMetadata::get(
           ConstantInt::get(Type::getInt32Ty(Ctx), NumThreadsTag)));
-      std::vector<Metadata *> NumThreadVals;
-      NumThreadVals.emplace_back(ConstantAsMetadata::get(
-          ConstantInt::get(Type::getInt32Ty(Ctx), EP.NumThreadsX)));
-      NumThreadVals.emplace_back(ConstantAsMetadata::get(
-          ConstantInt::get(Type::getInt32Ty(Ctx), EP.NumThreadsY)));
-      NumThreadVals.emplace_back(ConstantAsMetadata::get(
-          ConstantInt::get(Type::getInt32Ty(Ctx), EP.NumThreadsZ)));
+      Metadata *NumThreadVals[] = {ConstantAsMetadata::get(ConstantInt::get(
+                                       Type::getInt32Ty(Ctx), EP.NumThreadsX)),
+                                   ConstantAsMetadata::get(ConstantInt::get(
+                                       Type::getInt32Ty(Ctx), EP.NumThreadsY)),
+                                   ConstantAsMetadata::get(ConstantInt::get(
+                                       Type::getInt32Ty(Ctx), EP.NumThreadsZ))};
       MDVals.emplace_back(MDNode::get(Ctx, NumThreadVals));
     }
   }
@@ -333,8 +327,8 @@ static void translateMetadata(Module &M, const DXILResourceMap &DRM,
     if (MMDI.ShaderProfile != Triple::EnvironmentType::Library) {
       if (EntryProp.ShaderStage != MMDI.ShaderProfile) {
         M.getContext().diagnose(DiagnosticInfoModuleFormat(
-            M, "Non-library shader: Stage of Shader entry different from "
-               "target profile"));
+            M, "Non-library shader: Stage of shader entry different from "
+               "shader target profile"));
       }
     }
     EntryFnMDNodes.emplace_back(emitEntryMD(EntryProp, Signatures, ResourceMD,

llvm/test/CodeGen/DirectX/Metadata/target-profile-error.ll

@@ -2,7 +2,7 @@
 
 target triple = "dxil-pc-shadermodel6.6-pixel"
 
-; CHECK: Non-library shader: Stage of Shader entry different from target profile
+; CHECK: Non-library shader: Stage of shader entry different from shader target profile
 
 define void @entry() #0 {
 entry: