Skip to content
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/intel_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,16 @@ jobs:
gpu: BMG
intel_graphics: ROLLING
sycl_target: intel_gpu_bmg_g21
igc_version_major: 2
igc_version_minor: 18
runner: bmg108629-01
- compiler: RELEASE
gpu: PVC
intel_graphics: ROLLING
sycl_target: intel_gpu_pvc
igc_version_major: 2
igc_version_minor: 11
runner: pvc146162-01
- compiler: NIGHTLY
gpu: PVC
intel_graphics: ROLLING
sycl_target: intel_gpu_pvc
igc_version_major: 2
igc_version_minor: 11
runner: pvc146162-01

name: Run Intel ${{ matrix.compiler }} tests on ${{ matrix.gpu }} with intel-graphics ${{ matrix.intel_graphics }}
Expand Down Expand Up @@ -109,8 +103,6 @@ jobs:
cmake -G Ninja \
-DCUTLASS_ENABLE_SYCL=ON \
-DDPCPP_SYCL_TARGET=${{ matrix.sycl_target }} \
-DIGC_VERSION_MAJOR=${{ matrix.igc_version_major }} \
-DIGC_VERSION_MINOR=${{ matrix.igc_version_minor }} \
-DCMAKE_CXX_FLAGS="-Werror" \
-DCUTLASS_SYCL_RUNNING_CI=ON
cmake --build .
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/intel_test_gpp_host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,11 @@ jobs:
gpu: BMG
intel_graphics: ROLLING
sycl_target: intel_gpu_bmg_g21
igc_version_major: 2
igc_version_minor: 18
runner: bmg108629-01
- compiler: RELEASE
gpu: PVC
intel_graphics: ROLLING
sycl_target: intel_gpu_pvc
igc_version_major: 2
igc_version_minor: 11
runner: pvc146162-01


Expand Down Expand Up @@ -87,8 +83,6 @@ jobs:
cmake -G Ninja \
-DCUTLASS_ENABLE_SYCL=ON \
-DDPCPP_SYCL_TARGET=${{ matrix.sycl_target }} \
-DIGC_VERSION_MAJOR=${{ matrix.igc_version_major }} \
-DIGC_VERSION_MINOR=${{ matrix.igc_version_minor }} \
-DCUTLASS_SYCL_RUNNING_CI=ON \
-DCMAKE_CXX_FLAGS="-Werror" \
-DDPCPP_HOST_COMPILER=g++-13
Expand Down
52 changes: 42 additions & 10 deletions test/unit/cute/intel_xe/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2024 - 2024 Codeplay Software Ltd. All rights reserved.
# Copyright (C) 2025 Intel Corporation, All rights reserved.
# SPDX-License-Identifier: BSD-3-Clause
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -26,17 +27,41 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

if(NOT DEFINED IGC_VERSION_MAJOR)
set(IGC_VERSION_MAJOR 2)
endif()
if(NOT DEFINED IGC_VERSION_MINOR)
set(IGC_VERSION_MINOR 18)
endif()
# Function to check IGC version
function(check_igc_version)
execute_process(
COMMAND bash -c "dpkg -l | grep -E 'intel-igc-(core|opencl)(-[0-9]+)?' | awk '{print $3}' | cut -d'.' -f1,2 | head -1"
OUTPUT_VARIABLE IGC_VER
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)

# TEMPORARY: Force lower version for testing
# set(IGC_VER "2.11") # Change this to test different versions

add_compile_definitions(
IGC_VERSION_MAJOR=${IGC_VERSION_MAJOR}
IGC_VERSION_MINOR=${IGC_VERSION_MINOR}
)
message(STATUS "Found IGC version: ${IGC_VER}")

if(IGC_VER)
string(REPLACE "." ";" VER_LIST ${IGC_VER})
list(GET VER_LIST 0 MAJOR)
list(GET VER_LIST 1 MINOR)
set(IGC_VERSION_MAJOR ${MAJOR} PARENT_SCOPE)
set(IGC_VERSION_MINOR ${MINOR} PARENT_SCOPE)

if(IGC_VER VERSION_GREATER_EQUAL "2.18")
set(IGC_SUFFICIENT TRUE PARENT_SCOPE)
else()
set(IGC_SUFFICIENT FALSE PARENT_SCOPE)
endif()
else()
set(IGC_VERSION_MAJOR 0 PARENT_SCOPE)
set(IGC_VERSION_MINOR 0 PARENT_SCOPE)
set(IGC_SUFFICIENT FALSE PARENT_SCOPE)
message(WARNING "No IGC packages found")
endif()
endfunction()

check_igc_version()

if(SYCL_INTEL_TARGET)
cutlass_test_unit_add_executable(
Expand All @@ -47,7 +72,14 @@ cutlass_test_unit_add_executable(
copy_scatter.cpp
mma.cpp
tiled_mma.cpp
xe_copy_2d_test.cpp
)

target_compile_definitions(cutlass_test_unit_cute_intel_xe PRIVATE
IGC_VERSION_MAJOR=${IGC_VERSION_MAJOR}
IGC_VERSION_MINOR=${IGC_VERSION_MINOR}
)

else()
cutlass_test_unit_add_executable(
cutlass_test_unit_cute_intel_xe
Expand Down
7 changes: 7 additions & 0 deletions test/unit/cute/intel_xe/mma.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -414,4 +414,11 @@ TEST(PVC_CuTe_Xe, MMA_DPAS_TF32_1x16) {
tfloat32_t, float>(512, 512, 256);
}

#else

// Add fallback test to show DPAS tests are skipped
TEST(PVC_CuTe_Xe, MMA_DPAS_SKIPPED) {
GTEST_SKIP() << "MMA_DPAS tests require IGC version 2.18 or higher. "
<< "Current version: " << IGC_VERSION_MAJOR << "." << IGC_VERSION_MINOR;
}
#endif
Loading
Loading