Added support to dump isa into ostream

Change-Id: I615bf54c679798b98eb44f2e41a2b8d2ebeffa5c

Author: Sherstennikov, Mikhail

visa/BuildCISAIR.h

@@ -101,7 +101,7 @@ class CISA_IR_Builder : public VISABuilder
     static int DestroyBuilder(CISA_IR_Builder *builder);
     CM_BUILDER_API virtual int AddKernel(VISAKernel *& kernel, const char* kernelName);
     CM_BUILDER_API virtual int AddFunction(VISAFunction *& function, const char* functionName);
-    CM_BUILDER_API virtual int Compile(const char * isaFileNameint);
+    CM_BUILDER_API virtual int Compile(const char * isaFileNameint, std::ostream * os = nullptr, bool emit_visa_only = false);
 
     CM_BUILDER_API void SetOption(vISAOptions option, bool val) { m_options.setOption(option, val); }
     CM_BUILDER_API void SetOption(vISAOptions option, uint32_t val) { m_options.setOption(option, val); }

visa/BuildCISAIRImpl.cpp

@@ -741,7 +741,7 @@ int CISA_IR_Builder::ParseVISAText(const std::string& visaFile)
 
 // default size of the kernel mem manager in bytes
 #define KERNEL_MEM_SIZE    (4*1024*1024)
-int CISA_IR_Builder::Compile( const char* nameInput)
+int CISA_IR_Builder::Compile(const char* nameInput, std::ostream* os, bool emit_visa_only)
 {
 
     stopTimer(TIMER_BUILDER);   // TIMER_BUILDER is started when builder is created
@@ -795,11 +795,16 @@ int CISA_IR_Builder::Compile( const char* nameInput)
     /*
         In case there is an assert in compilation phase, at least vISA binary will be generated.
     */
-    if ( IS_VISA_BOTH_PATH && m_options.getOption(vISA_DumpvISA) )
+    if (IS_VISA_BOTH_PATH && m_options.getOption(vISA_DumpvISA) && nameInput && !os)
     {
         status = m_cisaBinary->dumpToFile(name);
     }
 
+    if (os && emit_visa_only)
+    {
+        return m_cisaBinary->dumpToStream(os);
+    }
+
     if ( IS_GEN_BOTH_PATH )
     {
         Mem_Manager mem(4096);
@@ -961,7 +966,10 @@ int CISA_IR_Builder::Compile( const char* nameInput)
             }
         }
 
-        status = m_cisaBinary->dumpToFile(name);
+        if (os)
+            status = m_cisaBinary->dumpToStream(os);
+        else
+            status = m_cisaBinary->dumpToFile(name);
     }
 
     stopTimer(TIMER_TOTAL); // have to record total time before dump the timer

visa/Common_ISA_framework.cpp

@@ -325,6 +325,24 @@ int CisaBinary::finalizeCisaBinary()
     return CM_SUCCESS;
 }
 
+int CisaBinary::dumpToStream(std::ostream * os)
+{
+    os->write(this->m_header_buffer, this->m_header_size);
+
+    for (int i = 0; i < m_header.num_kernels; i++)
+    {
+        os->write(m_header.kernels[i].cisa_binary_buffer, m_header.kernels[i].size);
+        os->write(m_header.kernels[i].genx_binary_buffer, m_header.kernels[i].binary_size);
+    }
+
+    for (int i = 0; i < m_header.num_functions; i++)
+    {
+        os->write(m_header.functions[i].cisa_binary_buffer, m_header.functions[i].size);
+        os->write(m_header.functions[i].genx_binary_buffer, m_header.functions[i].binary_size);
+    }
+    return CM_SUCCESS;
+}
+
 int CisaBinary::dumpToFile(std::string binFileName)
 {
     if ( binFileName == "" )
@@ -338,21 +356,9 @@ int CisaBinary::dumpToFile(std::string binFileName)
         std::cerr<<"Could not open %s"<< binFileName.c_str()<<std::endl;
         return CM_FAILURE;
     }
