[SYCL-MLIR] Refactor SYCL passes (#8092)

Follow conventions used in other upstream MLIR dialects and avoid using
deprecated pass definition mechanisms.

This also allows us to pass per-pass options to our current passes if we
define them beforehand.

Signed-off-by: Victor Perez <[email protected]>

Author: victor-eds

mlir-sycl/include/mlir/Conversion/SYCLToLLVM/SYCLToLLVMPass.h

@@ -20,6 +20,10 @@ namespace mlir {
 class ModuleOp;
 template <typename T> class OperationPass;
 
+#define GEN_PASS_DECL_CONVERTSYCLTOLLVM
+#include "mlir/Conversion/SYCLPasses.h.inc"
+#undef GEN_PASS_DECL_CONVERTSYCLTOLLVM
+
 namespace sycl {
 
 /// Creates a pass to convert SYCL operations to the LLVMIR dialect.

mlir-sycl/lib/Conversion/PassDetail.h

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Conversion/SYCLToLLVM/SYCLToLLVMPass.h"
-#include "../PassDetail.h"
+
 #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h"
 #include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "mlir/Conversion/SYCLToLLVM/SYCLToLLVM.h"
@@ -20,10 +20,16 @@
 
 using namespace mlir;
 
+namespace mlir {
+#define GEN_PASS_DEF_CONVERTSYCLTOLLVM
+#include "mlir/Conversion/SYCLPasses.h.inc"
+#undef GEN_PASS_DEF_CONVERTSYCLTOLLVM
+} // namespace mlir
+
 namespace {
 /// A pass converting MLIR SYCL operations into LLVM dialect.
 class ConvertSYCLToLLVMPass
-    : public ConvertSYCLToLLVMBase<ConvertSYCLToLLVMPass> {
+    : public impl::ConvertSYCLToLLVMBase<ConvertSYCLToLLVMPass> {
   void runOnOperation() override;
 };
 } // namespace

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

@@ -19,17 +19,23 @@
 #include "mlir/Dialect/SYCL/MethodUtils.h"
 #include "mlir/Dialect/SYCL/Transforms/Passes.h"
 
-#include "PassDetail.h"
 #include "mlir/Dialect/SYCL/IR/SYCLOps.h"
 #include "mlir/IR/FunctionInterfaces.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Rewrite/FrozenRewritePatternSet.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
 #include "polygeist/Ops.h"
+#include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "sycl-method-to-sycl-call"
 
+namespace mlir {
+#define GEN_PASS_DEF_SYCLMETHODTOSYCLCALL
+#include "mlir/Dialect/SYCL/Transforms/Passes.h.inc"
+#undef GEN_PASS_DEF_SYCLMETHODTOSYCLCALL
+} // namespace mlir
+
 using namespace mlir;
 using namespace sycl;
 
@@ -207,7 +213,8 @@ static void addSYCLMethodPatterns(RewritePatternSet &patterns) {
       >(patterns);
 }
 
-struct SYCLMethodToSYCLCall : SYCLMethodToSYCLCallBase<SYCLMethodToSYCLCall> {
+struct SYCLMethodToSYCLCall
+    : impl::SYCLMethodToSYCLCallBase<SYCLMethodToSYCLCall> {
   LogicalResult initialize(MLIRContext *context) final {
     RewritePatternSet owningPatterns(context);
     addSYCLMethodPatterns(owningPatterns);