Fix merge

Signed-off-by: Tsang, Whitney <[email protected]>

Author: whitneywhtsang

mlir-sycl/include/mlir/Dialect/SYCL/IR/SYCLOps.td

@@ -61,10 +61,6 @@ class SYCLMethodOpInterfaceImpl<
      }};
     static ::mlir::TypeID getTypeID() { return ::mlir::sycl::}] # type # [{::getTypeID(); }
     static constexpr llvm::ArrayRef<llvm::StringLiteral> getMethodNames() { return methods; }
-    ::mlir::Type getBaseType() { return BaseType(); }
-    llvm::StringRef getMangledFunctionName() { return MangledFunctionName(); }
-    llvm::StringRef getFunctionName() { return FunctionName(); }
-    llvm::StringRef getTypeName() { return TypeName(); }
   }];
 
   let extraClassDefinition = [{
@@ -189,13 +185,13 @@ def SYCLCallOp : SYCL_Op<"call", []> {
     "::llvm::StringRef":$MangledName,
     "::mlir::ValueRange":$Args), [{
       odsState.addOperands(Args);
-      if (Type.hasValue()) {
-        odsState.addAttribute(TypeAttrName(odsState.name), ::mlir::SymbolRefAttr::get(odsBuilder.getContext(), Type.getValue()));
+      if (Type.has_value()) {
+        odsState.addAttribute(TypeAttrName(odsState.name), ::mlir::SymbolRefAttr::get(odsBuilder.getContext(), Type.value()));
       }
-      odsState.addAttribute(FunctionAttrName(odsState.name), ::mlir::SymbolRefAttr::get(odsBuilder.getContext(), Function));
-      odsState.addAttribute(MangledNameAttrName(odsState.name), ::mlir::SymbolRefAttr::get(odsBuilder.getContext(), MangledName));
-      if (result.hasValue()) {
-        odsState.addTypes(result.getValue());
+      odsState.addAttribute(getFunctionAttrName(odsState.name), ::mlir::SymbolRefAttr::get(odsBuilder.getContext(), Function));
+      odsState.addAttribute(getMangledNameAttrName(odsState.name), ::mlir::SymbolRefAttr::get(odsBuilder.getContext(), MangledName));
+      if (result.has_value()) {
+        odsState.addTypes(result.value());
       }
     }]>
   ];

mlir-sycl/lib/Conversion/SYCLToLLVM/CMakeLists.txt

@@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRSYCLToLLVM
   MLIRSYCLConversionPassIncGen
 
   LINK_LIBS PUBLIC
-  MLIRArithmeticToLLVM
+  MLIRArithToLLVM
   MLIRFuncToLLVM
   MLIRIR
   MLIRLLVMCommonConversion

mlir-sycl/lib/Conversion/SYCLToLLVM/SYCLToLLVM.cpp

@@ -153,9 +153,9 @@ static Optional<Type> convertRangeOrIDTy(unsigned dimNum, StringRef name,
   if (!convertedTy.isInitialized()) {
     auto arrayTy =
         getArrayTy(converter.getContext(), dimNum, converter.getIndexType());
-    if (!arrayTy.hasValue())
+    if (!arrayTy.has_value())
       return llvm::None;
-    if (failed(convertedTy.setBody(arrayTy.getValue(), /*isPacked=*/false)))
+    if (failed(convertedTy.setBody(arrayTy.value(), /*isPacked=*/false)))
       return llvm::None;
   }
   return convertedTy;
@@ -236,8 +236,8 @@ class CallPattern final : public ConvertOpToLLVMPattern<sycl::SYCLCallOp> {
 
     bool producesResult = op.getNumResults() == 1;
     func::CallOp funcCall = builder.genCall(
-        op.MangledName(),
-        producesResult ? TypeRange(op.result().getType()) : TypeRange(),
+        op.getMangledName(),
+        producesResult ? TypeRange(op.getResult().getType()) : TypeRange(),
         op.getOperands(), module);
 
     rewriter.replaceOp(op.getOperation(),
@@ -274,14 +274,14 @@ class CastPattern final : public ConvertOpToLLVMPattern<sycl::SYCLCastOp> {
     LLVM_DEBUG(llvm::dbgs() << "CastPattern: Rewriting op: "; op.dump();
                llvm::dbgs() << "\n");
 
-    assert(op.source().getType().isa<MemRefType>() &&
+    assert(op.getSource().getType().isa<MemRefType>() &&
            "The cast source type should be a memref type");
-    assert(op.result().getType().isa<MemRefType>() &&
+    assert(op.getResult().getType().isa<MemRefType>() &&
            "The result source type should be a memref type");
 
     // Ensure the input and result types are legal.
-    auto srcType = op.source().getType().cast<MemRefType>();
-    auto resType = op.result().getType().cast<MemRefType>();
+    auto srcType = op.getSource().getType().cast<MemRefType>();
+    auto resType = op.getResult().getType().cast<MemRefType>();
 
     if (!isConvertibleAndHasIdentityMaps(srcType) ||
         !isConvertibleAndHasIdentityMaps(resType))
@@ -291,7 +291,7 @@ class CastPattern final : public ConvertOpToLLVMPattern<sycl::SYCLCastOp> {
     // type of those pointers in the results memref.
     Location loc = op.getLoc();
     LLVMBuilder builder(rewriter, loc);
-    MemRefDescriptor srcMemRefDesc(opAdaptor.source());
+    MemRefDescriptor srcMemRefDesc(opAdaptor.getSource());
     Value allocatedPtr = builder.genBitcast(
         getElementPtrType(resType), srcMemRefDesc.allocatedPtr(rewriter, loc));
     Value alignedPtr = builder.genBitcast(
@@ -344,7 +344,7 @@ class ConstructorPattern final
 
     ModuleOp module = op.getOperation()->getParentOfType<ModuleOp>();
     FuncBuilder builder(rewriter, op.getLoc());
-    func::CallOp funcCall = builder.genCall(op.MangledName(), TypeRange(),
+    func::CallOp funcCall = builder.genCall(op.getMangledName(), TypeRange(),
                                             op.getOperands(), module);
     rewriter.eraseOp(op);
     (void)funcCall;

mlir-sycl/lib/Dialect/IR/CMakeLists.txt

@@ -13,7 +13,7 @@ if (TARGET MLIRArithmetic)
     )
 else()
   set(MLIR_LIBS_TO_LINK
-    MLIRArithmeticDialect
+    MLIRArithDialect
     MLIRCallInterfaces
     MLIRCastInterfaces
     MLIRControlFlowInterfaces

polygeist/include/polygeist/BarrierUtils.h

@@ -17,7 +17,7 @@
 #include "mlir/IR/Block.h"
 #include "polygeist/Ops.h"
 #include "llvm/ADT/SetVector.h"
-#include <mlir/Dialect/Arithmetic/IR/Arithmetic.h>
+#include <mlir/Dialect/Arith/IR/Arith.h>
 
 std::pair<mlir::Block *, mlir::Block::iterator>
 findInsertionPointAfterLoopOperands(mlir::scf::ParallelOp op);

polygeist/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(); }
   }];
 }