commit 83969416ecce583ac536c9a04eb7313ae6d53390
author Thomas <thomasraoux@google.com> Fri Oct 23 13:11:06 2020 -0700
committer GitHub <noreply@github.com> Fri Oct 23 13:11:06 2020 -0700
tree 12b2e7a3a06b2f71a3d487a8f92eadff79172062
parent 7f30942f07e0faad67914ce128d4699fac8c9d7e

Add VectorToSPIRV patterns to ConvertToSPIRVPass (#3593)

iree/compiler/Conversion/LinalgToSPIRV/BUILD

diff --git a/iree/compiler/Conversion/LinalgToSPIRV/BUILD b/iree/compiler/Conversion/LinalgToSPIRV/BUILD
index cd0d823..f5fe4d9 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/BUILD
+++ b/iree/compiler/Conversion/LinalgToSPIRV/BUILD
@@ -76,6 +76,7 @@
         "@llvm-project//mlir:Support",
         "@llvm-project//mlir:Transforms",
         "@llvm-project//mlir:VectorOps",
+        "@llvm-project//mlir:VectorToSPIRV",
         "@org_tensorflow//tensorflow/compiler/mlir/hlo",
         "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_to_linalg",
     ],

iree/compiler/Conversion/LinalgToSPIRV/CMakeLists.txt

diff --git a/iree/compiler/Conversion/LinalgToSPIRV/CMakeLists.txt b/iree/compiler/Conversion/LinalgToSPIRV/CMakeLists.txt
index a4b11b3..79578dd 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/CMakeLists.txt
+++ b/iree/compiler/Conversion/LinalgToSPIRV/CMakeLists.txt
@@ -62,6 +62,7 @@
     MLIRSupport
     MLIRTransforms
     MLIRVector
+    MLIRVectorToSPIRV
     iree::compiler::Conversion::CodegenUtils
     iree::compiler::Conversion::HLOToHLO
     iree::compiler::Conversion::HLOToLinalg

iree/compiler/Conversion/LinalgToSPIRV/ConvertToSPIRVPass.cpp

diff --git a/iree/compiler/Conversion/LinalgToSPIRV/ConvertToSPIRVPass.cpp b/iree/compiler/Conversion/LinalgToSPIRV/ConvertToSPIRVPass.cpp
index 93b8809..508d0dc 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/ConvertToSPIRVPass.cpp
+++ b/iree/compiler/Conversion/LinalgToSPIRV/ConvertToSPIRVPass.cpp
@@ -30,6 +30,7 @@
 #include "mlir/Conversion/GPUToSPIRV/ConvertGPUToSPIRV.h"
 #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"
 #include "mlir/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.h"
+#include "mlir/Conversion/VectorToSPIRV/ConvertVectorToSPIRV.h"
 #include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Dialect/SPIRV/SPIRVDialect.h"
 #include "mlir/Dialect/SPIRV/SPIRVLowering.h"
@@ -402,6 +403,8 @@
                              patterns);
   // Pull in standard patterns to convert arithmetic ops and others.
   populateStandardToSPIRVPatterns(context, typeConverter, patterns);
+  // Pull in vector patterns to convert vector ops.
+  mlir::populateVectorToSPIRVPatterns(context, typeConverter, patterns);
   // Pull in builtin func to spv.func conversion.
   populateBuiltinFuncToSPIRVPatterns(context, typeConverter, patterns);
   auto &cooperativeMatrixAnalysis = getAnalysis<CooperativeMatrixAnalysis>();