From bec596eee78d8850be7ca69a4b3db271e8a6d025 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Fri, 5 Aug 2022 16:22:53 -0500
Subject: [PATCH] set_arg: Try cl_mem/svm based on what was used last
---
src/wrap_cl.hpp | 50 ++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/wrap_cl.hpp b/src/wrap_cl.hpp
index 5bebef66..47f392db 100644
--- a/src/wrap_cl.hpp
+++ b/src/wrap_cl.hpp
@@ -4661,16 +4661,18 @@ namespace pyopencl
{
private:
cl_kernel m_kernel;
+ bool m_set_arg_prefer_svm;
public:
kernel(cl_kernel knl, bool retain)
- : m_kernel(knl)
+ : m_kernel(knl), m_set_arg_prefer_svm(false)
{
if (retain)
PYOPENCL_CALL_GUARDED(clRetainKernel, (knl));
}
kernel(program const &prg, std::string const &kernel_name)
+ : m_set_arg_prefer_svm(false)
{
cl_int status_code;
@@ -4826,21 +4828,47 @@ namespace pyopencl
return;
}
- try
+ // It turns out that a taken 'catch' has a relatively high cost, so
+ // in deciding which of "mem object" and "svm" to try first, we use
+ // whatever we were given last time around.
+ if (m_set_arg_prefer_svm)
{
- set_arg_mem(arg_index, arg.cast<memory_object_holder &>());
- return;
+#if PYOPENCL_CL_VERSION >= 0x2000
+ try
+ {
+ set_arg_svm(arg_index, arg.cast<svm_pointer const &>());
+ return;
+ }
+ catch (py::cast_error &) { }
+#endif
+
+ try
+ {
+ set_arg_mem(arg_index, arg.cast<memory_object_holder &>());
+ m_set_arg_prefer_svm = false;
+ return;
+ }
+ catch (py::cast_error &) { }
}
- catch (py::cast_error &) { }
+ else
+ {
+ try
+ {
+ set_arg_mem(arg_index, arg.cast<memory_object_holder &>());
+ return;
+ }
+ catch (py::cast_error &) { }
#if PYOPENCL_CL_VERSION >= 0x2000
- try
- {
- set_arg_svm(arg_index, arg.cast<svm_pointer const &>());
- return;
- }
- catch (py::cast_error &) { }
+ try
+ {
+ set_arg_svm(arg_index, arg.cast<svm_pointer const &>());
+ m_set_arg_prefer_svm = true;
+ return;
+ }
+ catch (py::cast_error &) { }
#endif
+ }
try
{
--
GitLab