[mlir][VectorOps] Generalized vector.print to i32/i64

[aartbik]

Summary

Lowering to LLVM IR was restricted to float/double.
This CL also adds the integral values.

[ftynse]

mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir

403

Nit: let's drop the arg[0-9]+ pattern and just use .*, we don't guarantee anything on SSA names

mlir/test/mlir-cpu-runner/mlir_runner_utils.cpp

81

Cool, I did not know these macros existed!

[nicolasvasilache]

Thanks Aart!

[aartbik]

addressed comments

[aartbik]

mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir

403

Done, also for the other occurrences for consistency.

mlir/test/mlir-cpu-runner/mlir_runner_utils.cpp

81

A great way to keep our code portable!

mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp

matchAndRewrite(Operation *op, ArrayRef<Value> operands,
     if (lowering.convertType(printType) == nullptr)
       return matchFailure();
 
     // Make sure element type has runtime support (currently just Float/Double).
     VectorType vectorType = printType.dyn_cast<VectorType>();
     Type eltType = vectorType ? vectorType.getElementType() : printType;
     int64_t rank = vectorType ? vectorType.getRank() : 0;
     Operation *printer;
-    if (eltType.isF32())
+    if (eltType.isInteger(32))
+      printer = getPrintI32(op);
+    else if (eltType.isInteger(64))
+      printer = getPrintI64(op);
+    else if (eltType.isF32())
       printer = getPrintFloat(op);
     else if (eltType.isF64())
       printer = getPrintDouble(op);
     else
       return matchFailure();
 
     // Unroll vector into elementary print calls.
     emitRanks(rewriter, op, adaptor.source(), vectorType, printer, rank);
static Operation *getPrint(Operation *op, LLVM::LLVMDialect *dialect,
     OpBuilder moduleBuilder(module.getBodyRegion());
     return moduleBuilder.create<LLVM::LLVMFuncOp>(
         op->getLoc(), name,
         LLVM::LLVMType::getFunctionTy(LLVM::LLVMType::getVoidTy(dialect),
                                       params, /*isVarArg=*/false));
   }
 
   // Helpers for method names.
+  Operation *getPrintI32(Operation *op) const {
+    LLVM::LLVMDialect *dialect = lowering.getDialect();
+    return getPrint(op, dialect, "print_i32",
+                    LLVM::LLVMType::getInt32Ty(dialect));
+  }
+  Operation *getPrintI64(Operation *op) const {
+    LLVM::LLVMDialect *dialect = lowering.getDialect();
+    return getPrint(op, dialect, "print_i64",
+                    LLVM::LLVMType::getInt64Ty(dialect));
+  }
   Operation *getPrintFloat(Operation *op) const {
     LLVM::LLVMDialect *dialect = lowering.getDialect();
     return getPrint(op, dialect, "print_f32",
                     LLVM::LLVMType::getFloatTy(dialect));
   }
   Operation *getPrintDouble(Operation *op) const {
     LLVM::LLVMDialect *dialect = lowering.getDialect();
     return getPrint(op, dialect, "print_f64",

mlir/test/Conversion/VectorToLLVM/vector-to-llvm.mlir

 //       CHECK:   %[[allocatedBit:.*]] = llvm.bitcast %[[allocated]] : !llvm<"float*"> to !llvm<"[8 x [8 x <8 x float>]]*">
 //       CHECK:   llvm.insertvalue %[[allocatedBit]], {{.*}}[0] : !llvm<"{ [8 x [8 x <8 x float>]]*, [8 x [8 x <8 x float>]]*, i64 }">
 //       CHECK:   %[[aligned:.*]] = llvm.extractvalue {{.*}}[1] : !llvm<"{ float*, float*, i64, [3 x i64], [3 x i64] }">
 //       CHECK:   %[[alignedBit:.*]] = llvm.bitcast %[[aligned]] : !llvm<"float*"> to !llvm<"[8 x [8 x <8 x float>]]*">
 //       CHECK:   llvm.insertvalue %[[alignedBit]], {{.*}}[1] : !llvm<"{ [8 x [8 x <8 x float>]]*, [8 x [8 x <8 x float>]]*, i64 }">
 //       CHECK:   llvm.mlir.constant(0 : index
 //       CHECK:   llvm.insertvalue {{.*}}[2] : !llvm<"{ [8 x [8 x <8 x float>]]*, [8 x [8 x <8 x float>]]*, i64 }">
 
-func @vector_print_scalar(%arg0: f32) {
+func @vector_print_scalar_i32(%arg0: i32) {
+  vector.print %arg0 : i32
+  return
+}
+// CHECK-LABEL: llvm.func @vector_print_scalar_i32
+// CHECK-SAME: %[[A:arg[0-9]+]]: !llvm.i32
+//       CHECK:    llvm.call @print_i32(%[[A]]) : (!llvm.i32) -> ()
+//       CHECK:    llvm.call @print_newline() : () -> ()
+
+func @vector_print_scalar_i64(%arg0: i64) {
+  vector.print %arg0 : i64
+  return
+}
+// CHECK-LABEL: llvm.func @vector_print_scalar_i64
+// CHECK-SAME: %[[A:arg[0-9]+]]: !llvm.i64
+//       CHECK:    llvm.call @print_i64(%[[A]]) : (!llvm.i64) -> ()
+//       CHECK:    llvm.call @print_newline() : () -> ()
+
+func @vector_print_scalar_f32(%arg0: f32) {
   vector.print %arg0 : f32
   return
 }
-// CHECK-LABEL: llvm.func @vector_print_scalar
+// CHECK-LABEL: llvm.func @vector_print_scalar_f32
 // CHECK-SAME: %[[A:arg[0-9]+]]: !llvm.float
 //       CHECK:    llvm.call @print_f32(%[[A]]) : (!llvm.float) -> ()
 //       CHECK:    llvm.call @print_newline() : () -> ()
 
+func @vector_print_scalar_f64(%arg0: f64) {
+  vector.print %arg0 : f64
+  return
+}
+// CHECK-LABEL: llvm.func @vector_print_scalar_f64
+// CHECK-SAME: %[[A:arg[0-9]+]]: !llvm.double
+//       CHECK:    llvm.call @print_f64(%[[A]]) : (!llvm.double) -> ()
+//       CHECK:    llvm.call @print_newline() : () -> ()
+
 func @vector_print_vector(%arg0: vector<2x2xf32>) {
   vector.print %arg0 : vector<2x2xf32>
   return
 }
 // CHECK-LABEL: llvm.func @vector_print_vector
 // CHECK-SAME: %[[A:arg[0-9]+]]: !llvm<"[2 x <2 x float>]">
 //       CHECK:    llvm.call @print_open() : () -> ()
 //       CHECK:    %[[x0:.*]] = llvm.extractvalue %[[A]][0] : !llvm<"[2 x <2 x float>]">

mlir/test/mlir-cpu-runner/mlir_runner_utils.cpp

 //===- mlir_runner_utils.cpp - Utils for MLIR CPU execution ---------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // Utilities for interfacing MLIR types with C code as well as printing,
 // debugging etc.
 //
 //===----------------------------------------------------------------------===//
 
 #include "include/mlir_runner_utils.h"
 
+#include <cinttypes>
 #include <cstdio>
 
 extern "C" void
 print_memref_vector_4x4xf32(StridedMemRefType<Vector2D<4, 4, float>, 2> *M) {
   impl::printMemRef(*M);
 }
 
 #define MEMREF_CASE(TYPE, RANK)                                                \

 }
 extern "C" void print_memref_4d_f32(StridedMemRefType<float, 4> *M) {
   impl::printMemRef(*M);
 }
 
 // Small runtime support "lib" for vector.print lowering.
 // By providing elementary printing methods only, this
 // library can remain fully unaware of low-level implementation
-// details of our vectors.
+// details of our vectors. Also useful for direct LLVM IR output.
+extern "C" void print_i32(int32_t i) { fprintf(stdout, "%" PRId32, i); }
+extern "C" void print_i64(int64_t l) { fprintf(stdout, "%" PRId64, l); }
 extern "C" void print_f32(float f) { fprintf(stdout, "%g", f); }
 extern "C" void print_f64(double d) { fprintf(stdout, "%lg", d); }
 extern "C" void print_open() { fputs("( ", stdout); }
 extern "C" void print_close() { fputs(" )", stdout); }
 extern "C" void print_comma() { fputs(", ", stdout); }
 extern "C" void print_newline() { fputc('\n', stdout); }