fix build issue & cleanup names

carlguo866 · carlguo866 · commit 465d74a8cdf2 · 2023-02-15T22:01:57.000-05:00
diff --git a/include/sql/SQLDialect.h b/include/sql/SQLDialect.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SQL_DIALECT
-#define SQL_DIALECT
+#ifndef SQL_DIALECT_H
+#define SQL_DIALECT_H
 
 #include "mlir/IR/Dialect.h"
 
diff --git a/include/sql/SQLOps.td b/include/sql/SQLOps.td
@@ -53,5 +53,4 @@ def ResultOp : SQL_Op<"get_result", [Pure]> {
   let hasCanonicalizer = 0;
 }  
  
-
-#endif
+#endif // SQL_OPS
diff --git a/lib/sql/CMakeLists.txt b/lib/sql/CMakeLists.txt
@@ -11,3 +11,5 @@ MLIRSQLOpsIncGen
 LINK_LIBS PUBLIC
 MLIRIR
 )
+
+add_subdirectory(Passes)
diff --git a/test/polygeist-opt/sql.mlir b/test/polygeist-opt/sql.mlir
@@ -1,5 +1,5 @@
 // RUN: polygeist-opt %s | FileCheck %s
-
+// -lower-sql
 module  {
   func.func private @run() -> i32 {
     %c0 = arith.constant 0 : index
diff --git a/tools/polygeist-opt/CMakeLists.txt b/tools/polygeist-opt/CMakeLists.txt
@@ -6,6 +6,7 @@ set(LIBS
         MLIROptLib
 		MLIRPolygeist
 		MLIRPolygeistTransforms
+		MLIRSQLTransforms
         MLIRSQL
         )
 add_llvm_executable(polygeist-opt polygeist-opt.cpp)

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,4 @@ def ResultOp : SQL_Op<"get_result", [Pure]> {`
`53`	`53`	`let hasCanonicalizer = 0;`
`54`	`54`	`}`
`55`	`55`
`56`		`-`
`57`		`-#endif`
	`56`	`+#endif // SQL_OPS`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ set(LIBS`
`6`	`6`	`MLIROptLib`
`7`	`7`	`MLIRPolygeist`
`8`	`8`	`MLIRPolygeistTransforms`
	`9`	`+ MLIRSQLTransforms`
`9`	`10`	`MLIRSQL`
`10`	`11`	`)`
`11`	`12`	`add_llvm_executable(polygeist-opt polygeist-opt.cpp)`