From ecf5a81f64acd1ebcd87972a11a3f46de610ec65 Mon Sep 17 00:00:00 2001
From: "Maksimova, Viktoria" <viktoria.maksimova@intel.com>
Date: Mon, 8 Dec 2025 08:04:22 -0800
Subject: [PATCH 1/3] Replace GetElementCoord to cooperative matrix version

---
 sycl/include/sycl/__spirv/spirv_ops.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sycl/include/sycl/__spirv/spirv_ops.hpp b/sycl/include/sycl/__spirv/spirv_ops.hpp
index 4f68506aaca03..7eacbeb6a529f 100644
--- a/sycl/include/sycl/__spirv/spirv_ops.hpp
+++ b/sycl/include/sycl/__spirv/spirv_ops.hpp
@@ -107,12 +107,11 @@ extern __DPCPP_SYCL_EXTERNAL
     __spv::__spirv_CooperativeMatrixKHR<Tp, S, R, C, U> *
     __spirv_CompositeConstruct(const T v);
 
-// TODO: replace with __spirv_CooperativeMatrixGetElementCoordINTEL when ready
 template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
           __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
           __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
 extern __DPCPP_SYCL_EXTERNAL __ocl_vec_t<uint32_t, 2>
-__spirv_JointMatrixGetElementCoordINTEL(
+__spirv_CooperativeMatrixGetElementCoordINTEL(
     __spv::__spirv_CooperativeMatrixKHR<T, S, R, C, U> *, size_t i);
 
 // AccessChain followed by load/store serves to extract/insert and element

From 7f389d83d716e51288cb623efa17a80481fd2eed Mon Sep 17 00:00:00 2001
From: "Maksimova, Viktoria" <viktoria.maksimova@intel.com>
Date: Mon, 8 Dec 2025 08:09:11 -0800
Subject: [PATCH 2/3] fixup

---
 buildbot/configure.py                                | 2 ++
 sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildbot/configure.py b/buildbot/configure.py
index 5bddddec67a06..0e2aa59f2131c 100644
--- a/buildbot/configure.py
+++ b/buildbot/configure.py
@@ -214,6 +214,8 @@ def do_configure(args, passthrough_args):
         "-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
         "-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
         "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
+        "-DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON",
+        "-DLLVM_INSTALL_UTILS=ON"
     ]
     if args.offload:
         cmake_cmd.extend(
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
index 7a0fa9c0e6a79..48a3947ea8d10 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
@@ -116,7 +116,7 @@ class wi_element {
   inline __SYCL_ALWAYS_INLINE std::tuple<size_t, size_t> get_coord() {
 #if defined(__SYCL_DEVICE_ONLY__)
     __ocl_vec_t<uint32_t, 2> coord =
-        __spirv_JointMatrixGetElementCoordINTEL(M.spvm, idx);
+        __spirv_CooperativeMatrixGetElementCoordINTEL(M.spvm, idx);
     const size_t row = coord[0];
     const size_t col = coord[1];
     return std::make_tuple(row, col);
@@ -239,7 +239,7 @@ class wi_element<sycl::ext::oneapi::bfloat16, NumRows, NumCols, Use, Layout,
   inline __SYCL_ALWAYS_INLINE std::tuple<uint32_t, uint32_t> get_coord() {
 #if defined(__SYCL_DEVICE_ONLY__)
     __ocl_vec_t<uint32_t, 2> coord =
-        __spirv_JointMatrixGetElementCoordINTEL(M.spvm, idx);
+        __spirv_CooperativeMatrixGetElementCoordINTEL(M.spvm, idx);
     const uint32_t row = coord[0];
     const uint32_t col = coord[1];
     return std::make_tuple(row, col);

From d1528ae74ccfc7f9a661a69aec6440bb004ed707 Mon Sep 17 00:00:00 2001
From: "Maksimova, Viktoria" <viktoria.maksimova@intel.com>
Date: Mon, 8 Dec 2025 08:13:50 -0800
Subject: [PATCH 3/3] fixup

---
 buildbot/configure.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/buildbot/configure.py b/buildbot/configure.py
index 0e2aa59f2131c..5bddddec67a06 100644
--- a/buildbot/configure.py
+++ b/buildbot/configure.py
@@ -214,8 +214,6 @@ def do_configure(args, passthrough_args):
         "-DSYCL_ENABLE_EXTENSION_JIT={}".format(sycl_enable_jit),
         "-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
         "-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
-        "-DLLVM_INCLUDE_SPIRV_TOOLS_TESTS=ON",
-        "-DLLVM_INSTALL_UTILS=ON"
     ]
     if args.offload:
         cmake_cmd.extend(