membar decoupling

Author: toudefu

third_party/iluvatar/backend/flagtree_backend_specialization/include/flagtree_spec.h

@@ -1 +1,2 @@
 #include "triton/Analysis/iluvatar_AxisInfo.h"
+#include "triton/Analysis/iluvatar_Membar.h"

third_party/iluvatar/backend/flagtree_backend_specialization/include/triton/Analysis/iluvatar_Membar.h

@@ -0,0 +1,6 @@
+#ifndef ILUVATAR_TRITON_ANALYSIS_MEMBAR_H
+#define ILUVATAR_TRITON_ANALYSIS_MEMBAR_H
+
+#define FLAGTREE_SPEC_BlockInfo_Function
+
+#endif // ILUVATAR_TRITON_ANALYSIS_MEMBAR_H

third_party/iluvatar/backend/flagtree_backend_specialization/lib/Analysis/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_triton_library(FlagTree_iluvatar_TritonAnalysis
   AxisInfo.cpp
+  Membar.cpp
 
   DEPENDS
   TritonTableGen

third_party/iluvatar/backend/flagtree_backend_specialization/lib/Analysis/Membar.cpp

@@ -0,0 +1,35 @@
+#include "triton/Analysis/Membar.h"
+
+namespace mlir {
+
+// type: 0 all | 1 del W from other R |2 del R from other W
+void BlockInfo::erase(BlockInfo &other, int type) {
+  if (type == 0) {
+    for (auto &sri : other.syncReadIntervals)
+      syncReadIntervals.erase(sri);
+    for (auto &swi : other.syncWriteIntervals)
+      syncWriteIntervals.erase(swi);
+  } else if (type == 1) {
+    for (auto &sri : other.syncReadIntervals)
+      syncWriteIntervals.erase(sri);
+  } else if (type == 2) {
+    for (auto &swi : other.syncWriteIntervals)
+      syncReadIntervals.erase(swi);
+  }
+}
+
+// for debug
+void BlockInfo::printIntervals() {
+  if (syncReadIntervals.size() > 0 || syncWriteIntervals.size() > 0) {
+    std::cout << " syncReadIntervals";
+    for (auto &lhs : syncReadIntervals)
+      std::cout << " [" << lhs.start() << ", " << lhs.end() << "] ";
+    std::cout << "" << std::endl;
+    std::cout << " syncWriteIntervals";
+    for (auto &lhs : syncWriteIntervals)
+      std::cout << " [" << lhs.start() << ", " << lhs.end() << "] ";
+    std::cout << "" << std::endl;
+  }
+}
+
+}

third_party/iluvatar/include/triton/Analysis/Membar.h

@@ -6,6 +6,8 @@
 
 #include <set>
 
+#include "triton/../../backend/flagtree_backend_specialization/include/flagtree_spec.h"
+
 namespace mlir {
 
 class OpBuilder;
@@ -43,36 +45,12 @@ struct BlockInfo {
     syncWriteIntervals.clear();
   }
 
-#ifdef __ILUVATAR__
+#ifdef FLAGTREE_SPEC_BlockInfo_Function
   // type: 0 all | 1 del W from other R |2 del R from other W
-  void erase(BlockInfo &other, int type = 0) {
-    if (type == 0) {
-      for (auto &sri : other.syncReadIntervals)
-        syncReadIntervals.erase(sri);
-      for (auto &swi : other.syncWriteIntervals)
-        syncWriteIntervals.erase(swi);
-    } else if (type == 1) {
-      for (auto &sri : other.syncReadIntervals)
-        syncWriteIntervals.erase(sri);
-    } else if (type == 2) {
-      for (auto &swi : other.syncWriteIntervals)
-        syncReadIntervals.erase(swi);
-    }
-  }
+  void erase(BlockInfo &other, int type = 0);
 
   // for debug
-  void printIntervals() {
-    if (syncReadIntervals.size() > 0 || syncWriteIntervals.size() > 0) {
-      std::cout << " syncReadIntervals";
-      for (auto &lhs : syncReadIntervals)
-        std::cout << " [" << lhs.start() << ", " << lhs.end() << "] ";
-      std::cout << "" << std::endl;
-      std::cout << " syncWriteIntervals";
-      for (auto &lhs : syncWriteIntervals)
-        std::cout << " [" << lhs.start() << ", " << lhs.end() << "] ";
-      std::cout << "" << std::endl;
-    }
-  }
+  void printIntervals();
 #endif
 
   /// Compares two BlockInfo objects.