convert sycl.constructor(...) { Type = @id } (#45)

This PR implements the SYCLToLLVM conversion for lowering sycl::id<n>(....).
It introduces the class ConstructorPattern which generates an llvm.call to the appropriate ctor function of the sycl::id templated class when given a sycl.constructor(%1) {Type = @id} operation.

This PR also introduces a new too names sycl-mlir-opt which can be used to drive unit testing.

Signed-off-by: Tiotto, Ettore <ettore.tiotto@intel.com>

Author: etiotto

mlir-sycl/CMakeLists.txt

@@ -70,6 +70,7 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
 add_subdirectory(include/mlir)
 add_subdirectory(lib)
 add_subdirectory(test)
+add_subdirectory(tools)
 
 install(DIRECTORY include/
   DESTINATION include

mlir-sycl/include/mlir/Conversion/SYCLPasses.h

@@ -1,4 +1,4 @@
-//===- SYCLPasses.h - Conversion Pass Construction and Registration -----------===//
+//===- SYCLPasses.h - Conversion Pass Construction and Registration -------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,14 +9,16 @@
 #ifndef MLIR_CONVERSION_SYCLPASSES_H
 #define MLIR_CONVERSION_SYCLPASSES_H
 
-#include "mlir/Conversion/SYCLToLLVM/SYCLToLLVM.h"
+#include "mlir/Conversion/SYCLToLLVM/SYCLToLLVMPass.h"
 
 namespace mlir {
+namespace sycl {
 
 /// Generate the code for registering conversion passes.
 #define GEN_PASS_REGISTRATION
 #include "mlir/Conversion/SYCLPasses.h.inc"
 
+} // namespace sycl
 } // namespace mlir
 
 #endif // MLIR_CONVERSION_SYCLPASSES_H

mlir-sycl/include/mlir/Conversion/SYCLPasses.td

@@ -21,7 +21,7 @@ def ConvertSYCLToLLVM : Pass<"convert-sycl-to-llvm", "ModuleOp"> {
     See docs/SYCLToLLVMDialectConversion/ for more details.
     TODO: add docs referenced above.
   }];
-  let constructor = "mlir::createConvertSYCLToLLVMPass()";
+  let constructor = "mlir::sycl::createConvertSYCLToLLVMPass()";
   let dependentDialects = ["LLVM::LLVMDialect"];
 }
 

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

@@ -75,8 +75,8 @@ class LLVMBuilder : public DialectBuilder {
   LLVM::BitcastOp genBitcast(Type type, Value val) const;
   LLVM::ExtractValueOp genExtractValue(Type type, Value container,
                                        ArrayRef<int64_t> pos) const;
-  LLVM::CallOp genCall(FlatSymbolRefAttr funcSym, ArrayRef<Type> resTypes,
-                       ArrayRef<Value> operands) const;
+  LLVM::CallOp genCall(FlatSymbolRefAttr funcSym, TypeRange resTypes,
+                       ValueRange operands) const;
   LLVM::ConstantOp genConstant(Type type, double val) const;
   LLVM::SExtOp genSignExtend(Type type, Value val) const;
 };

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

@@ -54,7 +54,7 @@ class SYCLFuncDescriptor {
   // clang-format on
 
   // Call the SYCL constructor identified by \p id with the given \p args.
-  static Value call(FuncId id, ArrayRef<Value> args,
+  static Value call(FuncId id, ValueRange args,
                     const SYCLFuncRegistry &registry, OpBuilder &b,
                     Location loc);
 

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

@@ -14,6 +14,7 @@
 #define MLIR_CONVERSION_SYCLTOLLVM_SYCLTOLLVM_H
 
 #include "mlir/Transforms/DialectConversion.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
 
 namespace mlir {
 class LLVMTypeConverter;

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

@@ -13,15 +13,19 @@
 #ifndef MLIR_CONVERSION_SYCLTOLLVM_SYCLTOLLVMPASS_H
 #define MLIR_CONVERSION_SYCLTOLLVM_SYCLTOLLVMPASS_H
 
+#include "mlir/Pass/Pass.h"
 #include <memory>
 
 namespace mlir {
 class ModuleOp;
 template <typename T> class OperationPass;
 
+namespace sycl {
+
 /// Creates a pass to convert SYCL operations to the LLVMIR dialect.
 std::unique_ptr<OperationPass<ModuleOp>> createConvertSYCLToLLVMPass();
 
+} // namespace sycl
 } // namespace mlir
 
 #endif // MLIR_CONVERSION_SYCLTOLLVM_SYCLTOLLVMPASS_H

mlir-sycl/include/mlir/Dialect/SYCL/CMakeLists.txt

@@ -1 +1,2 @@
 add_subdirectory(IR)
+add_subdirectory(Transforms)

mlir-sycl/include/mlir/Dialect/SYCL/IR/CMakeLists.txt

@@ -1,12 +1,2 @@
-# Copyright (C) Codeplay Software Limited
-
-#===--- CMakeLists.txt -----------------------------------------------------===#
-#
-# MLIR-SYCL is 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
-#
-#===------------------------------------------------------------------------===#
-
 add_mlir_dialect(SYCLOps sycl)
 add_mlir_doc(SYCLOps SYCLOps Dialects/ -gen-op-doc)

mlir-sycl/include/mlir/Dialect/SYCL/Transforms/CMakeLists.txt

@@ -0,0 +1,6 @@
+set(LLVM_TARGET_DEFINITIONS Passes.td)
+mlir_tablegen(Passes.h.inc -gen-pass-decls -name SYCL)
+add_public_tablegen_target(MLIRSYCLTransformsIncGen)
+add_dependencies(mlir-headers MLIRSYCLTransformsIncGen)
+
+add_mlir_doc(Passes SYCLPasses ./ -gen-pass-doc)