From 87ed1577f78bc794438deafb20c0594cc06ef875 Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <evgeny.mankov@gmail.com>
Date: Mon, 20 Jan 2025 20:41:31 +0100
Subject: [PATCH] [HIPIFY][perl][fix] Eliminated more erroneous warnings

+ Eliminated erroneous warnings like `unsupported MIOpen identifier: cudnnOpTensor` when the actual identifier is `cudnnOpTensor_t`
---
 bin/hipify-perl       | 18 +++++++++---------
 src/CUDA2HIP_Perl.cpp |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/hipify-perl b/bin/hipify-perl
index ef5c4cc7..0e0675db 100755
--- a/bin/hipify-perl
+++ b/bin/hipify-perl
@@ -9922,7 +9922,7 @@ sub countSupportedDeviceDataTypes {
     my $k = 0;
     while (my($func) = each %SupportedDeviceDataTypes)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
         }
@@ -9939,7 +9939,7 @@ sub warnUnsupportedDeviceDataTypes {
     my $k = 0;
     while (my($func) = each %UnsupportedDeviceDataTypes)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             print STDERR "  $fileName:$line_num: warning: unsupported device data type identifier: $func\n";
@@ -9953,7 +9953,7 @@ sub warnExperimentalFunctions {
     my $k = 0;
     while (my($func, $val) = each %experimental_funcs)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             print STDERR "  $fileName:$line_num: warning: experimental ROCm HIP identifier: $func $val\n";
@@ -9967,7 +9967,7 @@ sub warnDeprecatedFunctions {
     my $k = 0;
     while (my($func, $val) = each %deprecated_funcs)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             my $cudnn = "CUDNN";
@@ -9986,7 +9986,7 @@ sub warnRemovedFunctions {
     my $k = 0;
     while (my($func, $val) = each %removed_funcs)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             my $cudnn = "CUDNN";
@@ -11398,7 +11398,7 @@ sub warnHipOnlyUnsupportedFunctions {
     my $k = 0;
     while (my($func) = each %HipOnlyUnsupportedFunctions)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             print STDERR "  $fileName:$line_num: warning: unsupported HIP identifier: $func\n";
@@ -12976,7 +12976,7 @@ sub warnRocOnlyUnsupportedFunctions {
     my $k = 0;
     while (my($func) = each %RocOnlyUnsupportedFunctions)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             print STDERR "  $fileName:$line_num: warning: unsupported ROC identifier: $func\n";
@@ -13599,7 +13599,7 @@ sub warnMIOpenOnlyUnsupportedFunctions {
     my $k = 0;
     while (my($func) = each %MIOpenOnlyUnsupportedFunctions)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             print STDERR "  $fileName:$line_num: warning: unsupported MIOpen identifier: $func\n";
@@ -14511,7 +14511,7 @@ sub warnHipDNNOnlyUnsupportedFunctions {
     my $k = 0;
     while (my($func) = each %HipDNNOnlyUnsupportedFunctions)
     {
-        my $mt = m/($func)/g;
+        my $mt = m/\b($func)\b/g;
         if ($mt) {
             $k += $mt;
             print STDERR "  $fileName:$line_num: warning: unsupported hipDNN identifier: $func\n";
diff --git a/src/CUDA2HIP_Perl.cpp b/src/CUDA2HIP_Perl.cpp
index 1b3a93af..bfe746cd 100644
--- a/src/CUDA2HIP_Perl.cpp
+++ b/src/CUDA2HIP_Perl.cpp
@@ -661,7 +661,7 @@ namespace perl {
     miopen_unsupported << endl << ");" << endl;
     hipdnn_unsupported << endl << ");" << endl;
     sCommon << tab << "{" << endl;
-    sCommon << tab_2 << my << "$mt = m/($func)/g;" << endl;
+    sCommon << tab_2 << my << "$mt = m/\\b($func)\\b/g;" << endl;
     sCommon << tab_2 << "if ($mt) {" << endl;
     sCommon << tab_3 << "$k += $mt;" << endl;
     sCommon1 << tab_3 << my << "$cudnn = \"CUDNN\";" << endl;
@@ -749,7 +749,7 @@ namespace perl {
     }
     if (countSupportedDataTypes || countUnsupportedDataTypes) {
       subCommonDataTypes << tab << "{" << endl;
-      subCommonDataTypes << tab_2 << my << "$mt = m/($func)/g;" << endl;
+      subCommonDataTypes << tab_2 << my << "$mt = m/\\b($func)\\b/g;" << endl;
       subCommonDataTypes << tab_2 << "if ($mt) {" << endl;
       subCommonDataTypes << tab_3 << "$k += $mt;" << endl;
     }