Skip to content

Commit 51a7928

Browse files
zhiweij1zhiweij1
committed
[SYCLomatic] Update deprecated oneMKL API
Signed-off-by: Jiang, Zhiwei <[email protected]>
1 parent 15c4348 commit 51a7928

File tree

12 files changed

+426
-109
lines changed

12 files changed

+426
-109
lines changed

‎clang/lib/DPCT/RulesLangLib/CUB/RewriterDeviceSpmv.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ RewriterMap dpct::createDeviceSpmvRewriterMap() {
2828
"cub::DeviceSpmv::CsrMV",
2929
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
3030
STREAM(10), ARG(2), ARG(3), ARG(4), ARG(5), ARG(6),
31-
ARG(7), ARG(8))),
31+
ARG(7), ARG(8), ARG(9))),
3232
CALL_FACTORY_ENTRY(
3333
"cub::DeviceSpmv::CsrMV",
3434
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
3535
QUEUESTR, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6),
36-
ARG(7), ARG(8)))))))};
36+
ARG(7), ARG(8), ARG(9)))))))};
3737
}

‎clang/lib/DPCT/RulesMathLib/APINamesCUSPARSE.inc‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,86 +74,86 @@ FEATURE_REQUEST_FACTORY(
7474
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
7575
"cusparseScsrsv_analysis",
7676
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
77-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
77+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
7878
ARG(5), ARG(6), ARG(7), ARG(8)))))
7979
FEATURE_REQUEST_FACTORY(
8080
HelperFeatureEnum::device_ext,
8181
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
8282
"cusparseDcsrsv_analysis",
8383
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
84-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
84+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
8585
ARG(5), ARG(6), ARG(7), ARG(8)))))
8686
FEATURE_REQUEST_FACTORY(
8787
HelperFeatureEnum::device_ext,
8888
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
8989
"cusparseCcsrsv_analysis",
9090
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
91-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
91+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
9292
ARG(5), ARG(6), ARG(7), ARG(8)))))
9393
FEATURE_REQUEST_FACTORY(
9494
HelperFeatureEnum::device_ext,
9595
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
9696
"cusparseZcsrsv_analysis",
9797
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
98-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4),
98+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4),
9999
ARG(5), ARG(6), ARG(7), ARG(8)))))
100100

101101
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
102102
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
103103
"cusparseScsrmv",
104104
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
105105
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
106-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
106+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
107107
ARG(9), ARG(10), ARG(11), ARG(12)))))
108108
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
109109
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
110110
"cusparseDcsrmv",
111111
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
112112
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
113-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
113+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
114114
ARG(9), ARG(10), ARG(11), ARG(12)))))
115115
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
116116
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
117117
"cusparseCcsrmv",
118118
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
119119
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
120-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
120+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
121121
ARG(9), ARG(10), ARG(11), ARG(12)))))
122122
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
123123
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
124124
"cusparseZcsrmv",
125125
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
126126
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
127-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
127+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
128128
ARG(9), ARG(10), ARG(11), ARG(12)))))
129129

130130
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
131131
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
132132
"cusparseScsrmv_mp",
133133
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
134134
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
135-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
135+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
136136
ARG(9), ARG(10), ARG(11), ARG(12)))))
137137
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
138138
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
139139
"cusparseDcsrmv_mp",
140140
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
141141
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
142-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
142+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
143143
ARG(9), ARG(10), ARG(11), ARG(12)))))
144144
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
145145
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
146146
"cusparseCcsrmv_mp",
147147
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
148148
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
149-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
149+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
150150
ARG(9), ARG(10), ARG(11), ARG(12)))))
151151
FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
152152
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
153153
"cusparseZcsrmv_mp",
154154
CALL(MapNames::getLibraryHelperNamespace() + "sparse::csrmv",
155155
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1),
156-
ARG(2), ARG(3), ARG(5), ARG(6), ARG(7), ARG(8),
156+
ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8),
157157
ARG(9), ARG(10), ARG(11), ARG(12)))))
158158

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

@@ -451,22 +451,22 @@ ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY("cusparseZcsrsv2_bufferSize", DEREF(9),
451451
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
452452
"cusparseScsrsv2_analysis",
453453
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
454-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
454+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
455455
ARG(6), ARG(7), ARG(8))))
456456
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
457457
"cusparseDcsrsv2_analysis",
458458
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
459-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
459+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
460460
ARG(6), ARG(7), ARG(8))))
461461
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
462462
"cusparseCcsrsv2_analysis",
463463
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
464-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
464+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
465465
ARG(6), ARG(7), ARG(8))))
466466
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
467467
"cusparseZcsrsv2_analysis",
468468
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsv",
469-
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(4), ARG(5),
469+
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(1), ARG(2), ARG(3), ARG(4), ARG(5),
470470
ARG(6), ARG(7), ARG(8))))
471471

472472
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
@@ -537,22 +537,22 @@ ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
537537
"cusparseScsrsm2_analysis",
538538
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
539539
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
540-
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
540+
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
541541
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
542542
"cusparseDcsrsm2_analysis",
543543
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
544544
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
545-
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
545+
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
546546
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
547547
"cusparseCcsrsm2_analysis",
548548
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
549549
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
550-
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
550+
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
551551
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
552552
"cusparseZcsrsm2_analysis",
553553
CALL(MapNames::getLibraryHelperNamespace() + "sparse::optimize_csrsm",
554554
MEMBER_CALL(ARG(0), true, "get_queue"), ARG(2), ARG(3), ARG(4), ARG(5),
555-
ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
555+
ARG(6), ARG(8), ARG(9), ARG(10), ARG(11), ARG(14))))
556556

557557
ASSIGNABLE_FACTORY(CALL_FACTORY_ENTRY(
558558
"cusparseScsrsm2_solve",

0 commit comments

Comments
 (0)