[SYCL-MLIR]: Fix warnings (#8410)

Fix the following issues in the SYCL-MLIR codebase:
- adapt SYCL-MLIR and Polygeist dialects to MLIR improved `fold` method
signature
(https://discourse.llvm.org/t/psa-new-improved-fold-method-signature-has-landed-please-update-your-downstream-projects/67618)
- warning: 'makeArrayRef<const char *, 6>' is deprecated: Use deduction
guide instead (https://reviews.llvm.org/D140896)
  - fix some clang-tidy warnings

---------

Signed-off-by: Tiotto, Ettore <[email protected]>

Author: etiotto

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

@@ -33,6 +33,7 @@ def SYCL_Dialect : Dialect {
   let name = "sycl";
   let cppNamespace = "::mlir::sycl";
   let useDefaultTypePrinterParser = 1;
+  let useFoldAPI = kEmitFoldAdaptorFolder;
   let extraClassDeclaration = [{
     MethodRegistry methods;
 

polygeist/include/mlir/Dialect/Polygeist/IR/PolygeistBase.td

@@ -15,6 +15,7 @@ def Polygeist_Dialect : Dialect {
   let name = "polygeist";
   let cppNamespace = "::mlir::polygeist";
   let description = [{}];
+  let useFoldAPI = kEmitFoldAdaptorFolder;
 }
 
 #endif // POLYGEIST_BASE

polygeist/lib/Dialect/Polygeist/IR/Ops.cpp

@@ -97,8 +97,7 @@ bool getEffectsBefore(Operation *op,
       if (isa<BarrierOp>(it)) {
         if (stopAtBarrier)
           return true;
-        else
-          continue;
+        continue;
       }
       if (!collectEffects(it, effects, /* ignoreBarriers */ true))
         return false;
@@ -259,7 +258,7 @@ class BarrierHoist final : public OpRewritePattern<BarrierOp> {
     // Move barrier into after region and after loop, if possible
     if (auto whileOp = dyn_cast<scf::WhileOp>(barrier->getParentOp())) {
       if (barrier->getParentRegion() == &whileOp.getBefore()) {
-        auto cond = whileOp.getBefore().front().getTerminator();
+        auto *cond = whileOp.getBefore().front().getTerminator();
 
         bool above = true;
         for (Operation *it = cond; it != nullptr; it = it->getPrevNode()) {
@@ -289,7 +288,7 @@ bool isCaptured(Value v, Operation *potentialUser = nullptr,
   SmallVector<Value> todo = {v};
   while (todo.size()) {
     Value v = todo.pop_back_val();
-    for (auto u : v.getUsers()) {
+    for (auto *u : v.getUsers()) {
       if (seenuse && u == potentialUser)
         *seenuse = true;
       if (isa<memref::LoadOp, LLVM::LoadOp, AffineLoadOp, polygeist::CacheLoad>(
@@ -1408,7 +1407,7 @@ class SetSimplification final : public OpRewritePattern<T> {
   }
 };
 
-OpFoldResult Memref2PointerOp::fold(ArrayRef<Attribute> operands) {
+OpFoldResult Memref2PointerOp::fold(FoldAdaptor operands) {
   if (auto subindex = getSource().getDefiningOp<SubIndexOp>()) {
     if (auto cop = subindex.getIndex().getDefiningOp<ConstantIndexOp>()) {
       if (cop.value() == 0) {
@@ -1920,7 +1919,7 @@ void Pointer2MemrefOp::getCanonicalizationPatterns(RewritePatternSet &results,
       MoveIntoIfs, MoveOutOfIfs, IfAndLazy>(context);
 }
 
-OpFoldResult Pointer2MemrefOp::fold(ArrayRef<Attribute> operands) {
+OpFoldResult Pointer2MemrefOp::fold(FoldAdaptor operands) {
   /// Simplify pointer2memref(bitcast(x)) to pointer2memref(x)
   if (auto mc = getSource().getDefiningOp<LLVM::BitcastOp>()) {
     getSourceMutable().assign(mc.getArg());
@@ -1948,7 +1947,7 @@ OpFoldResult Pointer2MemrefOp::fold(ArrayRef<Attribute> operands) {
   return nullptr;
 }
 
-OpFoldResult SubIndexOp::fold(ArrayRef<Attribute> operands) {
+OpFoldResult SubIndexOp::fold(FoldAdaptor operands) {
   if (getResult().getType() == getSource().getType()) {
     if (matchPattern(getIndex(), m_Zero()))
       return getSource();
@@ -1964,7 +1963,7 @@ OpFoldResult SubIndexOp::fold(ArrayRef<Attribute> operands) {
   return nullptr;
 }
 
-OpFoldResult TypeSizeOp::fold(ArrayRef<Attribute> operands) {
+OpFoldResult TypeSizeOp::fold(FoldAdaptor operands) {
   Type T = getSourceAttr().getValue();
   if (T.isa<IntegerType, FloatType>() || LLVM::isCompatibleType(T)) {
     DataLayout DLI(((Operation *)*this)->getParentOfType<ModuleOp>());
@@ -1994,7 +1993,7 @@ void TypeSizeOp::getCanonicalizationPatterns(RewritePatternSet &results,
   results.insert<TypeSizeCanonicalize>(context);
 }
 
-OpFoldResult TypeAlignOp::fold(ArrayRef<Attribute> operands) {
+OpFoldResult TypeAlignOp::fold(FoldAdaptor operands) {
   Type T = getSourceAttr().getValue();
   if (T.isa<IntegerType, FloatType>() || LLVM::isCompatibleType(T)) {
     DataLayout DLI(((Operation *)*this)->getParentOfType<ModuleOp>());
@@ -2267,7 +2266,7 @@ struct AlwaysAllocaScopeHoister : public OpRewritePattern<T> {
       // lastParentWithoutScope (i.e. where we would hoist to), skip.
       if (llvm::any_of(alloc->getOperands(), [&](Value v) { return !fix(v); }))
         return WalkResult::skip();
-      for (auto s : subHoist)
+      for (auto *s : subHoist)
         toHoist.insert(s);
       toHoist.insert(alloc);
       return WalkResult::advance();

polygeist/lib/Dialect/Polygeist/Transforms/Utils.h

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 namespace llvm {
-template <typename T> struct SmallVectorImpl;
+template <typename T> class SmallVectorImpl;
 } // namespace llvm
 
 namespace mlir {

polygeist/tools/cgeist/driver.cc

@@ -96,8 +96,8 @@ std::string GetExecutablePath(const char *Argv0, bool CanonicalPrefixes) {
 
   // This just needs to be some symbol in the binary; C++ doesn't
   // allow taking the address of ::main however.
-  void *P = (void *)(intptr_t)GetExecutablePath;
-  return llvm::sys::fs::getMainExecutable(Argv0, P);
+  return llvm::sys::fs::getMainExecutable(
+      Argv0, reinterpret_cast<void *>(GetExecutablePath));
 }
 
 static int executeCC1Tool(llvm::SmallVectorImpl<const char *> &ArgV) {
@@ -111,15 +111,15 @@ static int executeCC1Tool(llvm::SmallVectorImpl<const char *> &ArgV) {
   llvm::StringSaver Saver(A);
   llvm::cl::ExpandResponseFiles(Saver, &llvm::cl::TokenizeGNUCommandLine, ArgV);
   llvm::StringRef Tool = ArgV[1];
-  void *GetExecutablePathVP = (void *)(intptr_t)GetExecutablePath;
+  void *GetExecutablePathVP = reinterpret_cast<void *>(GetExecutablePath);
+  llvm::ArrayRef<const char *> argv{ArgV};
+
   if (Tool == "-cc1")
-    return cc1_main(makeArrayRef(ArgV).slice(1), ArgV[0], GetExecutablePathVP);
+    return cc1_main(argv.slice(1), ArgV[0], GetExecutablePathVP);
   if (Tool == "-cc1as")
-    return cc1as_main(makeArrayRef(ArgV).slice(2), ArgV[0],
-                      GetExecutablePathVP);
+    return cc1as_main(argv.slice(2), ArgV[0], GetExecutablePathVP);
   if (Tool == "-cc1gen-reproducer")
-    return cc1gen_reproducer_main(makeArrayRef(ArgV).slice(2), ArgV[0],
-                                  GetExecutablePathVP);
+    return cc1gen_reproducer_main(argv.slice(2), ArgV[0], GetExecutablePathVP);
   // Reject unknown tools.
   llvm::errs() << "error: unknown integrated tool '" << Tool << "'. "
                << "Valid tools include '-cc1' and '-cc1as'.\n";
@@ -1076,7 +1076,7 @@ int main(int argc, char **argv) {
     for (int I = 0; I < argc; I++)
       Args.push_back(argv[I]);
 
-    llvm::ArrayRef<const char *> Argv = makeArrayRef(Args);
+    llvm::ArrayRef<const char *> Argv{Args};
     const llvm::opt::OptTable &OptTbl = clang::driver::getDriverOptTable();
     const unsigned IncludedFlagsBitmask = clang::driver::options::CC1AsOption;
     unsigned MissingArgIndex, MissingArgCount;