[debugging] Make naive conv solvers obey MIOPEN_DEBUG_HIP_KERNELS (#3111

)
ROCm · Jul 22, 2024 · 3991184 · 3991184
1 parent 36ab779
commit 3991184
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/solver/conv/conv_direct_naive_conv_bwd.cpp b/src/solver/conv/conv_direct_naive_conv_bwd.cpp
@@ -40,9 +40,13 @@ using ProblemDescription = miopen::conv::ProblemDescription;
 bool ConvDirectNaiveConvBwd::IsApplicable(const ExecutionContext& ctx,
                                           const ProblemDescription& problem) const
 {
-    if(!miopen::debug::AlwaysEnableConvDirectNaive &&
-       env::disabled(MIOPEN_DEBUG_CONV_DIRECT_NAIVE_CONV_BWD))
-        return false;
+    if(!miopen::debug::AlwaysEnableConvDirectNaive)
+    {
+        if(env::disabled(MIOPEN_DEBUG_CONV_DIRECT_NAIVE_CONV_BWD))
+            return false;
+        if(!ctx.use_hip_kernels)
+            return false;
+    }
 
     if(!ConvDirectNaiveConvIsApplicableByKernelType(ctx, problem))
         return false;

diff --git a/src/solver/conv/conv_direct_naive_conv_fwd.cpp b/src/solver/conv/conv_direct_naive_conv_fwd.cpp
@@ -39,9 +39,13 @@ using ProblemDescription = miopen::conv::ProblemDescription;
 bool ConvDirectNaiveConvFwd::IsApplicable(const ExecutionContext& ctx,
                                           const ProblemDescription& problem) const
 {
-    if(!miopen::debug::AlwaysEnableConvDirectNaive &&
-       env::disabled(MIOPEN_DEBUG_CONV_DIRECT_NAIVE_CONV_FWD))
-        return false;
+    if(!miopen::debug::AlwaysEnableConvDirectNaive)
+    {
+        if(env::disabled(MIOPEN_DEBUG_CONV_DIRECT_NAIVE_CONV_FWD))
+            return false;
+        if(!ctx.use_hip_kernels)
+            return false;
+    }
 
     if(!ConvDirectNaiveConvIsApplicableByKernelType(ctx, problem))
         return false;

diff --git a/src/solver/conv/conv_direct_naive_conv_wrw.cpp b/src/solver/conv/conv_direct_naive_conv_wrw.cpp
@@ -40,9 +40,13 @@ using ProblemDescription = miopen::conv::ProblemDescription;
 bool ConvDirectNaiveConvWrw::IsApplicable(const ExecutionContext& ctx,
                                           const ProblemDescription& problem) const
 {
-    if(!miopen::debug::AlwaysEnableConvDirectNaive &&
-       env::disabled(MIOPEN_DEBUG_CONV_DIRECT_NAIVE_CONV_WRW))
-        return false;
+    if(!miopen::debug::AlwaysEnableConvDirectNaive)
+    {
+        if(env::disabled(MIOPEN_DEBUG_CONV_DIRECT_NAIVE_CONV_WRW))
+            return false;
+        if(!ctx.use_hip_kernels)
+            return false;
+    }
 
     if(!ConvDirectNaiveConvIsApplicableByKernelType(ctx, problem))
         return false;