[SYCL][Matrix] Remove legacy code of matrix implementation (intel#11813)

reble · Nov 10, 2023 · 1957f75 · 1957f75
1 parent aab2c61
commit 1957f75
Show file tree

Hide file tree

Showing 193 changed files with 129 additions and 7,352 deletions.
diff --git a/sycl/doc/extensions/deprecated/sycl_ext_oneapi_matrix_no_use.asciidoc b/sycl/doc/extensions/deprecated/sycl_ext_oneapi_matrix_no_use.asciidoc
diff --git a/sycl/include/CL/__spirv/spirv_ops.hpp b/sycl/include/CL/__spirv/spirv_ops.hpp
@@ -24,7 +24,6 @@
 
 #ifdef __SYCL_DEVICE_ONLY__
 
-#if (SYCL_EXT_ONEAPI_MATRIX_VERSION > 1)
 extern __DPCPP_SYCL_EXTERNAL float __spirv_RoundFToTF32INTEL(float a);
 template <typename T, typename Tp, std::size_t R, std::size_t C,
  __spv::MatrixUse U,
@@ -139,96 +138,6 @@ template <typename Ts, typename T, std::size_t R, std::size_t C,
 extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *
 __spirv_VectorInsertDynamic(__spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *,
  Ts val, size_t i);
-#else
-template <typename T, typename Tp, std::size_t R, std::size_t C,
- __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S> *
-__spirv_JointMatrixLoadINTEL(T *Ptr, std::size_t Stride,
- __spv::MatrixLayout Layout = L,
- __spv::Scope::Flag Sc = S, int MemOperand = 0);
-
-template <typename T, typename Tp, std::size_t R, std::size_t C,
- __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL void __spirv_JointMatrixStoreINTEL(
- T *Ptr, __spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S> *Object,
- std::size_t Stride, __spv::MatrixLayout Layout = L,
- __spv::Scope::Flag Sc = S, int MemOperand = 0);
-
-template <typename T1, typename T2, std::size_t M, std::size_t K, std::size_t N,
- __spv::MatrixLayout LA = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LB = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LC = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T2, M, N, LC, S> *
-__spirv_JointMatrixMadINTEL(
- __spv::__spirv_JointMatrixINTEL<T1, M, K, LA, S> *A,
- __spv::__spirv_JointMatrixINTEL<T1, K, N, LB, S> *B,
- __spv::__spirv_JointMatrixINTEL<T2, M, N, LC, S> *C,
- __spv::Scope::Flag Sc = __spv::Scope::Flag::Subgroup);
-
-template <typename T1, typename T2, typename T3, std::size_t M, std::size_t K,
- std::size_t N, __spv::MatrixLayout LA = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LB = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LC = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S> *
-__spirv_JointMatrixUUMadINTEL(
- __spv::__spirv_JointMatrixINTEL<T1, M, K, LA, S> *A,
- __spv::__spirv_JointMatrixINTEL<T2, K, N, LB, S> *B,
- __spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S> *C,
- __spv::Scope::Flag Sc = __spv::Scope::Flag::Subgroup);
-
-template <typename T1, typename T2, typename T3, std::size_t M, std::size_t K,
- std::size_t N, __spv::MatrixLayout LA = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LB = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LC = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S> *
-__spirv_JointMatrixUSMadINTEL(
- __spv::__spirv_JointMatrixINTEL<T1, M, K, LA, S> *A,
- __spv::__spirv_JointMatrixINTEL<T2, K, N, LB, S> *B,
- __spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S> *C,
- __spv::Scope::Flag Sc = __spv::Scope::Flag::Subgroup);
-
-template <typename T1, typename T2, typename T3, std::size_t M, std::size_t K,
- std::size_t N, __spv::MatrixLayout LA = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LB = __spv::MatrixLayout::RowMajor,
- __spv::MatrixLayout LC = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S> *
-__spirv_JointMatrixSUMadINTEL(
- __spv::__spirv_JointMatrixINTEL<T1, M, K, LA, S> *A,
- __spv::__spirv_JointMatrixINTEL<T2, K, N, LB, S> *B,
- __spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S> *C,
- __spv::Scope::Flag Sc = __spv::Scope::Flag::Subgroup);
-
-template <typename T, std::size_t R, std::size_t C,
- __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T, R, C, L, S> *
-__spirv_CompositeConstruct(const T v);
-
-template <typename T, std::size_t R, std::size_t C,
- __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL size_t __spirv_JointMatrixWorkItemLengthINTEL(
- __spv::__spirv_JointMatrixINTEL<T, R, C, L, S> *);
-
-template <typename T, std::size_t R, std::size_t C,
- __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL T __spirv_VectorExtractDynamic(
- __spv::__spirv_JointMatrixINTEL<T, R, C, L, S> *, size_t i);
-
-template <typename T, std::size_t R, std::size_t C,
- __spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
- __spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
-extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T, R, C, L, S> *
-__spirv_VectorInsertDynamic(__spv::__spirv_JointMatrixINTEL<T, R, C, L, S> *,
- T val, size_t i);
-#endif // SYCL_EXT_ONEAPI_MATRIX_VERSION
 
 #ifndef __SPIRV_BUILTIN_DECLARATIONS__
 #error \
@@ -1220,7 +1129,7 @@ extern __DPCPP_SYCL_EXTERNAL
  std::enable_if_t<std::is_integral_v<to> && std::is_unsigned_v<to>, to>
  __spirv_ConvertPtrToU(from val) noexcept;
 
-#else // if !__SYCL_DEVICE_ONLY__
+#else  // if !__SYCL_DEVICE_ONLY__
 
 template <typename dataT>
 __SYCL_CONVERGENT__ extern __ocl_event_t

diff --git a/sycl/include/CL/__spirv/spirv_types.hpp b/sycl/include/CL/__spirv/spirv_types.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <sycl/detail/defines.hpp> // for SYCL_EXT_ONEAPI_MATRIX_VERSION
+#include <sycl/detail/defines.hpp> // for __has_builtin
 #include <sycl/half_type.hpp> // for half
 
 #include <cstddef> // for size_t
@@ -110,35 +110,19 @@ enum class GroupOperation : uint32_t {
  ClusteredReduce = 3,
 };
 
-#if (SYCL_EXT_ONEAPI_MATRIX_VERSION > 1)
 enum class MatrixLayout : uint32_t {
  RowMajor = 0,
  ColumnMajor = 1,
  Packed = 2,
  Dynamic = 3
 };
-#else
-enum class MatrixLayout : uint32_t {
- RowMajor = 0,
- ColumnMajor = 1,
- PackedA = 2,
- PackedB = 3,
- Unused = 4
-};
-#endif
 
 enum class MatrixUse : uint32_t { MatrixA = 0, MatrixB = 1, Accumulator = 2 };
 
-#if (SYCL_EXT_ONEAPI_MATRIX_VERSION > 1)
 template <typename T, std::size_t R, std::size_t C, MatrixLayout L,
  Scope::Flag S = Scope::Flag::Subgroup,
  MatrixUse U = MatrixUse::MatrixA>
 struct __spirv_JointMatrixINTEL;
-#else
-template <typename T, std::size_t R, std::size_t C, MatrixLayout L,
- Scope::Flag S = Scope::Flag::Subgroup>
-struct __spirv_JointMatrixINTEL;
-#endif // SYCL_EXT_ONEAPI_MATRIX_VERSION
 
 } // namespace __spv
 
