Skip to content

[SYCLomatic] Fix the issue that wmma type not procssed if namespace alias used #2820

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

Merged
zhimingwang36 merged 2 commits into from
May 13, 2025
Merged

[SYCLomatic] Fix the issue that wmma type not procssed if namespace alias used #2820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d536d58
fix
intwanghao May 7, 2025
3d63f1b
fix
intwanghao May 7, 2025
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
6 changes: 6 additions & 0 deletions clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,12 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
dyn_cast<NamespaceDecl>(Qualifier->getAsNamespace())) {
CTSName = getNameSpace(NSD) + "::" + DRE->getNameInfo().getAsString();
}
} else if (auto NA = Qualifier->getAsNamespaceAlias()) {
auto ND = NA->getNamespace();
if (ND && (ND->getName() == "wmma") &&
dpct::DpctGlobalInfo::isInCudaPath(ND->getBeginLoc())) {
CTSName = getNameSpace(ND) + "::" + DRE->getNameInfo().getAsString();
}
} else if (!IsNamespaceOrAlias || !IsSpecicalAPI) {
if (DRE->getDecl()->isCXXClassMember()) {
std::string Result;
Expand Down
4 changes: 3 additions & 1 deletion clang/lib/DPCT/RulesLang/RulesLangNoneAPIAndType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,8 +1123,10 @@ void NamespaceRule::runRule(const MatchFinder::MatchResult &Result) {
} else if (auto NAD = getAssistNodeAsType<NamespaceAliasDecl>(
Result, "namespaceAlias")) {
std::string Namespace = NAD->getNamespace()->getNameAsString();
if (Namespace == "cooperative_groups" || Namespace == "placeholders")
if (Namespace == "cooperative_groups" || Namespace == "placeholders" ||
Namespace == "wmma") {
emplaceTransformation(new ReplaceDecl(NAD, ""));
}
} else if (auto UD = getAssistNodeAsType<UsingDecl>(Result, "using")) {
auto &SM = DpctGlobalInfo::getSourceManager();
SourceLocation Beg, End;
Expand Down
32 changes: 32 additions & 0 deletions clang/test/dpct/wmma2.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// clang-format off
// UNSUPPORTED: cuda-8.0, cuda-9.0, cuda-9.1, cuda-9.2, cuda-10.0
// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
// RUN: dpct --format-range=none --use-experimental-features=matrix -out-root %T/wmma2 %s --cuda-include-path="%cuda-path/include" -- -std=c++14 -x cuda --cuda-host-only
// RUN: FileCheck --input-file %T/wmma2/wmma2.dp.cpp --match-full-lines %s
// RUN: %if build_lit %{icpx -c -fsycl -DNO_BUILD_TEST %T/wmma2/wmma2.dp.cpp -o %T/wmma2/wmma2.dp.o %}

#include <assert.h>
#include <cuda.h>
#include <iostream>
#include <mma.h>
// CHECK: #include <sycl/sycl.hpp>
// CHECK: #include <dpct/dpct.hpp>
namespace wmmaa = nvcuda::wmma;

template<typename T>
__global__ void simple_wmma_gemm(T *d) {
wmmaa::fragment<wmmaa::accumulator, 16, 16, 16, T> c_frag;
// CHECK: sycl::ext::oneapi::experimental::matrix::joint_matrix_store(sycl::ext::oneapi::this_work_item::get_sub_group(), c_frag.get(), sycl::address_space_cast<sycl::access::address_space::generic_space, sycl::access::decorated::no, T>(d), 1, sycl::ext::oneapi::experimental::matrix::layout::row_major);
wmmaa::store_matrix_sync(d, c_frag, 1, wmmaa::mem_row_major);
}

int main() {

simple_wmma_gemm<half><<<1, 1>>>(nullptr);

simple_wmma_gemm<float><<<1, 1>>>(nullptr);

return 0;
}