[Mlir-commits] [mlir] 3f4c1e1 - [mlir] Fix return values of AMX tests

[Matthias Springer]

Author: Matthias Springer
Date: 2021-04-14T09:40:49+09:00
New Revision: 3f4c1e13bca1bd0f78420bfec6b6f6e1de2d491a

URL: https://github.com/llvm/llvm-project/commit/3f4c1e13bca1bd0f78420bfec6b6f6e1de2d491a
DIFF: https://github.com/llvm/llvm-project/commit/3f4c1e13bca1bd0f78420bfec6b6f6e1de2d491a.diff

LOG: [mlir] Fix return values of AMX tests

Differential Revision: https://reviews.llvm.org/D100422

Added: 
    

Modified: 
    mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir
    mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir
    mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir
    mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir
    mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir

Removed: 
    


################################################################################
diff  --git a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir
index 899fe8606455a..7ed1b3541ec83 100644
--- a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir
+++ b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir
@@ -32,7 +32,7 @@ func @kernel2(%arg0: memref<2x4xbf16>,
   return
 }
 
-func @entry() {
+func @entry() -> i32 {
   %f0 = constant 0.0: f32
   %c0 = constant 0: index
   %c1 = constant 1: index
@@ -80,5 +80,6 @@ func @entry() {
   memref.dealloc %b : memref<2x4xbf16>
   memref.dealloc %c : memref<2x2xf32>
 
-  return
+  %i0 = constant 0 : i32
+  return %i0 : i32
 }

diff  --git a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir
index 499fdf1e59d69..851c0892d968f 100644
--- a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir
+++ b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir
@@ -66,7 +66,7 @@ func @kernel4(%arg0: memref<16x16xi8>,
   return
 }
 
-func @entry() {
+func @entry() -> i32 {
   %c0 = constant 0: index
 
   // Set up memory.
@@ -194,5 +194,6 @@ func @entry() {
   memref.dealloc %b : memref<4x16xi8>
   memref.dealloc %c : memref<16x4xi32>
 
-  return
+  %i0 = constant 0 : i32
+  return %i0 : i32
 }

diff  --git a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir
index 517db1ec22ba5..dbe8d76d2fbad 100644
--- a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir
+++ b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir
@@ -32,7 +32,7 @@ func @kernel2(%arg0: memref<2x8xi8>,
   return
 }
 
-func @entry() {
+func @entry() -> i32 {
   %i0 = constant 0: i32
   %c0 = constant 0: index
   %c1 = constant 1: index
@@ -80,5 +80,5 @@ func @entry() {
   memref.dealloc %b : memref<2x8xi8>
   memref.dealloc %c : memref<2x2xi32>
 
-  return
+  return %i0 : i32
 }

diff  --git a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir
index 9dd3b4c2e09aa..fb0fafcfbe0d0 100644
--- a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir
+++ b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir
@@ -34,7 +34,7 @@ func @kernel(%arg0: memref<4x32xf32>) {
   return
 }
 
-func @entry() {
+func @entry() -> i32 {
   %f1  = constant 1.0: f32
   %c0  = constant 0: index
   %c1  = constant 1: index
@@ -78,5 +78,6 @@ func @entry() {
   // Release resources.
   memref.dealloc %a : memref<4x32xf32>
 
-  return
+  %i0 = constant 0 : i32
+  return %i0 : i32
 }

diff  --git a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir
index 3927a99837164..e40b87f4fb603 100644
--- a/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir
+++ b/mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir
@@ -12,7 +12,7 @@ func @tilezero(%arg0: memref<?x?xi32>, %i: index, %j: index) {
   return
 }
 
-func @entry() {
+func @entry() -> i32 {
   %i0 = constant 0: i32
   %i1 = constant 1: i32
   %c0 = constant 0: index
@@ -93,5 +93,5 @@ func @entry() {
   // Release resources.
   memref.dealloc %a : memref<?x?xi32>
 
-  return
+  return %i0 : i32
 }