Merge branch 'main' into imex-embargo

intel · Aug 27, 2024 · cb9f6b5 · cb9f6b5
2 parents dfbae44 + 6ab0f20
commit cb9f6b5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/.github/workflows/build_gpu-fs-sim.yml b/.github/workflows/build_gpu-fs-sim.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     if: github.repository == 'intel-innersource/frameworks.ai.mlir.mlir-extensions'
-    runs-on: [self-hosted, icx, fs-sim]
+    runs-on: [self-hosted, icx, fs-sim-2]
     timeout-minutes: 450
 
     env:
@@ -62,10 +62,10 @@ jobs:
           set -x
           cd $HOME_DIR/frameworks.ai.mlir.mlir-extensions
 
-          cmake -S $BUILD_ROOT/llvm-project/llvm -B build -GNinja  -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. -DIMEX_ENABLE_SYCL_RUNTIME=1 -DIMEX_ENABLE_L0_RUNTIME=1 -DLLVM_LIT_ARGS="-a -j 1 --debug --timeout=1800 --filter=Integration/Dialect/Xe*/*" -DIMEX_ENABLE_FS_SIMULATOR=ON || exit
+          cmake -S $BUILD_ROOT/llvm-project/llvm -B build -GNinja  -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. -DIMEX_ENABLE_SYCL_RUNTIME=1 -DIMEX_ENABLE_L0_RUNTIME=1 -DLLVM_LIT_ARGS="-a --time-tests -j 1 --debug --timeout=1500 --filter=Integration/Dialect/Xe*/*" -DIMEX_ENABLE_FS_SIMULATOR=ON || exit
           sed -e 's,-printAllFeatures,,g' -i ${WORK_ROOT}/fs/scripts/run_in_a_loop_rasty.sh
           export NEO_BINARIES_ROOT="$HOME"/neo
-          (cd ${WORK_ROOT}/fs/scripts && source setup.sh && umd_driver_env_variables_export && ./run_in_a_loop_rasty.sh) &> fs-sim.log &
+          (cd ${WORK_ROOT}/fs/scripts && source setup.sh && umd_driver_env_variables_export && run_coral_fs -r -m umd -l) &> fs-sim.log &
           SIM_PID=$!
           cmake --build build --target check-static | tee build/tests.txt
           TEST_RESULT=${PIPESTATUS[0]}

diff --git a/test/Integration/Dialect/XeGPU/lit.local.cfg b/test/Integration/Dialect/XeGPU/lit.local.cfg
@@ -32,6 +32,27 @@ slow_simulator_tests = [
     'loadgather_chunk_size_f32.mlir', #gather support
     'loadgather_chunk_size_i32.mlir', #gather support
     'gemm_4kx4kx4k_bf16_bf16_f32_xetla_like_load_store_prefetch.mlir', # explicit memcpy not supported for the simulator
+    'gemm_4kx4kx4k_f16_f16_f16_w_8x32xf16_stores.mlir',
+    'gemm_4kx4kx4k_f16_f16_f16.mlir',
+    'gemm_4kx4kx4k_f16_f16_f16_w_simple_B_prefetch.mlir',
+    'gemm_1024x1016x1016_f16_f16_f32.mlir',
+    'gemm_1024x1024xf16.using.updateoffset.mlir',
+    'gemm_with_transposed_B_1kx1kx1k_f16_f16_f32.mlir',
+    'gemm_1024x1024xf16.mlir',
+    'gemm_1024x1024xbf16.mlir',
+    'flash_attention_fwd.mlir',
+    # below are tests with bad pitch/surface combination
+    'dynamic_memref.vc.mlir',
+    'exp_f32.vc.mlir',
+    'load2d-padding.mlir',
+    'load2d_dpas_store2d.mlir',
+    'preop_dpas.mlir',
+    'vector_broadcast_1.mlir',
+    'vector_broadcast_2.mlir',
+    'vector_extract_strided_slice_1.vc.mlir',
+    'vector_insert_1.mlir',
+    'vector_insert_2.mlir',
+    'xegpu-to-vc.mlir',
 ]
 
 if(config.imex_enable_fs_simulator):

diff --git a/test/Integration/Dialect/XeTile/lit.local.cfg b/test/Integration/Dialect/XeTile/lit.local.cfg
@@ -6,5 +6,24 @@ local_excludes = [
                   "wg_gemm_1kx1kx1k_f16_f16_f32.mlir",
                   "wg_gemm_4kx4kx4k_i8_i8_i32.mlir",
                  ]
+
+slow_simulator_tests = [
+    'sg_gemm_1kx1kx1k_f16_f16_f16_blk_16x32x32.mlir',
+    'sg_gemm_1kx1kx1k_f16_f16_f32_transpose_b.mlir',
+    'sg_gemm_1kx1kx1k_f16_f16_f32_transpose_a.mlir',
+    'sg_gemm_1kx1kx1k_f16_f16_f32_transpose_col_major_b.mlir',
+    'sg_gemm_1kx1kx1k_f32_f32_f32_with_truncf_a_b.mlir',
+    'sg_gemm_1kx1kx1k_transposed_b_preop_postop_bf16_bf16_f32.mlir',
+    'sg_gemm_1kx1kx1k_preop_postop_bf16_bf16_f32.mlir',
+    'sg_gemm_1kx1kx1k_f16_f16_f32.mlir',
+    'sg_gemm_pre_broadcast_a.mlir',
+    'sg_gemm_pre_broadcast_b.mlir',
+    'sg_gemm_preop_a.mlir',
+    'sg_gemm_preop_b.mlir',
+]
+
+if(config.imex_enable_fs_simulator):
+  local_excludes += slow_simulator_tests
+
 if(not config.imex_enable_excluded_tests):
     config.excludes.update(local_excludes)