Update IGC code format

Update IGC code format

Author: paigeale

IGC/AdaptorCommon/API/igc.h

@@ -12,15 +12,15 @@ SPDX-License-Identifier: MIT
 #include "../../common/EmUtils.h"
 
 #if defined(_WIN32)
-    #define IGC_API_CALL_TYPE __stdcall
-    #ifdef IGC_EXPORTS
-        #define IGC_API_CALL __declspec(dllexport) IGC_API_CALL_TYPE
-    #else
-        #define IGC_API_CALL __declspec(dllimport) IGC_API_CALL_TYPE
-    #endif
+#define IGC_API_CALL_TYPE __stdcall
+#ifdef IGC_EXPORTS
+#define IGC_API_CALL __declspec(dllexport) IGC_API_CALL_TYPE
 #else
-        #define IGC_API_CALL_TYPE
-    #define IGC_API_CALL __attribute__ ((visibility("default"))) IGC_API_CALL_TYPE
+#define IGC_API_CALL __declspec(dllimport) IGC_API_CALL_TYPE
+#endif
+#else
+#define IGC_API_CALL_TYPE
+#define IGC_API_CALL __attribute__((visibility("default"))) IGC_API_CALL_TYPE
 #endif
 
 #endif // IGC_API_CALLS_H

IGC/AdaptorCommon/API/igc_api_calls.h

@@ -19,131 +19,116 @@ SPDX-License-Identifier: MIT
 #include <set>
 #include <map>
 
