[mlir][spirv] Add integration test for `vector.interleave` and `vector.shuffle` #93595

angelz913 · 2024-05-28T18:39:36Z

Add integration test for vector.shuffle and vector.interleave, mentioned in issue [mlir][spirv] Add integration tests for vector.shuffle / vector.interleave #91978
Add VectorToSPIRV patterns to GPUToSPIRVPass

llvmbot · 2024-05-28T18:40:07Z

@llvm/pr-subscribers-mlir

@llvm/pr-subscribers-mlir-gpu

Author: Angel Zhang (angelz913)

Changes

Add integration test for vector.interleave, mentioned in issue 91978
Add VectorToSPIRV patterns to GPUToSPIRVPass

Full diff: https://github.com/llvm/llvm-project/pull/93595.diff

2 Files Affected:

(modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp (+2)
(added) mlir/test/mlir-vulkan-runner/vector-interleave.mlir (+53)

diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
index 1d1db913e3df2..2677d4e24be2c 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
+++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
@@ -16,6 +16,7 @@
 #include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h"
 #include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h"
 #include "mlir/Conversion/GPUToSPIRV/GPUToSPIRV.h"
+#include "mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h"
 #include "mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h"
 #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
@@ -132,6 +133,7 @@ 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
new file mode 100644
index 0000000000000..d760c1631c473
--- /dev/null
+++ b/mlir/test/mlir-vulkan-runner/vector-interleave.mlir
@@ -0,0 +1,53 @@
+// 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<v1.0, [Shader], [SPV_KHR_storage_buffer_storage_class]>, #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<workgroup_size = [1, 1, 1]>} {
+      %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<?xi32>
+    call @fillResource1DInt(%buf3, %value0) : (memref<?xi32>, 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<?xi32> to memref<*xi32>
+    call @printMemrefI32(%buf4) : (memref<*xi32>) -> ()
+    return
+  }
+  func.func private @fillResource1DInt(%0 : memref<?xi32>, %1 : i32)
+  func.func private @printMemrefI32(%ptr : memref<*xi32>)
+}

llvmbot · 2024-05-28T18:40:07Z

@llvm/pr-subscribers-mlir-spirv

Author: Angel Zhang (angelz913)

Changes

Add integration test for vector.interleave, mentioned in issue 91978
Add VectorToSPIRV patterns to GPUToSPIRVPass

Full diff: https://github.com/llvm/llvm-project/pull/93595.diff

2 Files Affected:

(modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp (+2)
(added) mlir/test/mlir-vulkan-runner/vector-interleave.mlir (+53)

diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
index 1d1db913e3df2..2677d4e24be2c 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
+++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
@@ -16,6 +16,7 @@
 #include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h"
 #include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h"
 #include "mlir/Conversion/GPUToSPIRV/GPUToSPIRV.h"
+#include "mlir/Conversion/VectorToSPIRV/VectorToSPIRV.h"
 #include "mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h"
 #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
@@ -132,6 +133,7 @@ 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
new file mode 100644
index 0000000000000..d760c1631c473
--- /dev/null
+++ b/mlir/test/mlir-vulkan-runner/vector-interleave.mlir
@@ -0,0 +1,53 @@
+// 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<v1.0, [Shader], [SPV_KHR_storage_buffer_storage_class]>, #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<workgroup_size = [1, 1, 1]>} {
+      %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<?xi32>
+    call @fillResource1DInt(%buf3, %value0) : (memref<?xi32>, 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<?xi32> to memref<*xi32>
+    call @printMemrefI32(%buf4) : (memref<*xi32>) -> ()
+    return
+  }
+  func.func private @fillResource1DInt(%0 : memref<?xi32>, %1 : i32)
+  func.func private @printMemrefI32(%ptr : memref<*xi32>)
+}

github-actions · 2024-05-28T18:42:34Z

✅ With the latest revision this PR passed the C/C++ code formatter.

kuhar

Overall looks fine. Just need to format the code and confirm the dependencies.

mlir/test/mlir-vulkan-runner/vector-interleave.mlir

mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp

Co-authored-by: Jakub Kuderski <[email protected]>

kuhar · 2024-05-29T14:19:54Z

@angelz913 please format the code and this should be good to land

kuhar

LGTM

…d `vector.shuffle`" (#93732) Reverts #93595 This broke the gcc-7 bot.

joker-eph · 2024-05-29T20:29:27Z

This broke the gcc-7 bot unfortunately, I reverted in #93732

https://lab.llvm.org/buildbot/#/builders/264/builds/11077

joker-eph · 2024-05-29T20:44:18Z

Actually this crashed with clang as well: https://lab.llvm.org/buildbot/#/builders/61

kuhar · 2024-05-29T21:05:28Z

Thanks, @joker-eph

kuhar · 2024-05-30T02:07:06Z

