Pretty close

Author: ivanradanov

include/mlir/Dialect/Polygeist/Transforms/Passes.h

@@ -6,7 +6,7 @@
 #include "mlir/Dialect/OpenMP/OpenMPDialect.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "polygeist/Dialect.h"
+#include "mlir/Dialect/Polygeist/IR/PolygeistDialect.h"
 #include <memory>
 
 enum PolygeistAlternativesMode { PAM_Static, PAM_PGO_Profile, PAM_PGO_Opt };
@@ -128,7 +128,7 @@ class LLVMDialect;
 }
 
 #define GEN_PASS_REGISTRATION
-#include "polygeist/Passes/Passes.h.inc"
+#include "mlir/Dialect/Polygeist/Transforms/Passes.h.inc"
 
 } // end namespace mlir
 

lib/Dialect/Polygeist/Transforms/RuntimeWrapperUtils.h renamed to include/mlir/Dialect/Polygeist/Utils/RuntimeWrapperUtils.h

@@ -56,7 +56,7 @@
 #include <map>
 #include <numeric>
 
-#include "RuntimeWrapperUtils.h"
+#include "mlir/Dialect/Polygeist/Utils/RuntimeWrapperUtils.h"
 
 extern llvm::cl::opt<bool> EmitROCM;
 

lib/Conversion/PolygeistToLLVM/PolygeistToLLVM.cpp

@@ -27,7 +27,7 @@
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
-#include "polygeist/BarrierUtils.h"
+#include "mlir/Dialect/Polygeist/Utils/BarrierUtils.h"
 #include "mlir/Dialect/Polygeist/Transforms/Passes.h"
 
 using namespace mlir;

lib/Dialect/Polygeist/Transforms/BarrierRemovalContinuation.cpp

@@ -27,18 +27,18 @@
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "mlir/Transforms/RegionUtils.h"
-#include "polygeist/BarrierUtils.h"
+#include "mlir/Dialect/Polygeist/Utils/BarrierUtils.h"
 #include "mlir/Dialect/Polygeist/IR/PolygeistOps.h"
 #include "mlir/Dialect/Polygeist/Transforms/Passes.h"
-#include "polygeist/Passes/Utils.h"
+#include "mlir/Dialect/Polygeist/Transforms/Utils.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
 
 #include <llvm/ADT/StringRef.h>
 #include <optional>
 
 #include "ParallelLoopUnroll.h"
-#include "RuntimeWrapperUtils.h"
+#include "mlir/Dialect/Polygeist/Utils/RuntimeWrapperUtils.h"
 
 static llvm::cl::opt<bool> GPUKernelEmitCoarsenedAlternatives(
     "gpu-kernel-emit-coarsened-alternatives", llvm::cl::init(false),

lib/Dialect/Polygeist/Transforms/ConvertParallelToGPU.cpp

@@ -13,7 +13,7 @@
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
 #include "mlir/Dialect/Polygeist/Transforms/Passes.h"
-#include "polygeist/Passes/Utils.h"
+#include "mlir/Dialect/Polygeist/Transforms/Utils.h"
 #include "llvm/ADT/STLExtras.h"
 #include <memory>
 

lib/Dialect/Polygeist/Transforms/ConvertToOpaquePtr.cpp

@@ -14,7 +14,7 @@
 
 #include "mlir/Dialect/Polygeist/IR/PolygeistOps.h"
 #include "mlir/Dialect/Polygeist/Transforms/Passes.h"
-#include "polygeist/Passes/Utils.h"
+#include "mlir/Dialect/Polygeist/Transforms/Utils.h"
 
 using namespace mlir;
 using namespace polygeist;

lib/Dialect/Polygeist/Transforms/LowerAlternatives.cpp

@@ -23,10 +23,10 @@
 #include "mlir/Support/LLVM.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-#include "polygeist/BarrierUtils.h"
+#include "mlir/Dialect/Polygeist/Utils/BarrierUtils.h"
 #include "mlir/Dialect/Polygeist/IR/PolygeistOps.h"
 #include "mlir/Dialect/Polygeist/Transforms/Passes.h"
-#include "polygeist/Passes/Utils.h"
+#include "mlir/Dialect/Polygeist/Transforms/Utils.h"
 
 #include <cmath>
 #include <deque>

lib/Dialect/Polygeist/Transforms/ParallelLoopDistribute.cpp

@@ -38,7 +38,7 @@
 #include <mutex>
 #include <regex>
 
-#include "RuntimeWrapperUtils.h"
+#include "mlir/Dialect/Polygeist/Utils/RuntimeWrapperUtils.h"
 
 #define DEBUG_TYPE "parallel-lower-opt"
 

lib/Dialect/Polygeist/Transforms/ParallelLower.cpp

@@ -34,7 +34,7 @@
 #include <set>
 
 #include "mlir/Dialect/Polygeist/IR/PolygeistOps.h"
-#include "polygeist/Passes/Utils.h"
+#include "mlir/Dialect/Polygeist/Transforms/Utils.h"
 
 #define DEBUG_TYPE "mem2reg"