cmake

Author: ivanradanov

include/CMakeLists.txt

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

include/mlir/Conversion/PolygeistToLLVM/PolygeistPasses.h renamed to include/mlir/Conversion/PolygeistPasses.h

@@ -1,5 +1 @@
 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)

include/mlir/Conversion/PolygeistToLLVM/PolygeistPasses.td renamed to include/mlir/Conversion/PolygeistPasses.td

@@ -1,16 +1,16 @@
-//===- BFVDialect.h - BFV dialect -----------------*- C++ -*-===//
+//===- PolygeistDialect.h - Polygeist dialect -------------------*- C++ -*-===//
 //
 // 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 BFV_BFVDIALECT_H
-#define BFV_BFVDIALECT_H
+#ifndef MLIR_DIALECT_POLYGEIST_IR_POLYGEISTDIALECT_H
+#define MLIR_DIALECT_POLYGEIST_IR_POLYGEISTDIALECT_H
 
 #include "mlir/IR/Dialect.h"
 
-#include "polygeist/PolygeistOpsDialect.h.inc"
+#include "mlir/Dialect/Polygeist/IR/PolygeistOpsDialect.h.inc"
 
-#endif // BFV_BFVDIALECT_H
+#endif // MLIR_DIALECT_POLYGEIST_IR_POLYGEISTDIALECT_H

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

@@ -1,17 +1,17 @@
-//===- Polygeistps.h - Polygeist dialect ops --------------------*- C++ -*-===//
+//===--- PolygeistOps.h ---------------------------------------------------===//
 //
 // 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 POLYGEISTOPS_H
-#define POLYGEISTOPS_H
+#ifndef MLIR_DIALECT_POLYGEIST_IR_POLYGEISTOPS_H
+#define MLIR_DIALECT_POLYGEIST_IR_POLYGEISTOPS_H
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
-#include "mlir/Dialect/GPU/IR/GPUDialect.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/Polygeist/IR/PolygeistTypes.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
@@ -23,7 +23,7 @@
 #include "llvm/Support/CommandLine.h"
 
 #define GET_OP_CLASSES
-#include "polygeist/PolygeistOps.h.inc"
+#include "mlir/Dialect/Polygeist/IR/PolygeistOps.h.inc"
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
@@ -81,9 +81,8 @@ class BarrierElim final
     }
 
     Operation *op = barrier;
-    if (NotTopLevel &&
-        isa<mlir::scf::ParallelOp, mlir::affine::AffineParallelOp>(
-            barrier->getParentOp()))
+    if (NotTopLevel && isa<mlir::scf::ParallelOp, affine::AffineParallelOp>(
+                           barrier->getParentOp()))
       return failure();
 
     {
@@ -149,84 +148,4 @@ class BarrierElim final
   }
 };
 
-struct ValueOrInt {
-  bool isValue;
-  mlir::Value v_val;
-  int64_t i_val;
-  ValueOrInt(mlir::Value v) { initValue(v); }
-  void initValue(mlir::Value v) {
-    using namespace mlir;
-    if (v) {
-      IntegerAttr iattr;
-      if (matchPattern(v, m_Constant(&iattr))) {
-        i_val = iattr.getValue().getSExtValue();
-        v_val = nullptr;
-        isValue = false;
-        return;
-      }
-    }
-    isValue = true;
-    v_val = v;
-  }
-
-  ValueOrInt(size_t i) : isValue(false), v_val(), i_val(i) {}
-
-  bool operator>=(int64_t v) {
-    if (isValue)
-      return false;
-    return i_val >= v;
-  }
-  bool operator>(int64_t v) {
-    if (isValue)
-      return false;
-    return i_val > v;
-  }
-  bool operator==(int64_t v) {
-    if (isValue)
-      return false;
-    return i_val == v;
-  }
-  bool operator<(int64_t v) {
-    if (isValue)
-      return false;
-    return i_val < v;
-  }
-  bool operator<=(int64_t v) {
-    if (isValue)
-      return false;
-    return i_val <= v;
-  }
-  bool operator>=(llvm::APInt v) {
-    if (isValue)
-      return false;
-    return i_val >= v.getSExtValue();
-  }
-  bool operator>(llvm::APInt v) {
-    if (isValue)
-      return false;
-    return i_val > v.getSExtValue();
-  }
-  bool operator==(llvm::APInt v) {
-    if (isValue)
-      return false;
-    return i_val == v.getSExtValue();
-  }
-  bool operator<(llvm::APInt v) {
-    if (isValue)
-      return false;
-    return i_val < v.getSExtValue();
-  }
-  bool operator<=(llvm::APInt v) {
-    if (isValue)
-      return false;
-    return i_val <= v.getSExtValue();
-  }
-};
-
-enum class Cmp { EQ, LT, LE, GT, GE };
-
-bool valueCmp(Cmp cmp, mlir::AffineExpr expr, size_t numDim,
-              mlir::ValueRange operands, ValueOrInt val);
-
-bool valueCmp(Cmp cmp, mlir::Value bval, ValueOrInt val);
-#endif // POLYGEISTOPS_H
+#endif // MLIR_DIALECT_POLYGEIST_IR_POLYGEISTOPS_H

