Merge pull request #3374 from ROCm/bpepers/solver_fixes

Cherry pick of solver fixes for 6.3 release
ROCm · Nov 13, 2024 · 7a3c295 · 7a3c295
2 parents 7c3300f + c828f0e
commit 7a3c295
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/conv/solver_finders.cpp b/src/conv/solver_finders.cpp
@@ -274,13 +274,19 @@ static std::vector<Solution> EvaluateInvokers(Handle& handle,
                 invoker(handle, invoke_ctx);
                 elapsed += handle.GetKernelTime();
                 if(i < N_RUNS_DISCARD)
-                    first_elapsed += elapsed;
+                    first_elapsed = elapsed;
                 ++i;
             }
             // If the execution time was not too long,
             // then the 1st run is not counted (assume it's warm-up):
-            if(i > 1)
+            if(i > N_RUNS_DISCARD)
+            {
                 elapsed = (elapsed - first_elapsed) / static_cast<elapsed_t>(i - N_RUNS_DISCARD);
+            }
+            else if(i > 0)
+            {
+                elapsed /= i;
+            }
 
             MIOPEN_LOG_I(sol << ": " << elapsed << (elapsed < best ? " < " : " >= ") << best);
             if(elapsed < best)