@@ -176,8 +160,8 @@ template <int Bits> using ap_int = _BitInt(Bits);
 // SPIRV built-in functions.
 // Only in such cases the class is recognized as SPIRV type __ocl_event_t.
 #ifndef __SYCL_DEVICE_ONLY__
-typedef void* __ocl_event_t;
-typedef void* __ocl_sampler_t;
+typedef void *__ocl_event_t;
+typedef void *__ocl_sampler_t;
 // Adding only the datatypes that can be currently used in SYCL,
 // as per SYCL spec 1.2.1
 #define __SYCL_SPV_IMAGE_TYPE(NAME) typedef void *__ocl_##NAME##_t

diff --git a/sycl/include/sycl/detail/defines.hpp b/sycl/include/sycl/detail/defines.hpp
@@ -38,12 +38,3 @@
 #else
 #define __SYCL_TYPE(x)
 #endif
-
-// joint matrix should only be included by default for SPIR, NVPTX or HIP(GFX90A
-// only) backends
-#if defined __SPIR__ || defined __NVPTX__ || !defined __SYCL_DEVICE_ONLY__ || \
- defined __gfx90a__
-#ifndef SYCL_EXT_ONEAPI_MATRIX_VERSION
-#define SYCL_EXT_ONEAPI_MATRIX_VERSION 4
-#endif // SYCL_EXT_ONEAPI_MATRIX_VERSION
-#endif // __SPIR__ || __NVPTX__ || !__SYCL_DEVICE_ONLY || __gfx90a__