-namespace IGC
-{
-    class CodeGenContext;
+namespace IGC {
+class CodeGenContext;
 }
 
-namespace IGC
-{
-    // struct
-    typedef std::map<unsigned int, llvm::Argument*> InfoToImpArgMap;
-    typedef std::map<llvm::Function*, InfoToImpArgMap> FuncInfoToImpArgMap;
-
-
-    typedef std::map<llvm::Argument*, unsigned int> ImpArgToExpNum;
-    typedef std::map<llvm::Function*, ImpArgToExpNum> FuncImpToExpNumMap;
-
-    /// @brief  AddImplicitArgs pass used for changing the function signatures and calls to represent
-    ///         the implicit arguments needed by each function and passed from the OpenCL runtime
-    ///         This pass depdends on the WIFuncAnalysis pass runing before it
-    /// @Author Marina Yatsina
-    class AddImplicitArgs : public llvm::ModulePass
-    {
-    public:
-        // Pass identification, replacement for typeid
-        static char ID;
-
-        /// @brief  Constructor
-        AddImplicitArgs();
-
-        /// @brief  Destructor
-        ~AddImplicitArgs() {}
-
-        /// @brief  Provides name of pass
-        virtual llvm::StringRef getPassName() const override
-        {
-            return "AddImplicitArgs";
-        }
-
-        virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
-        {
-            AU.addRequired<CodeGenContextWrapper>();
-            AU.addRequired<MetaDataUtilsWrapper>();
-        }
-
-        /// @brief  Main entry point.
-        ///         Goes over all functions and changes their signature to contain the implicit arguments
-        ///         needed by each function, goes over all function calls and adds the implicit arguments
-        ///         to the function calls
-        /// @param  M The destination module.
-        virtual bool runOnModule(llvm::Module &M) override;
-
-        /// @brief  Check if a function has a stackcall in its call path to
-        ///         decide whether implicit args should be added
-        /// @param  pFunc           Source function
-        static bool hasStackCallInCG(const llvm::Function* pFunc);
-    private:
-
-        /// @brief  Create the type of the new function,
-        ///         including all explicit and needed impliict parameters
-        /// @param  pFunc           The old function
-        /// @param  pImplicitArgs   The implicit arguments needed by this function
-        /// @returns    The new function type
-        static llvm::FunctionType* getNewFuncType(const llvm::Function* pFunc, const ImplicitArgs& implicitArgs);
-
-        /// @brief  Transfers uses of old arguments to new arguments, sets names of all arguments
-        /// @param  pFunc           The old function
-        /// @param  pNewFunc        The new function
-        /// @param  pImplicitArgs   The implicit arguments needed by this function
-        void updateNewFuncArgs(llvm::Function* pFunc, llvm::Function* pNewFunc, const ImplicitArgs& implicitArgs);
-
-        /// @brief  Replace old CallInst with new CallInst
-        void replaceAllUsesWithNewOCLBuiltinFunction(llvm::Function* old_func, llvm::Function* new_func);
-
-        static llvm::Value* coerce(llvm::Value* arg, llvm::Type* type, llvm::Instruction* insertBefore);
-
-        /// @brief  Metadata API object.
-        IGC::IGCMD::MetaDataUtils *m_pMdUtils;
-
-        FuncInfoToImpArgMap     m_FuncInfoToImpArgMap;
-        FuncImpToExpNumMap      m_FuncImpToExpNumMap;
-    };
+namespace IGC {
+// struct
+typedef std::map<unsigned int, llvm::Argument *> InfoToImpArgMap;
+typedef std::map<llvm::Function *, InfoToImpArgMap> FuncInfoToImpArgMap;
+
+typedef std::map<llvm::Argument *, unsigned int> ImpArgToExpNum;
+typedef std::map<llvm::Function *, ImpArgToExpNum> FuncImpToExpNumMap;
+
+/// @brief  AddImplicitArgs pass used for changing the function signatures and calls to represent
+///         the implicit arguments needed by each function and passed from the OpenCL runtime
+///         This pass depdends on the WIFuncAnalysis pass runing before it
+/// @Author Marina Yatsina
+class AddImplicitArgs : public llvm::ModulePass {
+public:
+  // Pass identification, replacement for typeid
+  static char ID;
+
+  /// @brief  Constructor
+  AddImplicitArgs();
+
+  /// @brief  Destructor
+  ~AddImplicitArgs() {}
+
+  /// @brief  Provides name of pass
+  virtual llvm::StringRef getPassName() const override { return "AddImplicitArgs"; }
+
+  virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override {
+    AU.addRequired<CodeGenContextWrapper>();
+    AU.addRequired<MetaDataUtilsWrapper>();
+  }
+
+  /// @brief  Main entry point.
+  ///         Goes over all functions and changes their signature to contain the implicit arguments
+  ///         needed by each function, goes over all function calls and adds the implicit arguments
+  ///         to the function calls
+  /// @param  M The destination module.
+  virtual bool runOnModule(llvm::Module &M) override;
+
+  /// @brief  Check if a function has a stackcall in its call path to
+  ///         decide whether implicit args should be added
+  /// @param  pFunc           Source function
+  static bool hasStackCallInCG(const llvm::Function *pFunc);
+
+private:
+  /// @brief  Create the type of the new function,
+  ///         including all explicit and needed impliict parameters
+  /// @param  pFunc           The old function
+  /// @param  pImplicitArgs   The implicit arguments needed by this function
+  /// @returns    The new function type
+  static llvm::FunctionType *getNewFuncType(const llvm::Function *pFunc, const ImplicitArgs &implicitArgs);
+
+  /// @brief  Transfers uses of old arguments to new arguments, sets names of all arguments
+  /// @param  pFunc           The old function
+  /// @param  pNewFunc        The new function
+  /// @param  pImplicitArgs   The implicit arguments needed by this function
+  void updateNewFuncArgs(llvm::Function *pFunc, llvm::Function *pNewFunc, const ImplicitArgs &implicitArgs);
+
+  /// @brief  Replace old CallInst with new CallInst
+  void replaceAllUsesWithNewOCLBuiltinFunction(llvm::Function *old_func, llvm::Function *new_func);
+
+  static llvm::Value *coerce(llvm::Value *arg, llvm::Type *type, llvm::Instruction *insertBefore);
+
+  /// @brief  Metadata API object.
+  IGC::IGCMD::MetaDataUtils *m_pMdUtils;
+
+  FuncInfoToImpArgMap m_FuncInfoToImpArgMap;
+  FuncImpToExpNumMap m_FuncImpToExpNumMap;
+};
 
 } // namespace IGC
 
 // Builtin CallGraph Analysis Class
-namespace IGC
-{
-
-    struct ImplicitArgumentDetail
-    {
-        ImplicitArg::ArgMap     ArgsMaps;
-        std::set<unsigned int>  StructArgSet;
-    };
-
-    class BuiltinCallGraphAnalysis : public llvm::ModulePass
-    {
-    public:
-        static char ID;
-
-        BuiltinCallGraphAnalysis();
-        ~BuiltinCallGraphAnalysis() {}
-
-        virtual llvm::StringRef getPassName() const override
-        {
-            return "BuiltinCallGraphAnalysis";
-        }
-
-        void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
-        {
-            AU.addRequired<MetaDataUtilsWrapper>();
-            AU.addRequired<CodeGenContextWrapper>();
-            AU.addRequired<llvm::CallGraphWrapperPass>();
-        }
-
-        virtual bool runOnModule(llvm::Module &M) override;
-
-        void traverseCallGraphSCC(const std::vector<llvm::CallGraphNode *> &SCCNodes);
-        void combineTwoArgDetail(ImplicitArgumentDetail&, const ImplicitArgumentDetail&, llvm::Value*) const;
-        void writeBackAllIntoMetaData(const ImplicitArgumentDetail&, llvm::Function*);
-
-        bool pruneCallGraphForStackCalls(llvm::CallGraph& CG);
-
-    private:
-        IGC::IGCMD::MetaDataUtils *m_pMdUtils;
-        llvm::SmallDenseMap<llvm::Function*, ImplicitArgumentDetail *> argMap;
-        llvm::SmallVector<std::unique_ptr<ImplicitArgumentDetail>, 4> argDetails;
-    };
+namespace IGC {
+
+struct ImplicitArgumentDetail {
+  ImplicitArg::ArgMap ArgsMaps;
+  std::set<unsigned int> StructArgSet;
+};
+
+class BuiltinCallGraphAnalysis : public llvm::ModulePass {
+public:
+  static char ID;
+
+  BuiltinCallGraphAnalysis();
+  ~BuiltinCallGraphAnalysis() {}
+
+  virtual llvm::StringRef getPassName() const override { return "BuiltinCallGraphAnalysis"; }
+
+  void getAnalysisUsage(llvm::AnalysisUsage &AU) const override {
+    AU.addRequired<MetaDataUtilsWrapper>();
+    AU.addRequired<CodeGenContextWrapper>();
+    AU.addRequired<llvm::CallGraphWrapperPass>();
+  }
+
+  virtual bool runOnModule(llvm::Module &M) override;
+
+  void traverseCallGraphSCC(const std::vector<llvm::CallGraphNode *> &SCCNodes);
+  void combineTwoArgDetail(ImplicitArgumentDetail &, const ImplicitArgumentDetail &, llvm::Value *) const;
+  void writeBackAllIntoMetaData(const ImplicitArgumentDetail &, llvm::Function *);
+
+  bool pruneCallGraphForStackCalls(llvm::CallGraph &CG);
+
+private:
+  IGC::IGCMD::MetaDataUtils *m_pMdUtils;
+  llvm::SmallDenseMap<llvm::Function *, ImplicitArgumentDetail *> argMap;
+  llvm::SmallVector<std::unique_ptr<ImplicitArgumentDetail>, 4> argDetails;
+};
 
 } // namespace IGC