-
Couldn't load subscription status.
- Fork 130
add a new query test that uses the new API #1358
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| //==------ joint_matrix_query_use_default.cpp - DPC++ joint_matrix---------==// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| // REQUIRES: matrix | ||
|
|
||
| // RUN: %clangxx -fsycl %s -o %t.out -DSYCL_EXT_ONEAPI_MATRIX_VERSION=2 | ||
| // RUN: %CPU_RUN_PLACEHOLDER %t.out | ||
|
|
||
| // CHECK: passed | ||
|
|
||
| // CHECK: passed | ||
|
|
||
| #include <iostream> | ||
| #include <sycl/sycl.hpp> | ||
|
|
||
| using namespace sycl; | ||
| using namespace sycl::ext::oneapi::experimental::matrix; | ||
|
|
||
| template <typename T, size_t NUM_ROWS, size_t NUM_COLS> struct big_matrix { | ||
| public: | ||
| T *mat; | ||
|
|
||
| public: | ||
| T *get_data() { return mat; } | ||
| void set_data(T *data) { mat = data; } | ||
| big_matrix(T *data) : mat(data) {} | ||
| }; | ||
|
|
||
| template <typename T1, typename T2, size_t NUM_ROWS_A, size_t NUM_COLS_A, | ||
| size_t NUM_ROWS_B, size_t NUM_COLS_B, size_t NUM_ROWS_C, | ||
| size_t NUM_COLS_C> | ||
| void matrix_multiply(big_matrix<T1, NUM_ROWS_C, NUM_COLS_C> &C, | ||
| big_matrix<T2, NUM_ROWS_A, NUM_COLS_A> &A, | ||
| big_matrix<T2, NUM_ROWS_B, NUM_COLS_B> &B) { | ||
| size_t M = NUM_ROWS_C; | ||
| size_t N = NUM_COLS_C; | ||
| size_t K = NUM_COLS_A; | ||
| assert(NUM_ROWS_C == NUM_ROWS_A && NUM_COLS_A == NUM_ROWS_B * 4); | ||
|
|
||
| using myparams2 = tpu_params<tpu::amx, int8_t, int8_t, int>; | ||
| constexpr int TM = myparams2::M; | ||
| constexpr int TN = myparams2::N; | ||
| constexpr int TK = myparams2::K; | ||
|
|
||
| std::cout << "AMX query sizes are: M " << TM << " N " << TN << " K " << TK | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. check the query size as well There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @yanfeng3721 if there is "failed" in line48 and another "passed" in line166, can the test infrastructure detect it is failed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Hi @yubingex007-a11y, I think it can be checked by FileCheck. Please refer to usage doc https://llvm.org/docs/CommandGuide/FileCheck.html. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. // CHECK: The test passed. i think two "// CHECK: passed" should be added according to yanfeng's comments |
||
| << std::endl; | ||
| if (TM == 16 && TN == 16 && TK == 64) | ||
| std::cout << "passed\n"; | ||
| else | ||
| std::cout << "failed\n"; | ||
| constexpr int SG_SZ = TN; | ||
| size_t NDRangeM = M / TM; | ||
| size_t NDRangeN = N / TN; | ||
| buffer<int8_t, 2> bufA(A.get_data(), range<2>(M, K)); | ||
| buffer<int8_t, 2> bufB(B.get_data(), range<2>(K, N)); | ||
| buffer<int32_t, 2> bufC(C.get_data(), range<2>(M, N)); | ||
|
|
||
| queue q; | ||
| q.submit([&](handler &cgh) { | ||
| auto accC = bufC.get_access<access::mode::read_write>(cgh); | ||
| auto accA = bufA.get_access<access::mode::read_write>(cgh); | ||
| auto accB = bufB.get_access<access::mode::read_write>(cgh); | ||
|
|
||
| cgh.parallel_for<class imatrix>( | ||
| nd_range<2>({NDRangeM, NDRangeN * SG_SZ}, {1, 1 * SG_SZ}), | ||
| [accA, accB, accC, M, N, K](nd_item<2> spmd_item) | ||
| [[intel::reqd_sub_group_size(SG_SZ)]] | ||
|
|
||
| { | ||
| // The submatrix API has to be accessed by all the workitems in a | ||
| // subgroup these functions will be called once by the subgroup no | ||
| // code divergence between the workitems | ||
| const auto global_idx = spmd_item.get_global_id(0); | ||
| const auto global_idy = spmd_item.get_global_id(1); | ||
| const auto sg_startx = global_idx - spmd_item.get_local_id(0); | ||
| const auto sg_starty = global_idy - spmd_item.get_local_id(1); | ||
|
|
||
| ext::oneapi::sub_group sg = spmd_item.get_sub_group(); | ||
|
|
||
| myparams2::joint_matrix_a<sub_group> sub_a(sg); | ||
| myparams2::joint_matrix_b<sub_group> sub_b(sg); | ||
| myparams2::joint_matrix_accumulator<sub_group> sub_c(sg); | ||
|
|
||
| joint_matrix_load(sg, sub_c, | ||
| accC.get_pointer() + (sg_startx * TM) * N + | ||
| sg_starty / SG_SZ * TN, | ||
| N, layout::row_major); | ||
| for (int k = 0; k < K / TK; k += 1) { | ||
| joint_matrix_load( | ||
| sg, sub_a, accA.get_pointer() + (sg_startx * TM) * K + k * TK, | ||
| K, layout::row_major); | ||
| // Assuming B data is already in VNNI format. | ||
| joint_matrix_load(sg, sub_b, | ||
| accB.get_pointer() + (k * TK / 4) * (N * 4) + | ||
| sg_starty / SG_SZ * TN * 4, | ||
| N * 4, layout::packed_b); | ||
| sub_c = joint_matrix_mad(sg, sub_a, sub_b, sub_c); | ||
| } | ||
| joint_matrix_store(sg, sub_c, | ||
| accC.get_pointer() + (sg_startx * TM) * N + | ||
| sg_starty / SG_SZ * TN, | ||
| N, layout::row_major); | ||
| }); // parallel for | ||
| }).wait(); | ||
| } | ||
|
|
||
| static constexpr size_t MATRIX_M = 128; | ||
| static constexpr size_t MATRIX_N = 128; | ||
| static constexpr size_t MATRIX_K = 128; | ||
| int8_t A[MATRIX_M][MATRIX_K]; | ||
| int8_t B[MATRIX_K / 4][MATRIX_N * 4]; | ||
| int32_t C[MATRIX_M][MATRIX_N]; | ||
| int32_t D[MATRIX_M][MATRIX_N]; | ||
|
|
||
| void matrix_multiply_ref(int32_t *A_mem, int32_t *B_mem, int32_t *C_mem, int M, | ||
| int N, int K) { | ||
| // tiling | ||
| for (int m = 0; m < M; m++) | ||
| for (int n = 0; n < N; n++) { | ||
| for (int k = 0; k < K; k++) { | ||
| char *va = (char *)(A_mem + m * K + k); | ||
| char *vb = (char *)(B_mem + k * N + n); | ||
| int acc = *(C_mem + m * N + n); | ||
| for (int i = 0; i < 4; i++) { | ||
| acc += (va[i] * vb[i]); | ||
| } | ||
| *(C_mem + m * N + n) = acc; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| int main() { | ||
| for (int i = 0; i < MATRIX_M; i++) { | ||
| for (int j = 0; j < MATRIX_K; j++) { | ||
| A[i][j] = i + 2 * j; | ||
| } | ||
| } | ||
| for (int i = 0; i < MATRIX_K / 4; i++) { | ||
| for (int j = 0; j < MATRIX_N * 4; j++) { | ||
| B[i][j] = i + j; | ||
| } | ||
| } | ||
| for (int i = 0; i < MATRIX_M; i++) { | ||
| for (int j = 0; j < MATRIX_N; j++) { | ||
| C[i][j] = 1; | ||
| D[i][j] = 1; | ||
| } | ||
| } | ||
|
|
||
| big_matrix<int32_t, MATRIX_M, MATRIX_N> MC((int32_t *)&C); | ||
| big_matrix<int32_t, MATRIX_M, MATRIX_N> MD((int32_t *)&D); | ||
| big_matrix<int8_t, MATRIX_M, MATRIX_K> MA((int8_t *)&A); | ||
| big_matrix<int8_t, MATRIX_K / 4, MATRIX_N * 4> MB((int8_t *)&B); | ||
| matrix_multiply(MC, MA, MB); | ||
| matrix_multiply_ref((int32_t *)A, (int32_t *)B, (int32_t *)D, MATRIX_M, | ||
| MATRIX_N, MATRIX_K / 4); | ||
|
|
||
| bool res = true; | ||
| for (int i = 0; i < MATRIX_M; i++) { | ||
| for (int j = 0; j < MATRIX_N; j++) { | ||
| if (C[i][j] != D[i][j]) | ||
| res = false; | ||
| } | ||
| } | ||
| if (res) | ||
| std::cout << "passed\n"; | ||
| else | ||
| std::cout << "failed\n"; | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please add a comment clarifying what exactly is checked by this test. It is not clear which API is being tested.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We recently updated the matrix API to introduce a new argument "use" in joint_matrix type.
https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/experimental/sycl_ext_oneapi_matrix/sycl_ext_oneapi_matrix.asciidoc
the old API was moved to https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/deprecated/sycl_ext_oneapi_matrix_no_use.asciidoc
The specific changes that I am making here are done in intel/llvm#6981