diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp index 53e73ec0d81bf..1d1db913e3df2 100644 --- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp +++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp @@ -18,7 +18,6 @@ #include "mlir/Conversion/GPUToSPIRV/GPUToSPIRV.h" #include "mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h" #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h" -#include "mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h" @@ -133,7 +132,6 @@ void GPUToSPIRVPass::runOnOperation() { mlir::arith::populateArithToSPIRVPatterns(typeConverter, patterns); populateMemRefToSPIRVPatterns(typeConverter, patterns); populateFuncToSPIRVPatterns(typeConverter, patterns); - populateVectorToSPIRVPatterns(typeConverter, patterns); if (failed(applyFullConversion(gpuModule, *target, std::move(patterns)))) return signalPassFailure(); diff --git a/mlir/test/mlir-vulkan-runner/vector-interleave.mlir b/mlir/test/mlir-vulkan-runner/vector-interleave.mlir deleted file mode 100644 index 2f5c319e2f5c5..0000000000000 --- a/mlir/test/mlir-vulkan-runner/vector-interleave.mlir +++ /dev/null @@ -1,53 +0,0 @@ -// RUN: mlir-vulkan-runner %s \ -// RUN: --shared-libs=%vulkan-runtime-wrappers,%mlir_runner_utils \ -// RUN: --entry-point-result=void | FileCheck %s - -// CHECK: [0, 2, 1, 3] -module attributes { - gpu.container_module, - spirv.target_env = #spirv.target_env< - #spirv.vce, #spirv.resource_limits<>> -} { - gpu.module @kernels { - gpu.func @kernel_vector_interleave(%arg0 : memref<2xi32>, %arg1 : memref<2xi32>, %arg2 : memref<4xi32>) - kernel attributes { spirv.entry_point_abi = #spirv.entry_point_abi} { - %c0 = arith.constant 0 : index - %vec0 = vector.load %arg0[%c0] : memref<2xi32>, vector<2xi32> - %vec1 = vector.load %arg1[%c0] : memref<2xi32>, vector<2xi32> - %result = vector.interleave %vec0, %vec1 : vector<2xi32> -> vector<4xi32> - vector.store %result, %arg2[%c0] : memref<4xi32>, vector<4xi32> - gpu.return - } - } - - func.func @main() { - // Allocate 3 buffers. - %buf0 = memref.alloc() : memref<2xi32> - %buf1 = memref.alloc() : memref<2xi32> - %buf2 = memref.alloc() : memref<4xi32> - - %idx0 = arith.constant 0 : index - %idx1 = arith.constant 1 : index - %idx4 = arith.constant 4 : index - - // Initialize input buffer. - %buf0_vals = arith.constant dense<[0, 1]> : vector<2xi32> - %buf1_vals = arith.constant dense<[2, 3]> : vector<2xi32> - vector.store %buf0_vals, %buf0[%idx0] : memref<2xi32>, vector<2xi32> - vector.store %buf1_vals, %buf1[%idx0] : memref<2xi32>, vector<2xi32> - - // Initialize output buffer. - %value0 = arith.constant 0 : i32 - %buf3 = memref.cast %buf2 : memref<4xi32> to memref - call @fillResource1DInt(%buf3, %value0) : (memref, i32) -> () - - gpu.launch_func @kernels::@kernel_vector_interleave - blocks in (%idx4, %idx1, %idx1) threads in (%idx1, %idx1, %idx1) - args(%buf0 : memref<2xi32>, %buf1 : memref<2xi32>, %buf2 : memref<4xi32>) - %buf4 = memref.cast %buf3 : memref to memref<*xi32> - call @printMemrefI32(%buf4) : (memref<*xi32>) -> () - return - } - func.func private @fillResource1DInt(%0 : memref, %1 : i32) - func.func private @printMemrefI32(%ptr : memref<*xi32>) -} diff --git a/mlir/test/mlir-vulkan-runner/vector-shuffle.mlir b/mlir/test/mlir-vulkan-runner/vector-shuffle.mlir deleted file mode 100644 index e29e054ccd46b..0000000000000 --- a/mlir/test/mlir-vulkan-runner/vector-shuffle.mlir +++ /dev/null @@ -1,53 +0,0 @@ -// RUN: mlir-vulkan-runner %s \ -// RUN: --shared-libs=%vulkan-runtime-wrappers,%mlir_runner_utils \ -// RUN: --entry-point-result=void | FileCheck %s - -// CHECK: [2, 1, 3] -module attributes { - gpu.container_module, - spirv.target_env = #spirv.target_env< - #spirv.vce, #spirv.resource_limits<>> -} { - gpu.module @kernels { - gpu.func @kernel_vector_shuffle(%arg0 : memref<2xi32>, %arg1 : memref<2xi32>, %arg2 : memref<3xi32>) - kernel attributes { spirv.entry_point_abi = #spirv.entry_point_abi} { - %c0 = arith.constant 0 : index - %vec0 = vector.load %arg0[%c0] : memref<2xi32>, vector<2xi32> - %vec1 = vector.load %arg1[%c0] : memref<2xi32>, vector<2xi32> - %result = vector.shuffle %vec0, %vec1[2, 1, 3] : vector<2xi32>, vector<2xi32> - vector.store %result, %arg2[%c0] : memref<3xi32>, vector<3xi32> - gpu.return - } - } - - func.func @main() { - // Allocate 3 buffers. - %buf0 = memref.alloc() : memref<2xi32> - %buf1 = memref.alloc() : memref<2xi32> - %buf2 = memref.alloc() : memref<3xi32> - - %idx0 = arith.constant 0 : index - %idx1 = arith.constant 1 : index - %idx4 = arith.constant 4 : index - - // Initialize input buffer - %buf0_vals = arith.constant dense<[0, 1]> : vector<2xi32> - %buf1_vals = arith.constant dense<[2, 3]> : vector<2xi32> - vector.store %buf0_vals, %buf0[%idx0] : memref<2xi32>, vector<2xi32> - vector.store %buf1_vals, %buf1[%idx0] : memref<2xi32>, vector<2xi32> - - // Initialize output buffer. - %value0 = arith.constant 0 : i32 - %buf3 = memref.cast %buf2 : memref<3xi32> to memref - call @fillResource1DInt(%buf3, %value0) : (memref, i32) -> () - - gpu.launch_func @kernels::@kernel_vector_shuffle - blocks in (%idx4, %idx1, %idx1) threads in (%idx1, %idx1, %idx1) - args(%buf0 : memref<2xi32>, %buf1 : memref<2xi32>, %buf2 : memref<3xi32>) - %buf4 = memref.cast %buf3 : memref to memref<*xi32> - call @printMemrefI32(%buf4) : (memref<*xi32>) -> () - return - } - func.func private @fillResource1DInt(%0 : memref, %1 : i32) - func.func private @printMemrefI32(%ptr : memref<*xi32>) -}