[Beignet] [PATCH 5/6] Debug Support: Pass debug infomation to GenInsn

[Bai Yannan]

    1. Add a structure DBGInfo in GenEncoder class, storing debug infomation 
for subsequentlt passing to GenInsn.
    2. Add a structure GenInsnDBGInfo in GenInstruction defination.
    3. Add a vector<GenInsnDBGInfo> in GenEncoder class, storing debug 
information corresponding to vector<GenInstruction>.
    4. Pass debug information from SEL IR firstly to Gen Encoder, then pass to 
Gen Instruction when emitting, if OCL_PROFILING is true.

Signed-off-by: Yannan Bai <yannan....@intel.com>
---
 backend/src/backend/gen_context.cpp |  8 ++++++++
 backend/src/backend/gen_defs.hpp    |  6 ++++++
 backend/src/backend/gen_encoder.cpp | 16 ++++++++++++++++
 backend/src/backend/gen_encoder.hpp |  6 ++++++
 4 files changed, 36 insertions(+)

diff --git a/backend/src/backend/gen_context.cpp 
b/backend/src/backend/gen_context.cpp
index 4e2ebfb..0b92ed9 100644
--- a/backend/src/backend/gen_context.cpp
+++ b/backend/src/backend/gen_context.cpp
@@ -92,6 +92,12 @@ namespace gbe
     return i;
   }
 
+  extern bool OCL_PROFILING; // first defined by calling BVAR in program.cpp
+#define SET_GENINSN_DBGINFO(I) \
+  if(OCL_PROFILING) { \
+    p->DBGInfo.line = I.DBGInfo.line; \
+    p->DBGInfo.col = I.DBGInfo.col;}
+      
   void GenContext::emitInstructionStream(void) {
     // Emit Gen ISA
     for (auto &block : *sel->blockList)
@@ -101,6 +107,7 @@ namespace gbe
       // no more virtual register here in that part of the code generation
       GBE_ASSERT(insn.state.physicalFlag);
       p->curr = insn.state;
+      SET_GENINSN_DBGINFO(insn);
       switch (opcode) {
 #define DECL_SELECTION_IR(OPCODE, FAMILY) \
   case SEL_OP_##OPCODE: this->emit##FAMILY(insn); break;
@@ -114,6 +121,7 @@ namespace gbe
     for(int i = 0; i < 8; i++)
        p->NOP();
   }
+#undef SET_GENINSN_DBGINFO
 
   bool GenContext::patchBranches(void) {
     using namespace ir;
diff --git a/backend/src/backend/gen_defs.hpp b/backend/src/backend/gen_defs.hpp
index 1b550ac..fea0772 100644
--- a/backend/src/backend/gen_defs.hpp
+++ b/backend/src/backend/gen_defs.hpp
@@ -490,6 +490,12 @@ struct GenInstruction {
   uint32_t high;
 };
 
+/* Structure to store source infomation for each GenInstruction */
+struct GenInsnDBGInfo {
+  uint32_t srcline;
+  uint32_t srccol;
+};
+
 union GenCompactInstruction {
   struct GenInstruction low;
   struct {
diff --git a/backend/src/backend/gen_encoder.cpp 
b/backend/src/backend/gen_encoder.cpp
index 2cc51cc..5eaddf1 100644
--- a/backend/src/backend/gen_encoder.cpp
+++ b/backend/src/backend/gen_encoder.cpp
@@ -591,11 +591,26 @@ namespace gbe
       this->setSrc1(insn, bti);
     }
   }
+
+  extern bool OCL_PROFILING; // first defined by calling BVAR in program.cpp
+  void GenEncoder::setDBGInfo(uint32_t line, uint32_t col, bool hasHigh)
+  {
+    if(OCL_PROFILING)
+     {
+       GenInsnDBGInfo dginfo;
+       dginfo.srcline = DBGInfo.line;
+       dginfo.srccol = DBGInfo.col;
+       storedbg.push_back(dginfo);
+       if(hasHigh) storedbg.push_back(dginfo);
+     }
+  }
+  
   GenCompactInstruction *GenEncoder::nextCompact(uint32_t opcode) {
     GenCompactInstruction insn;
     std::memset(&insn, 0, sizeof(GenCompactInstruction));
     insn.bits1.opcode = opcode;
     this->store.push_back(insn.low);
+    setDBGInfo(DBGInfo.line, DBGInfo.col, false);
     return (GenCompactInstruction *)&this->store.back();
   }
 
@@ -605,6 +620,7 @@ namespace gbe
      insn.header.opcode = opcode;
      this->store.push_back(insn.low);
      this->store.push_back(insn.high);
+     setDBGInfo(DBGInfo.line, DBGInfo.col, true);
      return (GenNativeInstruction *)(&this->store.back()-1);
   }
 
diff --git a/backend/src/backend/gen_encoder.hpp 
b/backend/src/backend/gen_encoder.hpp
index f2bb5ab..354171c 100644
--- a/backend/src/backend/gen_encoder.hpp
+++ b/backend/src/backend/gen_encoder.hpp
@@ -88,6 +88,12 @@ namespace gbe
     uint32_t deviceID;
     /*! simd width for this codegen */
     uint32_t simdWidth;
+    struct {
+      uint32_t line;
+      uint32_t col;
+    } DBGInfo;
+    vector<GenInsnDBGInfo> storedbg;
+    void setDBGInfo(uint32_t line, uint32_t col, bool hasHigh);
     ////////////////////////////////////////////////////////////////////////
     // Encoding functions
     ////////////////////////////////////////////////////////////////////////
-- 
1.9.1

_______________________________________________
Beignet mailing list
Beignet@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/beignet