[Mlir-commits] [mlir] 6404fb4 - [mlir] [VectorOps] [integration-test] Add i64 typed outer product

[llvmlistbot at llvm.org]

Author: aartbik
Date: 2020-07-07T12:34:41-07:00
New Revision: 6404fb428a2c6ad4da2b0d79825aa92453ad9bdb

URL: https://github.com/llvm/llvm-project/commit/6404fb428a2c6ad4da2b0d79825aa92453ad9bdb
DIFF: https://github.com/llvm/llvm-project/commit/6404fb428a2c6ad4da2b0d79825aa92453ad9bdb.diff

LOG: [mlir] [VectorOps] [integration-test] Add i64 typed outer product

 Yields proper SIMD vpmullq/vpaddq on x86.

Reviewed By: bkramer

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

Added: 
    mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-f32.mlir
    mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir

Modified: 
    

Removed: 
    mlir/integration_test/Dialect/Vector/CPU/test-outerproduct.mlir


################################################################################
diff  --git a/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct.mlir b/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-f32.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-outerproduct.mlir
rename to mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-f32.mlir

diff  --git a/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir b/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir
new file mode 100644
index 000000000000..12a71d85b3f7
--- /dev/null
+++ b/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir
@@ -0,0 +1,76 @@
+// RUN: mlir-opt %s -convert-scf-to-std -convert-vector-to-llvm -convert-std-to-llvm | \
+// RUN: mlir-cpu-runner -e entry -entry-point-result=void  \
+// RUN:   -shared-libs=%mlir_integration_test_dir/libmlir_c_runner_utils%shlibext | \
+// RUN: FileCheck %s
+
+!vector_type_A = type vector<8xi64>
+!vector_type_B = type vector<8xi64>
+!vector_type_C = type vector<8x8xi64>
+
+!vector_type_X = type vector<2xi64>
+!vector_type_Y = type vector<3xi64>
+!vector_type_Z = type vector<2x3xi64>
+
+func @vector_outerproduct_splat_8x8(%ia: i64, %ib: i64, %ic: i64) -> !vector_type_C {
+  %a = splat %ia: !vector_type_A
+  %b = splat %ib: !vector_type_B
+  %c = splat %ic: !vector_type_C
+  %d = vector.outerproduct %a, %b, %c : !vector_type_A, !vector_type_B
+  return %d: !vector_type_C
+}
+
+func @vector_outerproduct_vec_2x3(%x : !vector_type_X,
+                                  %y : !vector_type_Y) -> !vector_type_Z {
+  %o = vector.outerproduct %x, %y : !vector_type_X, !vector_type_Y
+  return %o: !vector_type_Z
+}
+
+func @vector_outerproduct_vec_2x3_acc(%x : !vector_type_X,
+                                      %y : !vector_type_Y,
+                                      %z : !vector_type_Z) -> !vector_type_Z {
+  %o = vector.outerproduct %x, %y, %z : !vector_type_X, !vector_type_Y
+  return %o: !vector_type_Z
+}
+
+func @entry() {
+  %i1 = constant 1: i64
+  %i2 = constant 2: i64
+  %i3 = constant 3: i64
+  %i4 = constant 4: i64
+  %i5 = constant 5: i64
+  %i10 = constant 10: i64
+
+  // Simple case, splat scalars into vectors, then take outer product.
+  %v = call @vector_outerproduct_splat_8x8(%i1, %i2, %i10)
+      : (i64, i64, i64) -> (!vector_type_C)
+  vector.print %v : !vector_type_C
+  //
+  // outer product 8x8:
+  //
+  // CHECK-COUNT-8: ( 12, 12, 12, 12, 12, 12, 12, 12 )
+
+  // Direct outerproduct on vectors with 
diff erent size.
+  %0 = vector.broadcast %i1 : i64 to !vector_type_X
+  %x = vector.insert %i2, %0[1] : i64 into !vector_type_X
+  %1 = vector.broadcast %i3 : i64 to !vector_type_Y
+  %2 = vector.insert %i4, %1[1] : i64 into !vector_type_Y
+  %y = vector.insert %i5, %2[2] : i64 into !vector_type_Y
+
+  %p = call @vector_outerproduct_vec_2x3(%x, %y)
+      : (!vector_type_X, !vector_type_Y) -> (!vector_type_Z)
+  vector.print %p : !vector_type_Z
+  //
+  // outer product 2x3:
+  //
+  // CHECK: ( ( 3, 4, 5 ), ( 6, 8, 10 ) )
+
+  %q = call @vector_outerproduct_vec_2x3_acc(%x, %y, %p)
+      : (!vector_type_X, !vector_type_Y, !vector_type_Z) -> (!vector_type_Z)
+  vector.print %q : !vector_type_Z
+  //
+  // outer product 2x3:
+  //
+  // CHECK: ( ( 6, 8, 10 ), ( 12, 16, 20 ) )
+
+  return
+}