diff --git a/mlir/test/mlir-cpu-runner/include/mlir_runner_utils.h b/mlir/include/mlir/tools/mlir-runner-utils/mlir-runner-utils.h
rename from mlir/test/mlir-cpu-runner/include/mlir_runner_utils.h
rename to mlir/include/mlir/tools/mlir-runner-utils/mlir-runner-utils.h
--- a/mlir/test/mlir-cpu-runner/include/mlir_runner_utils.h
+++ b/mlir/include/mlir/tools/mlir-runner-utils/mlir-runner-utils.h
@@ -1,12 +1,12 @@
-//===- mlir_runner_utils.h - Utils for debugging MLIR CPU execution -------===//
+//===- mlir_runner_utils.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 TOOLS_MLIR_RUNNER_UTILS_MLIRRUNNERUTILS_H_
+#define TOOLS_MLIR_RUNNER_UTILS_MLIRRUNNERUTILS_H_
 
 #include <assert.h>
 #include <cstdint>
@@ -291,4 +291,4 @@
 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 // TOOLS_MLIR_RUNNER_UTILS_MLIRRUNNERUTILS_H_
diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -40,7 +40,7 @@
   mlir-translate
   cblas
   cblas_interface
-  mlir_runner_utils
+  mlir-runner-utils
   )
 
 if(LLVM_BUILD_EXAMPLES)
diff --git a/mlir/test/mlir-cpu-runner/CMakeLists.txt b/mlir/test/mlir-cpu-runner/CMakeLists.txt
--- a/mlir/test/mlir-cpu-runner/CMakeLists.txt
+++ b/mlir/test/mlir-cpu-runner/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(LLVM_OPTIONAL_SOURCES
   cblas.cpp
   cblas_interface.cpp
-  mlir_runner_utils.cpp
   )
 
 add_llvm_library(cblas SHARED cblas.cpp)
@@ -11,5 +10,3 @@
 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)
diff --git a/mlir/test/mlir-cpu-runner/include/cblas.h b/mlir/test/mlir-cpu-runner/include/cblas.h
--- a/mlir/test/mlir-cpu-runner/include/cblas.h
+++ b/mlir/test/mlir-cpu-runner/include/cblas.h
@@ -8,7 +8,7 @@
 #ifndef MLIR_CPU_RUNNER_CBLAS_H_
 #define MLIR_CPU_RUNNER_CBLAS_H_
 
-#include "mlir_runner_utils.h"
+#include "mlir/tools/mlir-runner-utils/mlir-runner-utils.h"
 
 #ifdef _WIN32
 #ifndef MLIR_CBLAS_EXPORT
diff --git a/mlir/test/mlir-cpu-runner/include/cblas_interface.h b/mlir/test/mlir-cpu-runner/include/cblas_interface.h
--- a/mlir/test/mlir-cpu-runner/include/cblas_interface.h
+++ b/mlir/test/mlir-cpu-runner/include/cblas_interface.h
@@ -8,7 +8,7 @@
 #ifndef MLIR_CPU_RUNNER_CBLAS_INTERFACE_H_
 #define MLIR_CPU_RUNNER_CBLAS_INTERFACE_H_
 
-#include "mlir_runner_utils.h"
+#include "mlir/tools/mlir-runner-utils/mlir-runner-utils.h"
 
 #ifdef _WIN32
 #ifndef MLIR_CBLAS_INTERFACE_EXPORT
diff --git a/mlir/tools/CMakeLists.txt b/mlir/tools/CMakeLists.txt
--- a/mlir/tools/CMakeLists.txt
+++ b/mlir/tools/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(mlir-cuda-runner)
 add_subdirectory(mlir-cpu-runner)
 add_subdirectory(mlir-opt)
+add_subdirectory(mlir-runner-utils)
 add_subdirectory(mlir-tblgen)
 add_subdirectory(mlir-translate)
 add_subdirectory(mlir-vulkan-runner)
diff --git a/mlir/tools/mlir-runner-utils/CMakeLists.txt b/mlir/tools/mlir-runner-utils/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/mlir/tools/mlir-runner-utils/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(LLVM_OPTIONAL_SOURCES
+  mlir-runner-utils.cpp
+  )
+
+add_llvm_library(mlir-runner-utils SHARED mlir-runner-utils.cpp)
+target_compile_definitions(mlir-runner-utils PRIVATE mlir-runner-utils_EXPORTS)
diff --git a/mlir/test/mlir-cpu-runner/mlir_runner_utils.cpp b/mlir/tools/mlir-runner-utils/mlir-runner-utils.cpp
rename from mlir/test/mlir-cpu-runner/mlir_runner_utils.cpp
rename to mlir/tools/mlir-runner-utils/mlir-runner-utils.cpp
--- a/mlir/test/mlir-cpu-runner/mlir_runner_utils.cpp
+++ b/mlir/tools/mlir-runner-utils/mlir-runner-utils.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "include/mlir_runner_utils.h"
+#include "mlir/tools/mlir-runner-utils/mlir-runner-utils.h"
 
 #include <cinttypes>
 #include <cstdio>