-    os.write(this->m_header_buffer, this->m_header_size);
-
-    for(int i = 0; i< m_header.num_kernels; i++)
-    {
-        os.write(m_header.kernels[i].cisa_binary_buffer, m_header.kernels[i].size);
-        os.write(m_header.kernels[i].genx_binary_buffer, m_header.kernels[i].binary_size);
-    }
-
-    for (int i = 0; i < m_header.num_functions; i++)
-    {
-        os.write(m_header.functions[i].cisa_binary_buffer, m_header.functions[i].size);
-        os.write(m_header.functions[i].genx_binary_buffer, m_header.functions[i].binary_size);
-    }
+    int result = dumpToStream(&os);
     os.close();
-    return CM_SUCCESS;
+    return result;
 }
 
 void CisaBinary::writeIsaAsmFile(string filename, string isaasmStr) const

visa/Common_ISA_framework.h

@@ -256,6 +256,7 @@ class CisaBinary
     void initKernel( int kernelIndex, VISAKernelImpl * kernel );
     int finalizeCisaBinary();
     int dumpToFile(std::string binFileName);
+    int dumpToStream(std::ostream *os);
 
     unsigned       getInstId() const { return m_instId; }
     void     incrementInstId() const { m_instId++;      }

visa/Gen4_IR.cpp

@@ -2499,7 +2499,7 @@ bool G4_INST::canHoist(bool simdBB, const Options *opt) const
     if (src->isImm() ||
         archRegSrc ||
         indirectSrc ||
-        (src->asSrcRegRegion()->getModifier() != Mod_src_undef) ||
+        (src->isSrcRegRegion() && src->asSrcRegRegion()->getModifier() != Mod_src_undef) ||
         (defInstList.size() == 0) ||
         noMultiDefOpt)
     {

visa/include/VISABuilderAPIDefinition.h

@@ -814,7 +814,7 @@ class VISABuilder
 public:
     CM_BUILDER_API virtual int AddKernel(VISAKernel *& kernel, const char* kernelName) = 0;
     CM_BUILDER_API virtual int AddFunction(VISAFunction *& function, const char* functionName) = 0;
-    CM_BUILDER_API virtual int Compile(const char * isaFileNameint) = 0;
+    CM_BUILDER_API virtual int Compile(const char * isaFileNameint, std::ostream* os = nullptr, bool emit_visa_only = false) = 0;
 
     CM_BUILDER_API virtual void SetOption(vISAOptions option, bool val) = 0;
     CM_BUILDER_API virtual void SetOption(vISAOptions option, uint32_t val) = 0;

visa/include/visaBuilder_interface.h

@@ -24,21 +24,21 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ======================= end_copyright_notice ==================================*/
 
-struct VISA_GenVar;
-struct VISA_AddrVar;
-struct VISA_PredVar;
-struct VISA_SamplerVar;
-struct VISA_SurfaceVar;
-struct VISA_VMEVar;
-struct VISA_LabelVar;
-struct VISA_FileVar;
-
-
-struct VISA_PredOpnd;
-struct VISA_RawOpnd;
-struct VISA_VectorOpnd;
-struct VISA_LabelOpnd;
-struct VISA_StateOpndHandle;
+typedef struct _VISA_GenVar      VISA_GenVar;
+typedef struct _VISA_AddrVar     VISA_AddrVar;
+typedef struct _VISA_PredVar     VISA_PredVar;
+typedef struct _VISA_SamplerVar  VISA_SamplerVar;
+typedef struct _VISA_SurfaceVar  VISA_SurfaceVar;
+typedef struct _VISA_VMEVar      VISA_VMEVar;
+typedef struct _VISA_LabelVar    VISA_LabelVar;
+typedef struct _VISA_FileVar     VISA_FileVar;
+
+
+typedef struct _VISA_LabelOpnd        VISA_LabelOpnd;
+typedef struct _VISA_VectorOpnd       VISA_VectorOpnd;
+typedef struct _VISA_RawOpnd          VISA_RawOpnd;
+typedef struct _VISA_PredOpnd         VISA_PredOpnd;
+typedef struct _VISA_StateOpndHandle  VISA_StateOpndHandle;
 
 #define CM_BUILDER_API