From e885d5fc8d97ba601f8ac62c5280c0eec374f8d0 Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Sat, 28 Aug 2021 18:09:10 +0100
Subject: [PATCH] Upgrade to llvm 13rc2

---
 bin/CMakeLists.txt                    | 3 +--
 include/serene/slir/CMakeLists.txt    | 1 +
 src/serene/passes/to_llvm_dialect.cpp | 2 ++
 src/serene/slir/dialect.cpp           | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index b2cdc2b..0f33abe 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(serenec serene.cpp)
 
 # Make sure to generate files related to the dialects first
-add_dependencies(serenec SereneDialectGen)
+#add_dependencies(serenec SereneDialectGen)
 
 if (CPP_20_SUPPORT)
   target_compile_features(serenec PRIVATE cxx_std_20)
@@ -37,4 +37,3 @@ target_include_directories(serene PRIVATE ${INCLUDE_DIR})
 
 install(TARGETS serenec DESTINATION bin)
 install(FILES "${PROJECT_BINARY_DIR}/config.h" DESTINATION include)
-cotire(serenec)
diff --git a/include/serene/slir/CMakeLists.txt b/include/serene/slir/CMakeLists.txt
index e8b8556..2d751f2 100644
--- a/include/serene/slir/CMakeLists.txt
+++ b/include/serene/slir/CMakeLists.txt
@@ -2,4 +2,5 @@ set(LLVM_TARGET_DEFINITIONS dialect.td)
 mlir_tablegen(ops.h.inc -gen-op-decls)
 mlir_tablegen(ops.cpp.inc -gen-op-defs)
 mlir_tablegen(dialect.h.inc -gen-dialect-decls)
+mlir_tablegen(dialect.cpp.inc -gen-dialect-defs)
 add_public_tablegen_target(SereneDialectGen)
diff --git a/src/serene/passes/to_llvm_dialect.cpp b/src/serene/passes/to_llvm_dialect.cpp
index 0bd4fe2..1158ea9 100644
--- a/src/serene/passes/to_llvm_dialect.cpp
+++ b/src/serene/passes/to_llvm_dialect.cpp
@@ -27,6 +27,8 @@
 
 #include <memory>
 #include <mlir/Conversion/AffineToStandard/AffineToStandard.h>
+#include <mlir/Conversion/LLVMCommon/ConversionTarget.h>
+#include <mlir/Conversion/LLVMCommon/TypeConverter.h>
 #include <mlir/Conversion/SCFToStandard/SCFToStandard.h>
 #include <mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h>
 #include <mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h>
diff --git a/src/serene/slir/dialect.cpp b/src/serene/slir/dialect.cpp
index a75bbf8..0af7165 100644
--- a/src/serene/slir/dialect.cpp
+++ b/src/serene/slir/dialect.cpp
@@ -26,6 +26,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OpImplementation.h"
+#include "serene/slir/dialect.cpp.inc"
 
 namespace serene {
 namespace slir {