include/mlir/Dialect/Polygeist/IR/PolygeistDialect.h

@@ -1,4 +1,4 @@
-//===- Polygeist.td - Polygeist dialect ops ----------------*- tablegen -*-===//
+//===- PolygeistOps.td - Polygeist op definitions ----------*- tablegen -*-===//
 //
 // This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,47 +9,15 @@
 #ifndef POLYGEIST_OPS
 #define POLYGEIST_OPS
 
-include "Dialect.td"
-include "mlir/Interfaces/SideEffectInterfaces.td"
-include "mlir/Interfaces/ViewLikeInterface.td"
-include "mlir/Interfaces/ControlFlowInterfaces.td"
-include "mlir/IR/SymbolInterfaces.td"
-
 include "mlir/Dialect/LLVMIR/LLVMOpBase.td"
 include "mlir/Dialect/LLVMIR/LLVMInterfaces.td"
+include "mlir/Dialect/Polygeist/IR/PolygeistBase.td"
+include "mlir/Dialect/Polygeist/IR/PolygeistTypes.td"
+include "mlir/Interfaces/SideEffectInterfaces.td"
+include "mlir/Interfaces/ViewLikeInterface.td"
 
-def UndefOp
-    : Polygeist_Op<"undef", [Pure]> {
-  let summary = "More flexible undef op";
-  let skipDefaultBuilders = 1;
-  let results = (outs AnyType:$result);
-  let builders = [
-    OpBuilder<(ins "Type":$type), [{
-      $_state.types.push_back(type);
-    }]>];
-  let hasCanonicalizer = true;
-}
-
-def NoopOp
-    : Polygeist_Op<"noop",
-                   [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
-  let summary = "Noop for preventing folding or transformations";
-  let arguments = (ins Variadic<Index>:$blockDims);
-  let skipDefaultBuilders = 1;
-  let builders = [
-      OpBuilder<(ins "ValueRange":$indices)>];
-  let description = [{}];
-}
-
-def GetDeviceGlobalOp
-    : Polygeist_Op<"get_device_global",
-                   [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>,
-                    DeclareOpInterfaceMethods<SymbolUserOpInterface>]> {
-  let summary = "";
-  let arguments = (ins FlatSymbolRefAttr:$name);
-  let results = (outs AnyStaticShapeMemRef:$result);
-  let description = [{}];
-}
+class Polygeist_Op<string mnemonic, list<Trait> traits = []>
+    : Op<Polygeist_Dialect, mnemonic, traits>;
 
 def CacheLoad
     : Polygeist_Op<"cacheload"> {
@@ -60,7 +28,7 @@ def CacheLoad
   let results = (outs AnyType:$result);
   let builders = [
     OpBuilder<(ins "Value":$memref, CArg<"ValueRange", "{}">:$indices), [{
-      auto memrefType = memref.getType().cast<MemRefType>();
+      auto memrefType = cast<MemRefType>(memref.getType());
       $_state.addOperands(memref);
       $_state.addOperands(indices);
       $_state.types.push_back(memrefType.getElementType());
@@ -100,73 +68,6 @@ def SubIndexOp : Polygeist_Op<"subindex", [
   }];
 }
 
-def GPUBlockOp : Polygeist_Op<"gpu_block", [
-  RecursiveMemoryEffects,
-  SingleBlockImplicitTerminator<"polygeist::PolygeistYieldOp">]>,
-  Arguments<(ins Index:$blockIndexX, Index:$blockIndexY, Index:$blockIndexZ)> {
-  let summary = "Wraps a GPU kernel block to prevent restructuring";
-  let regions = (region SizedRegion<1>:$region);
-  let skipDefaultBuilders = 1;
-  let builders = [OpBuilder<(ins
-      "Value":$blockIndexX, "Value":$blockIndexY, "Value":$blockIndexZ)>];
-}
-
-def GPUThreadOp : Polygeist_Op<"gpu_thread", [
-  RecursiveMemoryEffects,
-  SingleBlockImplicitTerminator<"polygeist::PolygeistYieldOp">]>,
-  Arguments<(ins Index:$threadIndexX, Index:$threadIndexY, Index:$threadIndexZ)> {
-  let summary = "Wraps a GPU kernel thread to prevent restructuring";
-  let regions = (region SizedRegion<1>:$region);
-  let skipDefaultBuilders = 1;
-  let builders = [OpBuilder<(ins
-      "Value":$threadIndexX, "Value":$threadIndexY, "Value":$threadIndexZ)>];
-}
-
-def AlternativesOp : Polygeist_Op<"alternatives", [
-  RecursiveMemoryEffects]> {
-  let summary = "Provides several alternatives kernels for gpu code";
-  let regions = (region VariadicRegion<SizedRegion<1>>:$regions);
-  let skipDefaultBuilders = 1;
-  let builders = [OpBuilder<(ins "int":$regionNum)>];
-  let hasCanonicalizer = 1;
-}
-
-def GPUWrapperOp : Polygeist_Op<"gpu_wrapper", [
-  RecursiveMemoryEffects,
-  AutomaticAllocationScope,
-  SingleBlockImplicitTerminator<"polygeist::PolygeistYieldOp">]> {
-  let arguments = (ins Variadic<Index>:$blockDims);
-  let summary = "Indicates the region contained must be executed on the GPU";
-  let description = [{
-    The optional arguments to this operation are suggestions about what block
-    dimensions this gpu kernel should have - usually taken from kernel launch
-    params
-  }];
-  let results = (outs Index : $result);
-  let regions = (region SizedRegion<1>:$region);
-  let skipDefaultBuilders = 1;
-  let builders = [
-      OpBuilder<(ins "ValueRange":$blockSizes)>,
-      OpBuilder<(ins)>];
-}
-
-def GPUErrorOp : Polygeist_Op<"gpu_error", [
-  RecursiveMemoryEffects,
-  SingleBlockImplicitTerminator<"polygeist::PolygeistYieldOp">]>,
-  Arguments<(ins)> {
-  let summary = "Gets the error returned by the gpu operation inside";
-  // TODO should be i32, not index
-  let results = (outs Index : $result);
-  let regions = (region SizedRegion<1>:$region);
-  let skipDefaultBuilders = 1;
-  let builders = [OpBuilder<(ins)>];
-
-}
-
-def PolygeistYieldOp : Polygeist_Op<"polygeist_yield", [Pure, ReturnLike, Terminator,
-    ParentOneOf<["AlternativesOp", "GPUWrapperOp", "GPUErrorOp", "GPUBlockOp", "GPUThreadOp"]>]> {
-  let summary = "Polygeist ops terminator";
-}
 
 def StreamToTokenOp : Polygeist_Op<"stream2token", [
   Pure
@@ -191,27 +92,13 @@ def Memref2PointerOp : Polygeist_Op<"memref2pointer", [
 
   let hasFolder = 1;
   let hasCanonicalizer = 1;
+  let hasVerifier = 1;
 
   let extraClassDeclaration = [{
     ::mlir::Value getViewSource() { return getSource(); }
   }];
 }
 
-def MemrefCastOp : Polygeist_Op<"memref_cast", [
-  ViewLikeOpInterface, Pure
-]> {
-  let summary = "Cast memrefs like c/c++ pointers";
-
-  let arguments = (ins AnyMemRef : $source);
-  let results = (outs AnyMemRef : $result);
-
-  //let hasFolder = 1;
-  //let hasCanonicalizer = 1;
-  let extraClassDeclaration = [{
-    ::mlir::Value getViewSource() { return getSource(); }
-  }];
-}
-
 def Pointer2MemrefOp : Polygeist_Op<"pointer2memref", [
   ViewLikeOpInterface, Pure
 ]> {
@@ -222,21 +109,13 @@ def Pointer2MemrefOp : Polygeist_Op<"pointer2memref", [
 
   let hasFolder = 1;
   let hasCanonicalizer = 1;
+  let hasVerifier = 1;
 
   let extraClassDeclaration = [{
     ::mlir::Value getViewSource() { return getSource(); }
   }];
 }
 
-def GetFuncOp : Polygeist_Op<"get_func",
-    [Pure, DeclareOpInterfaceMethods<SymbolUserOpInterface>]> {
-  let summary = "get the pointer pointing to a function";
-  let arguments = (ins FlatSymbolRefAttr:$name);
-  let results = (outs LLVM_AnyPointer : $result);
-  // let assemblyFormat = "$name `:` type($result) attr-dict";
-  let hasCanonicalizer = 1;
-}
-
 def TrivialUseOp : Polygeist_Op<"trivialuse"> {
   let summary = "memref subview operation";
 

include/mlir/Dialect/Polygeist/IR/PolygeistOps.h

@@ -1,5 +1,4 @@
 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_mlir_doc(Passes PolygeistPasses ./ -gen-pass-doc)
+add_dependencies(mlir-headers MLIRPolygeistPassIncGen)