From 8008719b0a17e0cdfe25a72346fef09cfa2e8a2c Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 13 Jun 2016 22:53:52 -0700
Subject: [PATCH] Add flag to disable global barriers, for backward
 compatibility

---
 loopy/options.py           | 8 +++++++-
 loopy/schedule/__init__.py | 7 ++++---
 loopy/version.py           | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/loopy/options.py b/loopy/options.py
index 9b27f111e..694b271a6 100644
--- a/loopy/options.py
+++ b/loopy/options.py
@@ -115,6 +115,9 @@ class Options(Record):
 
         A :class:`bool`. Whether to allow colors in terminal output
 
+    .. rubric:: Features
+
+    .. attribute:: disable_global_barriers
     """
 
     def __init__(
@@ -134,8 +137,10 @@ class Options(Record):
             write_wrapper=False, highlight_wrapper=False,
             write_cl=False, highlight_cl=False,
             edit_cl=False, cl_build_options=[],
-            allow_terminal_colors=True
+            allow_terminal_colors=True,
+            disable_global_barriers=False,
             ):
+
         Record.__init__(
                 self,
 
@@ -149,6 +154,7 @@ class Options(Record):
                 write_cl=write_cl, highlight_cl=highlight_cl,
                 edit_cl=edit_cl, cl_build_options=cl_build_options,
                 allow_terminal_colors=allow_terminal_colors,
+                disable_global_barriers=disable_global_barriers,
                 )
 
     def update(self, other):
diff --git a/loopy/schedule/__init__.py b/loopy/schedule/__init__.py
index 2027b0873..806d2b90f 100644
--- a/loopy/schedule/__init__.py
+++ b/loopy/schedule/__init__.py
@@ -1481,10 +1481,11 @@ def generate_loop_schedules(kernel, debug_args={}):
                 gsize, lsize = kernel.get_grid_size_upper_bounds()
 
                 if gsize or lsize:
-                    logger.info("%s: barrier insertion: global" % kernel.name)
+                    if not kernel.options.disable_global_barriers:
+                        logger.info("%s: barrier insertion: global" % kernel.name)
 
-                    gen_sched = insert_barriers(kernel, gen_sched,
-                            reverse=False, kind="global")
+                        gen_sched = insert_barriers(kernel, gen_sched,
+                                reverse=False, kind="global")
 
                     logger.info("%s: barrier insertion: local" % kernel.name)
 
diff --git a/loopy/version.py b/loopy/version.py
index 7a2a1b4b2..317919cd1 100644
--- a/loopy/version.py
+++ b/loopy/version.py
@@ -32,4 +32,4 @@ except ImportError:
 else:
     _islpy_version = islpy.version.VERSION_TEXT
 
-DATA_MODEL_VERSION = "v38-islpy%s" % _islpy_version
+DATA_MODEL_VERSION = "v39-islpy%s" % _islpy_version
-- 
GitLab