Use mlir sycl runtime for XeVM and XeGPU to XeVM integration tests. (#1082)

silee2 · web-flow · commit 3ad0633b304f · 2025-05-30T08:14:54.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -214,6 +214,10 @@ else ()
     set(IMEX_ENABLE_SYCL_RUNTIME 0)
 endif()
 
+if(NOT DEFINED MLIR_ENABLE_SYCL_RUNNER)
+    set(MLIR_ENABLE_SYCL_RUNNER 0)
+endif()
+
 if (IMEX_ENABLE_L0_RUNTIME)
     set(IMEX_ENABLE_L0_RUNTIME 1)
 else ()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,6 +6,7 @@ endif()
 set(IMEX_TEST_DEPENDS
         imex-opt
         imex-cpu-runner
+        mlir-runner
         mlir_c_runner_utils
         mlir_runner_utils
         imex_runner_utils
@@ -46,7 +47,7 @@ if(IMEX_ENABLE_VULKAN_RUNNER)
         )
 endif()
 
-if(IMEX_ENABLE_SYCL_RUNTIME)
+if(MLIR_ENABLE_SYCL_RUNNER)
     list(APPEND IMEX_TEST_DEPENDS
         mlir_sycl_runtime
         )
diff --git a/test/Integration/Dialect/XeGPUToXeVM/gemm_4kx4kx4k_f16_f16_f16_simt.mlir b/test/Integration/Dialect/XeGPUToXeVM/gemm_4kx4kx4k_f16_f16_f16_simt.mlir
@@ -1,4 +1,4 @@
-// RUN: %python_executable %imex_runner --requires=sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
 // RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
diff --git a/test/Integration/Dialect/XeGPUToXeVM/lit.local.cfg b/test/Integration/Dialect/XeGPUToXeVM/lit.local.cfg
@@ -0,0 +1,2 @@
+if(not config.mlir_enable_sycl_runtime):
+  config.unsupported = True
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd_dpas.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd_dpas.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 #sg_map_a_f16 = #xegpu.layout<lane_layout = [1, 16], lane_data = [1, 1]>
 #sg_map_b_f16 = #xegpu.layout<lane_layout = [1, 16], lane_data = [2, 1]>
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd_prefetch.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd_prefetch.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd_update_offset.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_nd_update_offset.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_1.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_1.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_1_non_contig_offsets.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_1_non_contig_offsets.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_1_update_offset.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_1_update_offset.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_2.mlir b/test/Integration/Dialect/XeGPUToXeVM/loadstore_scatter_chunk_size_2.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
     gpu.func @load_store_2d(%src: memref<128xf32, 1>, %dst: memref<128xf32, 1>) kernel {
diff --git a/test/Integration/Dialect/XeGPUToXeVM/simple_gemm.mlir b/test/Integration/Dialect/XeGPUToXeVM/simple_gemm.mlir
@@ -1,4 +1,4 @@
-// RUN: %python_executable %imex_runner --requires=sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
 // RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
diff --git a/test/Integration/Dialect/XeVM/lit.local.cfg b/test/Integration/Dialect/XeVM/lit.local.cfg
@@ -0,0 +1,2 @@
+if(not config.mlir_enable_sycl_runtime):
+  config.unsupported = True
diff --git a/test/Integration/Dialect/XeVM/xevm_block_dpas.mlir b/test/Integration/Dialect/XeVM/xevm_block_dpas.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeVM/xevm_block_load_store.mlir b/test/Integration/Dialect/XeVM/xevm_block_load_store.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
 
diff --git a/test/Integration/Dialect/XeVM/xevm_block_load_store_transpose.mlir b/test/Integration/Dialect/XeVM/xevm_block_load_store_transpose.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeVM/xevm_block_load_store_vnni.mlir b/test/Integration/Dialect/XeVM/xevm_block_load_store_vnni.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
   gpu.module @kernel {
diff --git a/test/Integration/Dialect/XeVM/xevm_store_cst.mlir b/test/Integration/Dialect/XeVM/xevm_store_cst.mlir
@@ -1,7 +1,7 @@
-// RUN: %python_executable %imex_runner --requires=l0-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xevm-to-llvm.pp \
 // RUN:                                       --runner imex-cpu-runner -e main \
 // RUN:                                       --entry-point-result=void \
-// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%levelzero_runtime --filecheck
+// RUN:                                       --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck
 
 module @gemm attributes {gpu.container_module} {
 
diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
@@ -42,6 +42,7 @@ config.imex_enable_excluded_tests = @IMEX_ENABLE_EXCLUDED_TESTS@
 config.imex_enable_ats_target = @IMEX_ENABLE_ATS_TARGET@
 config.imex_enable_pvc_target = @IMEX_ENABLE_PVC_TARGET@
 config.imex_enable_bindings_python = @IMEX_ENABLE_BINDINGS_PYTHON@
+config.mlir_enable_sycl_runtime = @MLIR_ENABLE_SYCL_RUNNER@
 
 if sys.platform.startswith('win32'):
     config.shlib_prefix = ""
@@ -53,8 +54,9 @@ config.mlir_c_runner_utils = os.path.normpath(os.path.join(config.mlir_runner_ut
 if config.enable_vulkan_runner:
     config.vulkan_runtime_wrappers = os.path.normpath(os.path.join(config.mlir_runner_utils_dir, config.shlib_prefix + "vulkan-runtime-wrappers" + config.llvm_shlib_ext))
 if config.imex_enable_sycl_runtime:
-    config.mlir_sycl_runtime = os.path.normpath(os.path.join(config.mlir_runner_utils_dir, config.shlib_prefix + "mlir_sycl_runtime" + config.llvm_shlib_ext))
     config.sycl_runtime = os.path.normpath(os.path.join(config.imex_lib_dir, config.shlib_prefix + "sycl-runtime" + config.llvm_shlib_ext))
+if config.mlir_enable_sycl_runtime:
+    config.mlir_sycl_runtime = os.path.normpath(os.path.join(config.mlir_runner_utils_dir, config.shlib_prefix + "mlir_sycl_runtime" + config.llvm_shlib_ext))
 if config.imex_enable_l0_runtime:
     config.levelzero_runtime = os.path.normpath(os.path.join(config.imex_lib_dir, config.shlib_prefix + "level-zero-runtime" + config.llvm_shlib_ext))
 config.imex_enable_igpu = config.imex_enable_l0_runtime or config.imex_enable_sycl_runtime
diff --git a/tools/imex-runner/imex-runner.py.in b/tools/imex-runner/imex-runner.py.in
@@ -54,10 +54,11 @@ imex_enable_vulkan_runner = @IMEX_ENABLE_VULKAN_RUNNER@
 imex_enable_l0_runtime = @IMEX_ENABLE_L0_RUNTIME@
 imex_enable_sycl_runtime = @IMEX_ENABLE_SYCL_RUNTIME@
 imex_enable_spirv_backend = @IMEX_SPIRV_BACKEND_ENABLED@
+mlir_enable_sycl_runtime = @MLIR_ENABLE_SYCL_RUNNER@
 
-runner_choices = ['imex-cpu-runner']
+runner_choices = ['imex-cpu-runner', 'mlir-runner']
 enabled_features = []
-all_features = ['vulkan-runner', 'l0-runtime', 'sycl-runtime', 'igpu-fp64', 'spirv-backend']
+all_features = ['vulkan-runner', 'l0-runtime', 'sycl-runtime', 'igpu-fp64', 'spirv-backend', 'mlir-sycl-runtime']
 if imex_enable_vulkan_runner:
     runner_choices.append('mlir-vulkan-runner')
     enabled_features.append('vulkan-runner')
@@ -67,6 +68,8 @@ if imex_enable_sycl_runtime:
     enabled_features.append('sycl-runtime')
 if imex_enable_spirv_backend:
     enabled_features.append('spirv-backend')
+if mlir_enable_sycl_runtime:
+    enabled_features.append('mlir-sycl-runtime')
 
 class SplitArgs(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %python_executable %imex_runner --requires=sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \`
	`1`	`+// RUN: %python_executable %imex_runner --requires=mlir-sycl-runtime,spirv-backend -i %s --pass-pipeline-file=%p/xegpu-to-llvm.pp \`
`2`	`2`	`// RUN: --runner imex-cpu-runner -e main \`
`3`	`3`	`// RUN: --entry-point-result=void \`
`4`	`4`	`// RUN: --shared-libs=%irunner_utils,%mlir_runner_utils,%mlir_c_runner_utils,%mlir_sycl_runtime --filecheck`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+if(not config.mlir_enable_sycl_runtime):`
	`2`	`+ config.unsupported = True`