From 3f1e45005fd19314abd4565be0c75e15091f1245 Mon Sep 17 00:00:00 2001 From: Nicolas Vasilache Date: Mon, 19 Jun 2023 14:51:12 +0000 Subject: [PATCH] Revert "[mlir][Vector] Let VectorToLLVM operate on non-ModuleOp" This reverts commit aabea3d320c87561fe98b56c9f53cca1c6d18869. That commit had mistakenly squashed spurious changes in. --- mlir/include/mlir/Conversion/Passes.td | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mlir/include/mlir/Conversion/Passes.td b/mlir/include/mlir/Conversion/Passes.td index 1e16d7b..ac53af4 100644 --- a/mlir/include/mlir/Conversion/Passes.td +++ b/mlir/include/mlir/Conversion/Passes.td @@ -361,6 +361,10 @@ def GpuToLLVMConversionPass : Pass<"gpu-to-llvm", "ModuleOp"> { }]; let options = [ + Option<"hostBarePtrCallConv", "use-bare-pointers-for-host", "bool", + /*default=*/"false", + "Use bare pointers to pass memref arguments to host functions. " + "All memrefs must have static shape.">, Option<"kernelBarePtrCallConv", "use-bare-pointers-for-kernels", "bool", /*default=*/"false", "Use bare pointers to pass memref arguments to kernels. " @@ -422,6 +426,10 @@ def ConvertGpuOpsToNVVMOps : Pass<"convert-gpu-to-nvvm", "gpu::GPUModuleOp"> { "Bitwidth of the index type, 0 to use size of machine word">, Option<"hasRedux", "has-redux", "bool", /*default=*/"false", "Target gpu supports redux">, + Option<"useBarePtrCallConv", "use-bare-ptr-memref-call-conv", "bool", + /*default=*/"false", + "Replace memref arguments in GPU functions with bare pointers. " + "All memrefs must have static shape.">, Option<"useOpaquePointers", "use-opaque-pointers", "bool", /*default=*/"true", "Generate LLVM IR using opaque pointers " "instead of typed pointers">, @@ -1057,7 +1065,7 @@ def ConvertVectorToSCF : Pass<"convert-vector-to-scf"> { // VectorToLLVM //===----------------------------------------------------------------------===// -def ConvertVectorToLLVMPass : Pass<"convert-vector-to-llvm"> { +def ConvertVectorToLLVMPass : Pass<"convert-vector-to-llvm", "ModuleOp"> { let summary = "Lower the operations from the vector dialect into the LLVM " "dialect"; let description = [{ @@ -1092,6 +1100,10 @@ def ConvertVectorToLLVMPass : Pass<"convert-vector-to-llvm"> { "bool", /*default=*/"false", "Enables the use of ArmSVE dialect while lowering the vector " "dialect.">, + Option<"armSME", "enable-arm-sme", + "bool", /*default=*/"false", + "Enables the use of ArmSME dialect while lowering the vector " + "dialect.">, Option<"x86Vector", "enable-x86vector", "bool", /*default=*/"false", "Enables the use of X86Vector dialect while lowering the vector " -- 2.7.4