[PATCH] D78639: [mlir][vulkan-runner] Fix testsuite.

[Denis Khalikov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGec16df706682: [mlir][vulkan-runner] Fix testsuite. (authored by denis13).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D78639/new/

https://reviews.llvm.org/D78639

Files:
  mlir/test/mlir-vulkan-runner/addf.mlir
  mlir/test/mlir-vulkan-runner/mulf.mlir
  mlir/test/mlir-vulkan-runner/subf.mlir
  mlir/test/mlir-vulkan-runner/time.mlir


Index: mlir/test/mlir-vulkan-runner/time.mlir
===================================================================
--- mlir/test/mlir-vulkan-runner/time.mlir
+++ mlir/test/mlir-vulkan-runner/time.mlir
@@ -13,7 +13,7 @@
 } {
   gpu.module @kernels {
     gpu.func @kernel_add(%arg0 : memref<16384xf32>, %arg1 : memref<16384xf32>, %arg2 : memref<16384xf32>)
-      attributes { spv.entry_point_abi = {local_size = dense<[128, 1, 1]>: vector<3xi32>} } kernel {
+      kernel attributes { spv.entry_point_abi = {local_size = dense<[128, 1, 1]>: vector<3xi32> }} {
       %bid = "gpu.block_id"() {dimension = "x"} : () -> index
       %tid = "gpu.thread_id"() {dimension = "x"} : () -> index
       %cst = constant 128 : index
Index: mlir/test/mlir-vulkan-runner/subf.mlir
===================================================================
--- mlir/test/mlir-vulkan-runner/subf.mlir
+++ mlir/test/mlir-vulkan-runner/subf.mlir
@@ -10,7 +10,7 @@
 } {
   gpu.module @kernels {
     gpu.func @kernel_sub(%arg0 : memref<8x4x4xf32>, %arg1 : memref<4x4xf32>, %arg2 : memref<8x4x4xf32>)
-      attributes { spv.entry_point_abi = {local_size = dense<[1, 1, 1]>: vector<3xi32>} } kernel {
+      kernel attributes { spv.entry_point_abi = {local_size = dense<[1, 1, 1]>: vector<3xi32> }} {
       %x = "gpu.block_id"() {dimension = "x"} : () -> index
       %y = "gpu.block_id"() {dimension = "y"} : () -> index
       %z = "gpu.block_id"() {dimension = "z"} : () -> index
Index: mlir/test/mlir-vulkan-runner/mulf.mlir
===================================================================
--- mlir/test/mlir-vulkan-runner/mulf.mlir
+++ mlir/test/mlir-vulkan-runner/mulf.mlir
@@ -10,7 +10,7 @@
 } {
   gpu.module @kernels {
     gpu.func @kernel_mul(%arg0 : memref<4x4xf32>, %arg1 : memref<4x4xf32>, %arg2 : memref<4x4xf32>)
-      attributes { spv.entry_point_abi = {local_size = dense<[1, 1, 1]>: vector<3xi32>} } kernel {
+      kernel attributes { spv.entry_point_abi = {local_size = dense<[1, 1, 1]>: vector<3xi32> }} {
       %x = "gpu.block_id"() {dimension = "x"} : () -> index
       %y = "gpu.block_id"() {dimension = "y"} : () -> index
       %1 = load %arg0[%x, %y] : memref<4x4xf32>
Index: mlir/test/mlir-vulkan-runner/addf.mlir
===================================================================
--- mlir/test/mlir-vulkan-runner/addf.mlir
+++ mlir/test/mlir-vulkan-runner/addf.mlir
@@ -10,7 +10,7 @@
 } {
   gpu.module @kernels {
     gpu.func @kernel_add(%arg0 : memref<8xf32>, %arg1 : memref<8xf32>, %arg2 : memref<8xf32>)
-      attributes { spv.entry_point_abi = {local_size = dense<[1, 1, 1]>: vector<3xi32>} } kernel {
+      kernel attributes { spv.entry_point_abi = {local_size = dense<[1, 1, 1]>: vector<3xi32> }} {
       %0 = "gpu.block_id"() {dimension = "x"} : () -> index
       %1 = load %arg0[%0] : memref<8xf32>
       %2 = load %arg1[%0] : memref<8xf32>
@@ -39,7 +39,7 @@
 
     %cst1 = constant 1 : index
     %cst8 = constant 8 : index
-    gpu.launch_func"(%cst8, %cst1, %cst1, %cst1, %cst1, %cst1, %arg0, %arg1, %arg2) { kernel = @kernels::@kernel_add }
+    "gpu.launch_func"(%cst8, %cst1, %cst1, %cst1, %cst1, %cst1, %arg0, %arg1, %arg2) { kernel = @kernels::@kernel_add }
         : (index, index, index, index, index, index, memref<8xf32>, memref<8xf32>, memref<8xf32>) -> ()
     %arg6 = memref_cast %arg5 : memref<?xf32> to memref<*xf32>
     call @print_memref_f32(%arg6) : (memref<*xf32>) -> ()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78639.259304.patch
Type: text/x-patch
Size: 3420 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200422/e5d8b029/attachment.bin>