Revert "[SYCL-MLIR][NFC] Restructure Polygeist dialect" (#8356)

Reverts #8266

Author: etiotto

mlir-sycl/include/mlir/Dialect/SYCL/Transforms/Passes.h

@@ -17,7 +17,8 @@
 
 #include "mlir/Pass/Pass.h"
 
-#include "mlir/Dialect/Polygeist/IR/Polygeist.h"
+#include "polygeist/Dialect.h"
+#include "polygeist/Passes/Passes.h"
 
 namespace mlir {
 namespace sycl {

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

@@ -16,13 +16,13 @@
 #include "mlir/Conversion/SYCLToLLVM/DialectBuilder.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/Dialect/Polygeist/Utils/Utils.h"
 #include "mlir/Dialect/SYCL/IR/SYCLOps.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
+#include "polygeist/Passes/Utils.h"
 #include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "sycl-to-llvm"

mlir-sycl/lib/Dialect/IR/MethodUtils.cpp

@@ -10,10 +10,10 @@
 
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
-#include "mlir/Dialect/Polygeist/IR/Ops.h"
 #include "mlir/Dialect/SYCL/IR/SYCLOps.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/ValueRange.h"
+#include "polygeist/Ops.h"
 #include "llvm/ADT/TypeSwitch.h"
 
 #include <algorithm>

mlir-sycl/lib/Transforms/SYCLMethodToSYCLCall.cpp

@@ -25,7 +25,7 @@
 #include "mlir/Rewrite/FrozenRewritePatternSet.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
-#include "mlir/Dialect/Polygeist/IR/Ops.h"
+#include "polygeist/Ops.h"
 #include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "sycl-method-to-sycl-call"

polygeist/include/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(mlir)
+add_subdirectory(polygeist)

polygeist/include/mlir/CMakeLists.txt

@@ -1,25 +1,24 @@
-//===- BarrierUtils.h - Utilities for barrier removal ------------* C++ -*-===//
+//===- BarrierUtil.h - Utilities for barrier removal --------* C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_POLYGEIST_UTILS_BARRIERUTILS_H_
-#define MLIR_DIALECT_POLYGEIST_UTILS_BARRIERUTILS_H_
+#ifndef MLIR_LIB_DIALECT_SCF_TRANSFORMS_BARRIERUTILS_H_
+#define MLIR_LIB_DIALECT_SCF_TRANSFORMS_BARRIERUTILS_H_
 
 #include "mlir/Analysis/DataLayoutAnalysis.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
-#include "mlir/Dialect/Polygeist/IR/Ops.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/IR/Block.h"
+#include "polygeist/Ops.h"
 #include "llvm/ADT/SetVector.h"
 #include <mlir/Dialect/Arith/IR/Arith.h>
 
-namespace mlir {
 std::pair<mlir::Block *, mlir::Block::iterator>
 findInsertionPointAfterLoopOperands(mlir::scf::ParallelOp op);
 
@@ -73,6 +72,5 @@ static T allocateTemporaryBuffer(mlir::OpBuilder &rewriter, mlir::Value value,
   auto type = MemRefType::get(bufferSize, ty);
   return rewriter.create<T>(value.getLoc(), type, iterationCounts);
 }
-} // namespace mlir
 
-#endif // MLIR_DIALECT_POLYGEIST_UTILS_BARRIERUTILS_H_
+#endif // MLIR_LIB_DIALECT_SCF_TRANSFORMS_BARRIERUTILS_H_

polygeist/include/mlir/Conversion/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_mlir_dialect(PolygeistOps polygeist)
+add_mlir_doc(PolygeistDialect -gen-dialect-doc PolygeistDialect Polygeist/)
+add_mlir_doc(PolygeistOps -gen-op-doc PolygeistOps Polygeist/)
+
+add_subdirectory(Passes)

polygeist/include/mlir/Conversion/PolygeistPasses.h

@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_POLYGEIST_IR_POLYGEIST_H_
-#define MLIR_DIALECT_POLYGEIST_IR_POLYGEIST_H_
+#ifndef BFV_BFVDIALECT_H
+#define BFV_BFVDIALECT_H
 
 #include "mlir/IR/Dialect.h"
 
-#include "mlir/Dialect/Polygeist/IR/PolygeistOpsDialect.h.inc"
+#include "polygeist/PolygeistOpsDialect.h.inc"
 
-#endif // MLIR_DIALECT_POLYGEIST_IR_POLYGEIST_H_
+#endif // BFV_BFVDIALECT_H

polygeist/include/mlir/Conversion/PolygeistPasses.td

@@ -0,0 +1,31 @@
+//===- BFVDialect.td - BFV dialect -----------*- tablegen -*-===//
+//
+// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef POLYGEIST_DIALECT
+#define POLYGEIST_DIALECT
+
+include "mlir/IR/OpBase.td"
+
+//===----------------------------------------------------------------------===//
+// BFV dialect definition.
+//===----------------------------------------------------------------------===//
+
+def Polygeist_Dialect : Dialect {
+  let name = "polygeist";
+  let description = [{}];
+  let cppNamespace = "::mlir::polygeist";
+}
+
+//===----------------------------------------------------------------------===//
+// Base BFV operation definition.
+//===----------------------------------------------------------------------===//
+
+class Polygeist_Op<string mnemonic, list<Trait> traits = []>
+    : Op<Polygeist_Dialect, mnemonic, traits>;
+
+#endif // POLYGEIST_DIALECT

polygeist/include/mlir/Conversion/PolygeistToLLVM/PolygeistToLLVMPass.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_POLYGEIST_IR_OPS_H_
-#define MLIR_DIALECT_POLYGEIST_IR_OPS_H_
+#ifndef POLYGEISTOPS_H
+#define POLYGEISTOPS_H
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
@@ -22,7 +22,7 @@
 #include "llvm/Support/CommandLine.h"
 
 #define GET_OP_CLASSES
-#include "mlir/Dialect/Polygeist/IR/PolygeistOps.h.inc"
+#include "polygeist/PolygeistOps.h.inc"
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
@@ -147,4 +147,4 @@ class BarrierElim final
   }
 };
 
-#endif // MLIR_DIALECT_POLYGEIST_IR_OPS_H_
+#endif // POLYGEISTOPS_H

polygeist/include/mlir/Dialect/CMakeLists.txt

@@ -1,6 +1,5 @@
 set(LLVM_TARGET_DEFINITIONS Passes.td)
-mlir_tablegen(Passes.h.inc -gen-pass-decls -name Polygeist)
+mlir_tablegen(Passes.h.inc -gen-pass-decls -name polygeist)
 add_public_tablegen_target(MLIRPolygeistPassIncGen)
-add_dependencies(mlir-headers MLIRPolygeistPassIncGen)
 
 add_mlir_doc(Passes PolygeistPasses ./ -gen-pass-doc)

polygeist/include/mlir/Dialect/Polygeist/CMakeLists.txt

@@ -1,28 +1,14 @@
-#ifndef MLIR_DIALECT_POLYGEIST_TRANSFORMS_PASSES_H
-#define MLIR_DIALECT_POLYGEIST_TRANSFORMS_PASSES_H
+#ifndef POLYGEIST_DIALECT_POLYGEIST_PASSES_H
+#define POLYGEIST_DIALECT_POLYGEIST_PASSES_H
 
+#include "mlir/Conversion/LLVMCommon/LoweringOptions.h"
 #include "mlir/Pass/Pass.h"
-
 #include <memory>
-
 namespace mlir {
 class PatternRewriter;
 class DominanceInfo;
 class LLVMTypeConverter;
 namespace polygeist {
-//===----------------------------------------------------------------------===//
-// Patterns
-//===----------------------------------------------------------------------===//
-
-/// Collect a set of patterns to convert memory-related operations from the
-/// MemRef dialect to the LLVM dialect forcing a "bare pointer" calling
-/// convention.
-void populateBareMemRefToLLVMConversionPatterns(LLVMTypeConverter &converter,
-                                                RewritePatternSet &patterns);
-
-#define GEN_PASS_DECL
-#include "mlir/Dialect/Polygeist/Transforms/Passes.h.inc"
-
 std::unique_ptr<Pass> createParallelLICMPass();
 std::unique_ptr<Pass> createMem2RegPass();
 std::unique_ptr<Pass> createLoopRestructurePass();
@@ -37,15 +23,49 @@ std::unique_ptr<Pass> detectReductionPass();
 std::unique_ptr<Pass> createRemoveTrivialUsePass();
 std::unique_ptr<Pass> createParallelLowerPass();
 std::unique_ptr<Pass> createLegalizeForSPIRVPass();
+std::unique_ptr<Pass>
+createConvertPolygeistToLLVMPass(const LowerToLLVMOptions &options);
+std::unique_ptr<Pass> createConvertPolygeistToLLVMPass();
 
-//===----------------------------------------------------------------------===//
-// Registration
-//===----------------------------------------------------------------------===//
-
-#define GEN_PASS_REGISTRATION
-#include "mlir/Dialect/Polygeist/Transforms/Passes.h.inc"
+/// Collect a set of patterns to convert memory-related operations from the
+/// MemRef dialect to the LLVM dialect forcing a "bare pointer" calling
+/// convention.
+void populateBareMemRefToLLVMConversionPatterns(LLVMTypeConverter &converter,
+                                                RewritePatternSet &patterns);
 
 } // namespace polygeist
 } // namespace mlir
 
-#endif // MLIR_DIALECT_POLYGEIST_TRANSFORMS_PASSES_H
+void fully2ComposeAffineMapAndOperands(
+    mlir::PatternRewriter &rewriter, mlir::AffineMap *map,
+    llvm::SmallVectorImpl<mlir::Value> *operands, mlir::DominanceInfo &DI);
+bool isValidIndex(mlir::Value val);
+
+namespace mlir {
+// Forward declaration from Dialect.h
+template <typename ConcreteDialect>
+void registerDialect(DialectRegistry &registry);
+
+namespace scf {
+class SCFDialect;
+} // end namespace scf
+
+namespace memref {
+class MemRefDialect;
+} // end namespace memref
+
+namespace func {
+class FuncDialect;
+}
+
+class AffineDialect;
+namespace LLVM {
+class LLVMDialect;
+}
+
+#define GEN_PASS_REGISTRATION
+#include "polygeist/Passes/Passes.h.inc"
+
+} // end namespace mlir
+
+#endif // POLYGEIST_DIALECT_POLYGEIST_PASSES_H