[SYCL][GDB] Relax xmethod script template arg handling (#3256)

Depending on namespace inlining the template argument string may end
being "sycl:id<1>" or just "id<1>" rather than full "cl::sycl::id<1>"
currently expected.

Ideally a proper type lookup should happen, however, right now GDB does
not support inline namespaces so such lookup would always fail. This
patch relaxes regex matching instead as a compromise solution.

It does not seem possible to test this change within this repository,
unfortunately. It was manually verified at the moment of submission and
will be caught eventually by the debugger tests in case of regressions.

Author: mihails-strasuns-intel

sycl/gdb/libsycl.so-gdb.py

@@ -176,7 +176,7 @@ def get_result_type(self, *args):
         return self.result_type
 
     def __call__(self, obj, *args):
-        if obj['Val'].type.tag == self.result_type:
+        if obj['Val'].type.tag.endswith(self.result_type):
             # On device private_memory is a simple wrapper over actual value
             return obj['Val']
         else:
@@ -196,11 +196,10 @@ def match(self, class_type, method_name):
         if method_name != 'operator()':
             return None
 
-        result = re.match('^cl::sycl::private_memory<(cl::sycl::id<.+>), (.+)>$', class_type.tag)
+        result = re.match('^cl::sycl::private_memory<((cl::)?(sycl::)?id<.+>), (.+)>$', class_type.tag)
         if result is None:
             return None
-
-        return PrivateMemoryOpCall(result[1], result[2])
+        return PrivateMemoryOpCall(result[1], result[4])