[AutoBump] Merge with fixes of eb206e9 (Jan 24)

Author: jorickert

mlir/docs/Dialects/GPU.md

@@ -107,7 +107,7 @@ parallelization. To enable parallelism, necessary transformations must be
 applied before utilizing this pipeline.
 
 It's designed to provide a generic solution for NVVM targets, generating NVVM
-and LLVM dialect code compatible with `mlir-cpu-runner` or execution engine.
+and LLVM dialect code compatible with `mlir-runner` or execution engine.
 
 #### Example:
 
@@ -131,7 +131,7 @@ func.func @main() {
 The `gpu-lower-to-nvvm` pipeline compiles this input code to NVVM format as
 below. It provides customization options like specifying SM capability, PTX
 version, and optimization level. Once compiled, the resulting IR is ready for
-execution using `mlir-cpu-runner`. Alternatively, it can be translated into
+execution using `mlir-runner`. Alternatively, it can be translated into
 LLVM, expanding its utility within the system.
 
 ```

mlir/docs/ReleaseNotes.md

@@ -8,6 +8,10 @@ specifically, it is a snapshot of the MLIR development at the time of the releas
 
 [TOC]
 
+## LLVM 20
+
+All the MLIR runners other than `mlir-cpu-runner` have been removed, as their functionality has been merged into it, and it has been renamed to `mlir-runner`.
+
 ## LLVM 18
 
 ### Properties: beyond attributes

mlir/docs/SPIRVToLLVMDialectConversion.md

@@ -817,7 +817,7 @@ to LLVM ops. At the moment, SPIR-V module attributes are ignored.
 
 ## SPIR-V CPU Runner Tests
 
-The `mlir-cpu-runner` has support for executing a `gpu` dialect kernel on the
+The `mlir-runner` has support for executing a `gpu` dialect kernel on the
 CPU via SPIR-V to LLVM dialect conversion. This is referred to as the "SPIR-V
 CPU Runner". The `--link-nested-modules` flag needs to be passed for this.
 Currently, only single-threaded kernels are supported.

mlir/lib/ExecutionEngine/VulkanRuntimeWrappers.cpp

@@ -117,7 +117,7 @@ extern "C" {
 
 //===----------------------------------------------------------------------===//
 //
-// Wrappers intended for mlir-cpu-runner. Uses of GPU dialect operations get
+// Wrappers intended for mlir-runner. Uses of GPU dialect operations get
 // lowered to calls to these functions by GPUToLLVMConversionPass.
 //
 //===----------------------------------------------------------------------===//

mlir/test/CMakeLists.txt

@@ -22,8 +22,8 @@ if (MLIR_INCLUDE_INTEGRATION_TESTS)
       "If set, arch-specific Arm integration tests are run with an emulator.")
   set(ARM_EMULATOR_OPTIONS "" CACHE STRING
       "If arch-specific Arm integration tests run emulated, pass these as parameters to the emulator.")
-  set(ARM_EMULATOR_MLIR_CPU_RUNNER_EXECUTABLE "" CACHE STRING
-      "If arch-specific Arm integration tests run emulated, use this Arm native mlir-cpu-runner.")
+  set(ARM_EMULATOR_MLIR_RUNNER_EXECUTABLE "" CACHE STRING
+      "If arch-specific Arm integration tests run emulated, use this Arm native mlir-runner.")
   set(ARM_EMULATOR_LLI_EXECUTABLE "" CACHE STRING
       "If arch-specific Arm integration tests run emulated, use this Arm native lli.")
   set(ARM_EMULATOR_UTILS_LIB_DIR "" CACHE STRING
@@ -135,7 +135,7 @@ set(MLIR_TEST_DEPENDS ${MLIR_TEST_DEPENDS}
 # useless binaries.
 if(LLVM_ENABLE_PIC AND TARGET ${LLVM_NATIVE_ARCH})
   list(APPEND MLIR_TEST_DEPENDS
-    mlir-cpu-runner
+    mlir-runner
     llc
     mlir_async_runtime
     mlir-capi-execution-engine-test

mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-addi-i16.mlir

@@ -3,14 +3,14 @@
 
 // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines
 
 // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
 // RUN:             --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines
 

mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-cmpi-i16.mlir

@@ -4,14 +4,14 @@
 
 // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines
 
 // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
 // RUN:             --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines
 

mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-compare-results-i16.mlir

@@ -5,7 +5,7 @@
 // RUN:             --convert-vector-to-scf --convert-scf-to-cf --convert-cf-to-llvm \
 // RUN:             --convert-vector-to-llvm --convert-func-to-llvm --convert-arith-to-llvm \
 // RUN:             --reconcile-unrealized-casts | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:      --shared-libs="%mlir_c_runner_utils,%mlir_runner_utils" | \
 // RUN:   FileCheck %s
 

mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-constants-i16.mlir

@@ -4,7 +4,7 @@
 // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
 // RUN:             --convert-vector-to-scf --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm --reconcile-unrealized-casts | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines --check-prefix=EMULATED
 

mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-max-min-i16.mlir

@@ -4,14 +4,14 @@
 
 // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines
 
 // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
 // RUN:             --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
 // RUN:             --convert-func-to-llvm --convert-arith-to-llvm | \
-// RUN:   mlir-cpu-runner -e entry -entry-point-result=void \
+// RUN:   mlir-runner -e entry -entry-point-result=void \
 // RUN:                   --shared-libs=%mlir_c_runner_utils | \
 // RUN:   FileCheck %s --match-full-lines