Modernize vISA code

Author: PiotrFusik

visa/BuildCISAIR.h

@@ -38,15 +38,8 @@ class CISA_IR_Builder : public VISABuilder
     CISA_IR_Builder(
         VISA_BUILDER_OPTION buildOption, vISABuilderMode mode,
         int majorVersion, int minorVersion, const WA_TABLE *pWaTable)
-        : m_builderMode(mode), m_mem(4096), m_pWaTable(pWaTable)
+        : mBuildOption(buildOption), m_builderMode(mode), m_mem(4096), m_pWaTable(pWaTable)
     {
-        memset(&m_header, 0, sizeof(m_header));
-
-        mBuildOption = buildOption;
-        m_kernel_count = 0;
-        m_function_count = 0;
-        m_prevKernel = nullptr;
-
         m_header.major_version = majorVersion;
         m_header.minor_version = minorVersion;
         m_header.magic_number = COMMON_ISA_MAGIC_NUM;
@@ -67,40 +60,40 @@ class CISA_IR_Builder : public VISABuilder
         const char* flags[],
         const WA_TABLE *pWaTable = nullptr);
     static int DestroyBuilder(CISA_IR_Builder *builder);
-    VISA_BUILDER_API virtual int AddKernel(VISAKernel *& kernel, const char* kernelName);
-    VISA_BUILDER_API virtual int SetPrevKernel(VISAKernel *& prevKernel);
-    VISA_BUILDER_API virtual int AddFunction(VISAFunction *& function, const char* functionName);
-    VISA_BUILDER_API virtual int AddPayloadSection(VISAFunction *& function, const char* functionName);
-    VISA_BUILDER_API virtual int Compile(const char * isaFileNameint, std::ostream * os = nullptr, bool emit_visa_only = false);
+    VISA_BUILDER_API int AddKernel(VISAKernel *& kernel, const char* kernelName) override;
+    VISA_BUILDER_API int SetPrevKernel(VISAKernel *& prevKernel) override;
+    VISA_BUILDER_API int AddFunction(VISAFunction *& function, const char* functionName) override;
+    VISA_BUILDER_API int AddPayloadSection(VISAFunction *& function, const char* functionName) override;
+    VISA_BUILDER_API int Compile(const char * isaFileNameint, std::ostream * os = nullptr, bool emit_visa_only = false) override;
 
-    VISA_BUILDER_API void SetOption(vISAOptions option, bool val) { m_options.setOption(option, val); }
-    VISA_BUILDER_API void SetOption(vISAOptions option, uint32_t val) { m_options.setOption(option, val); }
-    VISA_BUILDER_API void SetOption(vISAOptions option, const char *val) { m_options.setOption(option, val); }
+    VISA_BUILDER_API void SetOption(vISAOptions option, bool val) override { m_options.setOption(option, val); }
+    VISA_BUILDER_API void SetOption(vISAOptions option, uint32_t val) override { m_options.setOption(option, val); }
+    VISA_BUILDER_API void SetOption(vISAOptions option, const char *val) override { m_options.setOption(option, val); }
 
     // Used for inline asm code generation
-    VISA_BUILDER_API virtual int ParseVISAText(const std::string& visaText, const std::string& visaTextFile);
-    VISA_BUILDER_API virtual int ParseVISAText(const std::string& visaFile);
-    VISA_BUILDER_API std::stringstream& GetAsmTextStream() { return m_ssIsaAsm; }
-    VISA_BUILDER_API virtual VISAKernel* GetVISAKernel(const std::string& kernelName);
-    VISA_BUILDER_API virtual int ClearAsmTextStreams();
+    VISA_BUILDER_API int ParseVISAText(const std::string& visaText, const std::string& visaTextFile) override;
+    VISA_BUILDER_API int ParseVISAText(const std::string& visaFile) override;
+    VISA_BUILDER_API std::stringstream& GetAsmTextStream() override { return m_ssIsaAsm; }
+    VISA_BUILDER_API VISAKernel* GetVISAKernel(const std::string& kernelName) override;
+    VISA_BUILDER_API int ClearAsmTextStreams() override;
 
     /**************END VISA BUILDER API*************************/
 
     string_pool_entry** branch_targets;
-    common_isa_header m_header;
+    common_isa_header m_header {};
 
     // the current vISA kernel/function being processed
     VISAKernelImpl *m_kernel;
-    VISAKernelImpl *m_prevKernel;
+    VISAKernelImpl *m_prevKernel = nullptr;
     CisaFramework::CisaBinary *m_cisaBinary;
-    VISAKernelImpl * get_kernel() { return m_kernel; }
+    VISAKernelImpl * get_kernel() const { return m_kernel; }
 
     std::stringstream& criticalMsgStream()
     {
         return criticalMsg;
     }
 
-    std::string GetCriticalMsg()
+    std::string GetCriticalMsg() override
     {
         return criticalMsg.str();
     }
@@ -135,7 +128,7 @@ class CISA_IR_Builder : public VISABuilder
         criticalMsg << m_errorMessage << "\n";
     }
     bool HasParseError() const {return !m_errorMessage.empty();}
