Skip to content

[SYCLomatic] Update deprecated oneMKL API #2951

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 3 commits into
base: SYCLomatic
Choose a base branch
from
Open

[SYCLomatic] Update deprecated oneMKL API #2951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15c4348
Update migration of cusparse<T>csrmm and cusparse<T>csrmm2
zhiweij1 Sep 15, 2025
51a7928
[SYCLomatic] Update deprecated oneMKL API
zhiweij1 Sep 15, 2025
2ae2707
Update and fix
zhiweij1 Sep 16, 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
4 changes: 2 additions & 2 deletions clang/include/clang/DPCT/DPCTOptions.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ DPCT_ENUM_OPTION(
"syclcompat", int(clang::dpct::ExplicitNamespace::EN_SYCLCompat),
"DEPRECATED (Intel(R) DPC++ Compiler 2025.3 is deprecating SYCLCompat and will remove it in next release). Generate code with syclcompat:: namespace.", false)),
llvm::cl::desc("Define the namespaces to use explicitly in generated "
"code. The <value> is a comma\n"
"code. The <value> is a comma\n"
"separated list. Default: dpct/syclcompat, sycl.\n"
"Possible values are:"),
llvm::cl::CommaSeparated, llvm::cl::value_desc("value"),
Expand Down Expand Up @@ -1019,7 +1019,7 @@ DPCT_FLAG_OPTION(
"use-syclcompat",
llvm::cl::desc(
"DEPRECATED (Intel(R) DPC++ Compiler 2025.3 is deprecating SYCLCompat and will remove it in next release). Use SYCLcompat header-only library (syclcompat:: namespace) to assist "
"the migration of input source code. \nDefault: off.\n"),
"the migration of input source code.\nDefault: off.\n"),
llvm::cl::cat(CtHelpCatCodeGen), llvm::cl::cat(CtHelpCatAll))

DPCT_FLAG_OPTION(
Expand Down
4 changes: 2 additions & 2 deletions clang/lib/DPCT/RulesLangLib/CUB/RewriterDeviceSpmv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ RewriterMap dpct::createDeviceSpmvRewriterMap() {
"cub::DeviceSpmv::CsrMV",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
STREAM(10), ARG(2), ARG(3), ARG(4), ARG(5), ARG(6),
ARG(7), ARG(8))),
ARG(7), ARG(8), ARG(9))),
CALL_FACTORY_ENTRY(
"cub::DeviceSpmv::CsrMV",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
QUEUESTR, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6),
ARG(7), ARG(8)))))))};
ARG(7), ARG(8), ARG(9)))))))};
}
60 changes: 30 additions & 30 deletions clang/lib/DPCT/RulesMathLib/APINamesCUSPARSE.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,86 +74,86 @@ FEATURE_REQUEST_FACTORY(
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseScsrsv_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
ARG(5), ARG(6), ARG(7), ARG(8)))))
FEATURE_REQUEST_FACTORY(
HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrsv_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
ARG(5), ARG(6), ARG(7), ARG(8)))))
FEATURE_REQUEST_FACTORY(
HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrsv_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
ARG(5), ARG(6), ARG(7), ARG(8)))))
FEATURE_REQUEST_FACTORY(
HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrsv_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
ARG(5), ARG(6), ARG(7), ARG(8)))))

FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseScsrmv",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrmv",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrmv",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrmv",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))

FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseScsrmv_mp",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrmv_mp",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrmv_mp",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrmv_mp",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12)))))

ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cusparseCsrmvEx_bufferSize", DEREF(20),
Expand All @@ -163,7 +163,7 @@ FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
"cusparseCsrmvEx",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2),
ARG(3), ARG(4), ARG(6), ARG(7), ARG(8), ARG(9),
ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9),
ARG(10), ARG(11), ARG(12), ARG(13), ARG(14),
ARG(15), ARG(16), ARG(17), ARG(18)))))

Expand All @@ -172,31 +172,31 @@ FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
"cusparseScsrmm",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrmm",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrmm",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrmm",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(6), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15)))))

Expand All @@ -205,31 +205,31 @@ FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
"cusparseScsrmm2",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15), ARG(16)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrmm2",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15), ARG(16)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrmm2",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15), ARG(16)))))
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrmm2",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(7), ARG(8),
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
ARG(9), ARG(10), ARG(11), ARG(12), ARG(13),
ARG(14), ARG(15), ARG(16)))))

Expand Down Expand Up @@ -451,22 +451,22 @@ ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cusparseZcsrsv2_bufferSize", DEREF(9),
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseScsrsv2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(6), ARG(7), ARG(8))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrsv2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(6), ARG(7), ARG(8))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrsv2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(6), ARG(7), ARG(8))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrsv2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(6), ARG(7), ARG(8))))

ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
Expand Down Expand Up @@ -502,7 +502,7 @@ ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cusparseZcsrsv2_bufferSizeExt",
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCsrsv_analysisEx",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(6), ARG(7), ARG(8), ARG(9))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCsrsv_solveEx",
Expand Down Expand Up @@ -537,22 +537,22 @@ ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseScsrsm2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseDcsrsm2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseCcsrsm2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseZcsrsm2_analysis",
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))

ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
"cusparseScsrsm2_solve",
Expand Down
Loading
Loading