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

[HIPIFY][#584][DNN][MIOpen] cuDNN -> MIOpen - Part 12 - cuDNN LRN functions #826

Merged
merged 1 commit into from
Apr 4, 2023
Merged

[HIPIFY][#584][DNN][MIOpen] cuDNN -> MIOpen - Part 12 - cuDNN LRN functions #826

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
8 changes: 4 additions & 4 deletions src/CUDA2HIP_DNN_API_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ const std::map<llvm::StringRef, hipCounter> CUDA_DNN_FUNCTION_MAP {
{"cudnnGetActivationDescriptorSwishBeta", {"hipdnnGetActivationDescriptorSwishBeta", "", CONV_LIB_FUNC, API_DNN, 2, HIP_UNSUPPORTED}},

// cuDNN LRN functions
{"cudnnCreateLRNDescriptor", {"hipdnnCreateLRNDescriptor", "", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnSetLRNDescriptor", {"hipdnnSetLRNDescriptor", "", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnGetLRNDescriptor", {"hipdnnGetLRNDescriptor", "", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnDestroyLRNDescriptor", {"hipdnnDestroyLRNDescriptor", "", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnCreateLRNDescriptor", {"hipdnnCreateLRNDescriptor", "miopenCreateLRNDescriptor", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnSetLRNDescriptor", {"hipdnnSetLRNDescriptor", "miopenSetLRNDescriptor", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnGetLRNDescriptor", {"hipdnnGetLRNDescriptor", "miopenGetLRNDescriptor", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnDestroyLRNDescriptor", {"hipdnnDestroyLRNDescriptor", "miopenDestroyLRNDescriptor", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnLRNCrossChannelForward", {"hipdnnLRNCrossChannelForward", "", CONV_LIB_FUNC, API_DNN, 2}},
{"cudnnLRNCrossChannelBackward", {"hipdnnLRNCrossChannelBackward", "", CONV_LIB_FUNC, API_DNN, 2}},

Expand Down
13 changes: 12 additions & 1 deletion src/HipifyAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const std::string sCudnnSetPooling2dDescriptor = "cudnnSetPooling2dDescriptor";
const std::string sCudnnGetPooling2dDescriptor = "cudnnGetPooling2dDescriptor";
const std::string sCudnnSetPoolingNdDescriptor = "cudnnSetPoolingNdDescriptor";
const std::string sCudnnGetPoolingNdDescriptor = "cudnnGetPoolingNdDescriptor";
const std::string sCudnnSetLRNDescriptor = "cudnnSetLRNDescriptor";
// Matchers' names
const StringRef sCudaLaunchKernel = "cudaLaunchKernel";
const StringRef sCudaHostFuncCall = "cudaHostFuncCall";
Expand Down Expand Up @@ -264,6 +265,15 @@ std::map<std::string, ArgCastStruct> FuncArgCasts {
true
}
},
{sCudnnSetLRNDescriptor,
{
{
{1, {e_add_const_argument, cw_None, "miopenLRNCrossChannel"}}
},
true,
true
}
},
};

void HipifyAction::RewriteString(StringRef s, clang::SourceLocation start) {
Expand Down Expand Up @@ -846,7 +856,8 @@ std::unique_ptr<clang::ASTConsumer> HipifyAction::CreateASTConsumer(clang::Compi
sCudnnSetPooling2dDescriptor,
sCudnnGetPooling2dDescriptor,
sCudnnSetPoolingNdDescriptor,
sCudnnGetPoolingNdDescriptor
sCudnnGetPoolingNdDescriptor,
sCudnnSetLRNDescriptor
)
)
)
Expand Down
27 changes: 27 additions & 0 deletions tests/unit_tests/synthetic/libraries/cudnn2miopen.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,5 +436,32 @@ int main() {
// CHECK: status = miopenDestroyPoolingDescriptor(poolingDescriptor);
status = cudnnDestroyPoolingDescriptor(poolingDescriptor);

unsigned lrnN = 0;
double lrnAlpha = 0.0f;
double lrnBeta = 0.0f;
double lrnK = 0.0f;

// CUDA: cudnnStatus_t CUDNNWINAPI cudnnCreateLRNDescriptor(cudnnLRNDescriptor_t* normDesc);
// MIOPEN: MIOPEN_EXPORT miopenStatus_t miopenCreateLRNDescriptor(miopenLRNDescriptor_t* lrnDesc);
// CHECK: status = miopenCreateLRNDescriptor(&LRNDescriptor);
status = cudnnCreateLRNDescriptor(&LRNDescriptor);

// CUDA: cudnnStatus_t CUDNNWINAPI cudnnSetLRNDescriptor(cudnnLRNDescriptor_t normDesc, unsigned lrnN, double lrnAlpha, double lrnBeta, double lrnK);
// MIOPEN: MIOPEN_EXPORT miopenStatus_t miopenSetLRNDescriptor(const miopenLRNDescriptor_t lrnDesc, miopenLRNMode_t mode, unsigned int lrnN, double lrnAlpha, double lrnBeta, double lrnK);
// CHECK: status = miopenSetLRNDescriptor(LRNDescriptor, miopenLRNCrossChannel, lrnN, lrnAlpha, lrnBeta, lrnK);
status = cudnnSetLRNDescriptor(LRNDescriptor, lrnN, lrnAlpha, lrnBeta, lrnK);

// TODO: add a referrence to miopenLRNMode_t as a 2nd arg
// TODO: [feature] Add a new type of transformation with declaring a var before the function call to add that var referrence as an arg to the below function call
// CUDA: cudnnStatus_t CUDNNWINAPI cudnnGetLRNDescriptor(cudnnLRNDescriptor_t normDesc, unsigned* lrnN, double* lrnAlpha, double* lrnBeta, double* lrnK);
// MIOPEN: MIOPEN_EXPORT miopenStatus_t miopenGetLRNDescriptor(const miopenLRNDescriptor_t lrnDesc, miopenLRNMode_t* mode, unsigned int* lrnN, double* lrnAlpha, double* lrnBeta, double* lrnK);
// CHECK: status = miopenGetLRNDescriptor(LRNDescriptor, &lrnN, &lrnAlpha, &lrnBeta, &lrnK);
status = cudnnGetLRNDescriptor(LRNDescriptor, &lrnN, &lrnAlpha, &lrnBeta, &lrnK);

// CUDA: cudnnStatus_t CUDNNWINAPI cudnnDestroyLRNDescriptor(cudnnLRNDescriptor_t lrnDesc);
// MIOPEN: MIOPEN_EXPORT miopenStatus_t miopenDestroyLRNDescriptor(miopenLRNDescriptor_t lrnDesc);
// CHECK: status = miopenDestroyLRNDescriptor(LRNDescriptor);
status = cudnnDestroyLRNDescriptor(LRNDescriptor);

return 0;
}