-    std::string GetParseError() {return m_errorMessage;}
+    std::string GetParseError() const {return m_errorMessage;}
 
     template <typename...Ts>
     void RecordParseWarning(int lineNum, Ts...ts)
@@ -155,7 +148,7 @@ class CISA_IR_Builder : public VISABuilder
     // holds the %DispatchSimdSize attribute
     int    m_dispatchSimdSize = -1;
 
-    const WA_TABLE *getWATable() { return m_pWaTable; }
+    const WA_TABLE *getWATable() const { return m_pWaTable; }
 
     uint8_t getMajorVersion() const { return m_header.major_version; }
     uint8_t getMinorVersion() const { return m_header.minor_version; }
@@ -870,12 +863,12 @@ class CISA_IR_Builder : public VISABuilder
 private:
 
     vISA::Mem_Manager m_mem;
-    VISA_BUILDER_OPTION mBuildOption;
+    const VISA_BUILDER_OPTION mBuildOption;
     // FIXME: we need to make 3D/media per kernel instead of per builder
     const vISABuilderMode m_builderMode;
 
-    unsigned int m_kernel_count;
-    unsigned int m_function_count;
+    unsigned int m_kernel_count = 0;
+    unsigned int m_function_count = 0;
 
     // list of kernels and functions added to this builder
     std::list<VISAKernelImpl *> m_kernelsAndFunctions;

visa/BuildIR.h

@@ -101,13 +101,13 @@ class FCPatchingInfo
     }
 
     void setHasFCCalls(bool hasFC) { hasFCCalls = hasFC; }
-    bool getHasFCCalls() { return hasFCCalls; }
+    bool getHasFCCalls() const { return hasFCCalls; }
     void setIsCallableKernel(bool value) { isFCCallableKernel = value; }
-    bool getIsCallableKernel() { return isFCCallableKernel; }
+    bool getIsCallableKernel() const { return isFCCallableKernel; }
     void setFCComposableKernel(bool value) { isFCComposableKernel = value; }
-    bool getFCComposableKernel() { return isFCComposableKernel; }
+    bool getFCComposableKernel() const { return isFCComposableKernel; }
     void setIsEntryKernel(bool value) { isFCEntryKernel = value; }
-    bool getIsEntryKernel() { return isFCEntryKernel; }
+    bool getIsEntryKernel() const { return isFCEntryKernel; }
     std::vector<FCCalls*>& getFCCallsToPatch() { return FCCallsToPatch; }
     std::vector<unsigned int>& getFCReturnsToPatch() { return FCReturnOffsetsToPatch; }
 
@@ -388,7 +388,7 @@ class IR_Builder
     // map of all stack functioncs ever invoked by this builder's kernel/function
     std::map<std::string, G4_Label*> m_fcallLabels;
 
-    G4_Label* getFcallLabel(std::string str)
+    G4_Label* getFcallLabel(const std::string &str)
     {
         auto it = m_fcallLabels.find(str);
         if (it == m_fcallLabels.end())
@@ -1071,12 +1071,12 @@ class IR_Builder
     // a new null-terminated copy of "lab" is created for the new label, so
     // caller does not have to allocate memory for lab
     //
-    G4_Label* createLabel(std::string lab, VISA_Label_Kind kind)
+    G4_Label* createLabel(const std::string &lab, VISA_Label_Kind kind)
     {
         auto labStr = lab.c_str();
         size_t len = strlen(labStr) + 1;
         char* new_str = (char*)mem.alloc(len);  // +1 for null that ends the string
-        strcpy_s(new_str, len, labStr);
+        memcpy_s(new_str, len, labStr, len);
         return new (mem) G4_Label(new_str);
     }
 

visa/G4_Kernel.hpp

@@ -227,7 +227,7 @@ class G4_Kernel
     void computeChannelSlicing();
     void calculateSimdSize();
     G4_ExecSize getSimdSize() { return simdSize; }
-    bool getChannelSlicing() { return channelSliced; }
+    bool getChannelSlicing() const { return channelSliced; }
     unsigned getSimdSizeWithSlicing() { return channelSliced ? simdSize/2 : simdSize; }
 
     void setHasAddrTaken(bool val) { hasAddrTaken = val; }
@@ -237,16 +237,16 @@ class G4_Kernel
     unsigned getNumRegTotal() const { return numRegTotal; }
 
     void setName(const char* n) { name = n; }
-    const char* getName() { return name; }
+    const char* getName() const { return name; }
 
     void updateKernelByNumThreads(int nThreads);
 
     void evalAddrExp();
 
     void setRAType(RA_Type type) { RAType = type; }
-    RA_Type getRAType() { return RAType; }
+    RA_Type getRAType() const { return RAType; }
 
-    bool hasKernelDebugInfo() {return kernelDbgInfo;}
+    bool hasKernelDebugInfo() const {return kernelDbgInfo;}
     void setKernelDebugInfo(KernelDebugInfo* k);
     KernelDebugInfo* getKernelDebugInfo();