[coco] Automatic BlockIndex update (#1656)

With this commit, each Block includes BlockIndex which will be
automatically updated upon Block link update.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/coco/core/include/coco/IR/Block.h b/contrib/coco/core/include/coco/IR/Block.h
index 203c01e..b7c5926 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Block.h
+++ b/contrib/coco/core/include/coco/IR/Block.h
@@ -19,6 +19,7 @@
 
 #include "coco/IR/Module.forward.h"
 #include "coco/IR/Block.forward.h"
+#include "coco/IR/BlockIndex.h"
 #include "coco/IR/Instr.h"
 #include "coco/IR/Entity.h"
 
@@ -38,6 +39,10 @@ using BlockList = DLinkedList<Block, Module>::Head;
 class Block final : public DLinkedList<Block, Module>::Node, public Entity
 {
 public:
+  friend void DLinkedList<Block, Module>::joined(Module *, Block *);
+  friend void DLinkedList<Block, Module>::leaving(Module *, Block *);
+
+public:
   Block() : _instr{this}
   {
     // DO NOTHING
@@ -51,7 +56,11 @@ public:
   InstrList *instr(void) { return &_instr; }
   const InstrList *instr(void) const { return &_instr; }
 
+public:
+  const BlockIndex &index(void) const { return _index; }
+
 private:
+  BlockIndex _index;
   DLinkedList<Instr, Block>::Head _instr;
 };
 

diff --git a/contrib/coco/core/src/IR/Block.cpp b/contrib/coco/core/src/IR/Block.cpp
index 2235007..14c0260 100644 (file)
--- a/contrib/coco/core/src/IR/Block.cpp
+++ b/contrib/coco/core/src/IR/Block.cpp
@@ -17,17 +17,38 @@
 #include "coco/IR/Block.h"
 #include "coco/IR/Module.h"
 
+#include <cassert>
+
 namespace coco
 {
 
-template <> void DLinkedList<Block, Module>::joined(Module *, Block *)
+template <> void DLinkedList<Block, Module>::joined(Module *, Block *curr_blk)
 {
-  // TODO Implement this
+  assert(!curr_blk->index().valid());
+  uint32_t value = 0;
+
+  if (auto prev_blk = curr_blk->prev())
+  {
+    value = prev_blk->index().value() + 1;
+  }
+
+  for (auto blk = curr_blk; blk; blk = blk->next())
+  {
+    blk->_index.set(value++);
+  }
 }
 
-template <> void DLinkedList<Block, Module>::leaving(Module *, Block *)
+template <> void DLinkedList<Block, Module>::leaving(Module *, Block *curr_blk)
 {
-  // TODO Implement this
+  assert(curr_blk->index().valid());
+  uint32_t value = curr_blk->index().value();
+
+  for (auto blk = curr_blk->next(); blk; blk = blk->next())
+  {
+    blk->_index.set(value++);
+  }
+
+  curr_blk->_index.reset();
 }
 
 template <> BlockList *DLinkedList<Block, Module>::head(Module *m) { return m->block(); }

diff --git a/contrib/coco/core/src/IR/Module.test.cpp b/contrib/coco/core/src/IR/Module.test.cpp
index 41cd383..c69e163 100644 (file)
--- a/contrib/coco/core/src/IR/Module.test.cpp
+++ b/contrib/coco/core/src/IR/Module.test.cpp
@@ -79,6 +79,9 @@ TEST(IR_MODULE, append_two_blocks)
 
   ASSERT_EQ(blk_2->prev(), blk_1);
   ASSERT_EQ(blk_2->next(), nullptr);
+
+  ASSERT_EQ(blk_1->index().value(), 0);
+  ASSERT_EQ(blk_2->index().value(), 1);
 }
 
 TEST(IR_MODULE, append_two_instrs)