From 76fd6ab432b285b51e710fc6554ec519c4f1406d Mon Sep 17 00:00:00 2001
From: Greg Lueck <gregory.m.lueck@intel.com>
Date: Thu, 7 Nov 2024 16:18:31 -0500
Subject: [PATCH] Merge pull request #658 from gmlueck/gmlueck/cherry-pick-598

Add missing `multi_ptr` aliases for `access::address_space::generic`

(cherry picked from commit bb4f2c7ff1d53fcf02f7cb071f1af2bee0b5dc3e)
---
 adoc/config/rouge/lib/rouge/lexers/sycl.rb |  1 +
 adoc/headers/pointer.h                     | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/adoc/config/rouge/lib/rouge/lexers/sycl.rb b/adoc/config/rouge/lib/rouge/lexers/sycl.rb
index 657d1f24..d8e3ca6c 100644
--- a/adoc/config/rouge/lib/rouge/lexers/sycl.rb
+++ b/adoc/config/rouge/lib/rouge/lexers/sycl.rb
@@ -312,6 +312,7 @@ class Sycl < Cpp
         context_bound
         cpu_selector
         decorated_constant_ptr
+        decorated_generic_ptr
         decorated_global_ptr
         decorated_local_ptr
         decorated_private_ptr
diff --git a/adoc/headers/pointer.h b/adoc/headers/pointer.h
index 98905914..7c472332 100644
--- a/adoc/headers/pointer.h
+++ b/adoc/headers/pointer.h
@@ -30,6 +30,11 @@ template <typename ElementType,
 using private_ptr =
     multi_ptr<ElementType, access::address_space::private_space, IsDecorated>;
 
+template <typename ElementType,
+          access::decorated IsDecorated = access::decorated::legacy>
+using generic_ptr =
+    multi_ptr<ElementType, access::address_space::generic_space, IsDecorated>;
+
 // Template specialization aliases for different pointer address spaces.
 // The interface exposes non-decorated pointer while keeping the
 // address space information internally.
@@ -48,6 +53,11 @@ using raw_private_ptr =
     multi_ptr<ElementType, access::address_space::private_space,
               access::decorated::no>;
 
+template <typename ElementType>
+using raw_generic_ptr =
+    multi_ptr<ElementType, access::address_space::generic_space,
+              access::decorated::no>;
+
 // Template specialization aliases for different pointer address spaces.
 // The interface exposes decorated pointer.
 
@@ -66,4 +76,9 @@ using decorated_private_ptr =
     multi_ptr<ElementType, access::address_space::private_space,
               access::decorated::yes>;
 
+template <typename ElementType>
+using decorated_generic_ptr =
+    multi_ptr<ElementType, access::address_space::generic_space,
+              access::decorated::yes>;
+
 } // namespace sycl