-
Notifications
You must be signed in to change notification settings - Fork 12.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Revert "[mlir][spirv] Add integration test for vector.deinterleave
"
#95607
Merged
kuhar
merged 1 commit into
llvm:main
from
angelz913:revert-95469-vector-deinterleave-e2e
Jun 14, 2024
Merged
Revert "[mlir][spirv] Add integration test for vector.deinterleave
"
#95607
kuhar
merged 1 commit into
llvm:main
from
angelz913:revert-95469-vector-deinterleave-e2e
Jun 14, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lvm#95469)" This reverts commit b1b7643.
kuhar
approved these changes
Jun 14, 2024
@llvm/pr-subscribers-mlir Author: Angel Zhang (angelz913) ChangesReverts llvm/llvm-project#95469 because using literals instead of Full diff: https://github.com/llvm/llvm-project/pull/95607.diff 1 Files Affected:
diff --git a/mlir/test/mlir-vulkan-runner/vector-deinterleave.mlir b/mlir/test/mlir-vulkan-runner/vector-deinterleave.mlir
deleted file mode 100644
index 1805452ce988f..0000000000000
--- a/mlir/test/mlir-vulkan-runner/vector-deinterleave.mlir
+++ /dev/null
@@ -1,72 +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]
-// CHECK: [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_deinterleave(%arg0 : memref<4xi32>, %arg1 : memref<2xi32>, %arg2 : memref<2xi32>)
- kernel attributes { spirv.entry_point_abi = #spirv.entry_point_abi<workgroup_size = [1, 1, 1]>} {
-
- %src = arith.constant dense<[0, 0, 0, 0]> : vector<4xi32>
-
- %val0 = memref.load %arg0[0] : memref<4xi32>
- %val1 = memref.load %arg0[1] : memref<4xi32>
- %val2 = memref.load %arg0[2] : memref<4xi32>
- %val3 = memref.load %arg0[3] : memref<4xi32>
-
- %src0 = vector.insert %val0, %src[0] : i32 into vector<4xi32>
- %src1 = vector.insert %val1, %src0[1] : i32 into vector<4xi32>
- %src2 = vector.insert %val2, %src1[2] : i32 into vector<4xi32>
- %src3 = vector.insert %val3, %src2[3] : i32 into vector<4xi32>
-
- %res0, %res1 = vector.deinterleave %src3 : vector<4xi32> -> vector<2xi32>
-
- %res0_0 = vector.extract %res0[0] : i32 from vector<2xi32>
- %res0_1 = vector.extract %res0[1] : i32 from vector<2xi32>
- %res1_0 = vector.extract %res1[0] : i32 from vector<2xi32>
- %res1_1 = vector.extract %res1[1] : i32 from vector<2xi32>
-
- memref.store %res0_0, %arg1[0]: memref<2xi32>
- memref.store %res0_1, %arg1[1]: memref<2xi32>
- memref.store %res1_0, %arg2[0]: memref<2xi32>
- memref.store %res1_1, %arg2[1]: memref<2xi32>
-
- gpu.return
- }
- }
-
- func.func @main() {
- // Allocate 3 buffers.
- %buf0 = memref.alloc() : memref<4xi32>
- %buf1 = memref.alloc() : memref<2xi32>
- %buf2 = memref.alloc() : memref<2xi32>
-
- // Initialize input buffer.
- %buf0_vals = arith.constant dense<[0, 1, 2, 3]> : vector<4xi32>
- vector.store %buf0_vals, %buf0[0] : memref<4xi32>, vector<4xi32>
-
- // Initialize output buffers.
- %value0 = arith.constant 0 : i32
- %buf3 = memref.cast %buf1 : memref<2xi32> to memref<?xi32>
- %buf4 = memref.cast %buf2 : memref<2xi32> to memref<?xi32>
- call @fillResource1DInt(%buf3, %value0) : (memref<?xi32>, i32) -> ()
- call @fillResource1DInt(%buf4, %value0) : (memref<?xi32>, i32) -> ()
-
- gpu.launch_func @kernels::@kernel_vector_deinterleave
- blocks in (4, 1, 1) threads in (1, 1, 1)
- args(%buf0 : memref<4xi32>, %buf1 : memref<2xi32>, %buf2 : memref<2xi32>)
- %buf5 = memref.cast %buf3 : memref<?xi32> to memref<*xi32>
- %buf6 = memref.cast %buf4 : memref<?xi32> to memref<*xi32>
- call @printMemrefI32(%buf5) : (memref<*xi32>) -> ()
- call @printMemrefI32(%buf6) : (memref<*xi32>) -> ()
- return
- }
- func.func private @fillResource1DInt(%0 : memref<?xi32>, %1 : i32)
- func.func private @printMemrefI32(%ptr : memref<*xi32>)
-}
|
kuhar
pushed a commit
that referenced
this pull request
Jun 17, 2024
This PR relands the commit reverted in #95607. Fixes: - Now literals are only used for the indices of `vector.insert` and `vector.extract`. - `arith.constant` needs to be used for the `memref.load` and `memref.store` since otherwise there will be a failure to parse the input IR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #95469 because using literals instead of
arith.constant
as indices broke the tests.