inlineDynConstants to FunctionMetaData

Author: scottp101

IGC/Compiler/CodeGenContext.cpp

@@ -594,7 +594,7 @@ namespace IGC
         return llvmCtxWrapper;
     }
 
-    IGC::IGCMD::MetaDataUtils* CodeGenContext::getMetaDataUtils()
+    IGC::IGCMD::MetaDataUtils* CodeGenContext::getMetaDataUtils() const
     {
         IGC_ASSERT_MESSAGE(nullptr != m_pMdUtils, "Metadata Utils is not initialized");
         return m_pMdUtils;

IGC/Compiler/CodeGenPublic.h

@@ -1004,7 +1004,7 @@ namespace IGC
 
         void initLLVMContextWrapper(bool createResourceDimTypes = true);
         llvm::LLVMContext* getLLVMContext() const;
-        IGC::IGCMD::MetaDataUtils* getMetaDataUtils();
+        IGC::IGCMD::MetaDataUtils* getMetaDataUtils() const;
         IGCLLVM::Module* getModule() const;
 
         void setModule(llvm::Module* m);

IGC/common/MDFrameWork.h

@@ -177,13 +177,23 @@ namespace IGC
     };
 
 
+    struct ConstantAddress
+    {
+        unsigned int bufId = 0;
+        unsigned int eltId = 0;
+        unsigned int size = 0;
+    };
+
+    bool operator < (const ConstantAddress &a, const ConstantAddress &b);
+
     //to hold metadata of every function
     struct FunctionMetaData
     {
         std::vector<LocalOffsetMD> localOffsets;
         WorkGroupWalkOrderMD workGroupWalkOrder;
         std::vector<FuncArgMD> funcArgs;
         FunctionTypeMD functionType = KernelFunction;
+        std::map<ConstantAddress, uint32_t> inlineDynConstants;
         ResourceAllocMD resAllocMD;
         std::vector<unsigned> maxByteOffsets;
         bool IsInitializer = false;
@@ -349,15 +359,6 @@ namespace IGC
         std::map<unsigned int, int> simplePushLoads;
     };
 
-    struct ConstantAddress
-    {
-        unsigned int bufId = 0;
-        unsigned int eltId = 0;
-        unsigned int size = 0;
-    };
-
-    bool operator < (const ConstantAddress &a, const ConstantAddress &b);
-
     struct StatelessPushInfo
     {
         unsigned int addressOffset = 0;
@@ -449,7 +450,6 @@ namespace IGC
         PixelShaderInfo psInfo;
         ComputeShaderInfo csInfo;
         uint32_t CurUniqueIndirectIdx = DefaultIndirectIdx;
-        std::map<ConstantAddress, uint32_t>   inlineDynConstants;
         std::map<uint32_t, std::array<uint32_t, 4>> inlineDynTextures;
         std::vector<InlineResInfo> inlineResInfoData;
         ImmConstantInfo immConstant;