This is most likely caused by the nvidia driver rejecting the spir-v blob, whereas amdvlk/swiftshader seem more forgiving: https://gist.github.com/kuhar/f65f36d01e8c0b6018e2344ccbf39646

…or.shuffle` (#93858) This PR tries to reland #93595 which was reverted in #93732 due to some issues. The original PR: - Add integration test for `vector.shuffle` and `vector.interleave` - Add `VectorToSPIRV` patterns to `GPUToSPIRVPass` Description of the issue: - #93595 (comment) - Using either `vector.load` or `vector.store` in the kernel function will cause the validation layer to report an error - Trying to bypass the issue by using `memref.load` and `memref.store` to load/store individual elements from/to the vectors, and populate the vectors using `vector.insertelement` and `vector.extractelement` instead.

angelz913 requested review from antiagainst and kuhar as code owners May 28, 2024 18:39

llvmbot added mlir:gpu mlir:spirv mlir labels May 28, 2024

angelz913 added 3 commits May 28, 2024 18:53

Add integration test for vector.interleave

af1b339

Add VectorToSPIRV patterns to GPUToSPIRVPass, and fix errors in e2e test

7b52bd7

Add integration test for vector.shuffle

11cea8b

angelz913 force-pushed the vector-interleave-e2e-test branch from 263ede9 to 11cea8b Compare May 28, 2024 18:53

angelz913 changed the title ~~Add integration test for vector.interleave~~ Add integration test for vector.interleave and vector.shuffle May 28, 2024

kuhar changed the title ~~Add integration test for vector.interleave and vector.shuffle~~ [mlir][spirv] Add integration test for vector.interleave and vector.shuffle May 29, 2024

kuhar reviewed May 29, 2024

View reviewed changes

mlir/test/mlir-vulkan-runner/vector-interleave.mlir Outdated Show resolved Hide resolved

mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp Outdated Show resolved Hide resolved

Change comment

b2f029e

Co-authored-by: Jakub Kuderski <[email protected]>

Reformat code

bf9e6c5

kuhar approved these changes May 29, 2024

View reviewed changes

kuhar merged commit c9c2444 into llvm:main May 29, 2024
5 of 6 checks passed

keith added a commit that referenced this pull request May 29, 2024

[bazel] Port #93595 (#93716)

472184d

joker-eph mentioned this pull request May 29, 2024

Revert "[mlir][spirv] Add integration test for vector.interleave and vector.shuffle" #93732

Merged

joker-eph added a commit that referenced this pull request May 29, 2024

Revert "[mlir][spirv] Add integration test for vector.interleave an…

5bec47c

…d `vector.shuffle`" (#93732) Reverts #93595 This broke the gcc-7 bot.

angelz913 mentioned this pull request May 30, 2024

[mlir][spirv] Add integration tests for vector.interleave and vector.shuffle #93858

Merged

angelz913 deleted the vector-interleave-e2e-test branch June 6, 2024 19:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[mlir][spirv] Add integration test for `vector.interleave` and `vector.shuffle` #93595

[mlir][spirv] Add integration test for `vector.interleave` and `vector.shuffle` #93595

Uh oh!

angelz913 commented May 28, 2024 •

edited

Loading

Uh oh!

llvmbot commented May 28, 2024 •

edited

Loading

Uh oh!

llvmbot commented May 28, 2024

Uh oh!

github-actions bot commented May 28, 2024 •

edited

Loading

Uh oh!

kuhar left a comment

Uh oh!

Uh oh!

Uh oh!

kuhar commented May 29, 2024

Uh oh!

kuhar left a comment

Uh oh!

Uh oh!

joker-eph commented May 29, 2024

Uh oh!

joker-eph commented May 29, 2024

Uh oh!

kuhar commented May 29, 2024

Uh oh!

kuhar commented May 30, 2024

Uh oh!

Uh oh!

[mlir][spirv] Add integration test for vector.interleave and vector.shuffle #93595

[mlir][spirv] Add integration test for vector.interleave and vector.shuffle #93595

Uh oh!

Conversation

angelz913 commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented May 28, 2024

Uh oh!

github-actions bot commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kuhar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

kuhar commented May 29, 2024

Uh oh!

kuhar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

joker-eph commented May 29, 2024

Uh oh!

joker-eph commented May 29, 2024

Uh oh!

kuhar commented May 29, 2024

Uh oh!

kuhar commented May 30, 2024

Uh oh!

Uh oh!

[mlir][spirv] Add integration test for `vector.interleave` and `vector.shuffle` #93595

[mlir][spirv] Add integration test for `vector.interleave` and `vector.shuffle` #93595

angelz913 commented May 28, 2024 •

edited

Loading

llvmbot commented May 28, 2024 •

edited

Loading

github-actions bot commented May 28, 2024 •

edited

Loading