From dbd9a340a7809a770d52d10154712278431acdc3 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Tue, 29 Oct 2019 10:56:41 +0100
Subject: Unify AOS, SOA specific cell preshift between targets

SOA and AOS should not be target specific, neighbor offset calculation /
bijection between gid and cell coordinates should be customizable.
---
 boltzgen/kernel/target/layout/cl.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'boltzgen/kernel/target/layout/cl.py')

diff --git a/boltzgen/kernel/target/layout/cl.py b/boltzgen/kernel/target/layout/cl.py
index 9707cb3..e144faf 100644
--- a/boltzgen/kernel/target/layout/cl.py
+++ b/boltzgen/kernel/target/layout/cl.py
@@ -3,11 +3,8 @@ class SOA:
         self.descriptor = descriptor
         self.geometry = geometry
 
-    def gid(self):
-        return {
-            2: 'get_global_id(1)*%d + get_global_id(0)' % self.geometry.size_x,
-            3: 'get_global_id(2)*%d + get_global_id(1)*%d + get_global_id(0)' % (self.geometry.size_x*self.geometry.size_y, self.geometry.size_x)
-        }.get(self.descriptor.d)
+    def cell_preshift(self, gid):
+        return gid
 
     def pop_offset(self, i):
         return i * self.geometry.volume
@@ -23,11 +20,8 @@ class AOS:
         self.descriptor = descriptor
         self.geometry = geometry
 
-    def gid(self):
-        return {
-            2: '%d*(get_global_id(1)*%d + get_global_id(0))' % (self.descriptor.q, self.geometry.size_x),
-            3: '%d*(get_global_id(2)*%d + get_global_id(1)*%d + get_global_id(0))' % (self.descriptor.q, self.geometry.size_x*self.geometry.size_y, self.geometry.size_x)
-        }.get(self.descriptor.d)
+    def cell_preshift(self, gid):
+        return "(%s)*%d" % (gid, self.descriptor.q)
 
     def pop_offset(self, i):
         return i
-- 
cgit v1.2.3