[mlir] NFC - Move runner utils from mlir-cpu-runner to ExecutionEngine

[nicolasvasilache]

Summary

Runner utils are useful beyond just CPU and hiding them within the test directory makes it unnecessarily harder to reuse in other projects.

[nicolasvasilache]

Update CMakeLists.txt

[mehdi_amini]

mlir/tools/mlir-runner-utils/CMakeLists.txt

6 ↗

(On Diff #246847)

The tools directory isn't usually for exposing "libraries" but for exposing command line... tools?

Will this trigger the installation of a mlir-runner-utils library for example?

[nicolasvasilache]

mlir/tools/mlir-runner-utils/CMakeLists.txt

6 ↗

(On Diff #246847)

ok, I am working on changes to move that under ExecutionEngine.
I need to split things that need a C++ runtime from others for mobile anyway.

[nicolasvasilache]

Move to ExecutionEngine

[nicolasvasilache]

Land as bb67bbcf9d71e976b44605887d9857fd27d109c9 but a glitch in my local config dropped the phab link..

mlir/include/mlir/ExecutionEngine/RunnerUtils.h

-//===- mlir_runner_utils.h - Utils for debugging MLIR CPU execution -------===//
+//===- RunnerUtils.h - Utils for debugging MLIR 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
 //
 //===----------------------------------------------------------------------===//
-#ifndef MLIR_CPU_RUNNER_MLIRUTILS_H_
-#define MLIR_CPU_RUNNER_MLIRUTILS_H_
+
+#ifndef EXECUTIONENGINE_RUNNERUTILS_H_
+#define EXECUTIONENGINE_RUNNERUTILS_H_
 
 #include <assert.h>
 #include <cstdint>
 #include <iostream>
 
 #ifdef _WIN32
 #ifndef MLIR_RUNNER_UTILS_EXPORT
 #ifdef mlir_runner_utils_EXPORTS

 // Small runtime support "lib" for vector.print lowering.
 extern "C" MLIR_RUNNER_UTILS_EXPORT void print_f32(float f);
 extern "C" MLIR_RUNNER_UTILS_EXPORT void print_f64(double d);
 extern "C" MLIR_RUNNER_UTILS_EXPORT void print_open();
 extern "C" MLIR_RUNNER_UTILS_EXPORT void print_close();
 extern "C" MLIR_RUNNER_UTILS_EXPORT void print_comma();
 extern "C" MLIR_RUNNER_UTILS_EXPORT void print_newline();
 
-#endif // MLIR_CPU_RUNNER_MLIRUTILS_H_
+#endif // EXECUTIONENGINE_RUNNERUTILS_H_

mlir/lib/ExecutionEngine/CMakeLists.txt

+set(LLVM_OPTIONAL_SOURCES
+  ExecutionEngine.cpp
+  RunnerUtils.cpp
+  OptUtils.cpp
+  )
+
 llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO")
 add_llvm_library(MLIRExecutionEngine
   ExecutionEngine.cpp
   OptUtils.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/ExecutionEngine
   )
target_link_libraries(MLIRExecutionEngine
   LLVMInstCombine
   LLVMMC
   LLVMScalarOpts
   LLVMTarget
   LLVMVectorize
   LLVMTransformUtils
 
   ${outlibs})
+
+add_llvm_library(MLIRRunnerUtils SHARED RunnerUtils.cpp)
+target_compile_definitions(MLIRRunnerUtils PRIVATE mlir_runner_utils_EXPORTS)

mlir/lib/ExecutionEngine/RunnerUtils.cpp

-//===- mlir_runner_utils.cpp - Utils for MLIR CPU execution ---------------===//
+//===- RunnerUtils.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 "mlir/ExecutionEngine/RunnerUtils.h"
 
 #include <cinttypes>
 #include <cstdio>
 
 extern "C" void _mlir_ciface_print_memref_vector_4x4xf32(
     StridedMemRefType<Vector2D<4, 4, float>, 2> *M) {
   impl::printMemRef(*M);
 }

mlir/test/CMakeLists.txt

set(MLIR_TEST_DEPENDS
   mlir-cpu-runner
   mlir-edsc-builder-api-test
   mlir-opt
   mlir-sdbm-api-test
   mlir-tblgen
   mlir-translate
   cblas
   cblas_interface
-  mlir_runner_utils
+  MLIRRunnerUtils
   )
 
 if(LLVM_BUILD_EXAMPLES)
   list(APPEND MLIR_TEST_DEPENDS
     toyc-ch1
     toyc-ch2
     toyc-ch3
     toyc-ch4

mlir/test/mlir-cpu-runner/CMakeLists.txt

 set(LLVM_OPTIONAL_SOURCES
   cblas.cpp
   cblas_interface.cpp
-  mlir_runner_utils.cpp
   )
 
 add_llvm_library(cblas SHARED cblas.cpp)
 target_compile_definitions(cblas PRIVATE cblas_EXPORTS)
 
 add_llvm_library(cblas_interface SHARED cblas_interface.cpp)
 target_link_libraries(cblas_interface PRIVATE cblas)
 target_compile_definitions(cblas_interface PRIVATE cblas_interface_EXPORTS)
 
-add_llvm_library(mlir_runner_utils SHARED mlir_runner_utils.cpp)
-target_compile_definitions(mlir_runner_utils PRIVATE mlir_runner_utils_EXPORTS)

mlir/test/mlir-cpu-runner/include/cblas.h

 //===- cblas.h - Simple Blas subset ---------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 #ifndef MLIR_CPU_RUNNER_CBLAS_H_
 #define MLIR_CPU_RUNNER_CBLAS_H_
 
-#include "mlir_runner_utils.h"
+#include "mlir/ExecutionEngine/RunnerUtils.h"
 
 #ifdef _WIN32
 #ifndef MLIR_CBLAS_EXPORT
 #ifdef cblas_EXPORTS
 /* We are building this library */
 #define MLIR_CBLAS_EXPORT __declspec(dllexport)
 #else
 /* We are using this library */

mlir/test/mlir-cpu-runner/include/cblas_interface.h

 //===- cblas_interface.h - Simple Blas subset interface -------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 #ifndef MLIR_CPU_RUNNER_CBLAS_INTERFACE_H_
 #define MLIR_CPU_RUNNER_CBLAS_INTERFACE_H_
 
-#include "mlir_runner_utils.h"
+#include "mlir/ExecutionEngine/RunnerUtils.h"
 
 #ifdef _WIN32
 #ifndef MLIR_CBLAS_INTERFACE_EXPORT
 #ifdef cblas_interface_EXPORTS
 /* We are building this library */
 #define MLIR_CBLAS_INTERFACE_EXPORT __declspec(dllexport)
 #else
 /* We are using this library */