Bump llvm (#267)

* Bump llvm

* Fix polygeist-opt tests

* Do not use opaque pointers

* Do not return null but ValueCategory() for void function result

* Fix cgeist tests

* Fix eraseArgument API usage

* clang format

Author: ivanradanov

CMakeLists.txt

@@ -22,7 +22,7 @@ set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/lib)
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   project(polygeist LANGUAGES CXX C)
 
-  set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
+  set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
 
   message(STATUS "Searching for MLIRConfig.cmake in: ${MLIR_DIR}")
   find_package(MLIR REQUIRED CONFIG)

include/polygeist/BarrierUtils.h

@@ -13,7 +13,7 @@
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
-#include "mlir/Dialect/SCF/SCF.h"
+#include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/IR/Block.h"
 #include "polygeist/Ops.h"
 #include "llvm/ADT/SetVector.h"

include/polygeist/Ops.h

@@ -11,7 +11,7 @@
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/Dialect/SCF/SCF.h"
+#include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Matchers.h"
@@ -25,7 +25,7 @@
 #include "polygeist/PolygeistOps.h.inc"
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
-#include "mlir/Dialect/SCF/SCF.h"
+#include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/PatternMatch.h"
 #include "llvm/Support/CommandLine.h"

include/polygeist/Passes/Passes.td

@@ -124,9 +124,6 @@ def ConvertPolygeistToLLVM : Pass<"convert-polygeist-to-llvm", "mlir::ModuleOp">
            /*default=*/"false",
            "Replace FuncOp's MemRef arguments with bare pointers to the MemRef "
            "element types">,
-    Option<"emitCWrappers", "emit-c-wrappers", "bool", /*default=*/"false",
-           "Emit wrappers for C-compatible pointer-to-struct memref "
-           "descriptors">,
     Option<"indexBitwidth", "index-bitwidth", "unsigned",
            /*default=kDeriveIndexBitwidthFromDataLayout*/"0",
            "Bitwidth of the index type, 0 to use size of machine word">,

include/polygeist/Passes/Utils.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
-#include "mlir/Dialect/SCF/SCF.h"
+#include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/IntegerSet.h"
 
@@ -96,13 +96,13 @@ static inline mlir::Region &getThenRegion(mlir::scf::IfOp op) {
   return op.getThenRegion();
 }
 static inline mlir::Region &getThenRegion(mlir::AffineIfOp op) {
-  return op.thenRegion();
+  return op.getThenRegion();
 }
 static inline mlir::Region &getElseRegion(mlir::scf::IfOp op) {
   return op.getElseRegion();
 }
 static inline mlir::Region &getElseRegion(mlir::AffineIfOp op) {
-  return op.elseRegion();
+  return op.getElseRegion();
 }
 
 static inline mlir::scf::YieldOp getThenYield(mlir::scf::IfOp op) {
@@ -135,5 +135,5 @@ static inline bool hasElse(mlir::scf::IfOp op) {
   return op.getElseRegion().getBlocks().size() > 0;
 }
 static inline bool hasElse(mlir::AffineIfOp op) {
-  return op.elseRegion().getBlocks().size() > 0;
+  return op.getElseRegion().getBlocks().size() > 0;
 }

include/polygeist/PolygeistOps.td

@@ -61,7 +61,7 @@ def SubIndexOp : Polygeist_Op<"subindex", [
   let hasCanonicalizer = 1;
 
   let extraClassDeclaration = [{
-    ::mlir::Value getViewSource() { return source(); }
+    ::mlir::Value getViewSource() { return getSource(); }
   }];
 }
 
@@ -91,7 +91,7 @@ def Memref2PointerOp : Polygeist_Op<"memref2pointer", [
   let hasCanonicalizer = 1;
 
   let extraClassDeclaration = [{
-    ::mlir::Value getViewSource() { return source(); }
+    ::mlir::Value getViewSource() { return getSource(); }
   }];
 }
 
@@ -107,7 +107,7 @@ def Pointer2MemrefOp : Polygeist_Op<"pointer2memref", [
   let hasCanonicalizer = 1;
 
   let extraClassDeclaration = [{
-    ::mlir::Value getViewSource() { return source(); }
+    ::mlir::Value getViewSource() { return getSource(); }
   }];
 }
 

lib/polygeist/CMakeLists.txt

@@ -10,6 +10,6 @@ MLIRPolygeistOpsIncGen
 
 LINK_LIBS PUBLIC
 MLIRIR
-MLIRMemRef
+MLIRMemRefDialect
 )
 add_subdirectory(Passes)