Skip to content

[Bug][MMA] Changed the type of D matrix elements array from volatile CDType * to volatile void * #2878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: SYCLomatic
Choose a base branch
from
Open

[Bug][MMA] Changed the type of D matrix elements array from volatile CDType * to volatile void * #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions clang/lib/DPCT/RulesAsm/AsmMigration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,8 +1563,8 @@ class SYCLGen : public SYCLGenBase {
OS() << "{" << getNL();
incIndent();
indent();
OS() << "volatile " << CDType << " *d_mat_frag_ct1["
<< DMatVE->getNumElements() << "] = { ";
OS() << "volatile void *d_mat_frag_ct1[" << DMatVE->getNumElements()
<< "] = { ";
for (unsigned Inst = 0; Inst != DMatVE->getNumElements(); ++Inst) {
if (isa<InlineAsmDiscardExpr>(DMatVE->getElement(Inst)))
continue;
Expand Down
14 changes: 7 additions & 7 deletions clang/test/dpct/asm/mma.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Except for m8n8k4, all other shapes are supported for row/col layout of A/B matr

__global__ void mma_kernel_m8n8k4(int *a, int *b, float *c) {
// CHECK: {
// CHECK-NEXT: volatile float *d_mat_frag_ct1[8] = { &c[0], &c[1], &c[2], &c[3], &c[4], &c[5], &c[6], &c[7] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[8] = { &c[0], &c[1], &c[2], &c[3], &c[4], &c[5], &c[6], &c[7] };
// CHECK-NEXT: sycl::vec<uint32_t, 2> a_mat_frag_ct1(a[0], a[1]);
// CHECK-NEXT: sycl::vec<uint32_t, 2> b_mat_frag_ct1(b[0], b[1]);
// CHECK-NEXT: sycl::vec<float, 8> c_mat_frag_ct1(c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
Expand All @@ -44,7 +44,7 @@ __global__ void mma_kernel_m8n8k4(int *a, int *b, float *c) {

__global__ void mma_kernel_m8n8k16(int *a, int *b, int *c, int *d) {
// CHECK: {
// CHECK-NEXT: volatile int32_t *d_mat_frag_ct1[2] = { &d[0], &d[1] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[2] = { &d[0], &d[1] };
// CHECK-NEXT: sycl::vec<uint32_t, 1> a_mat_frag_ct1(a[0]);
// CHECK-NEXT: sycl::vec<uint32_t, 1> b_mat_frag_ct1(b[0]);
// CHECK-NEXT: sycl::vec<int32_t, 2> c_mat_frag_ct1(c[0], c[1]);
Expand All @@ -63,7 +63,7 @@ __global__ void mma_kernel_m8n8k16(int *a, int *b, int *c, int *d) {

__global__ void mma_kernel_m16n8k8(int *a, int *b, float *fc, float *fd) {
// CHECK: {
// CHECK-NEXT: volatile float *d_mat_frag_ct1[4] = { &fd[0], &fd[1], &fd[2], &fd[3] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[4] = { &fd[0], &fd[1], &fd[2], &fd[3] };
// CHECK-NEXT: sycl::vec<uint32_t, 2> a_mat_frag_ct1(*(reinterpret_cast<int *>(&a[0])), *(reinterpret_cast<int *>(&a[1])));
// CHECK-NEXT: sycl::vec<uint32_t, 1> b_mat_frag_ct1(*(reinterpret_cast<int *>(&b[0])));
// CHECK-NEXT: sycl::vec<float, 4> c_mat_frag_ct1(fc[0], fc[1], fc[2], fc[3]);
Expand All @@ -81,7 +81,7 @@ __global__ void mma_kernel_m16n8k8(int *a, int *b, float *fc, float *fd) {
"f"(fc[0]), "f"(fc[1]), "f"(fc[2]), "f"(fc[3]));

// CHECK: {
// CHECK-NEXT: volatile float *d_mat_frag_ct1[4] = { &fd[0], &fd[1], &fd[2], &fd[3] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[4] = { &fd[0], &fd[1], &fd[2], &fd[3] };
// CHECK-NEXT: sycl::vec<uint32_t, 2> a_mat_frag_ct1(*(reinterpret_cast<int *>(&a[0])), *(reinterpret_cast<int *>(&a[1])));
// CHECK-NEXT: sycl::vec<uint32_t, 1> b_mat_frag_ct1(*(reinterpret_cast<int *>(&b[0])));
// CHECK-NEXT: sycl::vec<float, 4> c_mat_frag_ct1(fc[0], fc[1], fc[2], fc[3]);
Expand All @@ -101,7 +101,7 @@ __global__ void mma_kernel_m16n8k8(int *a, int *b, float *fc, float *fd) {

__global__ void mma_kernel_m16n8k16(int *a, int *b, int *c, float *fc, int *d) {
// CHECK: {
// CHECK-NEXT: volatile float *d_mat_frag_ct1[4] = { &fc[0], &fc[1], &fc[2], &fc[3] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[4] = { &fc[0], &fc[1], &fc[2], &fc[3] };
// CHECK-NEXT: sycl::vec<uint32_t, 4> a_mat_frag_ct1(a[0], a[1], a[2], a[3]);
// CHECK-NEXT: sycl::vec<uint32_t, 2> b_mat_frag_ct1(b[0], b[1]);
// CHECK-NEXT: sycl::vec<float, 4> c_mat_frag_ct1(fc[0], fc[1], fc[2], fc[3]);
Expand All @@ -117,7 +117,7 @@ __global__ void mma_kernel_m16n8k16(int *a, int *b, int *c, float *fc, int *d) {
"r"(b[0]), "r"(b[1]));

// CHECK: {
// CHECK-NEXT: volatile int32_t *d_mat_frag_ct1[4] = { &d[0], &d[1], &d[2], &d[3] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[4] = { &d[0], &d[1], &d[2], &d[3] };
// CHECK-NEXT: sycl::vec<uint32_t, 2> a_mat_frag_ct1(a[0], a[1]);
// CHECK-NEXT: sycl::vec<uint32_t, 1> b_mat_frag_ct1(b[0]);
// CHECK-NEXT: sycl::vec<int32_t, 4> c_mat_frag_ct1(c[0], c[1], c[2], c[3]);
Expand All @@ -136,7 +136,7 @@ __global__ void mma_kernel_m16n8k16(int *a, int *b, int *c, float *fc, int *d) {

__global__ void mma_kernel_m16n8k32(int *a, int *b, int *c, int *d) {
// CHECK: {
// CHECK-NEXT: volatile int32_t *d_mat_frag_ct1[4] = { &d[0], &d[1], &d[2], &d[3] };
// CHECK-NEXT: volatile void *d_mat_frag_ct1[4] = { &d[0], &d[1], &d[2], &d[3] };
// CHECK-NEXT: sycl::vec<uint32_t, 4> a_mat_frag_ct1(a[0], a[1], a[2], a[3]);
// CHECK-NEXT: sycl::vec<uint32_t, 2> b_mat_frag_ct1(b[0], b[1]);
// CHECK-NEXT: sycl::vec<int32_t, 4> c_mat_frag_ct1(c[0], c[1], c[2], c[3]);
Expand Down