Skip to content
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

Jump to bottom

[SYCLomatic] Enable 3 cuDNN API migration #873

Merged
merged 1 commit into from
Apr 28, 2023
Merged

[SYCLomatic] Enable 3 cuDNN API migration #873

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
12 changes: 12 additions & 0 deletions clang/lib/DPCT/APINamesCUDNN.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,18 @@ ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY(
ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY(
"cudnnGetConvolutionBackwardFilterWorkspaceSize", DEREF(ARG_WC(6)), ARG("0")))

ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY(
"cudnnGetConvolutionBackwardFilterAlgorithm", DEREF(ARG_WC(7)),
ARG("dnnl::algorithm::convolution_auto")))

ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY(
"cudnnGetConvolutionBackwardDataAlgorithm", DEREF(ARG_WC(7)),
ARG("dnnl::algorithm::convolution_auto")))

ASSIGNABLE_FACTORY(ASSIGN_FACTORY_ENTRY(
"cudnnGetConvolutionForwardAlgorithm", DEREF(ARG_WC(7)),
ARG("dnnl::algorithm::convolution_auto")))

// RNN Layer
REMOVE_API_FACTORY_ENTRY("cudnnCreateRNNDescriptor")

Expand Down
3 changes: 3 additions & 0 deletions clang/lib/DPCT/APINames_cuDNN.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,11 @@ ENTRY(cudnnGetConvolution2dDescriptor, cudnnGetConvolution2dDescriptor, true, NO
ENTRY(cudnnGetConvolution2dForwardOutputDim, cudnnGetConvolution2dForwardOutputDim, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardDataAlgorithmMaxCount, cudnnGetConvolutionBackwardDataAlgorithmMaxCount, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardDataAlgorithm_v7, cudnnGetConvolutionBackwardDataAlgorithm_v7, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardDataAlgorithm, cudnnGetConvolutionBackwardDataAlgorithm, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardDataWorkspaceSize, cudnnGetConvolutionBackwardDataWorkspaceSize, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionForwardAlgorithmMaxCount, cudnnGetConvolutionForwardAlgorithmMaxCount, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionForwardAlgorithm_v7, cudnnGetConvolutionForwardAlgorithm_v7, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionForwardAlgorithm, cudnnGetConvolutionForwardAlgorithm, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionForwardWorkspaceSize, cudnnGetConvolutionForwardWorkspaceSize, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionGroupCount, cudnnGetConvolutionGroupCount, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionMathType, cudnnGetConvolutionMathType, false, NO_FLAG, P4, "comment")
Expand Down Expand Up @@ -205,6 +207,7 @@ ENTRY(cudnnFindConvolutionBackwardFilterAlgorithmEx, cudnnFindConvolutionBackwar
ENTRY(cudnnFusedOpsExecute, cudnnFusedOpsExecute, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardFilterAlgorithmMaxCount, cudnnGetConvolutionBackwardFilterAlgorithmMaxCount, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardFilterAlgorithm_v7, cudnnGetConvolutionBackwardFilterAlgorithm_v7, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardFilterAlgorithm, cudnnGetConvolutionBackwardFilterAlgorithm, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetConvolutionBackwardFilterWorkspaceSize, cudnnGetConvolutionBackwardFilterWorkspaceSize, true, NO_FLAG, P4, "comment")
ENTRY(cudnnGetFusedOpsConstParamPackAttribute, cudnnGetFusedOpsConstParamPackAttribute, false, NO_FLAG, P4, "comment")
ENTRY(cudnnGetFusedOpsVariantParamPackAttribute, cudnnGetFusedOpsVariantParamPackAttribute, false, NO_FLAG, P4, "comment")
Expand Down
5 changes: 4 additions & 1 deletion clang/lib/DPCT/DNNAPIMigration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,10 @@ void CuDNNAPIRule::registerMatcher(ast_matchers::MatchFinder &MF) {
"cudnnCreateDropoutDescriptor", "cudnnSetDropoutDescriptor",
"cudnnGetDropoutDescriptor", "cudnnDropoutGetReserveSpaceSize",
"cudnnRestoreDropoutDescriptor", "cudnnDropoutForward", "cudnnDropoutBackward",
"cudnnDestroyDropoutDescriptor", "cudnnGetVersion");
"cudnnDestroyDropoutDescriptor", "cudnnGetVersion",
"cudnnGetConvolutionBackwardFilterAlgorithm",
"cudnnGetConvolutionBackwardDataAlgorithm",
"cudnnGetConvolutionForwardAlgorithm");
};

MF.addMatcher(
Expand Down
29 changes: 29 additions & 0 deletions clang/test/dpct/dnn/convolution_v7.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0, cuda-12.1
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0, v12.1
// RUN: dpct -in-root %S -out-root %T/convolution_v7 %S/convolution_v7.cu --cuda-include-path="%cuda-path/include" -- -std=c++14 -x cuda --cuda-host-only
// RUN: FileCheck --input-file %T/convolution_v7/convolution_v7.dp.cpp --match-full-lines %s
#include <cuda_runtime.h>
#include <cudnn.h>
#include <iostream>
#include <vector>

int main() {
cudnnHandle_t handle;
cudnnTensorDescriptor_t dataTensor;
cudnnFilterDescriptor_t filterTensor;
cudnnConvolutionDescriptor_t covdes;
// CHECK: dnnl::algorithm bwd_filter_a;
// CHECK: dnnl::algorithm bwd_data_a;
// CHECK: dnnl::algorithm fwd_a;
cudnnConvolutionBwdFilterAlgo_t bwd_filter_a;
cudnnConvolutionBwdDataAlgo_t bwd_data_a;
cudnnConvolutionFwdAlgo_t fwd_a;
// CHECK: bwd_filter_a = dnnl::algorithm::convolution_auto;
cudnnGetConvolutionBackwardFilterAlgorithm(handle, dataTensor, dataTensor, covdes, filterTensor, CUDNN_CONVOLUTION_BWD_FILTER_PREFER_FASTEST, 10, &bwd_filter_a);
// CHECK: bwd_data_a = dnnl::algorithm::convolution_auto;
cudnnGetConvolutionBackwardDataAlgorithm(handle, filterTensor, dataTensor, covdes, dataTensor, CUDNN_CONVOLUTION_BWD_DATA_PREFER_FASTEST, 10, &bwd_data_a);
// CHECK: fwd_a = dnnl::algorithm::convolution_auto;
cudnnGetConvolutionForwardAlgorithm(handle, dataTensor, filterTensor, covdes, dataTensor, CUDNN_CONVOLUTION_FWD_PREFER_FASTEST, 10, &fwd_a);

return 0;
}