Revert "Remove SPV_KHR_bfloat16 workaround"

Signed-off-by: Whitney Tsang <[email protected]>

Author: whitneywhtsang

.github/workflows/build-test-reusable.yml

@@ -124,6 +124,7 @@ jobs:
           build_llvm: ${{ inputs.build_llvm }}
           use_spirv_backend: ${{ inputs.use_spirv_backend }}
           command: >
+            source ./scripts/capture-hw-details.sh &&
             DEBUG=1
             python -m build --wheel --no-isolation && pip install dist/*.whl
 

scripts/skiplist/lts/language.txt

@@ -1,3 +1,9 @@
 # https://github.com/intel/intel-xpu-backend-for-triton/issues/4665
 python/test/unit/language/test_core.py::test_dot3d[8-1-32-32-32-32-32-float64-float64]
 python/test/unit/language/test_core.py::test_dot3d[4-1-64-64-64-32-32-float64-float64]
+# Below bfloat16 tests require IGC 1188 or above
+python/test/unit/language/test_core.py::test_atomic_rmw["*bfloat16*"]@regexp
+python/test/unit/language/test_core.py::test_tensor_atomic_rmw["*bfloat16*"]@regexp
+python/test/unit/language/test_core.py::test_tensor_atomic_add_non_exclusive_offset["*bfloat16*"]@regexp
+python/test/unit/language/test_core.py::test_tensor_atomic_add_shift_1["*bfloat16*"]@regexp
+python/test/unit/language/test_core.py::test_tensor_atomic_add_access_patterns["*bfloat16*"]@regexp

third_party/intel/cmake/FindSPIRVToLLVMTranslator.cmake

@@ -26,6 +26,35 @@ if (NOT SPIRVToLLVMTranslator_FOUND)
 
             FetchContent_MakeAvailable(spirv-llvm-translator)
 
+            # FIXME: Don't apply patch when LTS driver is updated.
+            if(DEFINED ENV{AGAMA_VERSION} AND "$ENV{AGAMA_VERSION}" STREQUAL "1146")
+                message(STATUS "Apply 3122.patch to SPIRV-LLVM-Translator")
+                execute_process(
+                    COMMAND git apply --check ${CMAKE_CURRENT_LIST_DIR}/3122.patch
+                    WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}
+                    ERROR_QUIET
+                    RESULT_VARIABLE PATCH_RESULT
+                )
+                if(PATCH_RESULT EQUAL 0)
+                    execute_process(
+                            COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/3122.patch
+                            WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}
+                            RESULT_VARIABLE PATCH_RESULT
+                    )
+                else()
+                    execute_process( # Check if the patch is already applied
+                            COMMAND git apply --reverse --check ${CMAKE_CURRENT_LIST_DIR}/3122.patch
+                            WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}
+                            RESULT_VARIABLE PATCH_RESULT
+                    )
+                endif()
+                if(NOT PATCH_RESULT EQUAL 0)
+                    message(FATAL_ERROR "Failed to apply 3122.patch to SPIRV-LLVM-Translator")
+                endif()
+            else()
+                message(STATUS "No need to apply 3122.patch to SPIRV-LLVM-Translator")
+            endif()
+
             # FIXME: Don't apply patch when Agama driver is updated to incorporate with the SPV_INTEL_bfloat16_arithmetic extension.
             execute_process(
                 COMMAND git apply --check ${CMAKE_CURRENT_LIST_DIR}/3388.patch