[Matchers] Move from scalehls utils to HLS dialect utils

UIUC-ChenLab · Jun 28, 2023 · ab10065 · ab10065
1 parent e1e3e38
commit ab10065
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/include/scalehls/Utils/Matchers.h → ...ude/scalehls/Dialect/HLS/Utils/Matchers.h b/include/scalehls/Utils/Matchers.h → ...ude/scalehls/Dialect/HLS/Utils/Matchers.h
@@ -4,8 +4,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SCALEHLS_UTILS_MATCHERS_H
-#define SCALEHLS_UTILS_MATCHERS_H
+#ifndef SCALEHLS_DIALECT_HLS_UTILS_MATCHERS_H
+#define SCALEHLS_DIALECT_HLS_UTILS_MATCHERS_H
 
 #include "scalehls/Dialect/HLS/IR/HLS.h"
 #include "scalehls/Utils/Utils.h"
@@ -15,8 +15,7 @@
 
 namespace mlir {
 namespace scalehls {
-
-using namespace hls;
+namespace hls {
 
 //===----------------------------------------------------------------------===//
 // BlockMatcher
@@ -380,7 +379,8 @@ struct IPMatcher {
   IPMatchingStatus status;
 };
 
+} // namespace hls
 } // namespace scalehls
 } // namespace mlir
 
-#endif // SCALEHLS_UTILS_MATCHERS_H
+#endif // SCALEHLS_DIALECT_HLS_UTILS_MATCHERS_H
diff --git a/lib/Dialect/HLS/Transforms/GenerateTaskDesignSpace.cpp b/lib/Dialect/HLS/Transforms/GenerateTaskDesignSpace.cpp
@@ -9,8 +9,8 @@
 #include "mlir/Dialect/SCF/Utils/Utils.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "scalehls/Dialect/HLS/Transforms/Passes.h"
+#include "scalehls/Dialect/HLS/Utils/Matchers.h"
 #include "scalehls/Dialect/HLS/Utils/Utils.h"
-#include "scalehls/Utils/Matchers.h"
 
 using namespace mlir;
 using namespace scalehls;

diff --git a/lib/Dialect/HLS/Transforms/ImplementTaskDesignSpace.cpp b/lib/Dialect/HLS/Transforms/ImplementTaskDesignSpace.cpp
@@ -9,8 +9,8 @@
 #include "mlir/Dialect/SCF/Utils/Utils.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "scalehls/Dialect/HLS/Transforms/Passes.h"
+#include "scalehls/Dialect/HLS/Utils/Matchers.h"
 #include "scalehls/Dialect/HLS/Utils/Utils.h"
-#include "scalehls/Utils/Matchers.h"
 
 using namespace mlir;
 using namespace scalehls;

diff --git a/lib/Dialect/HLS/Transforms/SimplifyDesignSpace.cpp b/lib/Dialect/HLS/Transforms/SimplifyDesignSpace.cpp
@@ -4,13 +4,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/Linalg/Transforms/Transforms.h"
-#include "mlir/Dialect/SCF/Transforms/Transforms.h"
-#include "mlir/Dialect/SCF/Utils/Utils.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "scalehls/Dialect/HLS/Transforms/Passes.h"
 #include "scalehls/Dialect/HLS/Utils/Utils.h"
-#include "scalehls/Utils/Matchers.h"
 
 using namespace mlir;
 using namespace scalehls;

diff --git a/lib/Dialect/HLS/Utils/CMakeLists.txt b/lib/Dialect/HLS/Utils/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_mlir_dialect_library(MLIRScaleHLSHLSUtils
+  Matchers.cpp
   Utils.cpp
 )
diff --git a/lib/Utils/Matchers.cpp → lib/Dialect/HLS/Utils/Matchers.cpp b/lib/Utils/Matchers.cpp → lib/Dialect/HLS/Utils/Matchers.cpp
@@ -4,13 +4,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "scalehls/Utils/Matchers.h"
+#include "scalehls/Dialect/HLS/Utils/Matchers.h"
 #include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "scalehls-matchers"
 
 using namespace mlir;
 using namespace scalehls;
+using namespace hls;
 
 //===----------------------------------------------------------------------===//
 // BlockMatcher

diff --git a/lib/Utils/CMakeLists.txt b/lib/Utils/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_mlir_library(MLIRScaleHLSUtils
-  Matchers.cpp
   Utils.cpp
 
   LINK_LIBS PUBLIC