fix build

Author: joaosaffran-zz

llvm/lib/Analysis/DXILResource.cpp

@@ -20,6 +20,7 @@
 #include "llvm/IR/Metadata.h"
 #include "llvm/IR/Module.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/Support/DXILABI.h"
 #include "llvm/Support/FormatVariadic.h"
 #include <cstdint>
 #include <optional>

llvm/lib/Support/CMakeLists.txt

@@ -182,6 +182,7 @@ add_llvm_component_library(LLVMSupport
   DivisionByConstantInfo.cpp
   DAGDeltaAlgorithm.cpp
   DJB.cpp
+  DXILABI.cpp
   DynamicAPInt.cpp
   ELFAttributes.cpp
   ELFAttrParserCompact.cpp

llvm/lib/Support/DXILABI.cpp

@@ -3,7 +3,8 @@
 #include "llvm/Support/ErrorHandling.h"
 
 using namespace llvm;
-
+namespace llvm {
+namespace dxil {
 StringRef getResourceClassName(dxil::ResourceClass RC) {
   switch (RC) {
   case dxil::ResourceClass::SRV:
@@ -16,4 +17,6 @@ StringRef getResourceClassName(dxil::ResourceClass RC) {
     return "Sampler";
   }
   llvm_unreachable("Unhandled ResourceClass");
-}
+}
+} // namespace dxil
+} // namespace llvm

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

@@ -162,8 +162,7 @@ void DXContainerGlobals::addRootSignature(Module &M,
 
   auto &RSA = getAnalysis<RootSignatureAnalysisWrapper>().getRSInfo();
   const Function *EntryFunction = MMI.EntryPropertyVec[0].Entry;
-  const std::optional<mcdxbc::RootSignatureDesc> &RS =
-      RSA.getDescForFunction(EntryFunction);
+  const mcdxbc::RootSignatureDesc *RS = RSA.getDescForFunction(EntryFunction);
 
   if (!RS)
     return;

llvm/lib/Target/DirectX/DXILOpLowering.cpp

@@ -919,7 +919,7 @@ PreservedAnalyses DXILOpLowering::run(Module &M, ModuleAnalysisManager &MAM) {
   PA.preserve<DXILResourceAnalysis>();
   PA.preserve<DXILMetadataAnalysis>();
   PA.preserve<ShaderFlagsAnalysis>();
-  PA.preserve<RootSignatureAnalysisWrapper>();
+  PA.preserve<RootSignatureAnalysis>();
   return PA;
 }
 

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -18,6 +18,7 @@
 #include "llvm/IR/IntrinsicsDirectX.h"
 #include "llvm/IR/Module.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/Support/DXILABI.h"
 
 #define DEBUG_TYPE "dxil-post-optimization-validation"