InlineAsm Prototype

Change-Id: If0584fc3523ef920325b9f89f07a5327beebec44

Author: dlei6g

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -30,7 +30,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "visa_wa.h"
 
-
 namespace IGC
 {
 class CShader;
@@ -131,6 +130,8 @@ class CEncoder
 {
 public:
     void InitEncoder( bool canAbortOnSpill, bool hasStackCall);
+    void InitBuildParams(llvm::SmallVector<const char*, 10> &params);
+    void InitVISABuilderOptions(TARGET_PLATFORM VISAPlatform, bool canAbortOnSpill, bool hasStackCall);
     SEncoderState CopyEncoderState();
     void SetEncoderState(SEncoderState &newState);
 
@@ -344,6 +345,7 @@ class CEncoder
     void Wait();
 
     VISAKernel* GetVISAKernel() { return vKernel; }
+    VISABuilder* GetVISABuilder() { return vbuilder; }
     void Init();
     void Push();
 
@@ -396,6 +398,9 @@ class CEncoder
 
     void AddFunctionSymbol(llvm::Function* F, CVariable* fvar);
 
+    std::string GetVariableName(CVariable* var);
+    std::string GetDumpFileName(std::string extension);
+
 private:
     // helper functions
     VISA_VectorOpnd* GetSourceOperand(CVariable* var, const SModifier& mod);
@@ -501,6 +506,11 @@ class CEncoder
 
     uint32_t getNumChannels(CVariable* var) const;
 
+    void SaveOption(vISAOptions option, bool val);
+    void SaveOption(vISAOptions option, uint32_t val);
+    void SaveOption(vISAOptions option, const char* val);
+    void SetBuilderOptions(VISABuilder* pbuilder);
+
 protected:
     // encoder states
     SEncoderState m_encoderState;
@@ -509,6 +519,22 @@ class CEncoder
 
     VISA_WA_TABLE m_WaTable;
 
+    enum OpType
+    {
+        ET_BOOL,
+        ET_INT32,
+        ET_CSTR
+    };
+    struct OptionValue
+    {
+        OpType type;
+        bool vBool;
+        uint32_t vInt32;
+        const char* vCstr;
+    };
+    // List of vISA user options
+    std::vector<std::pair<vISAOptions, OptionValue>> m_visaUserOptions;
+
     // Typically IGC just use ones vKernel for every vISA::compile call,
     // in those cases, vKernel and vMainKernel should be the same.
     // Only when using stack-call, vKernel pointer changes every time
@@ -517,8 +543,10 @@ class CEncoder
     VISAKernel*   vKernel;
     VISAKernel*   vMainKernel;
     VISABuilder* vbuilder;
+    VISABuilder* vAsmTextBuilder;
 
     bool m_enableVISAdump;
+    bool m_hasInlineAsm;
     std::vector<VISA_LabelOpnd*> labelMap;
 
     /// Per kernel label counter

IGC/Compiler/CISACodeGen/CISABuilder.hpp

@@ -64,6 +64,7 @@ CheckInstrTypes::CheckInstrTypes(IGC::SInstrTypes* instrList) : FunctionPass(ID)
     instrList->hasLoadStore = false;
     instrList->hasCall = false;
     instrList->hasIndirectCall = false;
+    instrList->hasInlineAsm = false;
     instrList->hasIndirectBranch = false;
     instrList->hasFunctionAddressTaken = false;
     instrList->hasSel = false;
@@ -148,6 +149,7 @@ void CheckInstrTypes::visitCallInst(CallInst &C)
     {
         if (C.isInlineAsm())
         {
+            g_InstrTypes->hasInlineAsm = true;
             return;
         }
         // calls to 'blocks' have a null Function object

IGC/Compiler/CISACodeGen/CheckInstrTypes.cpp

@@ -7473,6 +7473,76 @@ void EmitPass::EmitIntrinsicMessage(llvm::IntrinsicInst* inst)
     }
 }
 
+// Parse the inlined asm string to generate VISA operands
+// Example: "mul (M1, 16) $0(0, 0)<1> $1(0, 0)<1;1,0> $2(0, 0)<1;1,0>", "=r,r,r"(float %6, float %7)
+void EmitPass::EmitInlineAsm(llvm::CallInst* inst)
+{
+    std::stringstream &str = m_encoder->GetVISABuilder()->GetAsmTextStream();
+    str << "    ";
+
+    InlineAsm* IA = cast<InlineAsm>(inst->getCalledValue());
+    const char* asmStr = IA->getAsmString().c_str();
+    const char* lastEmitted = asmStr;
+    smallvector<CVariable*, 8> opnds;
+    opnds.push_back(m_destination);
+    for (unsigned i = 0; i < inst->getNumArgOperands(); i++)
+    {
+        CVariable* cv = GetSymbol(inst->getArgOperand(i));
+        opnds.push_back(cv);
+    }
+
+    while (*lastEmitted)
+    {
+        switch (*lastEmitted)
+        {
+        default:
+        {
+            const char* literalEnd = lastEmitted + 1;
+            while (*literalEnd && *literalEnd != '{' && *literalEnd != '|' &&
+                *literalEnd != '}' && *literalEnd != '$' && *literalEnd != '\n')
+            {
+                ++literalEnd;
+            }
+            str.write(lastEmitted, literalEnd - lastEmitted);
+            lastEmitted = literalEnd;
+            break;
+        }
+        case '\n':
+        {
+            ++lastEmitted;
+            str << '\n';
+            break;
+        }
+        case '$':
+        {
+            ++lastEmitted;
+            const char* idStart = lastEmitted;
+            const char* idEnd = idStart;
+            while (*idEnd >= '0' && *idEnd <= '9')
+                ++idEnd;
+
+            unsigned val;
+            if (StringRef(idStart, idEnd - idStart).getAsInteger(10, val))
+            {
+                assert(0 && "Invalid operand format");
+                return;
+            }
+            lastEmitted = idEnd;
+
+            if (val >= opnds.size())
+            {
+                assert(0 && "Invalid operand index");
+                return;
+            }
+
+            str << m_encoder->GetVariableName(opnds[val]);
+            break;
+        }
+        }
+    }
+    str << "    /// inlined ASM" << endl;
+}
+
 CVariable *EmitPass::Mul(CVariable *Src0, CVariable *Src1, const CVariable *DstPrototype)
 {
     bool IsSrc0Imm = Src0->IsImmediate();
@@ -8145,6 +8215,10 @@ void EmitPass::EmitNoModifier(llvm::Instruction* inst)
         {
             EmitIntrinsicMessage(I);
         }
+        else if (cast<CallInst>(inst)->isInlineAsm())
+        {
+            EmitInlineAsm(cast<CallInst>(inst));
+        }
         else
         {
             emitCall(cast<CallInst>(inst));

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -35,6 +35,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "common/LLVMWarningsPush.hpp"
 #include <llvm/IR/DataLayout.h>
+#include <llvm/IR/InlineAsm.h>
 #include "llvm/IR/GetElementPtrTypeIterator.h"
 #include "common/LLVMWarningsPop.hpp"
 #include "Compiler/IGCPassSupport.h"
@@ -126,7 +127,8 @@ class EmitPass : public llvm::FunctionPass
     void EmitSubPair(llvm::GenIntrinsicInst *GII, const SSource Sources[4], const DstModifier &DstMod);
     void EmitMulPair(llvm::GenIntrinsicInst *GII, const SSource Sources[4], const DstModifier &DstMod);
     void EmitPtrToPair(llvm::GenIntrinsicInst *GII, const SSource Sources[1], const DstModifier &DstMod);
-    
+    void EmitInlineAsm(llvm::CallInst* inst);
+
     void emitPairToPtr(llvm::GenIntrinsicInst *GII);
 
     void emitMulAdd16(llvm::Instruction* I, const SSource source[2], const DstModifier &dstMod);

IGC/Compiler/CISACodeGen/EmitVISAPass.hpp

@@ -31,6 +31,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "common/igc_regkeys.hpp"
 
 #include "common/LLVMWarningsPush.hpp"
+#include <llvm/IR/InlineAsm.h>
 #include <llvm/IR/Dominators.h>
 #include <llvm/IR/Constants.h>
 #include <llvm/IR/Instruction.h>
@@ -1126,14 +1127,24 @@ void CodeGenPatternMatch::visitCallInst(CallInst &I)
             match = MatchSingleInstruction(I);
         }
     }
-    else if(I.isInlineAsm())
+    else if (!I.getCalledFunction())
     {
-        return;
-    }
-    else if (IGC_IS_FLAG_ENABLED(EnableFunctionPointer) && !I.getCalledFunction())
-    {
-        // Match indirect call
-        match = MatchSingleInstruction(I);
+        // Match inline asm or indirect call
+        if (I.isInlineAsm())
+        {
+            if (IGC_IS_FLAG_ENABLED(EnableInlineAsmSupport))
+            {
+                match = MatchSingleInstruction(I);
+            }
+            else
+            {
+                return;
+            }
+        }
+        else if (IGC_IS_FLAG_ENABLED(EnableFunctionPointer))
+        {
+            match = MatchSingleInstruction(I);
+        }
     }
 
     assert(match && "no match for this call");

IGC/Compiler/CISACodeGen/PatternMatchPass.cpp

@@ -142,6 +142,7 @@ namespace IGC
         bool hasLoadStore;
         bool hasCall;
         bool hasIndirectCall;
+        bool hasInlineAsm;
         bool hasIndirectBranch;
         bool hasFunctionAddressTaken;
         bool hasSel;

IGC/Compiler/CodeGenPublic.h

@@ -252,6 +252,7 @@ DECLARE_IGC_REGKEY(bool, AdvRuntimeUnrollCount,         0,     "Advanced runtime
 DECLARE_IGC_REGKEY(bool, EnableAdvMemOpt,               true,  "Enable advanced memory optimization")
 DECLARE_IGC_REGKEY(bool, UniformMemOptLimit,            0,     "Limit of uniform memory optimization in bits")
 DECLARE_IGC_REGKEY(bool, EnableFunctionPointer,         false,  "Enables support for function pointers and indirect calls")
+DECLARE_IGC_REGKEY(bool, EnableInlineAsmSupport,        false,  "Enables support for inlineAsm calls")
 
 DECLARE_IGC_REGKEY(bool, EnableReadGTPinInput,          true,  "Enables setting GTPin context flags by reading the input to the compiler adapters")
 

IGC/common/igc_flags.def

@@ -36,11 +36,9 @@ class CisaBinary;
 class VISAKernelImpl;
 class VISAFunction;
 
-#ifndef DLL_MODE
 extern FILE *CISAin;
 extern FILE *CISAout;
 extern int CISAdebug;
-#endif
 
 #include "VISABuilderAPIDefinition.h"
 #include "visa_wa.h"
@@ -72,12 +70,17 @@ class CISA_IR_Builder : public VISABuilder
 
     CISA_IR_Builder(CM_VISA_BUILDER_OPTION buildOption, int majorVersion, int minorVersion, PVISA_WA_TABLE pWaTable) : m_mem(4096)
     {
+        memset(&m_header, 0, sizeof(m_header));
+
         mBuildOption = buildOption;
         m_executionSatarted = false;
         m_kernel_count = 0;
         m_function_count = 0;
-        m_majorVersion = majorVersion;
-        m_minorVersion = minorVersion;
+
+        m_header.major_version = majorVersion;
+        m_header.minor_version = minorVersion;
+        m_header.magic_number = COMMON_ISA_MAGIC_NUM;
+
         m_cisaBinary = new (m_mem) CisaFramework::CisaBinary(&m_options);
         m_currentKernel = NULL;
         m_pWaTable = pWaTable;
@@ -101,9 +104,10 @@ class CISA_IR_Builder : public VISABuilder
         return true;
     }
 
-    void closeCISAParsingFile() {fclose(CISAin);}
+    void closeCISAParsingFile() { fclose(CISAin); }
 
     #endif
+
     /**************START VISA BUILDER API*****************************/
 
     static int CreateBuilder(CISA_IR_Builder *&builder,
@@ -125,18 +129,26 @@ class CISA_IR_Builder : public VISABuilder
     CM_BUILDER_API void SetOption(vISAOptions option, uint32_t val) { m_options.setOption(option, val); }
     CM_BUILDER_API void SetOption(vISAOptions option, const char *val) { m_options.setOption(option, val); }
 
+    // Used for inline asm code generation
+    CM_BUILDER_API virtual int ParseVISAText(const std::string& visaHeader, const std::string& visaText, const std::string& visaTextFile);
+    CM_BUILDER_API virtual int WriteVISAHeader();
+    CM_BUILDER_API std::stringstream& GetAsmTextStream() { return m_ssIsaAsm; }
+    CM_BUILDER_API std::stringstream& GetAsmTextHeaderStream() { return m_ssIsaAsmHeader; }
+    CM_BUILDER_API virtual VISAKernel* GetKernel();
+
     /**************END VISA BUILDER API*************************/
 
     string_pool_entry** branch_targets;
+    common_isa_header m_header;
 
     VISAKernelImpl *m_kernel;
     CisaFramework::CisaBinary *m_cisaBinary;
     VISAKernelImpl * get_kernel() { return m_kernel; }
 
     void CISA_IR_setVersion(unsigned char major_ver, unsigned char minor_ver)
     {
-        m_majorVersion = major_ver;
-        m_minorVersion = minor_ver;
+        m_header.major_version = major_ver;
+        m_header.minor_version = minor_ver;
     }
 
     Common_ISA_Input_Class get_input_class(Common_ISA_Var_Class var_class);
@@ -754,6 +766,8 @@ class CISA_IR_Builder : public VISABuilder
     void setTestName(std::string name) { testName = name; }
 
     Options m_options;
+    std::stringstream m_ssIsaAsm;
+    std::stringstream m_ssIsaAsmHeader;
 
     void setupNativeRelocs(unsigned int, const BasicRelocEntry*);
     NativeRelocs* getNativeRelocs(bool createIfNULL = true)
@@ -778,8 +792,6 @@ class CISA_IR_Builder : public VISABuilder
 
     unsigned int m_kernel_count;
     unsigned int m_function_count;
-    int m_majorVersion;
-    int m_minorVersion;
 
     std::list<VISAKernelImpl *> m_kernels;
     //keeps track of functions for stitching purposes, after compilation.
@@ -803,4 +815,5 @@ class CISA_IR_Builder : public VISABuilder
     void* gtpin_init = nullptr;
 };
 extern _THREAD CISA_IR_Builder * pCisaBuilder;
+
 #endif