diff --git a/OpenCL/inc_types.h b/OpenCL/inc_types.h
index 9431c7ee7..cf2df9898 100644
--- a/OpenCL/inc_types.h
+++ b/OpenCL/inc_types.h
@@ -19,7 +19,7 @@
 #define COMBS_MODE          kernel_param->combs_mode
 #define SALT_REPEAT         kernel_param->salt_repeat
 #define PWS_POS             kernel_param->pws_pos
-#define GID_MAX             kernel_param->gid_max
+#define GID_CNT             kernel_param->gid_max
 #else
 #define BITMAP_MASK         kernel_param->bitmap_mask
 #define BITMAP_SHIFT1       kernel_param->bitmap_shift1
@@ -33,7 +33,7 @@
 #define COMBS_MODE          kernel_param->combs_mode
 #define SALT_REPEAT         kernel_param->salt_repeat
 #define PWS_POS             kernel_param->pws_pos
-#define GID_MAX             kernel_param->gid_max
+#define GID_CNT             kernel_param->gid_max
 #endif
 
 #ifdef IS_CUDA
diff --git a/OpenCL/m00000_a0-optimized.cl b/OpenCL/m00000_a0-optimized.cl
index 2052d6bab..f6b4a3836 100644
--- a/OpenCL/m00000_a0-optimized.cl
+++ b/OpenCL/m00000_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -165,7 +165,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00000_a0-pure.cl b/OpenCL/m00000_a0-pure.cl
index d31fc5532..f7d3d2222 100644
--- a/OpenCL/m00000_a0-pure.cl
+++ b/OpenCL/m00000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00000_a1-optimized.cl b/OpenCL/m00000_a1-optimized.cl
index fe108fad5..f6735d8c6 100644
--- a/OpenCL/m00000_a1-optimized.cl
+++ b/OpenCL/m00000_a1-optimized.cl
@@ -29,7 +29,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -223,7 +223,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00000_a1-pure.cl b/OpenCL/m00000_a1-pure.cl
index f728d6cf5..49637d470 100644
--- a/OpenCL/m00000_a1-pure.cl
+++ b/OpenCL/m00000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00000_a3-optimized.cl b/OpenCL/m00000_a3-optimized.cl
index 603f548ce..a5df2528f 100644
--- a/OpenCL/m00000_a3-optimized.cl
+++ b/OpenCL/m00000_a3-optimized.cl
@@ -437,7 +437,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -475,7 +475,7 @@ KERNEL_FQ void m00000_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m00000_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -551,7 +551,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -589,7 +589,7 @@ KERNEL_FQ void m00000_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -627,7 +627,7 @@ KERNEL_FQ void m00000_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00000_a3-pure.cl b/OpenCL/m00000_a3-pure.cl
index 566cfb4e8..1f00b9b91 100644
--- a/OpenCL/m00000_a3-pure.cl
+++ b/OpenCL/m00000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00010_a0-optimized.cl b/OpenCL/m00010_a0-optimized.cl
index 14ef9bb94..7b04b5f58 100644
--- a/OpenCL/m00010_a0-optimized.cl
+++ b/OpenCL/m00010_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -239,7 +239,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00010_a0-pure.cl b/OpenCL/m00010_a0-pure.cl
index 2c447c59b..b0a92847e 100644
--- a/OpenCL/m00010_a0-pure.cl
+++ b/OpenCL/m00010_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00010_a1-optimized.cl b/OpenCL/m00010_a1-optimized.cl
index 53820e945..ec0ff34b8 100644
--- a/OpenCL/m00010_a1-optimized.cl
+++ b/OpenCL/m00010_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -297,7 +297,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00010_a1-pure.cl b/OpenCL/m00010_a1-pure.cl
index 6d3f87384..401a7e53f 100644
--- a/OpenCL/m00010_a1-pure.cl
+++ b/OpenCL/m00010_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00010_a3-optimized.cl b/OpenCL/m00010_a3-optimized.cl
index 487f91fd8..796fc4033 100644
--- a/OpenCL/m00010_a3-optimized.cl
+++ b/OpenCL/m00010_a3-optimized.cl
@@ -486,7 +486,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -524,7 +524,7 @@ KERNEL_FQ void m00010_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -562,7 +562,7 @@ KERNEL_FQ void m00010_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -600,7 +600,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -638,7 +638,7 @@ KERNEL_FQ void m00010_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -676,7 +676,7 @@ KERNEL_FQ void m00010_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00010_a3-pure.cl b/OpenCL/m00010_a3-pure.cl
index 163e7cb64..fffc3c31c 100644
--- a/OpenCL/m00010_a3-pure.cl
+++ b/OpenCL/m00010_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00020_a0-optimized.cl b/OpenCL/m00020_a0-optimized.cl
index 4bf41989a..a497151b9 100644
--- a/OpenCL/m00020_a0-optimized.cl
+++ b/OpenCL/m00020_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -219,7 +219,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00020_a0-pure.cl b/OpenCL/m00020_a0-pure.cl
index b282c61fa..61f268c4a 100644
--- a/OpenCL/m00020_a0-pure.cl
+++ b/OpenCL/m00020_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00020_a1-optimized.cl b/OpenCL/m00020_a1-optimized.cl
index 13b6735ad..c1cd300cf 100644
--- a/OpenCL/m00020_a1-optimized.cl
+++ b/OpenCL/m00020_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -275,7 +275,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00020_a1-pure.cl b/OpenCL/m00020_a1-pure.cl
index a2583c80e..65dd78e64 100644
--- a/OpenCL/m00020_a1-pure.cl
+++ b/OpenCL/m00020_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00020_a3-optimized.cl b/OpenCL/m00020_a3-optimized.cl
index 8157bb151..61be14e6a 100644
--- a/OpenCL/m00020_a3-optimized.cl
+++ b/OpenCL/m00020_a3-optimized.cl
@@ -387,7 +387,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -434,7 +434,7 @@ KERNEL_FQ void m00020_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -481,7 +481,7 @@ KERNEL_FQ void m00020_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -575,7 +575,7 @@ KERNEL_FQ void m00020_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -622,7 +622,7 @@ KERNEL_FQ void m00020_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00020_a3-pure.cl b/OpenCL/m00020_a3-pure.cl
index 5544620af..ed673ac80 100644
--- a/OpenCL/m00020_a3-pure.cl
+++ b/OpenCL/m00020_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00030_a0-optimized.cl b/OpenCL/m00030_a0-optimized.cl
index 85cbca6a4..29209768d 100644
--- a/OpenCL/m00030_a0-optimized.cl
+++ b/OpenCL/m00030_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -244,7 +244,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00030_a0-pure.cl b/OpenCL/m00030_a0-pure.cl
index 253bf413a..1e6fb1147 100644
--- a/OpenCL/m00030_a0-pure.cl
+++ b/OpenCL/m00030_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00030_a1-optimized.cl b/OpenCL/m00030_a1-optimized.cl
index 46d07dd18..775765292 100644
--- a/OpenCL/m00030_a1-optimized.cl
+++ b/OpenCL/m00030_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -302,7 +302,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00030_a1-pure.cl b/OpenCL/m00030_a1-pure.cl
index 2769af047..53b68b947 100644
--- a/OpenCL/m00030_a1-pure.cl
+++ b/OpenCL/m00030_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00030_a3-optimized.cl b/OpenCL/m00030_a3-optimized.cl
index 210923966..707c0ea68 100644
--- a/OpenCL/m00030_a3-optimized.cl
+++ b/OpenCL/m00030_a3-optimized.cl
@@ -486,7 +486,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -524,7 +524,7 @@ KERNEL_FQ void m00030_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -562,7 +562,7 @@ KERNEL_FQ void m00030_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -600,7 +600,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -638,7 +638,7 @@ KERNEL_FQ void m00030_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -676,7 +676,7 @@ KERNEL_FQ void m00030_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00030_a3-pure.cl b/OpenCL/m00030_a3-pure.cl
index de1f296af..232d464f7 100644
--- a/OpenCL/m00030_a3-pure.cl
+++ b/OpenCL/m00030_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00040_a0-optimized.cl b/OpenCL/m00040_a0-optimized.cl
index 4de081c58..e8dea5a57 100644
--- a/OpenCL/m00040_a0-optimized.cl
+++ b/OpenCL/m00040_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -224,7 +224,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00040_a0-pure.cl b/OpenCL/m00040_a0-pure.cl
index a2f7a7ae3..7f32f61a1 100644
--- a/OpenCL/m00040_a0-pure.cl
+++ b/OpenCL/m00040_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00040_a1-optimized.cl b/OpenCL/m00040_a1-optimized.cl
index bcbbc3655..77fad8370 100644
--- a/OpenCL/m00040_a1-optimized.cl
+++ b/OpenCL/m00040_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -280,7 +280,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00040_a1-pure.cl b/OpenCL/m00040_a1-pure.cl
index efaee0041..4f842eee4 100644
--- a/OpenCL/m00040_a1-pure.cl
+++ b/OpenCL/m00040_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00040_a3-optimized.cl b/OpenCL/m00040_a3-optimized.cl
index a886b0b55..eedff8f43 100644
--- a/OpenCL/m00040_a3-optimized.cl
+++ b/OpenCL/m00040_a3-optimized.cl
@@ -387,7 +387,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -434,7 +434,7 @@ KERNEL_FQ void m00040_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -481,7 +481,7 @@ KERNEL_FQ void m00040_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -575,7 +575,7 @@ KERNEL_FQ void m00040_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -622,7 +622,7 @@ KERNEL_FQ void m00040_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00040_a3-pure.cl b/OpenCL/m00040_a3-pure.cl
index 95b0300c2..80259bd01 100644
--- a/OpenCL/m00040_a3-pure.cl
+++ b/OpenCL/m00040_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00050_a0-optimized.cl b/OpenCL/m00050_a0-optimized.cl
index 60d4bb3b0..6cddfe4b1 100644
--- a/OpenCL/m00050_a0-optimized.cl
+++ b/OpenCL/m00050_a0-optimized.cl
@@ -115,7 +115,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -228,7 +228,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00050_a0-pure.cl b/OpenCL/m00050_a0-pure.cl
index 4162b0703..6d6dd7a50 100644
--- a/OpenCL/m00050_a0-pure.cl
+++ b/OpenCL/m00050_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00050_a1-optimized.cl b/OpenCL/m00050_a1-optimized.cl
index 29c8a1659..ec271582a 100644
--- a/OpenCL/m00050_a1-optimized.cl
+++ b/OpenCL/m00050_a1-optimized.cl
@@ -113,7 +113,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -286,7 +286,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00050_a1-pure.cl b/OpenCL/m00050_a1-pure.cl
index 252c422d8..15ea8fbf2 100644
--- a/OpenCL/m00050_a1-pure.cl
+++ b/OpenCL/m00050_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00050_a3-optimized.cl b/OpenCL/m00050_a3-optimized.cl
index 48345d666..d15fe1aee 100644
--- a/OpenCL/m00050_a3-optimized.cl
+++ b/OpenCL/m00050_a3-optimized.cl
@@ -329,7 +329,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -376,7 +376,7 @@ KERNEL_FQ void m00050_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -423,7 +423,7 @@ KERNEL_FQ void m00050_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -470,7 +470,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -517,7 +517,7 @@ KERNEL_FQ void m00050_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -564,7 +564,7 @@ KERNEL_FQ void m00050_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00050_a3-pure.cl b/OpenCL/m00050_a3-pure.cl
index f20dbdc7c..0bc0f0c7d 100644
--- a/OpenCL/m00050_a3-pure.cl
+++ b/OpenCL/m00050_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl
index 0c8aeb59d..727d05b62 100644
--- a/OpenCL/m00060_a0-optimized.cl
+++ b/OpenCL/m00060_a0-optimized.cl
@@ -115,7 +115,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -250,7 +250,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00060_a0-pure.cl b/OpenCL/m00060_a0-pure.cl
index 7a43646bb..b1f7ffb70 100644
--- a/OpenCL/m00060_a0-pure.cl
+++ b/OpenCL/m00060_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00060_a1-optimized.cl b/OpenCL/m00060_a1-optimized.cl
index b2d5b5e88..89a052e0e 100644
--- a/OpenCL/m00060_a1-optimized.cl
+++ b/OpenCL/m00060_a1-optimized.cl
@@ -113,7 +113,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -289,7 +289,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00060_a1-pure.cl b/OpenCL/m00060_a1-pure.cl
index 663cefebc..c39f00ec2 100644
--- a/OpenCL/m00060_a1-pure.cl
+++ b/OpenCL/m00060_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -103,7 +103,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00060_a3-optimized.cl b/OpenCL/m00060_a3-optimized.cl
index 3fe821771..028226149 100644
--- a/OpenCL/m00060_a3-optimized.cl
+++ b/OpenCL/m00060_a3-optimized.cl
@@ -325,7 +325,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -372,7 +372,7 @@ KERNEL_FQ void m00060_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -419,7 +419,7 @@ KERNEL_FQ void m00060_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m00060_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m00060_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00060_a3-pure.cl b/OpenCL/m00060_a3-pure.cl
index 5ebed2ca7..eda5e16fc 100644
--- a/OpenCL/m00060_a3-pure.cl
+++ b/OpenCL/m00060_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00070_a0-optimized.cl b/OpenCL/m00070_a0-optimized.cl
index 4c24f1c6c..712d8b20d 100644
--- a/OpenCL/m00070_a0-optimized.cl
+++ b/OpenCL/m00070_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -174,7 +174,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00070_a0-pure.cl b/OpenCL/m00070_a0-pure.cl
index 1b6a7a56c..78280f16c 100644
--- a/OpenCL/m00070_a0-pure.cl
+++ b/OpenCL/m00070_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00070_a1-optimized.cl b/OpenCL/m00070_a1-optimized.cl
index f66eeee8d..0fb527231 100644
--- a/OpenCL/m00070_a1-optimized.cl
+++ b/OpenCL/m00070_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -232,7 +232,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00070_a1-pure.cl b/OpenCL/m00070_a1-pure.cl
index 96f50effe..22147cfdd 100644
--- a/OpenCL/m00070_a1-pure.cl
+++ b/OpenCL/m00070_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00070_a3-optimized.cl b/OpenCL/m00070_a3-optimized.cl
index cff809797..05b33afdc 100644
--- a/OpenCL/m00070_a3-optimized.cl
+++ b/OpenCL/m00070_a3-optimized.cl
@@ -440,7 +440,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -478,7 +478,7 @@ KERNEL_FQ void m00070_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -516,7 +516,7 @@ KERNEL_FQ void m00070_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -554,7 +554,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -592,7 +592,7 @@ KERNEL_FQ void m00070_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -630,7 +630,7 @@ KERNEL_FQ void m00070_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00070_a3-pure.cl b/OpenCL/m00070_a3-pure.cl
index bad529a39..be522d5ad 100644
--- a/OpenCL/m00070_a3-pure.cl
+++ b/OpenCL/m00070_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00100_a0-optimized.cl b/OpenCL/m00100_a0-optimized.cl
index d09569f09..5f9826069 100644
--- a/OpenCL/m00100_a0-optimized.cl
+++ b/OpenCL/m00100_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -210,7 +210,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00100_a0-pure.cl b/OpenCL/m00100_a0-pure.cl
index 27f2b8b82..153a50a29 100644
--- a/OpenCL/m00100_a0-pure.cl
+++ b/OpenCL/m00100_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00100_a1-optimized.cl b/OpenCL/m00100_a1-optimized.cl
index 316acc346..0daa28f08 100644
--- a/OpenCL/m00100_a1-optimized.cl
+++ b/OpenCL/m00100_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -266,7 +266,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00100_a1-pure.cl b/OpenCL/m00100_a1-pure.cl
index 41c875984..e9b20948c 100644
--- a/OpenCL/m00100_a1-pure.cl
+++ b/OpenCL/m00100_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00100_a3-optimized.cl b/OpenCL/m00100_a3-optimized.cl
index b40e940d1..f14921d71 100644
--- a/OpenCL/m00100_a3-optimized.cl
+++ b/OpenCL/m00100_a3-optimized.cl
@@ -530,7 +530,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -568,7 +568,7 @@ KERNEL_FQ void m00100_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -606,7 +606,7 @@ KERNEL_FQ void m00100_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -644,7 +644,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -682,7 +682,7 @@ KERNEL_FQ void m00100_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -720,7 +720,7 @@ KERNEL_FQ void m00100_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00100_a3-pure.cl b/OpenCL/m00100_a3-pure.cl
index aa6a59509..75a7260e7 100644
--- a/OpenCL/m00100_a3-pure.cl
+++ b/OpenCL/m00100_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00110_a0-optimized.cl b/OpenCL/m00110_a0-optimized.cl
index 374394e9e..39a6f1c6b 100644
--- a/OpenCL/m00110_a0-optimized.cl
+++ b/OpenCL/m00110_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -283,7 +283,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00110_a0-pure.cl b/OpenCL/m00110_a0-pure.cl
index a43c9a45f..0b586f404 100644
--- a/OpenCL/m00110_a0-pure.cl
+++ b/OpenCL/m00110_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00110_a1-optimized.cl b/OpenCL/m00110_a1-optimized.cl
index 1cc088254..9f0fb7321 100644
--- a/OpenCL/m00110_a1-optimized.cl
+++ b/OpenCL/m00110_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -341,7 +341,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00110_a1-pure.cl b/OpenCL/m00110_a1-pure.cl
index a105fca51..4f12fc7ce 100644
--- a/OpenCL/m00110_a1-pure.cl
+++ b/OpenCL/m00110_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00110_a3-optimized.cl b/OpenCL/m00110_a3-optimized.cl
index 65727e73a..d330277fa 100644
--- a/OpenCL/m00110_a3-optimized.cl
+++ b/OpenCL/m00110_a3-optimized.cl
@@ -578,7 +578,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -616,7 +616,7 @@ KERNEL_FQ void m00110_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m00110_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -730,7 +730,7 @@ KERNEL_FQ void m00110_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -768,7 +768,7 @@ KERNEL_FQ void m00110_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00110_a3-pure.cl b/OpenCL/m00110_a3-pure.cl
index b0b2666f1..401a3e1f2 100644
--- a/OpenCL/m00110_a3-pure.cl
+++ b/OpenCL/m00110_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00120_a0-optimized.cl b/OpenCL/m00120_a0-optimized.cl
index 24577c57d..102454931 100644
--- a/OpenCL/m00120_a0-optimized.cl
+++ b/OpenCL/m00120_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -275,7 +275,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00120_a0-pure.cl b/OpenCL/m00120_a0-pure.cl
index a2cd2c535..945b22174 100644
--- a/OpenCL/m00120_a0-pure.cl
+++ b/OpenCL/m00120_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00120_a1-optimized.cl b/OpenCL/m00120_a1-optimized.cl
index a276bfbfd..10e3eb25b 100644
--- a/OpenCL/m00120_a1-optimized.cl
+++ b/OpenCL/m00120_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -331,7 +331,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00120_a1-pure.cl b/OpenCL/m00120_a1-pure.cl
index 4cfd66b66..896ce7f3f 100644
--- a/OpenCL/m00120_a1-pure.cl
+++ b/OpenCL/m00120_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00120_a3-optimized.cl b/OpenCL/m00120_a3-optimized.cl
index a8f45ec1f..3d51feb30 100644
--- a/OpenCL/m00120_a3-optimized.cl
+++ b/OpenCL/m00120_a3-optimized.cl
@@ -481,7 +481,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m00120_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -575,7 +575,7 @@ KERNEL_FQ void m00120_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -622,7 +622,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -669,7 +669,7 @@ KERNEL_FQ void m00120_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -716,7 +716,7 @@ KERNEL_FQ void m00120_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00120_a3-pure.cl b/OpenCL/m00120_a3-pure.cl
index 9e282f2a9..6fbc3830e 100644
--- a/OpenCL/m00120_a3-pure.cl
+++ b/OpenCL/m00120_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00130_a0-optimized.cl b/OpenCL/m00130_a0-optimized.cl
index b62bbf71a..a857e267c 100644
--- a/OpenCL/m00130_a0-optimized.cl
+++ b/OpenCL/m00130_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -288,7 +288,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00130_a0-pure.cl b/OpenCL/m00130_a0-pure.cl
index ff6f7d0c1..6323817fb 100644
--- a/OpenCL/m00130_a0-pure.cl
+++ b/OpenCL/m00130_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00130_a1-optimized.cl b/OpenCL/m00130_a1-optimized.cl
index 81d1d80eb..aa47bb836 100644
--- a/OpenCL/m00130_a1-optimized.cl
+++ b/OpenCL/m00130_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -346,7 +346,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00130_a1-pure.cl b/OpenCL/m00130_a1-pure.cl
index d9d9f858d..5f9cbef88 100644
--- a/OpenCL/m00130_a1-pure.cl
+++ b/OpenCL/m00130_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00130_a3-optimized.cl b/OpenCL/m00130_a3-optimized.cl
index 86bc281c5..284c32a8c 100644
--- a/OpenCL/m00130_a3-optimized.cl
+++ b/OpenCL/m00130_a3-optimized.cl
@@ -578,7 +578,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -616,7 +616,7 @@ KERNEL_FQ void m00130_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m00130_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -730,7 +730,7 @@ KERNEL_FQ void m00130_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -768,7 +768,7 @@ KERNEL_FQ void m00130_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00130_a3-pure.cl b/OpenCL/m00130_a3-pure.cl
index 94824d3a2..c87a43746 100644
--- a/OpenCL/m00130_a3-pure.cl
+++ b/OpenCL/m00130_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00140_a0-optimized.cl b/OpenCL/m00140_a0-optimized.cl
index c9d70c648..582c25635 100644
--- a/OpenCL/m00140_a0-optimized.cl
+++ b/OpenCL/m00140_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -268,7 +268,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00140_a0-pure.cl b/OpenCL/m00140_a0-pure.cl
index 3075238c6..e6ee9aeb8 100644
--- a/OpenCL/m00140_a0-pure.cl
+++ b/OpenCL/m00140_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00140_a1-optimized.cl b/OpenCL/m00140_a1-optimized.cl
index cfe2d491d..9ce440a32 100644
--- a/OpenCL/m00140_a1-optimized.cl
+++ b/OpenCL/m00140_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -324,7 +324,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00140_a1-pure.cl b/OpenCL/m00140_a1-pure.cl
index 1ac340bf5..da26eeb70 100644
--- a/OpenCL/m00140_a1-pure.cl
+++ b/OpenCL/m00140_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00140_a3-optimized.cl b/OpenCL/m00140_a3-optimized.cl
index 56d2c1dba..292b8bbd7 100644
--- a/OpenCL/m00140_a3-optimized.cl
+++ b/OpenCL/m00140_a3-optimized.cl
@@ -481,7 +481,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m00140_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -575,7 +575,7 @@ KERNEL_FQ void m00140_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -622,7 +622,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -669,7 +669,7 @@ KERNEL_FQ void m00140_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -716,7 +716,7 @@ KERNEL_FQ void m00140_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00140_a3-pure.cl b/OpenCL/m00140_a3-pure.cl
index 8d914b465..05b03a55f 100644
--- a/OpenCL/m00140_a3-pure.cl
+++ b/OpenCL/m00140_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00150_a0-optimized.cl b/OpenCL/m00150_a0-optimized.cl
index 64bc31d4f..9816079f6 100644
--- a/OpenCL/m00150_a0-optimized.cl
+++ b/OpenCL/m00150_a0-optimized.cl
@@ -119,7 +119,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -241,7 +241,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00150_a0-pure.cl b/OpenCL/m00150_a0-pure.cl
index 3691e8c58..9374b241f 100644
--- a/OpenCL/m00150_a0-pure.cl
+++ b/OpenCL/m00150_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00150_a1-optimized.cl b/OpenCL/m00150_a1-optimized.cl
index aa5dbbfa5..c52311bd5 100644
--- a/OpenCL/m00150_a1-optimized.cl
+++ b/OpenCL/m00150_a1-optimized.cl
@@ -117,7 +117,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -307,7 +307,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00150_a1-pure.cl b/OpenCL/m00150_a1-pure.cl
index d16ed73a2..f99531354 100644
--- a/OpenCL/m00150_a1-pure.cl
+++ b/OpenCL/m00150_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00150_a3-optimized.cl b/OpenCL/m00150_a3-optimized.cl
index cea019f3a..f286e5aef 100644
--- a/OpenCL/m00150_a3-optimized.cl
+++ b/OpenCL/m00150_a3-optimized.cl
@@ -333,7 +333,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -380,7 +380,7 @@ KERNEL_FQ void m00150_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -427,7 +427,7 @@ KERNEL_FQ void m00150_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -474,7 +474,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -521,7 +521,7 @@ KERNEL_FQ void m00150_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -568,7 +568,7 @@ KERNEL_FQ void m00150_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00150_a3-pure.cl b/OpenCL/m00150_a3-pure.cl
index a641f4d96..cd7e364d3 100644
--- a/OpenCL/m00150_a3-pure.cl
+++ b/OpenCL/m00150_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl
index 99567a048..f09f14e54 100644
--- a/OpenCL/m00160_a0-optimized.cl
+++ b/OpenCL/m00160_a0-optimized.cl
@@ -119,7 +119,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -254,7 +254,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00160_a0-pure.cl b/OpenCL/m00160_a0-pure.cl
index 709c1c15a..ceedc13cc 100644
--- a/OpenCL/m00160_a0-pure.cl
+++ b/OpenCL/m00160_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00160_a1-optimized.cl b/OpenCL/m00160_a1-optimized.cl
index ec3857301..e3f09abb7 100644
--- a/OpenCL/m00160_a1-optimized.cl
+++ b/OpenCL/m00160_a1-optimized.cl
@@ -117,7 +117,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -312,7 +312,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00160_a1-pure.cl b/OpenCL/m00160_a1-pure.cl
index b39a59a0a..bccd2a98e 100644
--- a/OpenCL/m00160_a1-pure.cl
+++ b/OpenCL/m00160_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -103,7 +103,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00160_a3-optimized.cl b/OpenCL/m00160_a3-optimized.cl
index b12c7b323..42d934989 100644
--- a/OpenCL/m00160_a3-optimized.cl
+++ b/OpenCL/m00160_a3-optimized.cl
@@ -329,7 +329,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -376,7 +376,7 @@ KERNEL_FQ void m00160_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -423,7 +423,7 @@ KERNEL_FQ void m00160_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -470,7 +470,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -517,7 +517,7 @@ KERNEL_FQ void m00160_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -564,7 +564,7 @@ KERNEL_FQ void m00160_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m00160_a3-pure.cl b/OpenCL/m00160_a3-pure.cl
index 4259c6c7d..2538d6040 100644
--- a/OpenCL/m00160_a3-pure.cl
+++ b/OpenCL/m00160_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00170_a0-optimized.cl b/OpenCL/m00170_a0-optimized.cl
index 25daed69b..7f0b89745 100644
--- a/OpenCL/m00170_a0-optimized.cl
+++ b/OpenCL/m00170_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -215,7 +215,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00170_a0-pure.cl b/OpenCL/m00170_a0-pure.cl
index 53f03d72b..cbc2e9deb 100644
--- a/OpenCL/m00170_a0-pure.cl
+++ b/OpenCL/m00170_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00170_a1-optimized.cl b/OpenCL/m00170_a1-optimized.cl
index 0a9f101fc..5f213ffb0 100644
--- a/OpenCL/m00170_a1-optimized.cl
+++ b/OpenCL/m00170_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -271,7 +271,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00170_a1-pure.cl b/OpenCL/m00170_a1-pure.cl
index 6b72e4bb4..69360afd0 100644
--- a/OpenCL/m00170_a1-pure.cl
+++ b/OpenCL/m00170_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00170_a3-optimized.cl b/OpenCL/m00170_a3-optimized.cl
index 7ab61fccf..e94aa1840 100644
--- a/OpenCL/m00170_a3-optimized.cl
+++ b/OpenCL/m00170_a3-optimized.cl
@@ -527,7 +527,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -565,7 +565,7 @@ KERNEL_FQ void m00170_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -603,7 +603,7 @@ KERNEL_FQ void m00170_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -641,7 +641,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -679,7 +679,7 @@ KERNEL_FQ void m00170_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -717,7 +717,7 @@ KERNEL_FQ void m00170_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00170_a3-pure.cl b/OpenCL/m00170_a3-pure.cl
index c31d2d3ef..c72830521 100644
--- a/OpenCL/m00170_a3-pure.cl
+++ b/OpenCL/m00170_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00200_a0-optimized.cl b/OpenCL/m00200_a0-optimized.cl
index 1da035a0a..8c7d5444b 100644
--- a/OpenCL/m00200_a0-optimized.cl
+++ b/OpenCL/m00200_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -156,7 +156,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00200_a1-optimized.cl b/OpenCL/m00200_a1-optimized.cl
index 3cc52a5d2..45826c59c 100644
--- a/OpenCL/m00200_a1-optimized.cl
+++ b/OpenCL/m00200_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -218,7 +218,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00200_a3-optimized.cl b/OpenCL/m00200_a3-optimized.cl
index 826be0140..9ec0bb9cd 100644
--- a/OpenCL/m00200_a3-optimized.cl
+++ b/OpenCL/m00200_a3-optimized.cl
@@ -354,7 +354,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -392,7 +392,7 @@ KERNEL_FQ void m00200_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -430,7 +430,7 @@ KERNEL_FQ void m00200_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -468,7 +468,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -506,7 +506,7 @@ KERNEL_FQ void m00200_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -544,7 +544,7 @@ KERNEL_FQ void m00200_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00300_a0-optimized.cl b/OpenCL/m00300_a0-optimized.cl
index 26e43cbf2..7dcb5b003 100644
--- a/OpenCL/m00300_a0-optimized.cl
+++ b/OpenCL/m00300_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -335,7 +335,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00300_a0-pure.cl b/OpenCL/m00300_a0-pure.cl
index 10cceac44..7b392c006 100644
--- a/OpenCL/m00300_a0-pure.cl
+++ b/OpenCL/m00300_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -92,7 +92,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00300_a1-optimized.cl b/OpenCL/m00300_a1-optimized.cl
index cf40a028a..4b07f3b23 100644
--- a/OpenCL/m00300_a1-optimized.cl
+++ b/OpenCL/m00300_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -391,7 +391,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00300_a1-pure.cl b/OpenCL/m00300_a1-pure.cl
index 119ed3af1..96ba19312 100644
--- a/OpenCL/m00300_a1-pure.cl
+++ b/OpenCL/m00300_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -88,7 +88,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00300_a3-optimized.cl b/OpenCL/m00300_a3-optimized.cl
index 1551e9828..dee438e83 100644
--- a/OpenCL/m00300_a3-optimized.cl
+++ b/OpenCL/m00300_a3-optimized.cl
@@ -781,7 +781,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -819,7 +819,7 @@ KERNEL_FQ void m00300_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -857,7 +857,7 @@ KERNEL_FQ void m00300_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -895,7 +895,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -933,7 +933,7 @@ KERNEL_FQ void m00300_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -971,7 +971,7 @@ KERNEL_FQ void m00300_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00300_a3-pure.cl b/OpenCL/m00300_a3-pure.cl
index ff3f0e438..5f188ada4 100644
--- a/OpenCL/m00300_a3-pure.cl
+++ b/OpenCL/m00300_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00400-optimized.cl b/OpenCL/m00400-optimized.cl
index 489f4791f..c5b218b28 100644
--- a/OpenCL/m00400-optimized.cl
+++ b/OpenCL/m00400-optimized.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -128,7 +128,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x w0[4];
   u32x w1[4];
@@ -220,7 +220,7 @@ KERNEL_FQ void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00400-pure.cl b/OpenCL/m00400-pure.cl
index 79bbebaf6..57e5a099d 100644
--- a/OpenCL/m00400-pure.cl
+++ b/OpenCL/m00400-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -68,7 +68,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -170,7 +170,7 @@ KERNEL_FQ void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl
index c965512b0..a7de5c664 100644
--- a/OpenCL/m00500-optimized.cl
+++ b/OpenCL/m00500-optimized.cl
@@ -667,7 +667,7 @@ KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -830,7 +830,7 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1018,7 +1018,7 @@ KERNEL_FQ void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m00500-pure.cl b/OpenCL/m00500-pure.cl
index e8b961809..da1ea42dc 100644
--- a/OpenCL/m00500-pure.cl
+++ b/OpenCL/m00500-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -138,7 +138,7 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -233,7 +233,7 @@ KERNEL_FQ void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m00600_a0-optimized.cl b/OpenCL/m00600_a0-optimized.cl
index 824641acc..32070865d 100644
--- a/OpenCL/m00600_a0-optimized.cl
+++ b/OpenCL/m00600_a0-optimized.cl
@@ -24,7 +24,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -110,7 +110,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00600_a0-pure.cl b/OpenCL/m00600_a0-pure.cl
index 34c37bb3d..3671fb378 100644
--- a/OpenCL/m00600_a0-pure.cl
+++ b/OpenCL/m00600_a0-pure.cl
@@ -24,7 +24,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00600_a1-optimized.cl b/OpenCL/m00600_a1-optimized.cl
index 75184cfae..1700c1524 100644
--- a/OpenCL/m00600_a1-optimized.cl
+++ b/OpenCL/m00600_a1-optimized.cl
@@ -22,7 +22,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -168,7 +168,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00600_a1-pure.cl b/OpenCL/m00600_a1-pure.cl
index ae84ed2b7..3929ea5e9 100644
--- a/OpenCL/m00600_a1-pure.cl
+++ b/OpenCL/m00600_a1-pure.cl
@@ -22,7 +22,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -63,7 +63,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00600_a3-optimized.cl b/OpenCL/m00600_a3-optimized.cl
index ca1debe58..bd977b222 100644
--- a/OpenCL/m00600_a3-optimized.cl
+++ b/OpenCL/m00600_a3-optimized.cl
@@ -198,7 +198,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -236,7 +236,7 @@ KERNEL_FQ void m00600_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -274,7 +274,7 @@ KERNEL_FQ void m00600_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -312,7 +312,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -350,7 +350,7 @@ KERNEL_FQ void m00600_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -388,7 +388,7 @@ KERNEL_FQ void m00600_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00600_a3-pure.cl b/OpenCL/m00600_a3-pure.cl
index 98c7ccae6..76509acf7 100644
--- a/OpenCL/m00600_a3-pure.cl
+++ b/OpenCL/m00600_a3-pure.cl
@@ -22,7 +22,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -74,7 +74,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00900_a0-optimized.cl b/OpenCL/m00900_a0-optimized.cl
index 01596b38c..de2d58db4 100644
--- a/OpenCL/m00900_a0-optimized.cl
+++ b/OpenCL/m00900_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -146,7 +146,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00900_a0-pure.cl b/OpenCL/m00900_a0-pure.cl
index dd154dc1c..7b41bcb5c 100644
--- a/OpenCL/m00900_a0-pure.cl
+++ b/OpenCL/m00900_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00900_a1-optimized.cl b/OpenCL/m00900_a1-optimized.cl
index 1539f23bd..825c640a6 100644
--- a/OpenCL/m00900_a1-optimized.cl
+++ b/OpenCL/m00900_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -203,7 +203,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m00900_a1-pure.cl b/OpenCL/m00900_a1-pure.cl
index 409a0b388..4957ad750 100644
--- a/OpenCL/m00900_a1-pure.cl
+++ b/OpenCL/m00900_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m00900_a3-optimized.cl b/OpenCL/m00900_a3-optimized.cl
index d67d84152..13464ba68 100644
--- a/OpenCL/m00900_a3-optimized.cl
+++ b/OpenCL/m00900_a3-optimized.cl
@@ -361,7 +361,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -399,7 +399,7 @@ KERNEL_FQ void m00900_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -437,7 +437,7 @@ KERNEL_FQ void m00900_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -475,7 +475,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m00900_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -551,7 +551,7 @@ KERNEL_FQ void m00900_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m00900_a3-pure.cl b/OpenCL/m00900_a3-pure.cl
index 65c548692..fa3b137ce 100644
--- a/OpenCL/m00900_a3-pure.cl
+++ b/OpenCL/m00900_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01000_a0-optimized.cl b/OpenCL/m01000_a0-optimized.cl
index fb4ed9b72..202c2f5c0 100644
--- a/OpenCL/m01000_a0-optimized.cl
+++ b/OpenCL/m01000_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -149,7 +149,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01000_a0-pure.cl b/OpenCL/m01000_a0-pure.cl
index eac37f155..6b2cbef75 100644
--- a/OpenCL/m01000_a0-pure.cl
+++ b/OpenCL/m01000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01000_a1-optimized.cl b/OpenCL/m01000_a1-optimized.cl
index 3747785e0..81c1c5574 100644
--- a/OpenCL/m01000_a1-optimized.cl
+++ b/OpenCL/m01000_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -209,7 +209,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01000_a1-pure.cl b/OpenCL/m01000_a1-pure.cl
index d50d7a502..a5ba0f110 100644
--- a/OpenCL/m01000_a1-pure.cl
+++ b/OpenCL/m01000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01000_a3-optimized.cl b/OpenCL/m01000_a3-optimized.cl
index 53296fcea..85ed9f2e9 100644
--- a/OpenCL/m01000_a3-optimized.cl
+++ b/OpenCL/m01000_a3-optimized.cl
@@ -361,7 +361,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -399,7 +399,7 @@ KERNEL_FQ void m01000_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -437,7 +437,7 @@ KERNEL_FQ void m01000_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -475,7 +475,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m01000_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -551,7 +551,7 @@ KERNEL_FQ void m01000_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01000_a3-pure.cl b/OpenCL/m01000_a3-pure.cl
index 4ac216f4a..8485501eb 100644
--- a/OpenCL/m01000_a3-pure.cl
+++ b/OpenCL/m01000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01100_a0-optimized.cl b/OpenCL/m01100_a0-optimized.cl
index 8368ba921..de724c6cd 100644
--- a/OpenCL/m01100_a0-optimized.cl
+++ b/OpenCL/m01100_a0-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define salt_buf00 s_salt_buf[0].salt_buf[ 0]
   #define salt_buf01 s_salt_buf[0].salt_buf[ 1]
@@ -273,7 +273,7 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define salt_buf00 s_salt_buf[0].salt_buf[ 0]
   #define salt_buf01 s_salt_buf[0].salt_buf[ 1]
diff --git a/OpenCL/m01100_a0-pure.cl b/OpenCL/m01100_a0-pure.cl
index 1a1fe96d8..77edf051b 100644
--- a/OpenCL/m01100_a0-pure.cl
+++ b/OpenCL/m01100_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -93,7 +93,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01100_a1-optimized.cl b/OpenCL/m01100_a1-optimized.cl
index 1093e338b..d150ee88d 100644
--- a/OpenCL/m01100_a1-optimized.cl
+++ b/OpenCL/m01100_a1-optimized.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define salt_buf00 s_salt_buf[0].salt_buf[ 0]
   #define salt_buf01 s_salt_buf[0].salt_buf[ 1]
@@ -333,7 +333,7 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define salt_buf00 s_salt_buf[0].salt_buf[ 0]
   #define salt_buf01 s_salt_buf[0].salt_buf[ 1]
diff --git a/OpenCL/m01100_a1-pure.cl b/OpenCL/m01100_a1-pure.cl
index a1b62ece6..5cdb2ef9e 100644
--- a/OpenCL/m01100_a1-pure.cl
+++ b/OpenCL/m01100_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01100_a3-optimized.cl b/OpenCL/m01100_a3-optimized.cl
index 6c52735c1..5a787ef9c 100644
--- a/OpenCL/m01100_a3-optimized.cl
+++ b/OpenCL/m01100_a3-optimized.cl
@@ -544,7 +544,7 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -598,7 +598,7 @@ KERNEL_FQ void m01100_m08 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -652,7 +652,7 @@ KERNEL_FQ void m01100_m16 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -706,7 +706,7 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -760,7 +760,7 @@ KERNEL_FQ void m01100_s08 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -814,7 +814,7 @@ KERNEL_FQ void m01100_s16 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m01100_a3-pure.cl b/OpenCL/m01100_a3-pure.cl
index 7834b5f05..39d2b86eb 100644
--- a/OpenCL/m01100_a3-pure.cl
+++ b/OpenCL/m01100_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -102,7 +102,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01300_a0-optimized.cl b/OpenCL/m01300_a0-optimized.cl
index 2d095df11..bfea22572 100644
--- a/OpenCL/m01300_a0-optimized.cl
+++ b/OpenCL/m01300_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -198,7 +198,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01300_a0-pure.cl b/OpenCL/m01300_a0-pure.cl
index e3412d290..7b7fd83f8 100644
--- a/OpenCL/m01300_a0-pure.cl
+++ b/OpenCL/m01300_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01300_a1-optimized.cl b/OpenCL/m01300_a1-optimized.cl
index 055335aac..f28c77402 100644
--- a/OpenCL/m01300_a1-optimized.cl
+++ b/OpenCL/m01300_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -254,7 +254,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01300_a1-pure.cl b/OpenCL/m01300_a1-pure.cl
index 346b1b239..ff5930cc0 100644
--- a/OpenCL/m01300_a1-pure.cl
+++ b/OpenCL/m01300_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01300_a3-optimized.cl b/OpenCL/m01300_a3-optimized.cl
index 370ac60f5..05b184172 100644
--- a/OpenCL/m01300_a3-optimized.cl
+++ b/OpenCL/m01300_a3-optimized.cl
@@ -304,7 +304,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -342,7 +342,7 @@ KERNEL_FQ void m01300_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -380,7 +380,7 @@ KERNEL_FQ void m01300_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -418,7 +418,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -456,7 +456,7 @@ KERNEL_FQ void m01300_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -494,7 +494,7 @@ KERNEL_FQ void m01300_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01300_a3-pure.cl b/OpenCL/m01300_a3-pure.cl
index 4b9506c38..2b076452d 100644
--- a/OpenCL/m01300_a3-pure.cl
+++ b/OpenCL/m01300_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01400_a0-optimized.cl b/OpenCL/m01400_a0-optimized.cl
index 1ed573954..62f623366 100644
--- a/OpenCL/m01400_a0-optimized.cl
+++ b/OpenCL/m01400_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -199,7 +199,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01400_a0-pure.cl b/OpenCL/m01400_a0-pure.cl
index e7a2f89d4..6574d78fa 100644
--- a/OpenCL/m01400_a0-pure.cl
+++ b/OpenCL/m01400_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01400_a1-optimized.cl b/OpenCL/m01400_a1-optimized.cl
index 2a8eda9df..af143adfd 100644
--- a/OpenCL/m01400_a1-optimized.cl
+++ b/OpenCL/m01400_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -255,7 +255,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01400_a1-pure.cl b/OpenCL/m01400_a1-pure.cl
index 30b058a99..eb0aa0a64 100644
--- a/OpenCL/m01400_a1-pure.cl
+++ b/OpenCL/m01400_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01400_a3-optimized.cl b/OpenCL/m01400_a3-optimized.cl
index bde611927..f107af9ec 100644
--- a/OpenCL/m01400_a3-optimized.cl
+++ b/OpenCL/m01400_a3-optimized.cl
@@ -307,7 +307,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -345,7 +345,7 @@ KERNEL_FQ void m01400_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -383,7 +383,7 @@ KERNEL_FQ void m01400_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -421,7 +421,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -459,7 +459,7 @@ KERNEL_FQ void m01400_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -497,7 +497,7 @@ KERNEL_FQ void m01400_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01400_a3-pure.cl b/OpenCL/m01400_a3-pure.cl
index 57dcd8e7e..25b8431db 100644
--- a/OpenCL/m01400_a3-pure.cl
+++ b/OpenCL/m01400_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01410_a0-optimized.cl b/OpenCL/m01410_a0-optimized.cl
index be9ac6d2f..e2134462d 100644
--- a/OpenCL/m01410_a0-optimized.cl
+++ b/OpenCL/m01410_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -272,7 +272,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01410_a0-pure.cl b/OpenCL/m01410_a0-pure.cl
index d0607e0ca..2bfc5119e 100644
--- a/OpenCL/m01410_a0-pure.cl
+++ b/OpenCL/m01410_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01410_a1-optimized.cl b/OpenCL/m01410_a1-optimized.cl
index 473be1e4f..a2b96d08c 100644
--- a/OpenCL/m01410_a1-optimized.cl
+++ b/OpenCL/m01410_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -330,7 +330,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01410_a1-pure.cl b/OpenCL/m01410_a1-pure.cl
index 2c5442e52..f594b1705 100644
--- a/OpenCL/m01410_a1-pure.cl
+++ b/OpenCL/m01410_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01410_a3-optimized.cl b/OpenCL/m01410_a3-optimized.cl
index c6f49ee3f..cd5c23888 100644
--- a/OpenCL/m01410_a3-optimized.cl
+++ b/OpenCL/m01410_a3-optimized.cl
@@ -358,7 +358,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -396,7 +396,7 @@ KERNEL_FQ void m01410_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -434,7 +434,7 @@ KERNEL_FQ void m01410_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -472,7 +472,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -510,7 +510,7 @@ KERNEL_FQ void m01410_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -548,7 +548,7 @@ KERNEL_FQ void m01410_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01410_a3-pure.cl b/OpenCL/m01410_a3-pure.cl
index 1ab8486d7..e592c7dab 100644
--- a/OpenCL/m01410_a3-pure.cl
+++ b/OpenCL/m01410_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01420_a0-optimized.cl b/OpenCL/m01420_a0-optimized.cl
index 8ec4b7f67..50805f210 100644
--- a/OpenCL/m01420_a0-optimized.cl
+++ b/OpenCL/m01420_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -252,7 +252,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01420_a0-pure.cl b/OpenCL/m01420_a0-pure.cl
index 9578d8868..0060e8e5e 100644
--- a/OpenCL/m01420_a0-pure.cl
+++ b/OpenCL/m01420_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01420_a1-optimized.cl b/OpenCL/m01420_a1-optimized.cl
index 3c8131c1d..7e6b15d93 100644
--- a/OpenCL/m01420_a1-optimized.cl
+++ b/OpenCL/m01420_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -308,7 +308,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01420_a1-pure.cl b/OpenCL/m01420_a1-pure.cl
index e92c4fc11..a18e1bab4 100644
--- a/OpenCL/m01420_a1-pure.cl
+++ b/OpenCL/m01420_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01420_a3-optimized.cl b/OpenCL/m01420_a3-optimized.cl
index e0aac9346..3ee96bfbd 100644
--- a/OpenCL/m01420_a3-optimized.cl
+++ b/OpenCL/m01420_a3-optimized.cl
@@ -457,7 +457,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -504,7 +504,7 @@ KERNEL_FQ void m01420_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -551,7 +551,7 @@ KERNEL_FQ void m01420_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -598,7 +598,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -645,7 +645,7 @@ KERNEL_FQ void m01420_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m01420_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01420_a3-pure.cl b/OpenCL/m01420_a3-pure.cl
index 0bf81bc0d..4bb288da5 100644
--- a/OpenCL/m01420_a3-pure.cl
+++ b/OpenCL/m01420_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01430_a0-optimized.cl b/OpenCL/m01430_a0-optimized.cl
index d9b7e86d6..2973b2654 100644
--- a/OpenCL/m01430_a0-optimized.cl
+++ b/OpenCL/m01430_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -277,7 +277,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01430_a0-pure.cl b/OpenCL/m01430_a0-pure.cl
index 108c6071e..95dbe576f 100644
--- a/OpenCL/m01430_a0-pure.cl
+++ b/OpenCL/m01430_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01430_a1-optimized.cl b/OpenCL/m01430_a1-optimized.cl
index d88ab462d..b64bb16ad 100644
--- a/OpenCL/m01430_a1-optimized.cl
+++ b/OpenCL/m01430_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -335,7 +335,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01430_a1-pure.cl b/OpenCL/m01430_a1-pure.cl
index 3c0f763ca..7c89f73eb 100644
--- a/OpenCL/m01430_a1-pure.cl
+++ b/OpenCL/m01430_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01430_a3-optimized.cl b/OpenCL/m01430_a3-optimized.cl
index c57918c0f..104c59c7f 100644
--- a/OpenCL/m01430_a3-optimized.cl
+++ b/OpenCL/m01430_a3-optimized.cl
@@ -358,7 +358,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -396,7 +396,7 @@ KERNEL_FQ void m01430_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -434,7 +434,7 @@ KERNEL_FQ void m01430_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -472,7 +472,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -510,7 +510,7 @@ KERNEL_FQ void m01430_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -548,7 +548,7 @@ KERNEL_FQ void m01430_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01430_a3-pure.cl b/OpenCL/m01430_a3-pure.cl
index 175543b45..3683f9640 100644
--- a/OpenCL/m01430_a3-pure.cl
+++ b/OpenCL/m01430_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01440_a0-optimized.cl b/OpenCL/m01440_a0-optimized.cl
index cda478431..a3d4e8e84 100644
--- a/OpenCL/m01440_a0-optimized.cl
+++ b/OpenCL/m01440_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -257,7 +257,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01440_a0-pure.cl b/OpenCL/m01440_a0-pure.cl
index ed995de09..c6f7c4cf4 100644
--- a/OpenCL/m01440_a0-pure.cl
+++ b/OpenCL/m01440_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01440_a1-optimized.cl b/OpenCL/m01440_a1-optimized.cl
index 694191bb0..6339a2d53 100644
--- a/OpenCL/m01440_a1-optimized.cl
+++ b/OpenCL/m01440_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -313,7 +313,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01440_a1-pure.cl b/OpenCL/m01440_a1-pure.cl
index 3dd87e4ab..129930f9f 100644
--- a/OpenCL/m01440_a1-pure.cl
+++ b/OpenCL/m01440_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01440_a3-optimized.cl b/OpenCL/m01440_a3-optimized.cl
index 5e39177f8..ccd6052f4 100644
--- a/OpenCL/m01440_a3-optimized.cl
+++ b/OpenCL/m01440_a3-optimized.cl
@@ -457,7 +457,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -504,7 +504,7 @@ KERNEL_FQ void m01440_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -551,7 +551,7 @@ KERNEL_FQ void m01440_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -598,7 +598,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -645,7 +645,7 @@ KERNEL_FQ void m01440_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m01440_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01440_a3-pure.cl b/OpenCL/m01440_a3-pure.cl
index 5cba24633..bf12e9036 100644
--- a/OpenCL/m01440_a3-pure.cl
+++ b/OpenCL/m01440_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01450_a0-optimized.cl b/OpenCL/m01450_a0-optimized.cl
index af07dbee7..d735c6ebe 100644
--- a/OpenCL/m01450_a0-optimized.cl
+++ b/OpenCL/m01450_a0-optimized.cl
@@ -131,7 +131,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -253,7 +253,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01450_a0-pure.cl b/OpenCL/m01450_a0-pure.cl
index 8cf8eff95..a97344894 100644
--- a/OpenCL/m01450_a0-pure.cl
+++ b/OpenCL/m01450_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01450_a1-optimized.cl b/OpenCL/m01450_a1-optimized.cl
index 237f6226f..6cfa9978a 100644
--- a/OpenCL/m01450_a1-optimized.cl
+++ b/OpenCL/m01450_a1-optimized.cl
@@ -129,7 +129,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -319,7 +319,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01450_a1-pure.cl b/OpenCL/m01450_a1-pure.cl
index 7a8c7face..f47f8a78c 100644
--- a/OpenCL/m01450_a1-pure.cl
+++ b/OpenCL/m01450_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01450_a3-optimized.cl b/OpenCL/m01450_a3-optimized.cl
index 2e93b881e..44d7482f9 100644
--- a/OpenCL/m01450_a3-optimized.cl
+++ b/OpenCL/m01450_a3-optimized.cl
@@ -345,7 +345,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -392,7 +392,7 @@ KERNEL_FQ void m01450_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -439,7 +439,7 @@ KERNEL_FQ void m01450_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -486,7 +486,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -533,7 +533,7 @@ KERNEL_FQ void m01450_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -580,7 +580,7 @@ KERNEL_FQ void m01450_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01450_a3-pure.cl b/OpenCL/m01450_a3-pure.cl
index 55b3c638f..892a57358 100644
--- a/OpenCL/m01450_a3-pure.cl
+++ b/OpenCL/m01450_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl
index d7dbcbd36..ea58258d2 100644
--- a/OpenCL/m01460_a0-optimized.cl
+++ b/OpenCL/m01460_a0-optimized.cl
@@ -131,7 +131,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -266,7 +266,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01460_a0-pure.cl b/OpenCL/m01460_a0-pure.cl
index 001924f71..e83db7c9d 100644
--- a/OpenCL/m01460_a0-pure.cl
+++ b/OpenCL/m01460_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01460_a1-optimized.cl b/OpenCL/m01460_a1-optimized.cl
index 1eb613562..c4693b624 100644
--- a/OpenCL/m01460_a1-optimized.cl
+++ b/OpenCL/m01460_a1-optimized.cl
@@ -129,7 +129,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -324,7 +324,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01460_a1-pure.cl b/OpenCL/m01460_a1-pure.cl
index 76f47226c..48250b5f6 100644
--- a/OpenCL/m01460_a1-pure.cl
+++ b/OpenCL/m01460_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -103,7 +103,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01460_a3-optimized.cl b/OpenCL/m01460_a3-optimized.cl
index 62c0cdeeb..45c845407 100644
--- a/OpenCL/m01460_a3-optimized.cl
+++ b/OpenCL/m01460_a3-optimized.cl
@@ -341,7 +341,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -388,7 +388,7 @@ KERNEL_FQ void m01460_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -435,7 +435,7 @@ KERNEL_FQ void m01460_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -482,7 +482,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -529,7 +529,7 @@ KERNEL_FQ void m01460_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -576,7 +576,7 @@ KERNEL_FQ void m01460_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01460_a3-pure.cl b/OpenCL/m01460_a3-pure.cl
index 098f8e10b..7e7fccda2 100644
--- a/OpenCL/m01460_a3-pure.cl
+++ b/OpenCL/m01460_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01470_a0-optimized.cl b/OpenCL/m01470_a0-optimized.cl
index f0acf5cb2..83f8da1e7 100644
--- a/OpenCL/m01470_a0-optimized.cl
+++ b/OpenCL/m01470_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -204,7 +204,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01470_a0-pure.cl b/OpenCL/m01470_a0-pure.cl
index f7793c63f..b6d1fcc03 100644
--- a/OpenCL/m01470_a0-pure.cl
+++ b/OpenCL/m01470_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -71,7 +71,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01470_a1-optimized.cl b/OpenCL/m01470_a1-optimized.cl
index ee1f43b85..3f0b8741a 100644
--- a/OpenCL/m01470_a1-optimized.cl
+++ b/OpenCL/m01470_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -260,7 +260,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01470_a1-pure.cl b/OpenCL/m01470_a1-pure.cl
index 600c5a86d..c7989047c 100644
--- a/OpenCL/m01470_a1-pure.cl
+++ b/OpenCL/m01470_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01470_a3-optimized.cl b/OpenCL/m01470_a3-optimized.cl
index 41e5eee28..f584af084 100644
--- a/OpenCL/m01470_a3-optimized.cl
+++ b/OpenCL/m01470_a3-optimized.cl
@@ -359,7 +359,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -406,7 +406,7 @@ KERNEL_FQ void m01470_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -453,7 +453,7 @@ KERNEL_FQ void m01470_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -500,7 +500,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -547,7 +547,7 @@ KERNEL_FQ void m01470_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -594,7 +594,7 @@ KERNEL_FQ void m01470_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01470_a3-pure.cl b/OpenCL/m01470_a3-pure.cl
index 708754217..157a93fb0 100644
--- a/OpenCL/m01470_a3-pure.cl
+++ b/OpenCL/m01470_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -82,7 +82,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01500_a0-pure.cl b/OpenCL/m01500_a0-pure.cl
index 6db09f430..ff5525fa7 100644
--- a/OpenCL/m01500_a0-pure.cl
+++ b/OpenCL/m01500_a0-pure.cl
@@ -522,7 +522,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -606,7 +606,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m01500_a1-pure.cl b/OpenCL/m01500_a1-pure.cl
index 2425cc521..db739cd66 100644
--- a/OpenCL/m01500_a1-pure.cl
+++ b/OpenCL/m01500_a1-pure.cl
@@ -520,7 +520,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -683,7 +683,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m01500_a3-pure.cl b/OpenCL/m01500_a3-pure.cl
index 35ae97bb8..4405ccbd1 100644
--- a/OpenCL/m01500_a3-pure.cl
+++ b/OpenCL/m01500_a3-pure.cl
@@ -1920,7 +1920,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BITSLICE ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -2293,7 +2293,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BITSLICE ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl
index e8ec025ac..fd4c9fdfa 100644
--- a/OpenCL/m01600-optimized.cl
+++ b/OpenCL/m01600-optimized.cl
@@ -682,7 +682,7 @@ KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -845,7 +845,7 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1033,7 +1033,7 @@ KERNEL_FQ void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m01600-pure.cl b/OpenCL/m01600-pure.cl
index 48ba3f35c..5294b5582 100644
--- a/OpenCL/m01600-pure.cl
+++ b/OpenCL/m01600-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -140,7 +140,7 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -235,7 +235,7 @@ KERNEL_FQ void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl
index 072d1b245..83c0a78db 100644
--- a/OpenCL/m01700_a0-optimized.cl
+++ b/OpenCL/m01700_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -237,7 +237,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01700_a0-pure.cl b/OpenCL/m01700_a0-pure.cl
index cd9ae7563..62b9184e0 100644
--- a/OpenCL/m01700_a0-pure.cl
+++ b/OpenCL/m01700_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01700_a1-optimized.cl b/OpenCL/m01700_a1-optimized.cl
index c98f1ce29..214f52f20 100644
--- a/OpenCL/m01700_a1-optimized.cl
+++ b/OpenCL/m01700_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -293,7 +293,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01700_a1-pure.cl b/OpenCL/m01700_a1-pure.cl
index 923393ead..43426e86f 100644
--- a/OpenCL/m01700_a1-pure.cl
+++ b/OpenCL/m01700_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01700_a3-optimized.cl b/OpenCL/m01700_a3-optimized.cl
index c7aa14442..f1a2fa179 100644
--- a/OpenCL/m01700_a3-optimized.cl
+++ b/OpenCL/m01700_a3-optimized.cl
@@ -270,7 +270,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -308,7 +308,7 @@ KERNEL_FQ void m01700_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -346,7 +346,7 @@ KERNEL_FQ void m01700_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -384,7 +384,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -422,7 +422,7 @@ KERNEL_FQ void m01700_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -460,7 +460,7 @@ KERNEL_FQ void m01700_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01700_a3-pure.cl b/OpenCL/m01700_a3-pure.cl
index bea37d8f5..e4c4a2272 100644
--- a/OpenCL/m01700_a3-pure.cl
+++ b/OpenCL/m01700_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl
index 6956a6aef..f9f041636 100644
--- a/OpenCL/m01710_a0-optimized.cl
+++ b/OpenCL/m01710_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -310,7 +310,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01710_a0-pure.cl b/OpenCL/m01710_a0-pure.cl
index f09a7fdb4..43761d5bb 100644
--- a/OpenCL/m01710_a0-pure.cl
+++ b/OpenCL/m01710_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01710_a1-optimized.cl b/OpenCL/m01710_a1-optimized.cl
index c4fcf6c6f..5df70a5f9 100644
--- a/OpenCL/m01710_a1-optimized.cl
+++ b/OpenCL/m01710_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -368,7 +368,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01710_a1-pure.cl b/OpenCL/m01710_a1-pure.cl
index 071fe90f5..9464caf02 100644
--- a/OpenCL/m01710_a1-pure.cl
+++ b/OpenCL/m01710_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01710_a3-optimized.cl b/OpenCL/m01710_a3-optimized.cl
index 9e13827ec..f2a3c9c5d 100644
--- a/OpenCL/m01710_a3-optimized.cl
+++ b/OpenCL/m01710_a3-optimized.cl
@@ -321,7 +321,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -359,7 +359,7 @@ KERNEL_FQ void m01710_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -397,7 +397,7 @@ KERNEL_FQ void m01710_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -435,7 +435,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -473,7 +473,7 @@ KERNEL_FQ void m01710_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -511,7 +511,7 @@ KERNEL_FQ void m01710_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01710_a3-pure.cl b/OpenCL/m01710_a3-pure.cl
index 91168c138..7521d440a 100644
--- a/OpenCL/m01710_a3-pure.cl
+++ b/OpenCL/m01710_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl
index 90dcff5c9..ea3ad85ca 100644
--- a/OpenCL/m01720_a0-optimized.cl
+++ b/OpenCL/m01720_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -290,7 +290,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01720_a0-pure.cl b/OpenCL/m01720_a0-pure.cl
index 7b0850211..d215e6109 100644
--- a/OpenCL/m01720_a0-pure.cl
+++ b/OpenCL/m01720_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01720_a1-optimized.cl b/OpenCL/m01720_a1-optimized.cl
index 490299f77..9f9fba532 100644
--- a/OpenCL/m01720_a1-optimized.cl
+++ b/OpenCL/m01720_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -346,7 +346,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01720_a1-pure.cl b/OpenCL/m01720_a1-pure.cl
index 3219c6660..16dda82ec 100644
--- a/OpenCL/m01720_a1-pure.cl
+++ b/OpenCL/m01720_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01720_a3-optimized.cl b/OpenCL/m01720_a3-optimized.cl
index 2a41cdafb..7a0ed147e 100644
--- a/OpenCL/m01720_a3-optimized.cl
+++ b/OpenCL/m01720_a3-optimized.cl
@@ -376,7 +376,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -423,7 +423,7 @@ KERNEL_FQ void m01720_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -470,7 +470,7 @@ KERNEL_FQ void m01720_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -517,7 +517,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -564,7 +564,7 @@ KERNEL_FQ void m01720_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -611,7 +611,7 @@ KERNEL_FQ void m01720_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01720_a3-pure.cl b/OpenCL/m01720_a3-pure.cl
index becab2aea..14b14c7cc 100644
--- a/OpenCL/m01720_a3-pure.cl
+++ b/OpenCL/m01720_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl
index 1c1424862..ee3c39ca7 100644
--- a/OpenCL/m01730_a0-optimized.cl
+++ b/OpenCL/m01730_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -315,7 +315,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01730_a0-pure.cl b/OpenCL/m01730_a0-pure.cl
index ce164228e..4fe8338bd 100644
--- a/OpenCL/m01730_a0-pure.cl
+++ b/OpenCL/m01730_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01730_a1-optimized.cl b/OpenCL/m01730_a1-optimized.cl
index ba9de9f83..08810796a 100644
--- a/OpenCL/m01730_a1-optimized.cl
+++ b/OpenCL/m01730_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -373,7 +373,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01730_a1-pure.cl b/OpenCL/m01730_a1-pure.cl
index 78735e57d..98211c4d5 100644
--- a/OpenCL/m01730_a1-pure.cl
+++ b/OpenCL/m01730_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01730_a3-optimized.cl b/OpenCL/m01730_a3-optimized.cl
index f15dadc6a..018d0c10e 100644
--- a/OpenCL/m01730_a3-optimized.cl
+++ b/OpenCL/m01730_a3-optimized.cl
@@ -321,7 +321,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -359,7 +359,7 @@ KERNEL_FQ void m01730_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -397,7 +397,7 @@ KERNEL_FQ void m01730_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -435,7 +435,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -473,7 +473,7 @@ KERNEL_FQ void m01730_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -511,7 +511,7 @@ KERNEL_FQ void m01730_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01730_a3-pure.cl b/OpenCL/m01730_a3-pure.cl
index 40d0c3418..3ba0bd2bf 100644
--- a/OpenCL/m01730_a3-pure.cl
+++ b/OpenCL/m01730_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl
index 6ba949bee..62ec73187 100644
--- a/OpenCL/m01740_a0-optimized.cl
+++ b/OpenCL/m01740_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -295,7 +295,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01740_a0-pure.cl b/OpenCL/m01740_a0-pure.cl
index 4f31b9c62..aa45abd37 100644
--- a/OpenCL/m01740_a0-pure.cl
+++ b/OpenCL/m01740_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01740_a1-optimized.cl b/OpenCL/m01740_a1-optimized.cl
index cd1517a35..80d7fc62d 100644
--- a/OpenCL/m01740_a1-optimized.cl
+++ b/OpenCL/m01740_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -351,7 +351,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01740_a1-pure.cl b/OpenCL/m01740_a1-pure.cl
index f23e6728f..47e831f55 100644
--- a/OpenCL/m01740_a1-pure.cl
+++ b/OpenCL/m01740_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01740_a3-optimized.cl b/OpenCL/m01740_a3-optimized.cl
index f3fef207b..56d21bc4a 100644
--- a/OpenCL/m01740_a3-optimized.cl
+++ b/OpenCL/m01740_a3-optimized.cl
@@ -376,7 +376,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -423,7 +423,7 @@ KERNEL_FQ void m01740_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -470,7 +470,7 @@ KERNEL_FQ void m01740_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -517,7 +517,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -564,7 +564,7 @@ KERNEL_FQ void m01740_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -611,7 +611,7 @@ KERNEL_FQ void m01740_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01740_a3-pure.cl b/OpenCL/m01740_a3-pure.cl
index 64f35b445..43d6f33f7 100644
--- a/OpenCL/m01740_a3-pure.cl
+++ b/OpenCL/m01740_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01750_a0-optimized.cl b/OpenCL/m01750_a0-optimized.cl
index 7ac25ce67..851398f52 100644
--- a/OpenCL/m01750_a0-optimized.cl
+++ b/OpenCL/m01750_a0-optimized.cl
@@ -205,7 +205,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -332,7 +332,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01750_a0-pure.cl b/OpenCL/m01750_a0-pure.cl
index 1774ced1c..a88c2c953 100644
--- a/OpenCL/m01750_a0-pure.cl
+++ b/OpenCL/m01750_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01750_a1-optimized.cl b/OpenCL/m01750_a1-optimized.cl
index bc269792b..2f3fe2875 100644
--- a/OpenCL/m01750_a1-optimized.cl
+++ b/OpenCL/m01750_a1-optimized.cl
@@ -203,7 +203,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -398,7 +398,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01750_a1-pure.cl b/OpenCL/m01750_a1-pure.cl
index ffed39764..c854c4445 100644
--- a/OpenCL/m01750_a1-pure.cl
+++ b/OpenCL/m01750_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01750_a3-optimized.cl b/OpenCL/m01750_a3-optimized.cl
index 738d936b2..3e9dd508c 100644
--- a/OpenCL/m01750_a3-optimized.cl
+++ b/OpenCL/m01750_a3-optimized.cl
@@ -429,7 +429,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -476,7 +476,7 @@ KERNEL_FQ void m01750_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -523,7 +523,7 @@ KERNEL_FQ void m01750_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -570,7 +570,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -617,7 +617,7 @@ KERNEL_FQ void m01750_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -664,7 +664,7 @@ KERNEL_FQ void m01750_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01750_a3-pure.cl b/OpenCL/m01750_a3-pure.cl
index 3d7f81f59..678bad843 100644
--- a/OpenCL/m01750_a3-pure.cl
+++ b/OpenCL/m01750_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl
index 04c906bfa..394311912 100644
--- a/OpenCL/m01760_a0-optimized.cl
+++ b/OpenCL/m01760_a0-optimized.cl
@@ -205,7 +205,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -345,7 +345,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01760_a0-pure.cl b/OpenCL/m01760_a0-pure.cl
index 5f1d92632..516b85138 100644
--- a/OpenCL/m01760_a0-pure.cl
+++ b/OpenCL/m01760_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01760_a1-optimized.cl b/OpenCL/m01760_a1-optimized.cl
index 25ead9af1..1b45f9777 100644
--- a/OpenCL/m01760_a1-optimized.cl
+++ b/OpenCL/m01760_a1-optimized.cl
@@ -203,7 +203,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -403,7 +403,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01760_a1-pure.cl b/OpenCL/m01760_a1-pure.cl
index 0e26d5e26..8cd93f3f8 100644
--- a/OpenCL/m01760_a1-pure.cl
+++ b/OpenCL/m01760_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -103,7 +103,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01760_a3-optimized.cl b/OpenCL/m01760_a3-optimized.cl
index e110a717a..b4a62b3dc 100644
--- a/OpenCL/m01760_a3-optimized.cl
+++ b/OpenCL/m01760_a3-optimized.cl
@@ -425,7 +425,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -472,7 +472,7 @@ KERNEL_FQ void m01760_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -519,7 +519,7 @@ KERNEL_FQ void m01760_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -566,7 +566,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -613,7 +613,7 @@ KERNEL_FQ void m01760_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -660,7 +660,7 @@ KERNEL_FQ void m01760_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m01760_a3-pure.cl b/OpenCL/m01760_a3-pure.cl
index c2a2f4bcc..9437496e5 100644
--- a/OpenCL/m01760_a3-pure.cl
+++ b/OpenCL/m01760_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01770_a0-optimized.cl b/OpenCL/m01770_a0-optimized.cl
index a0472ee01..0635fa95c 100644
--- a/OpenCL/m01770_a0-optimized.cl
+++ b/OpenCL/m01770_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -242,7 +242,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01770_a0-pure.cl b/OpenCL/m01770_a0-pure.cl
index 0e96aac92..6b9909684 100644
--- a/OpenCL/m01770_a0-pure.cl
+++ b/OpenCL/m01770_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01770_a1-optimized.cl b/OpenCL/m01770_a1-optimized.cl
index 211e515e9..96704d7c9 100644
--- a/OpenCL/m01770_a1-optimized.cl
+++ b/OpenCL/m01770_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -298,7 +298,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m01770_a1-pure.cl b/OpenCL/m01770_a1-pure.cl
index 6cd4cb56d..c56317ba9 100644
--- a/OpenCL/m01770_a1-pure.cl
+++ b/OpenCL/m01770_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01770_a3-optimized.cl b/OpenCL/m01770_a3-optimized.cl
index d15cb8ef3..96845eaa9 100644
--- a/OpenCL/m01770_a3-optimized.cl
+++ b/OpenCL/m01770_a3-optimized.cl
@@ -272,7 +272,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -310,7 +310,7 @@ KERNEL_FQ void m01770_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -348,7 +348,7 @@ KERNEL_FQ void m01770_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -386,7 +386,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -424,7 +424,7 @@ KERNEL_FQ void m01770_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -462,7 +462,7 @@ KERNEL_FQ void m01770_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m01770_a3-pure.cl b/OpenCL/m01770_a3-pure.cl
index 26f6b3f58..2854369b3 100644
--- a/OpenCL/m01770_a3-pure.cl
+++ b/OpenCL/m01770_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m01800-optimized.cl b/OpenCL/m01800-optimized.cl
index 7ee794856..1aa2e52f9 100644
--- a/OpenCL/m01800-optimized.cl
+++ b/OpenCL/m01800-optimized.cl
@@ -179,7 +179,7 @@ KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -308,7 +308,7 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u64 l_p_bytes0[2];
 
@@ -485,7 +485,7 @@ KERNEL_FQ void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m01800-pure.cl b/OpenCL/m01800-pure.cl
index c17385c1f..462410be9 100644
--- a/OpenCL/m01800-pure.cl
+++ b/OpenCL/m01800-pure.cl
@@ -36,7 +36,7 @@ KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -321,7 +321,7 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pw_len = pws[gid].pw_len;
 
@@ -405,7 +405,7 @@ KERNEL_FQ void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m02100-pure.cl b/OpenCL/m02100-pure.cl
index b9236608f..987e79af0 100644
--- a/OpenCL/m02100-pure.cl
+++ b/OpenCL/m02100-pure.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // dcc1
 
@@ -187,7 +187,7 @@ KERNEL_FQ void m02100_loop (KERN_ATTR_TMPS (dcc2_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -274,7 +274,7 @@ KERNEL_FQ void m02100_comp (KERN_ATTR_TMPS (dcc2_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m02400_a0-optimized.cl b/OpenCL/m02400_a0-optimized.cl
index 449316dcf..ca48510f0 100644
--- a/OpenCL/m02400_a0-optimized.cl
+++ b/OpenCL/m02400_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -199,7 +199,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m02400_a1-optimized.cl b/OpenCL/m02400_a1-optimized.cl
index fa1526e8e..78fd8e5c9 100644
--- a/OpenCL/m02400_a1-optimized.cl
+++ b/OpenCL/m02400_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m02400_a3-optimized.cl b/OpenCL/m02400_a3-optimized.cl
index 5535763ec..4b793c070 100644
--- a/OpenCL/m02400_a3-optimized.cl
+++ b/OpenCL/m02400_a3-optimized.cl
@@ -467,7 +467,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -505,7 +505,7 @@ KERNEL_FQ void m02400_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -543,7 +543,7 @@ KERNEL_FQ void m02400_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -581,7 +581,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -619,7 +619,7 @@ KERNEL_FQ void m02400_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -657,7 +657,7 @@ KERNEL_FQ void m02400_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m02410_a0-optimized.cl b/OpenCL/m02410_a0-optimized.cl
index 388e69f2d..377a1355b 100644
--- a/OpenCL/m02410_a0-optimized.cl
+++ b/OpenCL/m02410_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -278,7 +278,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m02410_a1-optimized.cl b/OpenCL/m02410_a1-optimized.cl
index b4890d49f..5b6bf131b 100644
--- a/OpenCL/m02410_a1-optimized.cl
+++ b/OpenCL/m02410_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -336,7 +336,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m02410_a3-optimized.cl b/OpenCL/m02410_a3-optimized.cl
index dfbe61018..e2813021f 100644
--- a/OpenCL/m02410_a3-optimized.cl
+++ b/OpenCL/m02410_a3-optimized.cl
@@ -565,7 +565,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -603,7 +603,7 @@ KERNEL_FQ void m02410_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -641,7 +641,7 @@ KERNEL_FQ void m02410_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -679,7 +679,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -717,7 +717,7 @@ KERNEL_FQ void m02410_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -755,7 +755,7 @@ KERNEL_FQ void m02410_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m02500-pure.cl b/OpenCL/m02500-pure.cl
index 1eb1e3a71..4aff6b539 100644
--- a/OpenCL/m02500-pure.cl
+++ b/OpenCL/m02500-pure.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m02500_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx0;
 
@@ -240,7 +240,7 @@ KERNEL_FQ void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -388,7 +388,7 @@ KERNEL_FQ void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -573,7 +573,7 @@ KERNEL_FQ void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -789,7 +789,7 @@ KERNEL_FQ void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
diff --git a/OpenCL/m02501-pure.cl b/OpenCL/m02501-pure.cl
index 6f63f5ce1..8518bac74 100644
--- a/OpenCL/m02501-pure.cl
+++ b/OpenCL/m02501-pure.cl
@@ -106,7 +106,7 @@ KERNEL_FQ void m02501_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 in[16];
 
@@ -152,7 +152,7 @@ KERNEL_FQ void m02501_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 }
 
 KERNEL_FQ void m02501_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t))
@@ -164,7 +164,7 @@ KERNEL_FQ void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -349,7 +349,7 @@ KERNEL_FQ void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -565,7 +565,7 @@ KERNEL_FQ void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
diff --git a/OpenCL/m02610_a0-optimized.cl b/OpenCL/m02610_a0-optimized.cl
index 3f341898c..63b5745cc 100644
--- a/OpenCL/m02610_a0-optimized.cl
+++ b/OpenCL/m02610_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -339,7 +339,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m02610_a0-pure.cl b/OpenCL/m02610_a0-pure.cl
index 9443b8307..ec5ba78be 100644
--- a/OpenCL/m02610_a0-pure.cl
+++ b/OpenCL/m02610_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -158,7 +158,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m02610_a1-optimized.cl b/OpenCL/m02610_a1-optimized.cl
index 0c34d8265..9d2b7a589 100644
--- a/OpenCL/m02610_a1-optimized.cl
+++ b/OpenCL/m02610_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -396,7 +396,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m02610_a1-pure.cl b/OpenCL/m02610_a1-pure.cl
index 4b5d0646a..502f5ae59 100644
--- a/OpenCL/m02610_a1-pure.cl
+++ b/OpenCL/m02610_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -154,7 +154,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m02610_a3-optimized.cl b/OpenCL/m02610_a3-optimized.cl
index 6a7804302..778ec0572 100644
--- a/OpenCL/m02610_a3-optimized.cl
+++ b/OpenCL/m02610_a3-optimized.cl
@@ -619,7 +619,7 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -689,7 +689,7 @@ KERNEL_FQ void m02610_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -759,7 +759,7 @@ KERNEL_FQ void m02610_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -829,7 +829,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -899,7 +899,7 @@ KERNEL_FQ void m02610_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -969,7 +969,7 @@ KERNEL_FQ void m02610_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m02610_a3-pure.cl b/OpenCL/m02610_a3-pure.cl
index 0ef93d93d..aed0c91d1 100644
--- a/OpenCL/m02610_a3-pure.cl
+++ b/OpenCL/m02610_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m02710_a0-optimized.cl b/OpenCL/m02710_a0-optimized.cl
index 7bb4bb534..60b5a8237 100644
--- a/OpenCL/m02710_a0-optimized.cl
+++ b/OpenCL/m02710_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -424,7 +424,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m02710_a1-optimized.cl b/OpenCL/m02710_a1-optimized.cl
index a653022ab..b50ec315d 100644
--- a/OpenCL/m02710_a1-optimized.cl
+++ b/OpenCL/m02710_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -481,7 +481,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m02710_a3-optimized.cl b/OpenCL/m02710_a3-optimized.cl
index 799c6b964..a9e9cc247 100644
--- a/OpenCL/m02710_a3-optimized.cl
+++ b/OpenCL/m02710_a3-optimized.cl
@@ -788,7 +788,7 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -858,7 +858,7 @@ KERNEL_FQ void m02710_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -928,7 +928,7 @@ KERNEL_FQ void m02710_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -998,7 +998,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1068,7 +1068,7 @@ KERNEL_FQ void m02710_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1138,7 +1138,7 @@ KERNEL_FQ void m02710_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl
index 714e558d0..313a55edc 100644
--- a/OpenCL/m02810_a0-optimized.cl
+++ b/OpenCL/m02810_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -423,7 +423,7 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m02810_a0-pure.cl b/OpenCL/m02810_a0-pure.cl
index f198a7ce1..6a100e0a2 100644
--- a/OpenCL/m02810_a0-pure.cl
+++ b/OpenCL/m02810_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -181,7 +181,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m02810_a1-optimized.cl b/OpenCL/m02810_a1-optimized.cl
index 7dd007ebf..1ba50e3e9 100644
--- a/OpenCL/m02810_a1-optimized.cl
+++ b/OpenCL/m02810_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -480,7 +480,7 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m02810_a1-pure.cl b/OpenCL/m02810_a1-pure.cl
index f93b3c7b4..a0c739802 100644
--- a/OpenCL/m02810_a1-pure.cl
+++ b/OpenCL/m02810_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -177,7 +177,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m02810_a3-optimized.cl b/OpenCL/m02810_a3-optimized.cl
index 205f6cedc..67bfd7e0f 100644
--- a/OpenCL/m02810_a3-optimized.cl
+++ b/OpenCL/m02810_a3-optimized.cl
@@ -786,7 +786,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -856,7 +856,7 @@ KERNEL_FQ void m02810_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -926,7 +926,7 @@ KERNEL_FQ void m02810_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -996,7 +996,7 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1066,7 +1066,7 @@ KERNEL_FQ void m02810_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1136,7 +1136,7 @@ KERNEL_FQ void m02810_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m02810_a3-pure.cl b/OpenCL/m02810_a3-pure.cl
index 857f2c037..9c16782f9 100644
--- a/OpenCL/m02810_a3-pure.cl
+++ b/OpenCL/m02810_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -190,7 +190,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03000_a0-pure.cl b/OpenCL/m03000_a0-pure.cl
index bb226dae8..9d73315aa 100644
--- a/OpenCL/m03000_a0-pure.cl
+++ b/OpenCL/m03000_a0-pure.cl
@@ -532,7 +532,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -617,7 +617,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03000_a1-pure.cl b/OpenCL/m03000_a1-pure.cl
index fb6dc3e89..04b550888 100644
--- a/OpenCL/m03000_a1-pure.cl
+++ b/OpenCL/m03000_a1-pure.cl
@@ -530,7 +530,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -694,7 +694,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03000_a3-pure.cl b/OpenCL/m03000_a3-pure.cl
index bb7e3ea6e..61befdb66 100644
--- a/OpenCL/m03000_a3-pure.cl
+++ b/OpenCL/m03000_a3-pure.cl
@@ -1761,7 +1761,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BITSLICE ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -2134,7 +2134,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BITSLICE ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl
index 97c1ac435..9fdea0687 100644
--- a/OpenCL/m03100_a0-optimized.cl
+++ b/OpenCL/m03100_a0-optimized.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -298,7 +298,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03100_a1-optimized.cl b/OpenCL/m03100_a1-optimized.cl
index c3407003c..22e0e896d 100644
--- a/OpenCL/m03100_a1-optimized.cl
+++ b/OpenCL/m03100_a1-optimized.cl
@@ -64,7 +64,7 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -356,7 +356,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03100_a3-optimized.cl b/OpenCL/m03100_a3-optimized.cl
index 6deca4484..7f381f5bd 100644
--- a/OpenCL/m03100_a3-optimized.cl
+++ b/OpenCL/m03100_a3-optimized.cl
@@ -462,7 +462,7 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -545,7 +545,7 @@ KERNEL_FQ void m03100_m08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -632,7 +632,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -715,7 +715,7 @@ KERNEL_FQ void m03100_s08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m03200-pure.cl b/OpenCL/m03200-pure.cl
index a622f703d..ee85ebfc1 100644
--- a/OpenCL/m03200-pure.cl
+++ b/OpenCL/m03200-pure.cl
@@ -434,7 +434,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_init (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pw_len = pws[gid].pw_len;
 
@@ -656,7 +656,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_loop (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load
 
@@ -859,7 +859,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_comp (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load
 
diff --git a/OpenCL/m03500_a0-optimized.cl b/OpenCL/m03500_a0-optimized.cl
index 217830c2c..537c2b328 100644
--- a/OpenCL/m03500_a0-optimized.cl
+++ b/OpenCL/m03500_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -445,7 +445,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03500_a0-pure.cl b/OpenCL/m03500_a0-pure.cl
index fa3bcf4af..7bec0e59d 100644
--- a/OpenCL/m03500_a0-pure.cl
+++ b/OpenCL/m03500_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -188,7 +188,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03500_a1-optimized.cl b/OpenCL/m03500_a1-optimized.cl
index d1df183c8..639b84801 100644
--- a/OpenCL/m03500_a1-optimized.cl
+++ b/OpenCL/m03500_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -502,7 +502,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03500_a1-pure.cl b/OpenCL/m03500_a1-pure.cl
index 6ccd1e9ba..53b5d144c 100644
--- a/OpenCL/m03500_a1-pure.cl
+++ b/OpenCL/m03500_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -184,7 +184,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03500_a3-optimized.cl b/OpenCL/m03500_a3-optimized.cl
index 208659bba..626063399 100644
--- a/OpenCL/m03500_a3-optimized.cl
+++ b/OpenCL/m03500_a3-optimized.cl
@@ -831,7 +831,7 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -901,7 +901,7 @@ KERNEL_FQ void m03500_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -971,7 +971,7 @@ KERNEL_FQ void m03500_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1041,7 +1041,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1111,7 +1111,7 @@ KERNEL_FQ void m03500_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1181,7 +1181,7 @@ KERNEL_FQ void m03500_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m03500_a3-pure.cl b/OpenCL/m03500_a3-pure.cl
index 4103f8695..9e2561d6c 100644
--- a/OpenCL/m03500_a3-pure.cl
+++ b/OpenCL/m03500_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -197,7 +197,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03710_a0-optimized.cl b/OpenCL/m03710_a0-optimized.cl
index d0f41a737..f44e8d324 100644
--- a/OpenCL/m03710_a0-optimized.cl
+++ b/OpenCL/m03710_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -370,7 +370,7 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03710_a0-pure.cl b/OpenCL/m03710_a0-pure.cl
index acda044e9..5b2c40f6f 100644
--- a/OpenCL/m03710_a0-pure.cl
+++ b/OpenCL/m03710_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -171,7 +171,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03710_a1-optimized.cl b/OpenCL/m03710_a1-optimized.cl
index 1a051ffbb..6080eb1ed 100644
--- a/OpenCL/m03710_a1-optimized.cl
+++ b/OpenCL/m03710_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -427,7 +427,7 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03710_a1-pure.cl b/OpenCL/m03710_a1-pure.cl
index fe2e28429..17485b433 100644
--- a/OpenCL/m03710_a1-pure.cl
+++ b/OpenCL/m03710_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03710_a3-optimized.cl b/OpenCL/m03710_a3-optimized.cl
index 56ec764e1..dedd3c015 100644
--- a/OpenCL/m03710_a3-optimized.cl
+++ b/OpenCL/m03710_a3-optimized.cl
@@ -646,7 +646,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -750,7 +750,7 @@ KERNEL_FQ void m03710_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -820,7 +820,7 @@ KERNEL_FQ void m03710_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -890,7 +890,7 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -960,7 +960,7 @@ KERNEL_FQ void m03710_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -996,7 +996,7 @@ KERNEL_FQ void m03710_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m03710_a3-pure.cl b/OpenCL/m03710_a3-pure.cl
index ee6c90e85..70d43c557 100644
--- a/OpenCL/m03710_a3-pure.cl
+++ b/OpenCL/m03710_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -180,7 +180,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03800_a0-optimized.cl b/OpenCL/m03800_a0-optimized.cl
index 739467b4b..ac57df0c0 100644
--- a/OpenCL/m03800_a0-optimized.cl
+++ b/OpenCL/m03800_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -269,7 +269,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m03800_a0-pure.cl b/OpenCL/m03800_a0-pure.cl
index 0669a57c2..5779c26f8 100644
--- a/OpenCL/m03800_a0-pure.cl
+++ b/OpenCL/m03800_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03800_a1-optimized.cl b/OpenCL/m03800_a1-optimized.cl
index 4a7f533a9..5a2a60b9b 100644
--- a/OpenCL/m03800_a1-optimized.cl
+++ b/OpenCL/m03800_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -327,7 +327,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m03800_a1-pure.cl b/OpenCL/m03800_a1-pure.cl
index 6ef7f3d46..b6da06cea 100644
--- a/OpenCL/m03800_a1-pure.cl
+++ b/OpenCL/m03800_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03800_a3-optimized.cl b/OpenCL/m03800_a3-optimized.cl
index 2abe79c95..4faf7e07f 100644
--- a/OpenCL/m03800_a3-optimized.cl
+++ b/OpenCL/m03800_a3-optimized.cl
@@ -485,7 +485,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -538,7 +538,7 @@ KERNEL_FQ void m03800_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -591,7 +591,7 @@ KERNEL_FQ void m03800_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -644,7 +644,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -697,7 +697,7 @@ KERNEL_FQ void m03800_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -750,7 +750,7 @@ KERNEL_FQ void m03800_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m03800_a3-pure.cl b/OpenCL/m03800_a3-pure.cl
index c98cb5027..c9370b54d 100644
--- a/OpenCL/m03800_a3-pure.cl
+++ b/OpenCL/m03800_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl
index 6ed5dd0a6..3f99d1498 100644
--- a/OpenCL/m03910_a0-optimized.cl
+++ b/OpenCL/m03910_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -423,7 +423,7 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03910_a0-pure.cl b/OpenCL/m03910_a0-pure.cl
index e2d0e0218..aeb1453d2 100644
--- a/OpenCL/m03910_a0-pure.cl
+++ b/OpenCL/m03910_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -181,7 +181,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03910_a1-optimized.cl b/OpenCL/m03910_a1-optimized.cl
index 7ece02213..1a806c6da 100644
--- a/OpenCL/m03910_a1-optimized.cl
+++ b/OpenCL/m03910_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -480,7 +480,7 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m03910_a1-pure.cl b/OpenCL/m03910_a1-pure.cl
index 88172f03d..e5b3142ad 100644
--- a/OpenCL/m03910_a1-pure.cl
+++ b/OpenCL/m03910_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -177,7 +177,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m03910_a3-optimized.cl b/OpenCL/m03910_a3-optimized.cl
index 67b3395b8..9ab7ef603 100644
--- a/OpenCL/m03910_a3-optimized.cl
+++ b/OpenCL/m03910_a3-optimized.cl
@@ -786,7 +786,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -856,7 +856,7 @@ KERNEL_FQ void m03910_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -926,7 +926,7 @@ KERNEL_FQ void m03910_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -996,7 +996,7 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1066,7 +1066,7 @@ KERNEL_FQ void m03910_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1136,7 +1136,7 @@ KERNEL_FQ void m03910_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m03910_a3-pure.cl b/OpenCL/m03910_a3-pure.cl
index 5f7e71d69..e9fe005c6 100644
--- a/OpenCL/m03910_a3-pure.cl
+++ b/OpenCL/m03910_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -190,7 +190,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04010_a0-optimized.cl b/OpenCL/m04010_a0-optimized.cl
index 56657e409..97d03fe0b 100644
--- a/OpenCL/m04010_a0-optimized.cl
+++ b/OpenCL/m04010_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -396,7 +396,7 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04010_a0-pure.cl b/OpenCL/m04010_a0-pure.cl
index 649d21083..b32abca8b 100644
--- a/OpenCL/m04010_a0-pure.cl
+++ b/OpenCL/m04010_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -162,7 +162,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04010_a1-optimized.cl b/OpenCL/m04010_a1-optimized.cl
index 81d8e7e20..d968b5b1e 100644
--- a/OpenCL/m04010_a1-optimized.cl
+++ b/OpenCL/m04010_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -452,7 +452,7 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04010_a1-pure.cl b/OpenCL/m04010_a1-pure.cl
index 56e876a35..ff484c67a 100644
--- a/OpenCL/m04010_a1-pure.cl
+++ b/OpenCL/m04010_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -158,7 +158,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04010_a3-optimized.cl b/OpenCL/m04010_a3-optimized.cl
index 2f00ec865..164e40905 100644
--- a/OpenCL/m04010_a3-optimized.cl
+++ b/OpenCL/m04010_a3-optimized.cl
@@ -686,7 +686,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -790,7 +790,7 @@ KERNEL_FQ void m04010_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -860,7 +860,7 @@ KERNEL_FQ void m04010_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -930,7 +930,7 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1000,7 +1000,7 @@ KERNEL_FQ void m04010_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1036,7 +1036,7 @@ KERNEL_FQ void m04010_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04010_a3-pure.cl b/OpenCL/m04010_a3-pure.cl
index 1164ac168..bc4920406 100644
--- a/OpenCL/m04010_a3-pure.cl
+++ b/OpenCL/m04010_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -175,7 +175,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04110_a0-optimized.cl b/OpenCL/m04110_a0-optimized.cl
index 6ee80f872..544b32701 100644
--- a/OpenCL/m04110_a0-optimized.cl
+++ b/OpenCL/m04110_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -441,7 +441,7 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04110_a0-pure.cl b/OpenCL/m04110_a0-pure.cl
index 517492a00..6529d512a 100644
--- a/OpenCL/m04110_a0-pure.cl
+++ b/OpenCL/m04110_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -175,7 +175,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04110_a1-optimized.cl b/OpenCL/m04110_a1-optimized.cl
index 4a8ea112f..6b3a3bb7a 100644
--- a/OpenCL/m04110_a1-optimized.cl
+++ b/OpenCL/m04110_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -499,7 +499,7 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04110_a1-pure.cl b/OpenCL/m04110_a1-pure.cl
index 7719f87bf..310f731d1 100644
--- a/OpenCL/m04110_a1-pure.cl
+++ b/OpenCL/m04110_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -171,7 +171,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04110_a3-optimized.cl b/OpenCL/m04110_a3-optimized.cl
index 8e7ee5115..6335cd69a 100644
--- a/OpenCL/m04110_a3-optimized.cl
+++ b/OpenCL/m04110_a3-optimized.cl
@@ -742,7 +742,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -846,7 +846,7 @@ KERNEL_FQ void m04110_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -916,7 +916,7 @@ KERNEL_FQ void m04110_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -986,7 +986,7 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1056,7 +1056,7 @@ KERNEL_FQ void m04110_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1092,7 +1092,7 @@ KERNEL_FQ void m04110_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04110_a3-pure.cl b/OpenCL/m04110_a3-pure.cl
index 4a3386daa..efb2e4a23 100644
--- a/OpenCL/m04110_a3-pure.cl
+++ b/OpenCL/m04110_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -186,7 +186,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04310_a0-optimized.cl b/OpenCL/m04310_a0-optimized.cl
index 5f44932f2..e025266aa 100644
--- a/OpenCL/m04310_a0-optimized.cl
+++ b/OpenCL/m04310_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -339,7 +339,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04310_a0-pure.cl b/OpenCL/m04310_a0-pure.cl
index 8e0515311..185f91ed9 100644
--- a/OpenCL/m04310_a0-pure.cl
+++ b/OpenCL/m04310_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -158,7 +158,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04310_a1-optimized.cl b/OpenCL/m04310_a1-optimized.cl
index 83540be4b..a7123d8c1 100644
--- a/OpenCL/m04310_a1-optimized.cl
+++ b/OpenCL/m04310_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -396,7 +396,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04310_a1-pure.cl b/OpenCL/m04310_a1-pure.cl
index 30da21734..b84625441 100644
--- a/OpenCL/m04310_a1-pure.cl
+++ b/OpenCL/m04310_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -154,7 +154,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04310_a3-optimized.cl b/OpenCL/m04310_a3-optimized.cl
index f2f2f420e..e802ba596 100644
--- a/OpenCL/m04310_a3-optimized.cl
+++ b/OpenCL/m04310_a3-optimized.cl
@@ -619,7 +619,7 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -689,7 +689,7 @@ KERNEL_FQ void m04310_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -759,7 +759,7 @@ KERNEL_FQ void m04310_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -829,7 +829,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -899,7 +899,7 @@ KERNEL_FQ void m04310_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -969,7 +969,7 @@ KERNEL_FQ void m04310_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m04310_a3-pure.cl b/OpenCL/m04310_a3-pure.cl
index 70899b550..d500b5c26 100644
--- a/OpenCL/m04310_a3-pure.cl
+++ b/OpenCL/m04310_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04400_a0-optimized.cl b/OpenCL/m04400_a0-optimized.cl
index 2b644f5a2..98aec0e73 100644
--- a/OpenCL/m04400_a0-optimized.cl
+++ b/OpenCL/m04400_a0-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -366,7 +366,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04400_a0-pure.cl b/OpenCL/m04400_a0-pure.cl
index 803e51955..49c165102 100644
--- a/OpenCL/m04400_a0-pure.cl
+++ b/OpenCL/m04400_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -153,7 +153,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04400_a1-optimized.cl b/OpenCL/m04400_a1-optimized.cl
index 4f3fbbbdf..edb8ac9fc 100644
--- a/OpenCL/m04400_a1-optimized.cl
+++ b/OpenCL/m04400_a1-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -422,7 +422,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04400_a1-pure.cl b/OpenCL/m04400_a1-pure.cl
index f45344681..f212ed9c0 100644
--- a/OpenCL/m04400_a1-pure.cl
+++ b/OpenCL/m04400_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -149,7 +149,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04400_a3-optimized.cl b/OpenCL/m04400_a3-optimized.cl
index f0e01109c..cc3158fbf 100644
--- a/OpenCL/m04400_a3-optimized.cl
+++ b/OpenCL/m04400_a3-optimized.cl
@@ -591,7 +591,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -661,7 +661,7 @@ KERNEL_FQ void m04400_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -731,7 +731,7 @@ KERNEL_FQ void m04400_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -801,7 +801,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -871,7 +871,7 @@ KERNEL_FQ void m04400_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -941,7 +941,7 @@ KERNEL_FQ void m04400_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04400_a3-pure.cl b/OpenCL/m04400_a3-pure.cl
index 35e00afd8..1fadf16c1 100644
--- a/OpenCL/m04400_a3-pure.cl
+++ b/OpenCL/m04400_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -162,7 +162,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04500_a0-optimized.cl b/OpenCL/m04500_a0-optimized.cl
index f25040c96..75cf9a841 100644
--- a/OpenCL/m04500_a0-optimized.cl
+++ b/OpenCL/m04500_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -392,7 +392,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04500_a0-pure.cl b/OpenCL/m04500_a0-pure.cl
index 72df122d2..4a2a66b23 100644
--- a/OpenCL/m04500_a0-pure.cl
+++ b/OpenCL/m04500_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -152,7 +152,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04500_a1-optimized.cl b/OpenCL/m04500_a1-optimized.cl
index 9319efe17..4b2805a67 100644
--- a/OpenCL/m04500_a1-optimized.cl
+++ b/OpenCL/m04500_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -448,7 +448,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04500_a1-pure.cl b/OpenCL/m04500_a1-pure.cl
index a601a85cd..7331716fb 100644
--- a/OpenCL/m04500_a1-pure.cl
+++ b/OpenCL/m04500_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -148,7 +148,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04500_a3-optimized.cl b/OpenCL/m04500_a3-optimized.cl
index 9947c578a..1253dd4ed 100644
--- a/OpenCL/m04500_a3-optimized.cl
+++ b/OpenCL/m04500_a3-optimized.cl
@@ -650,7 +650,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -720,7 +720,7 @@ KERNEL_FQ void m04500_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -790,7 +790,7 @@ KERNEL_FQ void m04500_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -860,7 +860,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -930,7 +930,7 @@ KERNEL_FQ void m04500_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1000,7 +1000,7 @@ KERNEL_FQ void m04500_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04500_a3-pure.cl b/OpenCL/m04500_a3-pure.cl
index ef87c82ca..1b2a5c818 100644
--- a/OpenCL/m04500_a3-pure.cl
+++ b/OpenCL/m04500_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -161,7 +161,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04510_a0-optimized.cl b/OpenCL/m04510_a0-optimized.cl
index c387b9421..ac16254bc 100644
--- a/OpenCL/m04510_a0-optimized.cl
+++ b/OpenCL/m04510_a0-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -1053,7 +1053,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
diff --git a/OpenCL/m04510_a0-pure.cl b/OpenCL/m04510_a0-pure.cl
index 994b5060b..883f780dc 100644
--- a/OpenCL/m04510_a0-pure.cl
+++ b/OpenCL/m04510_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -157,7 +157,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
diff --git a/OpenCL/m04510_a1-optimized.cl b/OpenCL/m04510_a1-optimized.cl
index d7bca692c..2347c16ac 100644
--- a/OpenCL/m04510_a1-optimized.cl
+++ b/OpenCL/m04510_a1-optimized.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -1108,7 +1108,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
diff --git a/OpenCL/m04510_a1-pure.cl b/OpenCL/m04510_a1-pure.cl
index d2c2698de..43809f981 100644
--- a/OpenCL/m04510_a1-pure.cl
+++ b/OpenCL/m04510_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -153,7 +153,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
diff --git a/OpenCL/m04510_a3-optimized.cl b/OpenCL/m04510_a3-optimized.cl
index 006250782..38c9ef648 100644
--- a/OpenCL/m04510_a3-optimized.cl
+++ b/OpenCL/m04510_a3-optimized.cl
@@ -1975,7 +1975,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -2045,7 +2045,7 @@ KERNEL_FQ void m04510_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -2115,7 +2115,7 @@ KERNEL_FQ void m04510_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -2185,7 +2185,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -2255,7 +2255,7 @@ KERNEL_FQ void m04510_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -2325,7 +2325,7 @@ KERNEL_FQ void m04510_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
diff --git a/OpenCL/m04510_a3-pure.cl b/OpenCL/m04510_a3-pure.cl
index ec33ab924..7977b2bc8 100644
--- a/OpenCL/m04510_a3-pure.cl
+++ b/OpenCL/m04510_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
@@ -161,7 +161,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX)
+  if (gid >= GID_CNT)
     return;
 
   /**
diff --git a/OpenCL/m04520_a0-optimized.cl b/OpenCL/m04520_a0-optimized.cl
index 11f921190..996bbe39b 100644
--- a/OpenCL/m04520_a0-optimized.cl
+++ b/OpenCL/m04520_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -623,7 +623,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04520_a0-pure.cl b/OpenCL/m04520_a0-pure.cl
index feb561587..41a9ff618 100644
--- a/OpenCL/m04520_a0-pure.cl
+++ b/OpenCL/m04520_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04520_a1-optimized.cl b/OpenCL/m04520_a1-optimized.cl
index 3b3e3be73..250dcc381 100644
--- a/OpenCL/m04520_a1-optimized.cl
+++ b/OpenCL/m04520_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -679,7 +679,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04520_a1-pure.cl b/OpenCL/m04520_a1-pure.cl
index 94bf96a5b..9ff53e135 100644
--- a/OpenCL/m04520_a1-pure.cl
+++ b/OpenCL/m04520_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -163,7 +163,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04520_a3-optimized.cl b/OpenCL/m04520_a3-optimized.cl
index 2151d90e7..01a85bcd5 100644
--- a/OpenCL/m04520_a3-optimized.cl
+++ b/OpenCL/m04520_a3-optimized.cl
@@ -1103,7 +1103,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1173,7 +1173,7 @@ KERNEL_FQ void m04520_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1243,7 +1243,7 @@ KERNEL_FQ void m04520_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1313,7 +1313,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1383,7 +1383,7 @@ KERNEL_FQ void m04520_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1453,7 +1453,7 @@ KERNEL_FQ void m04520_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04520_a3-pure.cl b/OpenCL/m04520_a3-pure.cl
index 05ebc0af9..eb2d2aa0b 100644
--- a/OpenCL/m04520_a3-pure.cl
+++ b/OpenCL/m04520_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -178,7 +178,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04700_a0-optimized.cl b/OpenCL/m04700_a0-optimized.cl
index f37a813f9..93d2853c5 100644
--- a/OpenCL/m04700_a0-optimized.cl
+++ b/OpenCL/m04700_a0-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -349,7 +349,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04700_a0-pure.cl b/OpenCL/m04700_a0-pure.cl
index 7cb3d8fc3..f4cbcaab8 100644
--- a/OpenCL/m04700_a0-pure.cl
+++ b/OpenCL/m04700_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -148,7 +148,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04700_a1-optimized.cl b/OpenCL/m04700_a1-optimized.cl
index 44522c2ec..4ddeed498 100644
--- a/OpenCL/m04700_a1-optimized.cl
+++ b/OpenCL/m04700_a1-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -402,7 +402,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04700_a1-pure.cl b/OpenCL/m04700_a1-pure.cl
index c5e35321d..3ad3397fa 100644
--- a/OpenCL/m04700_a1-pure.cl
+++ b/OpenCL/m04700_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -144,7 +144,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04700_a3-optimized.cl b/OpenCL/m04700_a3-optimized.cl
index 84344618d..bd1bbfa8d 100644
--- a/OpenCL/m04700_a3-optimized.cl
+++ b/OpenCL/m04700_a3-optimized.cl
@@ -591,7 +591,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -661,7 +661,7 @@ KERNEL_FQ void m04700_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -731,7 +731,7 @@ KERNEL_FQ void m04700_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -801,7 +801,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -871,7 +871,7 @@ KERNEL_FQ void m04700_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -941,7 +941,7 @@ KERNEL_FQ void m04700_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04700_a3-pure.cl b/OpenCL/m04700_a3-pure.cl
index 1a7151647..d54c77c68 100644
--- a/OpenCL/m04700_a3-pure.cl
+++ b/OpenCL/m04700_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -157,7 +157,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04710_a0-optimized.cl b/OpenCL/m04710_a0-optimized.cl
index be2dfe12f..aed934e35 100644
--- a/OpenCL/m04710_a0-optimized.cl
+++ b/OpenCL/m04710_a0-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -754,7 +754,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04710_a0-pure.cl b/OpenCL/m04710_a0-pure.cl
index fb48d6758..e276ab1b9 100644
--- a/OpenCL/m04710_a0-pure.cl
+++ b/OpenCL/m04710_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -173,7 +173,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04710_a1-optimized.cl b/OpenCL/m04710_a1-optimized.cl
index bfd4e5d8a..a69a30974 100644
--- a/OpenCL/m04710_a1-optimized.cl
+++ b/OpenCL/m04710_a1-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -807,7 +807,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04710_a1-pure.cl b/OpenCL/m04710_a1-pure.cl
index ce002933d..fca188d8c 100644
--- a/OpenCL/m04710_a1-pure.cl
+++ b/OpenCL/m04710_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -169,7 +169,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04710_a3-optimized.cl b/OpenCL/m04710_a3-optimized.cl
index b16dc00f1..115e46144 100644
--- a/OpenCL/m04710_a3-optimized.cl
+++ b/OpenCL/m04710_a3-optimized.cl
@@ -1401,7 +1401,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1471,7 +1471,7 @@ KERNEL_FQ void m04710_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1541,7 +1541,7 @@ KERNEL_FQ void m04710_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1611,7 +1611,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1681,7 +1681,7 @@ KERNEL_FQ void m04710_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1751,7 +1751,7 @@ KERNEL_FQ void m04710_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04710_a3-pure.cl b/OpenCL/m04710_a3-pure.cl
index 0711a5bad..3a755af0c 100644
--- a/OpenCL/m04710_a3-pure.cl
+++ b/OpenCL/m04710_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -182,7 +182,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04800_a0-optimized.cl b/OpenCL/m04800_a0-optimized.cl
index 15577e69a..2874f35a6 100644
--- a/OpenCL/m04800_a0-optimized.cl
+++ b/OpenCL/m04800_a0-optimized.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_RULES ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -230,7 +230,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_RULES ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04800_a0-pure.cl b/OpenCL/m04800_a0-pure.cl
index b40e911c0..a02a36f15 100644
--- a/OpenCL/m04800_a0-pure.cl
+++ b/OpenCL/m04800_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -86,7 +86,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04800_a1-optimized.cl b/OpenCL/m04800_a1-optimized.cl
index c879e280a..ef209a368 100644
--- a/OpenCL/m04800_a1-optimized.cl
+++ b/OpenCL/m04800_a1-optimized.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -300,7 +300,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m04800_a1-pure.cl b/OpenCL/m04800_a1-pure.cl
index 28e571472..e829c409c 100644
--- a/OpenCL/m04800_a1-pure.cl
+++ b/OpenCL/m04800_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04800_a3-optimized.cl b/OpenCL/m04800_a3-optimized.cl
index 7c10bd525..6f665b69d 100644
--- a/OpenCL/m04800_a3-optimized.cl
+++ b/OpenCL/m04800_a3-optimized.cl
@@ -405,7 +405,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -458,7 +458,7 @@ KERNEL_FQ void m04800_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -511,7 +511,7 @@ KERNEL_FQ void m04800_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -564,7 +564,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -617,7 +617,7 @@ KERNEL_FQ void m04800_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -670,7 +670,7 @@ KERNEL_FQ void m04800_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04800_a3-pure.cl b/OpenCL/m04800_a3-pure.cl
index 8faa2c030..875e730eb 100644
--- a/OpenCL/m04800_a3-pure.cl
+++ b/OpenCL/m04800_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -97,7 +97,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04900_a0-optimized.cl b/OpenCL/m04900_a0-optimized.cl
index 93e05ba38..1fb8c1a72 100644
--- a/OpenCL/m04900_a0-optimized.cl
+++ b/OpenCL/m04900_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -310,7 +310,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m04900_a0-pure.cl b/OpenCL/m04900_a0-pure.cl
index e51a0949d..6211df35e 100644
--- a/OpenCL/m04900_a0-pure.cl
+++ b/OpenCL/m04900_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04900_a1-optimized.cl b/OpenCL/m04900_a1-optimized.cl
index 7ca08dd1d..3e0bac41a 100644
--- a/OpenCL/m04900_a1-optimized.cl
+++ b/OpenCL/m04900_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -368,7 +368,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m04900_a1-pure.cl b/OpenCL/m04900_a1-pure.cl
index b83699ac4..22d2b59c0 100644
--- a/OpenCL/m04900_a1-pure.cl
+++ b/OpenCL/m04900_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m04900_a3-optimized.cl b/OpenCL/m04900_a3-optimized.cl
index fd2e59de6..7fc411a6b 100644
--- a/OpenCL/m04900_a3-optimized.cl
+++ b/OpenCL/m04900_a3-optimized.cl
@@ -577,7 +577,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -630,7 +630,7 @@ KERNEL_FQ void m04900_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -683,7 +683,7 @@ KERNEL_FQ void m04900_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -736,7 +736,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -789,7 +789,7 @@ KERNEL_FQ void m04900_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -842,7 +842,7 @@ KERNEL_FQ void m04900_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m04900_a3-pure.cl b/OpenCL/m04900_a3-pure.cl
index 182101dec..545ceffcb 100644
--- a/OpenCL/m04900_a3-pure.cl
+++ b/OpenCL/m04900_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05000_a0-optimized.cl b/OpenCL/m05000_a0-optimized.cl
index 2f52442ba..6e135b966 100644
--- a/OpenCL/m05000_a0-optimized.cl
+++ b/OpenCL/m05000_a0-optimized.cl
@@ -60,7 +60,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -498,7 +498,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m05000_a0-pure.cl b/OpenCL/m05000_a0-pure.cl
index 6f79c5fea..2f37ec450 100644
--- a/OpenCL/m05000_a0-pure.cl
+++ b/OpenCL/m05000_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05000_a1-optimized.cl b/OpenCL/m05000_a1-optimized.cl
index d5dc51066..fd8c66c59 100644
--- a/OpenCL/m05000_a1-optimized.cl
+++ b/OpenCL/m05000_a1-optimized.cl
@@ -58,7 +58,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -556,7 +556,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m05000_a1-pure.cl b/OpenCL/m05000_a1-pure.cl
index 738022a94..1cb45968c 100644
--- a/OpenCL/m05000_a1-pure.cl
+++ b/OpenCL/m05000_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -161,7 +161,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05000_a3-optimized.cl b/OpenCL/m05000_a3-optimized.cl
index 183ad0ca5..14ef950f6 100644
--- a/OpenCL/m05000_a3-optimized.cl
+++ b/OpenCL/m05000_a3-optimized.cl
@@ -888,7 +888,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -954,7 +954,7 @@ KERNEL_FQ void m05000_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1020,7 +1020,7 @@ KERNEL_FQ void m05000_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1087,7 +1087,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1153,7 +1153,7 @@ KERNEL_FQ void m05000_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1219,7 +1219,7 @@ KERNEL_FQ void m05000_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m05000_a3-pure.cl b/OpenCL/m05000_a3-pure.cl
index 80c163638..713530ea6 100644
--- a/OpenCL/m05000_a3-pure.cl
+++ b/OpenCL/m05000_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -178,7 +178,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05100_a0-optimized.cl b/OpenCL/m05100_a0-optimized.cl
index 305948596..423631278 100644
--- a/OpenCL/m05100_a0-optimized.cl
+++ b/OpenCL/m05100_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -178,7 +178,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m05100_a0-pure.cl b/OpenCL/m05100_a0-pure.cl
index 7b5cfc668..6c9163e7c 100644
--- a/OpenCL/m05100_a0-pure.cl
+++ b/OpenCL/m05100_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05100_a1-optimized.cl b/OpenCL/m05100_a1-optimized.cl
index 6eb45fb88..a627a0e1e 100644
--- a/OpenCL/m05100_a1-optimized.cl
+++ b/OpenCL/m05100_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -231,7 +231,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m05100_a1-pure.cl b/OpenCL/m05100_a1-pure.cl
index 0aba34173..0bd52cadf 100644
--- a/OpenCL/m05100_a1-pure.cl
+++ b/OpenCL/m05100_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05100_a3-optimized.cl b/OpenCL/m05100_a3-optimized.cl
index 5e48cbb8f..c05818b12 100644
--- a/OpenCL/m05100_a3-optimized.cl
+++ b/OpenCL/m05100_a3-optimized.cl
@@ -304,7 +304,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -351,7 +351,7 @@ KERNEL_FQ void m05100_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -398,7 +398,7 @@ KERNEL_FQ void m05100_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -445,7 +445,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -492,7 +492,7 @@ KERNEL_FQ void m05100_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -539,7 +539,7 @@ KERNEL_FQ void m05100_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m05100_a3-pure.cl b/OpenCL/m05100_a3-pure.cl
index fa0433dea..a6023d0c5 100644
--- a/OpenCL/m05100_a3-pure.cl
+++ b/OpenCL/m05100_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -82,7 +82,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05200-pure.cl b/OpenCL/m05200-pure.cl
index 5e17c6d0c..e92bca1c8 100644
--- a/OpenCL/m05200-pure.cl
+++ b/OpenCL/m05200-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m05200_init (KERN_ATTR_TMPS (pwsafe3_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t ctx;
 
@@ -57,7 +57,7 @@ KERNEL_FQ void m05200_loop (KERN_ATTR_TMPS (pwsafe3_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x digest[8];
 
@@ -128,7 +128,7 @@ KERNEL_FQ void m05200_comp (KERN_ATTR_TMPS (pwsafe3_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m05300_a0-optimized.cl b/OpenCL/m05300_a0-optimized.cl
index 774f2338c..e9e6b4321 100644
--- a/OpenCL/m05300_a0-optimized.cl
+++ b/OpenCL/m05300_a0-optimized.cl
@@ -141,7 +141,7 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -316,7 +316,7 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05300_a0-pure.cl b/OpenCL/m05300_a0-pure.cl
index 9bc28b1d2..4261e916a 100644
--- a/OpenCL/m05300_a0-pure.cl
+++ b/OpenCL/m05300_a0-pure.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -109,7 +109,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05300_a1-optimized.cl b/OpenCL/m05300_a1-optimized.cl
index f04482cb0..4bb23bbc2 100644
--- a/OpenCL/m05300_a1-optimized.cl
+++ b/OpenCL/m05300_a1-optimized.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -374,7 +374,7 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05300_a1-pure.cl b/OpenCL/m05300_a1-pure.cl
index c2dbb29d6..57db3a3aa 100644
--- a/OpenCL/m05300_a1-pure.cl
+++ b/OpenCL/m05300_a1-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -132,7 +132,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05300_a3-optimized.cl b/OpenCL/m05300_a3-optimized.cl
index 084aaceb2..b986e27fa 100644
--- a/OpenCL/m05300_a3-optimized.cl
+++ b/OpenCL/m05300_a3-optimized.cl
@@ -445,7 +445,7 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -518,7 +518,7 @@ KERNEL_FQ void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -591,7 +591,7 @@ KERNEL_FQ void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -664,7 +664,7 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -737,7 +737,7 @@ KERNEL_FQ void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -810,7 +810,7 @@ KERNEL_FQ void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05300_a3-pure.cl b/OpenCL/m05300_a3-pure.cl
index 189630bf0..4ed53f6b8 100644
--- a/OpenCL/m05300_a3-pure.cl
+++ b/OpenCL/m05300_a3-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -118,7 +118,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05400_a0-optimized.cl b/OpenCL/m05400_a0-optimized.cl
index 1c74982df..e65c4c4db 100644
--- a/OpenCL/m05400_a0-optimized.cl
+++ b/OpenCL/m05400_a0-optimized.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -329,7 +329,7 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05400_a0-pure.cl b/OpenCL/m05400_a0-pure.cl
index ea8a48179..157960690 100644
--- a/OpenCL/m05400_a0-pure.cl
+++ b/OpenCL/m05400_a0-pure.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -109,7 +109,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05400_a1-optimized.cl b/OpenCL/m05400_a1-optimized.cl
index 17c644cc8..d014aee64 100644
--- a/OpenCL/m05400_a1-optimized.cl
+++ b/OpenCL/m05400_a1-optimized.cl
@@ -143,7 +143,7 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -395,7 +395,7 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05400_a1-pure.cl b/OpenCL/m05400_a1-pure.cl
index 8bd1044a1..5fc3e97ce 100644
--- a/OpenCL/m05400_a1-pure.cl
+++ b/OpenCL/m05400_a1-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -132,7 +132,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05400_a3-optimized.cl b/OpenCL/m05400_a3-optimized.cl
index 3ca1d20bd..0e9bdd3bb 100644
--- a/OpenCL/m05400_a3-optimized.cl
+++ b/OpenCL/m05400_a3-optimized.cl
@@ -449,7 +449,7 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -522,7 +522,7 @@ KERNEL_FQ void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -595,7 +595,7 @@ KERNEL_FQ void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -668,7 +668,7 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -741,7 +741,7 @@ KERNEL_FQ void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -814,7 +814,7 @@ KERNEL_FQ void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05400_a3-pure.cl b/OpenCL/m05400_a3-pure.cl
index dc74c5a7f..b6c3d6af9 100644
--- a/OpenCL/m05400_a3-pure.cl
+++ b/OpenCL/m05400_a3-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -118,7 +118,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl
index 205aa4a63..36abb62b2 100644
--- a/OpenCL/m05500_a0-optimized.cl
+++ b/OpenCL/m05500_a0-optimized.cl
@@ -551,7 +551,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -773,7 +773,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05500_a0-pure.cl b/OpenCL/m05500_a0-pure.cl
index 3833ad1c3..aa60404f5 100644
--- a/OpenCL/m05500_a0-pure.cl
+++ b/OpenCL/m05500_a0-pure.cl
@@ -551,7 +551,7 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -684,7 +684,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05500_a1-optimized.cl b/OpenCL/m05500_a1-optimized.cl
index 6eb4e300c..138d71ca4 100644
--- a/OpenCL/m05500_a1-optimized.cl
+++ b/OpenCL/m05500_a1-optimized.cl
@@ -549,7 +549,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -824,7 +824,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05500_a1-pure.cl b/OpenCL/m05500_a1-pure.cl
index e84e32423..dbc69ac9d 100644
--- a/OpenCL/m05500_a1-pure.cl
+++ b/OpenCL/m05500_a1-pure.cl
@@ -549,7 +549,7 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -680,7 +680,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05500_a3-optimized.cl b/OpenCL/m05500_a3-optimized.cl
index e45687609..f7f5c7748 100644
--- a/OpenCL/m05500_a3-optimized.cl
+++ b/OpenCL/m05500_a3-optimized.cl
@@ -882,7 +882,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -965,7 +965,7 @@ KERNEL_FQ void m05500_m08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1048,7 +1048,7 @@ KERNEL_FQ void m05500_m16 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1131,7 +1131,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1214,7 +1214,7 @@ KERNEL_FQ void m05500_s08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1297,7 +1297,7 @@ KERNEL_FQ void m05500_s16 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05500_a3-pure.cl b/OpenCL/m05500_a3-pure.cl
index caeaa9622..64ffaace8 100644
--- a/OpenCL/m05500_a3-pure.cl
+++ b/OpenCL/m05500_a3-pure.cl
@@ -549,7 +549,7 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -693,7 +693,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05600_a0-optimized.cl b/OpenCL/m05600_a0-optimized.cl
index 87a0e6b02..349c65296 100644
--- a/OpenCL/m05600_a0-optimized.cl
+++ b/OpenCL/m05600_a0-optimized.cl
@@ -144,7 +144,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len
                            + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len;
@@ -383,7 +383,7 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len
                            + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len;
diff --git a/OpenCL/m05600_a0-pure.cl b/OpenCL/m05600_a0-pure.cl
index b91bda7fb..a0dac15ff 100644
--- a/OpenCL/m05600_a0-pure.cl
+++ b/OpenCL/m05600_a0-pure.cl
@@ -38,7 +38,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -137,7 +137,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05600_a1-optimized.cl b/OpenCL/m05600_a1-optimized.cl
index 3bda042e3..ac3781a49 100644
--- a/OpenCL/m05600_a1-optimized.cl
+++ b/OpenCL/m05600_a1-optimized.cl
@@ -142,7 +142,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len
                            + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len;
@@ -439,7 +439,7 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len
                            + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len;
diff --git a/OpenCL/m05600_a1-pure.cl b/OpenCL/m05600_a1-pure.cl
index ac362c571..adbbcde8f 100644
--- a/OpenCL/m05600_a1-pure.cl
+++ b/OpenCL/m05600_a1-pure.cl
@@ -36,7 +36,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_ESALT (netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -133,7 +133,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05600_a3-optimized.cl b/OpenCL/m05600_a3-optimized.cl
index 78a6bb739..9e271636b 100644
--- a/OpenCL/m05600_a3-optimized.cl
+++ b/OpenCL/m05600_a3-optimized.cl
@@ -566,7 +566,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -639,7 +639,7 @@ KERNEL_FQ void m05600_m08 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -712,7 +712,7 @@ KERNEL_FQ void m05600_m16 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -785,7 +785,7 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -858,7 +858,7 @@ KERNEL_FQ void m05600_s08 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -931,7 +931,7 @@ KERNEL_FQ void m05600_s16 (KERN_ATTR_ESALT (netntlm_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m05600_a3-pure.cl b/OpenCL/m05600_a3-pure.cl
index 50d0ede08..3c5d8410f 100644
--- a/OpenCL/m05600_a3-pure.cl
+++ b/OpenCL/m05600_a3-pure.cl
@@ -36,7 +36,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -146,7 +146,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl
index ff6f6bc2a..c85c0cb38 100644
--- a/OpenCL/m05800-optimized.cl
+++ b/OpenCL/m05800-optimized.cl
@@ -2211,7 +2211,7 @@ KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 word_buf[4];
 
@@ -2317,7 +2317,7 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -2419,7 +2419,7 @@ KERNEL_FQ void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m05800-pure.cl b/OpenCL/m05800-pure.cl
index 3898adc3c..9b01e5713 100644
--- a/OpenCL/m05800-pure.cl
+++ b/OpenCL/m05800-pure.cl
@@ -2080,7 +2080,7 @@ KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t ctx;
 
@@ -2131,7 +2131,7 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -2213,7 +2213,7 @@ KERNEL_FQ void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m06000_a0-optimized.cl b/OpenCL/m06000_a0-optimized.cl
index df6f1dcd3..5888b9980 100644
--- a/OpenCL/m06000_a0-optimized.cl
+++ b/OpenCL/m06000_a0-optimized.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -125,7 +125,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m06000_a0-pure.cl b/OpenCL/m06000_a0-pure.cl
index be104c8b6..d0bb32b8d 100644
--- a/OpenCL/m06000_a0-pure.cl
+++ b/OpenCL/m06000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m06000_a1-optimized.cl b/OpenCL/m06000_a1-optimized.cl
index 760c50563..7eb18b91e 100644
--- a/OpenCL/m06000_a1-optimized.cl
+++ b/OpenCL/m06000_a1-optimized.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -181,7 +181,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m06000_a1-pure.cl b/OpenCL/m06000_a1-pure.cl
index 1871a7fd2..fb0fbd132 100644
--- a/OpenCL/m06000_a1-pure.cl
+++ b/OpenCL/m06000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m06000_a3-optimized.cl b/OpenCL/m06000_a3-optimized.cl
index 40668aca2..c42668731 100644
--- a/OpenCL/m06000_a3-optimized.cl
+++ b/OpenCL/m06000_a3-optimized.cl
@@ -155,7 +155,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -202,7 +202,7 @@ KERNEL_FQ void m06000_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -249,7 +249,7 @@ KERNEL_FQ void m06000_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -296,7 +296,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -343,7 +343,7 @@ KERNEL_FQ void m06000_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -390,7 +390,7 @@ KERNEL_FQ void m06000_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m06000_a3-pure.cl b/OpenCL/m06000_a3-pure.cl
index 2112b3578..fb9855bea 100644
--- a/OpenCL/m06000_a3-pure.cl
+++ b/OpenCL/m06000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m06100_a0-optimized.cl b/OpenCL/m06100_a0-optimized.cl
index 9c58a9f21..034b8d860 100644
--- a/OpenCL/m06100_a0-optimized.cl
+++ b/OpenCL/m06100_a0-optimized.cl
@@ -73,7 +73,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -216,7 +216,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m06100_a0-pure.cl b/OpenCL/m06100_a0-pure.cl
index e702168e2..def04bca7 100644
--- a/OpenCL/m06100_a0-pure.cl
+++ b/OpenCL/m06100_a0-pure.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -155,7 +155,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m06100_a1-optimized.cl b/OpenCL/m06100_a1-optimized.cl
index 316bf89d9..a030551b1 100644
--- a/OpenCL/m06100_a1-optimized.cl
+++ b/OpenCL/m06100_a1-optimized.cl
@@ -71,7 +71,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -272,7 +272,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m06100_a1-pure.cl b/OpenCL/m06100_a1-pure.cl
index 3e86ac629..fd658f266 100644
--- a/OpenCL/m06100_a1-pure.cl
+++ b/OpenCL/m06100_a1-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -151,7 +151,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m06100_a3-optimized.cl b/OpenCL/m06100_a3-optimized.cl
index 8ac3d3d2a..bba2beca3 100644
--- a/OpenCL/m06100_a3-optimized.cl
+++ b/OpenCL/m06100_a3-optimized.cl
@@ -221,7 +221,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -316,7 +316,7 @@ KERNEL_FQ void m06100_m08 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -415,7 +415,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -510,7 +510,7 @@ KERNEL_FQ void m06100_s08 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m06100_a3-pure.cl b/OpenCL/m06100_a3-pure.cl
index d6961d438..4c53a7864 100644
--- a/OpenCL/m06100_a3-pure.cl
+++ b/OpenCL/m06100_a3-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -164,7 +164,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m06211-pure.cl b/OpenCL/m06211-pure.cl
index 68719c289..6aa3b22ff 100644
--- a/OpenCL/m06211-pure.cl
+++ b/OpenCL/m06211-pure.cl
@@ -104,7 +104,7 @@ KERNEL_FQ void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -217,7 +217,7 @@ KERNEL_FQ void m06211_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -355,7 +355,7 @@ KERNEL_FQ void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06212-pure.cl b/OpenCL/m06212-pure.cl
index 7588f9b5f..91b7a9651 100644
--- a/OpenCL/m06212-pure.cl
+++ b/OpenCL/m06212-pure.cl
@@ -104,7 +104,7 @@ KERNEL_FQ void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -217,7 +217,7 @@ KERNEL_FQ void m06212_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -355,7 +355,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06213-pure.cl b/OpenCL/m06213-pure.cl
index 20bc9356f..ee2147899 100644
--- a/OpenCL/m06213-pure.cl
+++ b/OpenCL/m06213-pure.cl
@@ -104,7 +104,7 @@ KERNEL_FQ void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -217,7 +217,7 @@ KERNEL_FQ void m06213_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -355,7 +355,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06221-pure.cl b/OpenCL/m06221-pure.cl
index ab38d23a4..98c05b4b0 100644
--- a/OpenCL/m06221-pure.cl
+++ b/OpenCL/m06221-pure.cl
@@ -126,7 +126,7 @@ KERNEL_FQ void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -271,7 +271,7 @@ KERNEL_FQ void m06221_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -450,7 +450,7 @@ KERNEL_FQ void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06222-pure.cl b/OpenCL/m06222-pure.cl
index 27ca6c61a..2ae119b9b 100644
--- a/OpenCL/m06222-pure.cl
+++ b/OpenCL/m06222-pure.cl
@@ -126,7 +126,7 @@ KERNEL_FQ void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -271,7 +271,7 @@ KERNEL_FQ void m06222_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -450,7 +450,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06223-pure.cl b/OpenCL/m06223-pure.cl
index f26b56590..e614adb17 100644
--- a/OpenCL/m06223-pure.cl
+++ b/OpenCL/m06223-pure.cl
@@ -126,7 +126,7 @@ KERNEL_FQ void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -271,7 +271,7 @@ KERNEL_FQ void m06223_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -450,7 +450,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06231-pure.cl b/OpenCL/m06231-pure.cl
index 4a3b3aaef..5286cbea6 100644
--- a/OpenCL/m06231-pure.cl
+++ b/OpenCL/m06231-pure.cl
@@ -206,7 +206,7 @@ KERNEL_FQ void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -407,7 +407,7 @@ KERNEL_FQ void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[16];
   u32x opad[16];
@@ -622,7 +622,7 @@ KERNEL_FQ void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06232-pure.cl b/OpenCL/m06232-pure.cl
index 6cba2bd65..404c54787 100644
--- a/OpenCL/m06232-pure.cl
+++ b/OpenCL/m06232-pure.cl
@@ -206,7 +206,7 @@ KERNEL_FQ void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -407,7 +407,7 @@ KERNEL_FQ void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[16];
   u32x opad[16];
@@ -622,7 +622,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06233-pure.cl b/OpenCL/m06233-pure.cl
index 4cb39f003..d38769009 100644
--- a/OpenCL/m06233-pure.cl
+++ b/OpenCL/m06233-pure.cl
@@ -206,7 +206,7 @@ KERNEL_FQ void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -407,7 +407,7 @@ KERNEL_FQ void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[16];
   u32x opad[16];
@@ -622,7 +622,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey1[8];
 
diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl
index 3f72c1358..d0dba2bbd 100644
--- a/OpenCL/m06300-optimized.cl
+++ b/OpenCL/m06300-optimized.cl
@@ -581,7 +581,7 @@ KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -739,7 +739,7 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -927,7 +927,7 @@ KERNEL_FQ void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m06300-pure.cl b/OpenCL/m06300-pure.cl
index 1578ec94b..6c9381313 100644
--- a/OpenCL/m06300-pure.cl
+++ b/OpenCL/m06300-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -130,7 +130,7 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -225,7 +225,7 @@ KERNEL_FQ void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m06400-pure.cl b/OpenCL/m06400-pure.cl
index 576cb798f..abf008f62 100644
--- a/OpenCL/m06400-pure.cl
+++ b/OpenCL/m06400-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m06400_init (KERN_ATTR_TMPS (sha256aix_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -157,7 +157,7 @@ KERNEL_FQ void m06400_loop (KERN_ATTR_TMPS (sha256aix_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -267,7 +267,7 @@ KERNEL_FQ void m06400_comp (KERN_ATTR_TMPS (sha256aix_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m06500-pure.cl b/OpenCL/m06500-pure.cl
index 0127d9139..824088b02 100644
--- a/OpenCL/m06500-pure.cl
+++ b/OpenCL/m06500-pure.cl
@@ -93,7 +93,7 @@ KERNEL_FQ void m06500_init (KERN_ATTR_TMPS (sha512aix_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -188,7 +188,7 @@ KERNEL_FQ void m06500_loop (KERN_ATTR_TMPS (sha512aix_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -315,7 +315,7 @@ KERNEL_FQ void m06500_comp (KERN_ATTR_TMPS (sha512aix_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m06600-pure.cl b/OpenCL/m06600-pure.cl
index 0cccf5205..40c5b111a 100644
--- a/OpenCL/m06600-pure.cl
+++ b/OpenCL/m06600-pure.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m06600_init (KERN_ATTR_TMPS (agilekey_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -148,7 +148,7 @@ KERNEL_FQ void m06600_loop (KERN_ATTR_TMPS (agilekey_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -286,7 +286,7 @@ KERNEL_FQ void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
diff --git a/OpenCL/m06700-pure.cl b/OpenCL/m06700-pure.cl
index 12378ae8d..151276f4c 100644
--- a/OpenCL/m06700-pure.cl
+++ b/OpenCL/m06700-pure.cl
@@ -71,7 +71,7 @@ KERNEL_FQ void m06700_init (KERN_ATTR_TMPS (sha1aix_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -139,7 +139,7 @@ KERNEL_FQ void m06700_loop (KERN_ATTR_TMPS (sha1aix_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -228,7 +228,7 @@ KERNEL_FQ void m06700_comp (KERN_ATTR_TMPS (sha1aix_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m06800-pure.cl b/OpenCL/m06800-pure.cl
index ce6691e36..9052b2baa 100644
--- a/OpenCL/m06800-pure.cl
+++ b/OpenCL/m06800-pure.cl
@@ -78,7 +78,7 @@ KERNEL_FQ void m06800_init (KERN_ATTR_TMPS (lastpass_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -158,7 +158,7 @@ KERNEL_FQ void m06800_loop (KERN_ATTR_TMPS (lastpass_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -317,7 +317,7 @@ KERNEL_FQ void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl
index e8fafdda4..e5df7b7a3 100644
--- a/OpenCL/m06900_a0-optimized.cl
+++ b/OpenCL/m06900_a0-optimized.cl
@@ -724,7 +724,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -940,7 +940,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m06900_a1-optimized.cl b/OpenCL/m06900_a1-optimized.cl
index 028ee5f5f..8f5c34fd3 100644
--- a/OpenCL/m06900_a1-optimized.cl
+++ b/OpenCL/m06900_a1-optimized.cl
@@ -722,7 +722,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -992,7 +992,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m06900_a3-optimized.cl b/OpenCL/m06900_a3-optimized.cl
index 40af86b42..7116c3e79 100644
--- a/OpenCL/m06900_a3-optimized.cl
+++ b/OpenCL/m06900_a3-optimized.cl
@@ -1082,7 +1082,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1151,7 +1151,7 @@ KERNEL_FQ void m06900_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1224,7 +1224,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1293,7 +1293,7 @@ KERNEL_FQ void m06900_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m07000_a0-optimized.cl b/OpenCL/m07000_a0-optimized.cl
index ad06184c0..7c21b315d 100644
--- a/OpenCL/m07000_a0-optimized.cl
+++ b/OpenCL/m07000_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -292,7 +292,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07000_a0-pure.cl b/OpenCL/m07000_a0-pure.cl
index ebe589789..cf2dccc61 100644
--- a/OpenCL/m07000_a0-pure.cl
+++ b/OpenCL/m07000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07000_a1-optimized.cl b/OpenCL/m07000_a1-optimized.cl
index 3021ec78b..7e1d40b0e 100644
--- a/OpenCL/m07000_a1-optimized.cl
+++ b/OpenCL/m07000_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -350,7 +350,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07000_a1-pure.cl b/OpenCL/m07000_a1-pure.cl
index e6d556144..3fe6a8f4d 100644
--- a/OpenCL/m07000_a1-pure.cl
+++ b/OpenCL/m07000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07000_a3-optimized.cl b/OpenCL/m07000_a3-optimized.cl
index f05d76cb3..9ee6d2dec 100644
--- a/OpenCL/m07000_a3-optimized.cl
+++ b/OpenCL/m07000_a3-optimized.cl
@@ -577,7 +577,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -630,7 +630,7 @@ KERNEL_FQ void m07000_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -683,7 +683,7 @@ KERNEL_FQ void m07000_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -736,7 +736,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -789,7 +789,7 @@ KERNEL_FQ void m07000_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -842,7 +842,7 @@ KERNEL_FQ void m07000_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m07000_a3-pure.cl b/OpenCL/m07000_a3-pure.cl
index ce108a2ae..3d9d69149 100644
--- a/OpenCL/m07000_a3-pure.cl
+++ b/OpenCL/m07000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -112,7 +112,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07100-pure.cl b/OpenCL/m07100-pure.cl
index f3d1b15a1..b31fd369c 100644
--- a/OpenCL/m07100-pure.cl
+++ b/OpenCL/m07100-pure.cl
@@ -99,7 +99,7 @@ KERNEL_FQ void m07100_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -199,7 +199,7 @@ KERNEL_FQ void m07100_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -329,7 +329,7 @@ KERNEL_FQ void m07100_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m07300_a0-optimized.cl b/OpenCL/m07300_a0-optimized.cl
index 72ad1b428..387743528 100644
--- a/OpenCL/m07300_a0-optimized.cl
+++ b/OpenCL/m07300_a0-optimized.cl
@@ -135,7 +135,7 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -271,7 +271,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07300_a0-pure.cl b/OpenCL/m07300_a0-pure.cl
index 5abe0edc8..380241387 100644
--- a/OpenCL/m07300_a0-pure.cl
+++ b/OpenCL/m07300_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07300_a1-optimized.cl b/OpenCL/m07300_a1-optimized.cl
index 5fd17fd6b..3d6c5b3b8 100644
--- a/OpenCL/m07300_a1-optimized.cl
+++ b/OpenCL/m07300_a1-optimized.cl
@@ -133,7 +133,7 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -337,7 +337,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07300_a1-pure.cl b/OpenCL/m07300_a1-pure.cl
index 636059b40..4b712f0a4 100644
--- a/OpenCL/m07300_a1-pure.cl
+++ b/OpenCL/m07300_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_ESALT (rakp_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -99,7 +99,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_ESALT (rakp_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07300_a3-optimized.cl b/OpenCL/m07300_a3-optimized.cl
index ebcae311c..4def5dcbe 100644
--- a/OpenCL/m07300_a3-optimized.cl
+++ b/OpenCL/m07300_a3-optimized.cl
@@ -365,7 +365,7 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -431,7 +431,7 @@ KERNEL_FQ void m07300_m08 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -497,7 +497,7 @@ KERNEL_FQ void m07300_m16 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -563,7 +563,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -629,7 +629,7 @@ KERNEL_FQ void m07300_s08 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -695,7 +695,7 @@ KERNEL_FQ void m07300_s16 (KERN_ATTR_ESALT (rakp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m07300_a3-pure.cl b/OpenCL/m07300_a3-pure.cl
index 006f6896e..17c565776 100644
--- a/OpenCL/m07300_a3-pure.cl
+++ b/OpenCL/m07300_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -85,7 +85,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl
index 26ec21bf6..44da7183c 100644
--- a/OpenCL/m07400-optimized.cl
+++ b/OpenCL/m07400-optimized.cl
@@ -1186,7 +1186,7 @@ KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1534,7 +1534,7 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pw_len = MIN (pws[gid].pw_len, 15);
 
@@ -1745,7 +1745,7 @@ KERNEL_FQ void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m07400-pure.cl b/OpenCL/m07400-pure.cl
index 3aacc0e4a..d0f1d5ea5 100644
--- a/OpenCL/m07400-pure.cl
+++ b/OpenCL/m07400-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -269,7 +269,7 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pw_len = pws[gid].pw_len;
 
@@ -353,7 +353,7 @@ KERNEL_FQ void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl
index 82b7d406f..b99dc20ec 100644
--- a/OpenCL/m07500_a0-optimized.cl
+++ b/OpenCL/m07500_a0-optimized.cl
@@ -287,7 +287,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -391,7 +391,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07500_a0-pure.cl b/OpenCL/m07500_a0-pure.cl
index 5836e8c2d..c8e6226e8 100644
--- a/OpenCL/m07500_a0-pure.cl
+++ b/OpenCL/m07500_a0-pure.cl
@@ -166,7 +166,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -235,7 +235,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m07500_a1-optimized.cl b/OpenCL/m07500_a1-optimized.cl
index a51afb159..6b3eb85ef 100644
--- a/OpenCL/m07500_a1-optimized.cl
+++ b/OpenCL/m07500_a1-optimized.cl
@@ -285,7 +285,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -439,7 +439,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07500_a1-pure.cl b/OpenCL/m07500_a1-pure.cl
index e63b2852a..6e30e4bd5 100644
--- a/OpenCL/m07500_a1-pure.cl
+++ b/OpenCL/m07500_a1-pure.cl
@@ -164,7 +164,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -231,7 +231,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m07500_a3-optimized.cl b/OpenCL/m07500_a3-optimized.cl
index b0715e255..57fe5b07a 100644
--- a/OpenCL/m07500_a3-optimized.cl
+++ b/OpenCL/m07500_a3-optimized.cl
@@ -370,7 +370,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -420,7 +420,7 @@ KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -474,7 +474,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -524,7 +524,7 @@ KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m07500_a3-pure.cl b/OpenCL/m07500_a3-pure.cl
index 293c8ac21..31ad4122d 100644
--- a/OpenCL/m07500_a3-pure.cl
+++ b/OpenCL/m07500_a3-pure.cl
@@ -164,7 +164,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -256,7 +256,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl
index 4c1d59630..708a8bf57 100644
--- a/OpenCL/m07700_a0-optimized.cl
+++ b/OpenCL/m07700_a0-optimized.cl
@@ -169,7 +169,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -333,7 +333,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07700_a1-optimized.cl b/OpenCL/m07700_a1-optimized.cl
index 7e6356d50..844d807f5 100644
--- a/OpenCL/m07700_a1-optimized.cl
+++ b/OpenCL/m07700_a1-optimized.cl
@@ -160,7 +160,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -367,7 +367,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07700_a3-optimized.cl b/OpenCL/m07700_a3-optimized.cl
index cdefcb692..fd2debc85 100644
--- a/OpenCL/m07700_a3-optimized.cl
+++ b/OpenCL/m07700_a3-optimized.cl
@@ -407,7 +407,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -460,7 +460,7 @@ KERNEL_FQ void m07700_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -517,7 +517,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -570,7 +570,7 @@ KERNEL_FQ void m07700_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m07701_a0-optimized.cl b/OpenCL/m07701_a0-optimized.cl
index 3794e4bec..1e047b337 100644
--- a/OpenCL/m07701_a0-optimized.cl
+++ b/OpenCL/m07701_a0-optimized.cl
@@ -162,7 +162,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -326,7 +326,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07701_a1-optimized.cl b/OpenCL/m07701_a1-optimized.cl
index 792edde2f..36a032693 100644
--- a/OpenCL/m07701_a1-optimized.cl
+++ b/OpenCL/m07701_a1-optimized.cl
@@ -160,7 +160,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -367,7 +367,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07701_a3-optimized.cl b/OpenCL/m07701_a3-optimized.cl
index 38be29474..4e605b759 100644
--- a/OpenCL/m07701_a3-optimized.cl
+++ b/OpenCL/m07701_a3-optimized.cl
@@ -407,7 +407,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -460,7 +460,7 @@ KERNEL_FQ void m07701_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -517,7 +517,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -570,7 +570,7 @@ KERNEL_FQ void m07701_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl
index 6174dc431..7ca7bc40c 100644
--- a/OpenCL/m07800_a0-optimized.cl
+++ b/OpenCL/m07800_a0-optimized.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -320,7 +320,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07800_a1-optimized.cl b/OpenCL/m07800_a1-optimized.cl
index 939ff8ba1..38d19279f 100644
--- a/OpenCL/m07800_a1-optimized.cl
+++ b/OpenCL/m07800_a1-optimized.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -378,7 +378,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07800_a3-optimized.cl b/OpenCL/m07800_a3-optimized.cl
index d505b7a54..59dc9baf4 100644
--- a/OpenCL/m07800_a3-optimized.cl
+++ b/OpenCL/m07800_a3-optimized.cl
@@ -512,7 +512,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -565,7 +565,7 @@ KERNEL_FQ void m07800_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -622,7 +622,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -675,7 +675,7 @@ KERNEL_FQ void m07800_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m07801_a0-optimized.cl b/OpenCL/m07801_a0-optimized.cl
index aa06560bd..631f70a07 100644
--- a/OpenCL/m07801_a0-optimized.cl
+++ b/OpenCL/m07801_a0-optimized.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -320,7 +320,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07801_a1-optimized.cl b/OpenCL/m07801_a1-optimized.cl
index 565735a59..54392a2aa 100644
--- a/OpenCL/m07801_a1-optimized.cl
+++ b/OpenCL/m07801_a1-optimized.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -378,7 +378,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m07801_a3-optimized.cl b/OpenCL/m07801_a3-optimized.cl
index a1053a123..f23a77759 100644
--- a/OpenCL/m07801_a3-optimized.cl
+++ b/OpenCL/m07801_a3-optimized.cl
@@ -512,7 +512,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -565,7 +565,7 @@ KERNEL_FQ void m07801_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -622,7 +622,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -675,7 +675,7 @@ KERNEL_FQ void m07801_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl
index e20ce4f02..be239a997 100644
--- a/OpenCL/m07900-pure.cl
+++ b/OpenCL/m07900-pure.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m07900_init (KERN_ATTR_TMPS (drupal7_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t ctx;
 
@@ -58,7 +58,7 @@ KERNEL_FQ void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -212,7 +212,7 @@ KERNEL_FQ void m07900_comp (KERN_ATTR_TMPS (drupal7_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl
index b7cf6b94c..7ce0dd6e5 100644
--- a/OpenCL/m08000_a0-optimized.cl
+++ b/OpenCL/m08000_a0-optimized.cl
@@ -279,7 +279,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -450,7 +450,7 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08000_a1-optimized.cl b/OpenCL/m08000_a1-optimized.cl
index 4767fa0bc..447a5404d 100644
--- a/OpenCL/m08000_a1-optimized.cl
+++ b/OpenCL/m08000_a1-optimized.cl
@@ -277,7 +277,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -502,7 +502,7 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08000_a3-optimized.cl b/OpenCL/m08000_a3-optimized.cl
index 390e4d235..03d882737 100644
--- a/OpenCL/m08000_a3-optimized.cl
+++ b/OpenCL/m08000_a3-optimized.cl
@@ -274,7 +274,7 @@ DECLSPEC void m08000m (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -396,7 +396,7 @@ DECLSPEC void m08000s (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m08100_a0-optimized.cl b/OpenCL/m08100_a0-optimized.cl
index b89ded3e8..68f7d1823 100644
--- a/OpenCL/m08100_a0-optimized.cl
+++ b/OpenCL/m08100_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -242,7 +242,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m08100_a0-pure.cl b/OpenCL/m08100_a0-pure.cl
index babe4f199..7d309daa9 100644
--- a/OpenCL/m08100_a0-pure.cl
+++ b/OpenCL/m08100_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -77,7 +77,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08100_a1-optimized.cl b/OpenCL/m08100_a1-optimized.cl
index 5d4aa05be..30b101c98 100644
--- a/OpenCL/m08100_a1-optimized.cl
+++ b/OpenCL/m08100_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -311,7 +311,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m08100_a1-pure.cl b/OpenCL/m08100_a1-pure.cl
index a374c084e..fed0733a4 100644
--- a/OpenCL/m08100_a1-pure.cl
+++ b/OpenCL/m08100_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -72,7 +72,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08100_a3-optimized.cl b/OpenCL/m08100_a3-optimized.cl
index fb5e13805..9ae1e2357 100644
--- a/OpenCL/m08100_a3-optimized.cl
+++ b/OpenCL/m08100_a3-optimized.cl
@@ -365,7 +365,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -429,7 +429,7 @@ KERNEL_FQ void m08100_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -501,7 +501,7 @@ KERNEL_FQ void m08100_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -588,7 +588,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -652,7 +652,7 @@ KERNEL_FQ void m08100_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -724,7 +724,7 @@ KERNEL_FQ void m08100_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m08100_a3-pure.cl b/OpenCL/m08100_a3-pure.cl
index 8a2a8edc5..a64c84da8 100644
--- a/OpenCL/m08100_a3-pure.cl
+++ b/OpenCL/m08100_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -88,7 +88,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08200-pure.cl b/OpenCL/m08200-pure.cl
index cd1cc3b46..abdd82920 100644
--- a/OpenCL/m08200-pure.cl
+++ b/OpenCL/m08200-pure.cl
@@ -101,7 +101,7 @@ KERNEL_FQ void m08200_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -201,7 +201,7 @@ KERNEL_FQ void m08200_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -331,7 +331,7 @@ KERNEL_FQ void m08200_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m08300_a0-optimized.cl b/OpenCL/m08300_a0-optimized.cl
index 20cf16fa7..658285976 100644
--- a/OpenCL/m08300_a0-optimized.cl
+++ b/OpenCL/m08300_a0-optimized.cl
@@ -187,7 +187,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -479,7 +479,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m08300_a0-pure.cl b/OpenCL/m08300_a0-pure.cl
index 12bdc253e..b3dfb033b 100644
--- a/OpenCL/m08300_a0-pure.cl
+++ b/OpenCL/m08300_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -157,7 +157,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08300_a1-optimized.cl b/OpenCL/m08300_a1-optimized.cl
index a9da3e76e..12086616a 100644
--- a/OpenCL/m08300_a1-optimized.cl
+++ b/OpenCL/m08300_a1-optimized.cl
@@ -185,7 +185,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -537,7 +537,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m08300_a1-pure.cl b/OpenCL/m08300_a1-pure.cl
index a1632007a..6638bd2d2 100644
--- a/OpenCL/m08300_a1-pure.cl
+++ b/OpenCL/m08300_a1-pure.cl
@@ -59,7 +59,7 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -176,7 +176,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08300_a3-optimized.cl b/OpenCL/m08300_a3-optimized.cl
index d835c0454..1684b8424 100644
--- a/OpenCL/m08300_a3-optimized.cl
+++ b/OpenCL/m08300_a3-optimized.cl
@@ -665,7 +665,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -712,7 +712,7 @@ KERNEL_FQ void m08300_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -759,7 +759,7 @@ KERNEL_FQ void m08300_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -806,7 +806,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -853,7 +853,7 @@ KERNEL_FQ void m08300_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -900,7 +900,7 @@ KERNEL_FQ void m08300_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m08300_a3-pure.cl b/OpenCL/m08300_a3-pure.cl
index c70908391..ca74a6248 100644
--- a/OpenCL/m08300_a3-pure.cl
+++ b/OpenCL/m08300_a3-pure.cl
@@ -34,7 +34,7 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -207,7 +207,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08400_a0-optimized.cl b/OpenCL/m08400_a0-optimized.cl
index 87f826c4f..76b36f983 100644
--- a/OpenCL/m08400_a0-optimized.cl
+++ b/OpenCL/m08400_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -309,7 +309,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08400_a0-pure.cl b/OpenCL/m08400_a0-pure.cl
index a992894f4..27ca4f24a 100644
--- a/OpenCL/m08400_a0-pure.cl
+++ b/OpenCL/m08400_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -206,7 +206,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08400_a1-optimized.cl b/OpenCL/m08400_a1-optimized.cl
index c14f8cc27..e108600f4 100644
--- a/OpenCL/m08400_a1-optimized.cl
+++ b/OpenCL/m08400_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -365,7 +365,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08400_a1-pure.cl b/OpenCL/m08400_a1-pure.cl
index d95eb15f2..92dff113a 100644
--- a/OpenCL/m08400_a1-pure.cl
+++ b/OpenCL/m08400_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -202,7 +202,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08400_a3-optimized.cl b/OpenCL/m08400_a3-optimized.cl
index 21cabe9a2..f21559771 100644
--- a/OpenCL/m08400_a3-optimized.cl
+++ b/OpenCL/m08400_a3-optimized.cl
@@ -485,7 +485,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -555,7 +555,7 @@ KERNEL_FQ void m08400_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -625,7 +625,7 @@ KERNEL_FQ void m08400_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -695,7 +695,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -765,7 +765,7 @@ KERNEL_FQ void m08400_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -835,7 +835,7 @@ KERNEL_FQ void m08400_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08400_a3-pure.cl b/OpenCL/m08400_a3-pure.cl
index 12a2cbbc0..6764a1200 100644
--- a/OpenCL/m08400_a3-pure.cl
+++ b/OpenCL/m08400_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -219,7 +219,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m08500_a0-pure.cl b/OpenCL/m08500_a0-pure.cl
index b3aea26dc..922498175 100644
--- a/OpenCL/m08500_a0-pure.cl
+++ b/OpenCL/m08500_a0-pure.cl
@@ -562,7 +562,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -660,7 +660,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08500_a1-pure.cl b/OpenCL/m08500_a1-pure.cl
index ee662557e..49cf560c4 100644
--- a/OpenCL/m08500_a1-pure.cl
+++ b/OpenCL/m08500_a1-pure.cl
@@ -560,7 +560,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -716,7 +716,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08500_a3-pure.cl b/OpenCL/m08500_a3-pure.cl
index 24983357a..db7213bde 100644
--- a/OpenCL/m08500_a3-pure.cl
+++ b/OpenCL/m08500_a3-pure.cl
@@ -698,7 +698,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -772,7 +772,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08600_a0-pure.cl b/OpenCL/m08600_a0-pure.cl
index 78fb5bcf3..5af9afb3e 100644
--- a/OpenCL/m08600_a0-pure.cl
+++ b/OpenCL/m08600_a0-pure.cl
@@ -288,7 +288,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -352,7 +352,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08600_a1-pure.cl b/OpenCL/m08600_a1-pure.cl
index 60144e77e..699b4161d 100644
--- a/OpenCL/m08600_a1-pure.cl
+++ b/OpenCL/m08600_a1-pure.cl
@@ -286,7 +286,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -410,7 +410,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08600_a3-pure.cl b/OpenCL/m08600_a3-pure.cl
index e53c1329d..a5f88b9fe 100644
--- a/OpenCL/m08600_a3-pure.cl
+++ b/OpenCL/m08600_a3-pure.cl
@@ -391,7 +391,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -448,7 +448,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl
index 8b9a82f15..5a6ea71a8 100644
--- a/OpenCL/m08700_a0-optimized.cl
+++ b/OpenCL/m08700_a0-optimized.cl
@@ -336,7 +336,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -523,7 +523,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08700_a1-optimized.cl b/OpenCL/m08700_a1-optimized.cl
index 0090ea2bb..d7072d48e 100644
--- a/OpenCL/m08700_a1-optimized.cl
+++ b/OpenCL/m08700_a1-optimized.cl
@@ -334,7 +334,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -581,7 +581,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08700_a3-optimized.cl b/OpenCL/m08700_a3-optimized.cl
index 49d81f2ab..2bae5e906 100644
--- a/OpenCL/m08700_a3-optimized.cl
+++ b/OpenCL/m08700_a3-optimized.cl
@@ -613,7 +613,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -681,7 +681,7 @@ KERNEL_FQ void m08700_m08 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -749,7 +749,7 @@ KERNEL_FQ void m08700_m16 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -817,7 +817,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -885,7 +885,7 @@ KERNEL_FQ void m08700_s08 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -953,7 +953,7 @@ KERNEL_FQ void m08700_s16 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m08800-pure.cl b/OpenCL/m08800-pure.cl
index 39e466e2e..1d7883f7b 100644
--- a/OpenCL/m08800-pure.cl
+++ b/OpenCL/m08800-pure.cl
@@ -76,7 +76,7 @@ KERNEL_FQ void m08800_init (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -144,7 +144,7 @@ KERNEL_FQ void m08800_loop (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -282,7 +282,7 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
diff --git a/OpenCL/m08900-pure.cl b/OpenCL/m08900-pure.cl
index 6f9821b59..a37036596 100644
--- a/OpenCL/m08900-pure.cl
+++ b/OpenCL/m08900-pure.cl
@@ -254,7 +254,7 @@ KERNEL_FQ void m08900_init (KERN_ATTR_TMPS (scrypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -359,7 +359,7 @@ KERNEL_FQ void m08900_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // SCRYPT part, init V
 
@@ -386,7 +386,7 @@ KERNEL_FQ void m08900_loop (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf;
   GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf;
@@ -415,7 +415,7 @@ KERNEL_FQ void m08900_comp (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * 2nd pbkdf2, creates B
diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl
index 99f9206e3..2de7cf709 100644
--- a/OpenCL/m09000-pure.cl
+++ b/OpenCL/m09000-pure.cl
@@ -415,7 +415,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m09000_init (KERN_ATTR_TMPS
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -644,7 +644,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m09000_loop (KERN_ATTR_TMPS
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
@@ -713,7 +713,7 @@ KERNEL_FQ void m09000_comp (KERN_ATTR_TMPS (pwsafe2_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m09100-pure.cl b/OpenCL/m09100-pure.cl
index dd63b1226..aa535d32a 100644
--- a/OpenCL/m09100-pure.cl
+++ b/OpenCL/m09100-pure.cl
@@ -464,7 +464,7 @@ KERNEL_FQ void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -700,7 +700,7 @@ KERNEL_FQ void m09100_loop (KERN_ATTR_TMPS (lotus8_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -789,7 +789,7 @@ KERNEL_FQ void m09100_comp (KERN_ATTR_TMPS (lotus8_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m09400-pure.cl b/OpenCL/m09400-pure.cl
index 5634e5be4..6cbbc966d 100644
--- a/OpenCL/m09400-pure.cl
+++ b/OpenCL/m09400-pure.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m09400_init (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t ctx;
 
@@ -64,7 +64,7 @@ KERNEL_FQ void m09400_loop (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x t0 = packv (tmps, out, gid, 0);
   u32x t1 = packv (tmps, out, gid, 1);
@@ -184,7 +184,7 @@ KERNEL_FQ void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m09500-pure.cl b/OpenCL/m09500-pure.cl
index 45b8de2fa..6f81115ab 100644
--- a/OpenCL/m09500-pure.cl
+++ b/OpenCL/m09500-pure.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m09500_init (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t ctx;
 
@@ -62,7 +62,7 @@ KERNEL_FQ void m09500_loop (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x t0 = packv (tmps, out, gid, 0);
   u32x t1 = packv (tmps, out, gid, 1);
@@ -182,7 +182,7 @@ KERNEL_FQ void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m09600-pure.cl b/OpenCL/m09600-pure.cl
index 2e060ee13..7a5165f04 100644
--- a/OpenCL/m09600-pure.cl
+++ b/OpenCL/m09600-pure.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m09600_init (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t ctx;
 
@@ -65,7 +65,7 @@ KERNEL_FQ void m09600_loop (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x t0 = pack64v (tmps, out, gid, 0);
   u64x t1 = pack64v (tmps, out, gid, 1);
@@ -228,7 +228,7 @@ KERNEL_FQ void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl
index 94af53443..cc6885b73 100644
--- a/OpenCL/m09700_a0-optimized.cl
+++ b/OpenCL/m09700_a0-optimized.cl
@@ -385,7 +385,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -570,7 +570,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09700_a1-optimized.cl b/OpenCL/m09700_a1-optimized.cl
index 12f15b0de..fabdce758 100644
--- a/OpenCL/m09700_a1-optimized.cl
+++ b/OpenCL/m09700_a1-optimized.cl
@@ -383,7 +383,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -626,7 +626,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl
index 7e279556a..5fa96f1e6 100644
--- a/OpenCL/m09700_a3-optimized.cl
+++ b/OpenCL/m09700_a3-optimized.cl
@@ -842,7 +842,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -891,7 +891,7 @@ KERNEL_FQ void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -944,7 +944,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -993,7 +993,7 @@ KERNEL_FQ void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl
index 906b1705b..1aa1cc125 100644
--- a/OpenCL/m09710_a0-optimized.cl
+++ b/OpenCL/m09710_a0-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -177,7 +177,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09710_a1-optimized.cl b/OpenCL/m09710_a1-optimized.cl
index 29be7bf1f..b584085ce 100644
--- a/OpenCL/m09710_a1-optimized.cl
+++ b/OpenCL/m09710_a1-optimized.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -221,7 +221,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl
index ee3a1a894..a17705df3 100644
--- a/OpenCL/m09710_a3-optimized.cl
+++ b/OpenCL/m09710_a3-optimized.cl
@@ -251,7 +251,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -308,7 +308,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m09720_a0-optimized.cl b/OpenCL/m09720_a0-optimized.cl
index 30af93809..cb8e9e5bd 100644
--- a/OpenCL/m09720_a0-optimized.cl
+++ b/OpenCL/m09720_a0-optimized.cl
@@ -383,7 +383,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -489,7 +489,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09720_a1-optimized.cl b/OpenCL/m09720_a1-optimized.cl
index c6c5cfb2f..35d1b8fc9 100644
--- a/OpenCL/m09720_a1-optimized.cl
+++ b/OpenCL/m09720_a1-optimized.cl
@@ -381,7 +381,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -537,7 +537,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09720_a3-optimized.cl b/OpenCL/m09720_a3-optimized.cl
index 6d9a208b8..57d040927 100644
--- a/OpenCL/m09720_a3-optimized.cl
+++ b/OpenCL/m09720_a3-optimized.cl
@@ -567,7 +567,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -614,7 +614,7 @@ KERNEL_FQ void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -665,7 +665,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -712,7 +712,7 @@ KERNEL_FQ void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl
index 433c00be6..c260871b6 100644
--- a/OpenCL/m09800_a0-optimized.cl
+++ b/OpenCL/m09800_a0-optimized.cl
@@ -45,7 +45,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -331,7 +331,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09800_a1-optimized.cl b/OpenCL/m09800_a1-optimized.cl
index feb749ce9..ec7f36096 100644
--- a/OpenCL/m09800_a1-optimized.cl
+++ b/OpenCL/m09800_a1-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -379,7 +379,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09800_a3-optimized.cl b/OpenCL/m09800_a3-optimized.cl
index 38ee92f36..f99649743 100644
--- a/OpenCL/m09800_a3-optimized.cl
+++ b/OpenCL/m09800_a3-optimized.cl
@@ -545,7 +545,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -594,7 +594,7 @@ KERNEL_FQ void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -643,7 +643,7 @@ KERNEL_FQ void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -741,7 +741,7 @@ KERNEL_FQ void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -790,7 +790,7 @@ KERNEL_FQ void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl
index aa600cbba..7369aae25 100644
--- a/OpenCL/m09810_a0-optimized.cl
+++ b/OpenCL/m09810_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -166,7 +166,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09810_a1-optimized.cl b/OpenCL/m09810_a1-optimized.cl
index 0574ff551..49a2522d4 100644
--- a/OpenCL/m09810_a1-optimized.cl
+++ b/OpenCL/m09810_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -210,7 +210,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl
index 219c6dc50..2b8f64df2 100644
--- a/OpenCL/m09810_a3-optimized.cl
+++ b/OpenCL/m09810_a3-optimized.cl
@@ -223,7 +223,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -272,7 +272,7 @@ KERNEL_FQ void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -321,7 +321,7 @@ KERNEL_FQ void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -370,7 +370,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -419,7 +419,7 @@ KERNEL_FQ void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -468,7 +468,7 @@ KERNEL_FQ void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m09820_a0-optimized.cl b/OpenCL/m09820_a0-optimized.cl
index fdf23c445..6a1709a5d 100644
--- a/OpenCL/m09820_a0-optimized.cl
+++ b/OpenCL/m09820_a0-optimized.cl
@@ -45,7 +45,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -275,7 +275,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09820_a1-optimized.cl b/OpenCL/m09820_a1-optimized.cl
index 3c4ffefd7..d822d5240 100644
--- a/OpenCL/m09820_a1-optimized.cl
+++ b/OpenCL/m09820_a1-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -323,7 +323,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09820_a3-optimized.cl b/OpenCL/m09820_a3-optimized.cl
index e0cbd2e8d..eb6ebc6db 100644
--- a/OpenCL/m09820_a3-optimized.cl
+++ b/OpenCL/m09820_a3-optimized.cl
@@ -430,7 +430,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -479,7 +479,7 @@ KERNEL_FQ void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -577,7 +577,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -626,7 +626,7 @@ KERNEL_FQ void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -675,7 +675,7 @@ KERNEL_FQ void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m09900_a0-optimized.cl b/OpenCL/m09900_a0-optimized.cl
index 038386c3e..a568a0778 100644
--- a/OpenCL/m09900_a0-optimized.cl
+++ b/OpenCL/m09900_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -264,7 +264,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09900_a0-pure.cl b/OpenCL/m09900_a0-pure.cl
index ff9f8b5ab..6a86d754e 100644
--- a/OpenCL/m09900_a0-pure.cl
+++ b/OpenCL/m09900_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m09900_a1-optimized.cl b/OpenCL/m09900_a1-optimized.cl
index e73623114..d24c8cb4b 100644
--- a/OpenCL/m09900_a1-optimized.cl
+++ b/OpenCL/m09900_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -322,7 +322,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m09900_a1-pure.cl b/OpenCL/m09900_a1-pure.cl
index 2f318d0de..d8e1a8017 100644
--- a/OpenCL/m09900_a1-pure.cl
+++ b/OpenCL/m09900_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m09900_a3-optimized.cl b/OpenCL/m09900_a3-optimized.cl
index ee590609e..b2d61e269 100644
--- a/OpenCL/m09900_a3-optimized.cl
+++ b/OpenCL/m09900_a3-optimized.cl
@@ -599,7 +599,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -637,7 +637,7 @@ KERNEL_FQ void m09900_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -675,7 +675,7 @@ KERNEL_FQ void m09900_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -713,7 +713,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -751,7 +751,7 @@ KERNEL_FQ void m09900_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -789,7 +789,7 @@ KERNEL_FQ void m09900_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m09900_a3-pure.cl b/OpenCL/m09900_a3-pure.cl
index a535c248d..031a7b219 100644
--- a/OpenCL/m09900_a3-pure.cl
+++ b/OpenCL/m09900_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10100_a0-optimized.cl b/OpenCL/m10100_a0-optimized.cl
index 8e5c31e0e..51ea4ca2d 100644
--- a/OpenCL/m10100_a0-optimized.cl
+++ b/OpenCL/m10100_a0-optimized.cl
@@ -46,7 +46,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -173,7 +173,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10100_a1-optimized.cl b/OpenCL/m10100_a1-optimized.cl
index 60e2dc73b..5ade8a2a0 100644
--- a/OpenCL/m10100_a1-optimized.cl
+++ b/OpenCL/m10100_a1-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -231,7 +231,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10100_a3-optimized.cl b/OpenCL/m10100_a3-optimized.cl
index d1d0c92d0..2e15decdc 100644
--- a/OpenCL/m10100_a3-optimized.cl
+++ b/OpenCL/m10100_a3-optimized.cl
@@ -237,7 +237,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -275,7 +275,7 @@ KERNEL_FQ void m10100_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -313,7 +313,7 @@ KERNEL_FQ void m10100_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -351,7 +351,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -389,7 +389,7 @@ KERNEL_FQ void m10100_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -427,7 +427,7 @@ KERNEL_FQ void m10100_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10300-pure.cl b/OpenCL/m10300-pure.cl
index 33655b875..fbabd37a2 100644
--- a/OpenCL/m10300-pure.cl
+++ b/OpenCL/m10300-pure.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m10300_init (KERN_ATTR_TMPS (saph_sha1_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t ctx;
 
@@ -55,7 +55,7 @@ KERNEL_FQ void m10300_loop (KERN_ATTR_TMPS (saph_sha1_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -135,7 +135,7 @@ KERNEL_FQ void m10300_comp (KERN_ATTR_TMPS (saph_sha1_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl
index f36a9b400..036063b00 100644
--- a/OpenCL/m10400_a0-optimized.cl
+++ b/OpenCL/m10400_a0-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_RULES_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -243,7 +243,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_RULES_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10400_a1-optimized.cl b/OpenCL/m10400_a1-optimized.cl
index 5982efb32..aeb7c89ac 100644
--- a/OpenCL/m10400_a1-optimized.cl
+++ b/OpenCL/m10400_a1-optimized.cl
@@ -51,7 +51,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -301,7 +301,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl
index 8a13c1b73..c628be916 100644
--- a/OpenCL/m10400_a3-optimized.cl
+++ b/OpenCL/m10400_a3-optimized.cl
@@ -409,7 +409,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -458,7 +458,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -507,7 +507,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -556,7 +556,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -605,7 +605,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl
index 63c247133..2527a9049 100644
--- a/OpenCL/m10410_a0-optimized.cl
+++ b/OpenCL/m10410_a0-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_RULES_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -140,7 +140,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_RULES_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10410_a1-optimized.cl b/OpenCL/m10410_a1-optimized.cl
index 005c490b8..6bbcc9dfb 100644
--- a/OpenCL/m10410_a1-optimized.cl
+++ b/OpenCL/m10410_a1-optimized.cl
@@ -51,7 +51,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -207,7 +207,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl
index 978918a34..dbfca0ec8 100644
--- a/OpenCL/m10410_a3-optimized.cl
+++ b/OpenCL/m10410_a3-optimized.cl
@@ -163,7 +163,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -212,7 +212,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m08 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -261,7 +261,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m16 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -310,7 +310,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -359,7 +359,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s08 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -408,7 +408,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s16 (KERN_ATTR_ESALT
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl
index aabd85015..ad9f8ec69 100644
--- a/OpenCL/m10420_a0-optimized.cl
+++ b/OpenCL/m10420_a0-optimized.cl
@@ -63,7 +63,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -224,7 +224,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10420_a1-optimized.cl b/OpenCL/m10420_a1-optimized.cl
index 3c8c0f7ca..ccceb9501 100644
--- a/OpenCL/m10420_a1-optimized.cl
+++ b/OpenCL/m10420_a1-optimized.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -282,7 +282,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10420_a3-optimized.cl b/OpenCL/m10420_a3-optimized.cl
index 8ea9798af..042da84ed 100644
--- a/OpenCL/m10420_a3-optimized.cl
+++ b/OpenCL/m10420_a3-optimized.cl
@@ -373,7 +373,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -420,7 +420,7 @@ KERNEL_FQ void m10420_m08 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -467,7 +467,7 @@ KERNEL_FQ void m10420_m16 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -514,7 +514,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -561,7 +561,7 @@ KERNEL_FQ void m10420_s08 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -608,7 +608,7 @@ KERNEL_FQ void m10420_s16 (KERN_ATTR_ESALT (pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl
index b3cf7bd7a..4140f5bb0 100644
--- a/OpenCL/m10500-pure.cl
+++ b/OpenCL/m10500-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
   const u64 gid = get_global_id (0);
   //const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -239,7 +239,7 @@ KERNEL_FQ void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * shared
@@ -339,7 +339,7 @@ KERNEL_FQ void m10500_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl
index c8f873b8f..e404bd8e1 100644
--- a/OpenCL/m10700-optimized.cl
+++ b/OpenCL/m10700-optimized.cl
@@ -577,7 +577,7 @@ KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t ctx;
 
@@ -640,7 +640,7 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -711,7 +711,7 @@ KERNEL_FQ void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m10700-pure.cl b/OpenCL/m10700-pure.cl
index e920d5f7d..1dd114b7b 100644
--- a/OpenCL/m10700-pure.cl
+++ b/OpenCL/m10700-pure.cl
@@ -1173,7 +1173,7 @@ KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t ctx;
 
@@ -1248,7 +1248,7 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1297,7 +1297,7 @@ KERNEL_FQ void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl
index d0f667acc..6bd14d5fb 100644
--- a/OpenCL/m10800_a0-optimized.cl
+++ b/OpenCL/m10800_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -237,7 +237,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10800_a0-pure.cl b/OpenCL/m10800_a0-pure.cl
index 963190d4e..5167e059b 100644
--- a/OpenCL/m10800_a0-pure.cl
+++ b/OpenCL/m10800_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10800_a1-optimized.cl b/OpenCL/m10800_a1-optimized.cl
index 3f25247ef..2444cee81 100644
--- a/OpenCL/m10800_a1-optimized.cl
+++ b/OpenCL/m10800_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -293,7 +293,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10800_a1-pure.cl b/OpenCL/m10800_a1-pure.cl
index 016556d81..ae952b308 100644
--- a/OpenCL/m10800_a1-pure.cl
+++ b/OpenCL/m10800_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10800_a3-optimized.cl b/OpenCL/m10800_a3-optimized.cl
index 8f0d9af4f..17762da6c 100644
--- a/OpenCL/m10800_a3-optimized.cl
+++ b/OpenCL/m10800_a3-optimized.cl
@@ -270,7 +270,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -308,7 +308,7 @@ KERNEL_FQ void m10800_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -346,7 +346,7 @@ KERNEL_FQ void m10800_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -384,7 +384,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -422,7 +422,7 @@ KERNEL_FQ void m10800_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -460,7 +460,7 @@ KERNEL_FQ void m10800_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10800_a3-pure.cl b/OpenCL/m10800_a3-pure.cl
index b67ef2916..5064b9f7c 100644
--- a/OpenCL/m10800_a3-pure.cl
+++ b/OpenCL/m10800_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10810_a0-optimized.cl b/OpenCL/m10810_a0-optimized.cl
index d4f159fcd..9d1c38642 100644
--- a/OpenCL/m10810_a0-optimized.cl
+++ b/OpenCL/m10810_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -310,7 +310,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10810_a0-pure.cl b/OpenCL/m10810_a0-pure.cl
index 07a8aaa87..af9445728 100644
--- a/OpenCL/m10810_a0-pure.cl
+++ b/OpenCL/m10810_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10810_a1-optimized.cl b/OpenCL/m10810_a1-optimized.cl
index 2c95ed439..22a4378ef 100644
--- a/OpenCL/m10810_a1-optimized.cl
+++ b/OpenCL/m10810_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -368,7 +368,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10810_a1-pure.cl b/OpenCL/m10810_a1-pure.cl
index b9cba988b..4dc12da20 100644
--- a/OpenCL/m10810_a1-pure.cl
+++ b/OpenCL/m10810_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10810_a3-optimized.cl b/OpenCL/m10810_a3-optimized.cl
index 2a351a4bc..f56ac5ea9 100644
--- a/OpenCL/m10810_a3-optimized.cl
+++ b/OpenCL/m10810_a3-optimized.cl
@@ -321,7 +321,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -359,7 +359,7 @@ KERNEL_FQ void m10810_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -397,7 +397,7 @@ KERNEL_FQ void m10810_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -435,7 +435,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -473,7 +473,7 @@ KERNEL_FQ void m10810_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -511,7 +511,7 @@ KERNEL_FQ void m10810_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10810_a3-pure.cl b/OpenCL/m10810_a3-pure.cl
index e3d7587e6..5c7d1d23c 100644
--- a/OpenCL/m10810_a3-pure.cl
+++ b/OpenCL/m10810_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10820_a0-optimized.cl b/OpenCL/m10820_a0-optimized.cl
index b26180939..9f8773f28 100644
--- a/OpenCL/m10820_a0-optimized.cl
+++ b/OpenCL/m10820_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -290,7 +290,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10820_a0-pure.cl b/OpenCL/m10820_a0-pure.cl
index c1c1cbab6..ea00b30b0 100644
--- a/OpenCL/m10820_a0-pure.cl
+++ b/OpenCL/m10820_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10820_a1-optimized.cl b/OpenCL/m10820_a1-optimized.cl
index 8deb991ef..45852faf3 100644
--- a/OpenCL/m10820_a1-optimized.cl
+++ b/OpenCL/m10820_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -346,7 +346,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10820_a1-pure.cl b/OpenCL/m10820_a1-pure.cl
index 7c403a63c..31b5eb906 100644
--- a/OpenCL/m10820_a1-pure.cl
+++ b/OpenCL/m10820_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10820_a3-optimized.cl b/OpenCL/m10820_a3-optimized.cl
index 232bcdd75..0a81eae31 100644
--- a/OpenCL/m10820_a3-optimized.cl
+++ b/OpenCL/m10820_a3-optimized.cl
@@ -376,7 +376,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -414,7 +414,7 @@ KERNEL_FQ void m10820_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -452,7 +452,7 @@ KERNEL_FQ void m10820_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -490,7 +490,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m10820_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -566,7 +566,7 @@ KERNEL_FQ void m10820_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10820_a3-pure.cl b/OpenCL/m10820_a3-pure.cl
index c3ca0cd45..311fd7f7d 100644
--- a/OpenCL/m10820_a3-pure.cl
+++ b/OpenCL/m10820_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10830_a0-optimized.cl b/OpenCL/m10830_a0-optimized.cl
index e75998582..381ad2e47 100644
--- a/OpenCL/m10830_a0-optimized.cl
+++ b/OpenCL/m10830_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -315,7 +315,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10830_a0-pure.cl b/OpenCL/m10830_a0-pure.cl
index 8e92686dc..3dafa17e9 100644
--- a/OpenCL/m10830_a0-pure.cl
+++ b/OpenCL/m10830_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10830_a1-optimized.cl b/OpenCL/m10830_a1-optimized.cl
index 386b1565d..069b12970 100644
--- a/OpenCL/m10830_a1-optimized.cl
+++ b/OpenCL/m10830_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -373,7 +373,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10830_a1-pure.cl b/OpenCL/m10830_a1-pure.cl
index 6add81237..7aad9a262 100644
--- a/OpenCL/m10830_a1-pure.cl
+++ b/OpenCL/m10830_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10830_a3-optimized.cl b/OpenCL/m10830_a3-optimized.cl
index 4bdee9039..43f2376fe 100644
--- a/OpenCL/m10830_a3-optimized.cl
+++ b/OpenCL/m10830_a3-optimized.cl
@@ -321,7 +321,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -359,7 +359,7 @@ KERNEL_FQ void m10830_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -397,7 +397,7 @@ KERNEL_FQ void m10830_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -435,7 +435,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -473,7 +473,7 @@ KERNEL_FQ void m10830_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -511,7 +511,7 @@ KERNEL_FQ void m10830_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10830_a3-pure.cl b/OpenCL/m10830_a3-pure.cl
index 226796a91..c7043fd0d 100644
--- a/OpenCL/m10830_a3-pure.cl
+++ b/OpenCL/m10830_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10840_a0-optimized.cl b/OpenCL/m10840_a0-optimized.cl
index 323364729..22479c271 100644
--- a/OpenCL/m10840_a0-optimized.cl
+++ b/OpenCL/m10840_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -295,7 +295,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10840_a0-pure.cl b/OpenCL/m10840_a0-pure.cl
index 8fd60c2e4..928737886 100644
--- a/OpenCL/m10840_a0-pure.cl
+++ b/OpenCL/m10840_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10840_a1-optimized.cl b/OpenCL/m10840_a1-optimized.cl
index 091250ba5..99f8c27e1 100644
--- a/OpenCL/m10840_a1-optimized.cl
+++ b/OpenCL/m10840_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -351,7 +351,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10840_a1-pure.cl b/OpenCL/m10840_a1-pure.cl
index 82a6c0152..231f6d964 100644
--- a/OpenCL/m10840_a1-pure.cl
+++ b/OpenCL/m10840_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10840_a3-optimized.cl b/OpenCL/m10840_a3-optimized.cl
index 0bfe720b9..0a2970c74 100644
--- a/OpenCL/m10840_a3-optimized.cl
+++ b/OpenCL/m10840_a3-optimized.cl
@@ -376,7 +376,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -414,7 +414,7 @@ KERNEL_FQ void m10840_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -452,7 +452,7 @@ KERNEL_FQ void m10840_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -490,7 +490,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -528,7 +528,7 @@ KERNEL_FQ void m10840_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -566,7 +566,7 @@ KERNEL_FQ void m10840_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10840_a3-pure.cl b/OpenCL/m10840_a3-pure.cl
index 4fc3612a4..a324c46ed 100644
--- a/OpenCL/m10840_a3-pure.cl
+++ b/OpenCL/m10840_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10870_a0-optimized.cl b/OpenCL/m10870_a0-optimized.cl
index 08982fcf0..e67988d3e 100644
--- a/OpenCL/m10870_a0-optimized.cl
+++ b/OpenCL/m10870_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -242,7 +242,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10870_a0-pure.cl b/OpenCL/m10870_a0-pure.cl
index 2eb1783d5..da7c05e73 100644
--- a/OpenCL/m10870_a0-pure.cl
+++ b/OpenCL/m10870_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -69,7 +69,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10870_a1-optimized.cl b/OpenCL/m10870_a1-optimized.cl
index 632300f6a..9524736d2 100644
--- a/OpenCL/m10870_a1-optimized.cl
+++ b/OpenCL/m10870_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -298,7 +298,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m10870_a1-pure.cl b/OpenCL/m10870_a1-pure.cl
index 0c1eaabd1..13471e9db 100644
--- a/OpenCL/m10870_a1-pure.cl
+++ b/OpenCL/m10870_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -65,7 +65,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10870_a3-optimized.cl b/OpenCL/m10870_a3-optimized.cl
index 4a2110609..5df134b4d 100644
--- a/OpenCL/m10870_a3-optimized.cl
+++ b/OpenCL/m10870_a3-optimized.cl
@@ -270,7 +270,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -308,7 +308,7 @@ KERNEL_FQ void m10870_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -346,7 +346,7 @@ KERNEL_FQ void m10870_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -384,7 +384,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -422,7 +422,7 @@ KERNEL_FQ void m10870_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -460,7 +460,7 @@ KERNEL_FQ void m10870_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m10870_a3-pure.cl b/OpenCL/m10870_a3-pure.cl
index 9af9c944b..1df19574a 100644
--- a/OpenCL/m10870_a3-pure.cl
+++ b/OpenCL/m10870_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m10900-pure.cl b/OpenCL/m10900-pure.cl
index 58917378d..154d7573f 100644
--- a/OpenCL/m10900-pure.cl
+++ b/OpenCL/m10900-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m10900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -163,7 +163,7 @@ KERNEL_FQ void m10900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -273,7 +273,7 @@ KERNEL_FQ void m10900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m11000_a0-optimized.cl b/OpenCL/m11000_a0-optimized.cl
index 5d44fc36c..78e05b214 100644
--- a/OpenCL/m11000_a0-optimized.cl
+++ b/OpenCL/m11000_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -327,7 +327,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m11000_a0-pure.cl b/OpenCL/m11000_a0-pure.cl
index e3bf6cf18..4058fe057 100644
--- a/OpenCL/m11000_a0-pure.cl
+++ b/OpenCL/m11000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11000_a1-optimized.cl b/OpenCL/m11000_a1-optimized.cl
index e2c6a392d..8a1162fbc 100644
--- a/OpenCL/m11000_a1-optimized.cl
+++ b/OpenCL/m11000_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -383,7 +383,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m11000_a1-pure.cl b/OpenCL/m11000_a1-pure.cl
index 4eb92bca5..aa9710afe 100644
--- a/OpenCL/m11000_a1-pure.cl
+++ b/OpenCL/m11000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11000_a3-optimized.cl b/OpenCL/m11000_a3-optimized.cl
index 9207556e5..231bf87a4 100644
--- a/OpenCL/m11000_a3-optimized.cl
+++ b/OpenCL/m11000_a3-optimized.cl
@@ -564,7 +564,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -611,7 +611,7 @@ KERNEL_FQ void m11000_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -658,7 +658,7 @@ KERNEL_FQ void m11000_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -705,7 +705,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -752,7 +752,7 @@ KERNEL_FQ void m11000_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -799,7 +799,7 @@ KERNEL_FQ void m11000_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m11000_a3-pure.cl b/OpenCL/m11000_a3-pure.cl
index 3f630fb02..b36d8f253 100644
--- a/OpenCL/m11000_a3-pure.cl
+++ b/OpenCL/m11000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11100_a0-optimized.cl b/OpenCL/m11100_a0-optimized.cl
index 78ce891d6..30493e584 100644
--- a/OpenCL/m11100_a0-optimized.cl
+++ b/OpenCL/m11100_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -389,7 +389,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11100_a0-pure.cl b/OpenCL/m11100_a0-pure.cl
index 06710ebc2..38e56b933 100644
--- a/OpenCL/m11100_a0-pure.cl
+++ b/OpenCL/m11100_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -201,7 +201,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11100_a1-optimized.cl b/OpenCL/m11100_a1-optimized.cl
index dcc4bf264..1d8fa4455 100644
--- a/OpenCL/m11100_a1-optimized.cl
+++ b/OpenCL/m11100_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -447,7 +447,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11100_a1-pure.cl b/OpenCL/m11100_a1-pure.cl
index 041924b62..74ce17491 100644
--- a/OpenCL/m11100_a1-pure.cl
+++ b/OpenCL/m11100_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -197,7 +197,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11100_a3-optimized.cl b/OpenCL/m11100_a3-optimized.cl
index cf7af1b30..dcf88457b 100644
--- a/OpenCL/m11100_a3-optimized.cl
+++ b/OpenCL/m11100_a3-optimized.cl
@@ -678,7 +678,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -748,7 +748,7 @@ KERNEL_FQ void m11100_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -818,7 +818,7 @@ KERNEL_FQ void m11100_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -888,7 +888,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -958,7 +958,7 @@ KERNEL_FQ void m11100_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1028,7 +1028,7 @@ KERNEL_FQ void m11100_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m11100_a3-pure.cl b/OpenCL/m11100_a3-pure.cl
index 852e46492..bcff7affe 100644
--- a/OpenCL/m11100_a3-pure.cl
+++ b/OpenCL/m11100_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -240,7 +240,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11200_a0-optimized.cl b/OpenCL/m11200_a0-optimized.cl
index baab5f44f..bbfd6fc06 100644
--- a/OpenCL/m11200_a0-optimized.cl
+++ b/OpenCL/m11200_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -492,7 +492,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m11200_a0-pure.cl b/OpenCL/m11200_a0-pure.cl
index bc3c5df28..134e939c9 100644
--- a/OpenCL/m11200_a0-pure.cl
+++ b/OpenCL/m11200_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -141,7 +141,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11200_a1-optimized.cl b/OpenCL/m11200_a1-optimized.cl
index ce863c119..6c7cfcb5f 100644
--- a/OpenCL/m11200_a1-optimized.cl
+++ b/OpenCL/m11200_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -548,7 +548,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m11200_a1-pure.cl b/OpenCL/m11200_a1-pure.cl
index 1e78457a9..ae3367ab3 100644
--- a/OpenCL/m11200_a1-pure.cl
+++ b/OpenCL/m11200_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -137,7 +137,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11200_a3-optimized.cl b/OpenCL/m11200_a3-optimized.cl
index 183ae1f46..59dd089fb 100644
--- a/OpenCL/m11200_a3-optimized.cl
+++ b/OpenCL/m11200_a3-optimized.cl
@@ -894,7 +894,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -945,7 +945,7 @@ KERNEL_FQ void m11200_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -996,7 +996,7 @@ KERNEL_FQ void m11200_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1047,7 +1047,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1098,7 +1098,7 @@ KERNEL_FQ void m11200_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1149,7 +1149,7 @@ KERNEL_FQ void m11200_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m11200_a3-pure.cl b/OpenCL/m11200_a3-pure.cl
index 1de719b9e..538281f9b 100644
--- a/OpenCL/m11200_a3-pure.cl
+++ b/OpenCL/m11200_a3-pure.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -164,7 +164,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11300-pure.cl b/OpenCL/m11300-pure.cl
index 8868bf057..4d995150c 100644
--- a/OpenCL/m11300-pure.cl
+++ b/OpenCL/m11300-pure.cl
@@ -97,7 +97,7 @@ KERNEL_FQ void m11300_init (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t ctx;
 
@@ -123,7 +123,7 @@ KERNEL_FQ void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x t0 = pack64v (tmps, dgst, gid, 0);
   u64x t1 = pack64v (tmps, dgst, gid, 1);
@@ -268,7 +268,7 @@ KERNEL_FQ void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * real code
diff --git a/OpenCL/m11400_a0-pure.cl b/OpenCL/m11400_a0-pure.cl
index 2a0ca2343..d6115d1cd 100644
--- a/OpenCL/m11400_a0-pure.cl
+++ b/OpenCL/m11400_a0-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -163,7 +163,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11400_a1-pure.cl b/OpenCL/m11400_a1-pure.cl
index 7b2a15143..dcc8ef445 100644
--- a/OpenCL/m11400_a1-pure.cl
+++ b/OpenCL/m11400_a1-pure.cl
@@ -63,7 +63,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_ESALT (sip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -157,7 +157,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11400_a3-pure.cl b/OpenCL/m11400_a3-pure.cl
index ea6b11da1..e2ca7f4de 100644
--- a/OpenCL/m11400_a3-pure.cl
+++ b/OpenCL/m11400_a3-pure.cl
@@ -63,7 +63,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -183,7 +183,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl
index b4f255cf6..b45f16866 100644
--- a/OpenCL/m11500_a0-optimized.cl
+++ b/OpenCL/m11500_a0-optimized.cl
@@ -149,7 +149,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -237,7 +237,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m11500_a1-optimized.cl b/OpenCL/m11500_a1-optimized.cl
index 0f0f492b1..f18f5e819 100644
--- a/OpenCL/m11500_a1-optimized.cl
+++ b/OpenCL/m11500_a1-optimized.cl
@@ -147,7 +147,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -295,7 +295,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m11500_a3-optimized.cl b/OpenCL/m11500_a3-optimized.cl
index 380bdb4d6..a732c3d6c 100644
--- a/OpenCL/m11500_a3-optimized.cl
+++ b/OpenCL/m11500_a3-optimized.cl
@@ -269,7 +269,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -307,7 +307,7 @@ KERNEL_FQ void m11500_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -345,7 +345,7 @@ KERNEL_FQ void m11500_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -383,7 +383,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -421,7 +421,7 @@ KERNEL_FQ void m11500_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -459,7 +459,7 @@ KERNEL_FQ void m11500_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m11600-optimized.cl b/OpenCL/m11600-optimized.cl
index 0fdf30a40..81a727d07 100644
--- a/OpenCL/m11600-optimized.cl
+++ b/OpenCL/m11600-optimized.cl
@@ -48,7 +48,7 @@ KERNEL_FQ void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].h[0] = SHA256M_A;
   tmps[gid].h[1] = SHA256M_B;
@@ -66,7 +66,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf[5];
 
@@ -182,7 +182,7 @@ KERNEL_FQ void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_h
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * context load
@@ -241,7 +241,7 @@ KERNEL_FQ void m11600_comp (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (hooks[gid].hook_success == 1)
   {
diff --git a/OpenCL/m11600-pure.cl b/OpenCL/m11600-pure.cl
index 05022d7e5..7ec3af56b 100644
--- a/OpenCL/m11600-pure.cl
+++ b/OpenCL/m11600-pure.cl
@@ -148,7 +148,7 @@ KERNEL_FQ void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * context save
@@ -195,7 +195,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pw_len = pws[gid].pw_len;
 
@@ -290,7 +290,7 @@ KERNEL_FQ void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_h
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * context load
@@ -349,7 +349,7 @@ KERNEL_FQ void m11600_comp (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (hooks[gid].hook_success == 1)
   {
diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl
index 560a4f77a..b249c7238 100644
--- a/OpenCL/m11700_a0-optimized.cl
+++ b/OpenCL/m11700_a0-optimized.cl
@@ -117,7 +117,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -275,7 +275,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11700_a0-pure.cl b/OpenCL/m11700_a0-pure.cl
index 10d260695..e1303b305 100644
--- a/OpenCL/m11700_a0-pure.cl
+++ b/OpenCL/m11700_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -127,7 +127,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11700_a1-optimized.cl b/OpenCL/m11700_a1-optimized.cl
index 2344544cd..a59d36640 100644
--- a/OpenCL/m11700_a1-optimized.cl
+++ b/OpenCL/m11700_a1-optimized.cl
@@ -115,7 +115,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -331,7 +331,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11700_a1-pure.cl b/OpenCL/m11700_a1-pure.cl
index ae3d2ace1..ca12322fb 100644
--- a/OpenCL/m11700_a1-pure.cl
+++ b/OpenCL/m11700_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -123,7 +123,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11700_a3-optimized.cl b/OpenCL/m11700_a3-optimized.cl
index c63df3b8e..ba2cb1294 100644
--- a/OpenCL/m11700_a3-optimized.cl
+++ b/OpenCL/m11700_a3-optimized.cl
@@ -284,7 +284,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -348,7 +348,7 @@ KERNEL_FQ void m11700_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -412,7 +412,7 @@ KERNEL_FQ void m11700_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -476,7 +476,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -540,7 +540,7 @@ KERNEL_FQ void m11700_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -604,7 +604,7 @@ KERNEL_FQ void m11700_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11700_a3-pure.cl b/OpenCL/m11700_a3-pure.cl
index 308c1d78d..9edb81ade 100644
--- a/OpenCL/m11700_a3-pure.cl
+++ b/OpenCL/m11700_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -136,7 +136,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11750_a0-pure.cl b/OpenCL/m11750_a0-pure.cl
index 67508a5d1..5382223ec 100644
--- a/OpenCL/m11750_a0-pure.cl
+++ b/OpenCL/m11750_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -136,7 +136,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11750_a1-pure.cl b/OpenCL/m11750_a1-pure.cl
index 621f46f25..580db366a 100644
--- a/OpenCL/m11750_a1-pure.cl
+++ b/OpenCL/m11750_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -159,7 +159,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11750_a3-pure.cl b/OpenCL/m11750_a3-pure.cl
index 808a918e8..3d274a15b 100644
--- a/OpenCL/m11750_a3-pure.cl
+++ b/OpenCL/m11750_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -145,7 +145,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11760_a0-pure.cl b/OpenCL/m11760_a0-pure.cl
index 4302f3d2b..982ebf204 100644
--- a/OpenCL/m11760_a0-pure.cl
+++ b/OpenCL/m11760_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -138,7 +138,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11760_a1-pure.cl b/OpenCL/m11760_a1-pure.cl
index 1e3e51926..73a14b9f1 100644
--- a/OpenCL/m11760_a1-pure.cl
+++ b/OpenCL/m11760_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -161,7 +161,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11760_a3-pure.cl b/OpenCL/m11760_a3-pure.cl
index cf4033f63..2e7e7c216 100644
--- a/OpenCL/m11760_a3-pure.cl
+++ b/OpenCL/m11760_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -147,7 +147,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl
index 6ec34e561..225f3d2b4 100644
--- a/OpenCL/m11800_a0-optimized.cl
+++ b/OpenCL/m11800_a0-optimized.cl
@@ -117,7 +117,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -275,7 +275,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11800_a0-pure.cl b/OpenCL/m11800_a0-pure.cl
index e881f0bff..e5396184a 100644
--- a/OpenCL/m11800_a0-pure.cl
+++ b/OpenCL/m11800_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -127,7 +127,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11800_a1-optimized.cl b/OpenCL/m11800_a1-optimized.cl
index ab94377ba..36078702f 100644
--- a/OpenCL/m11800_a1-optimized.cl
+++ b/OpenCL/m11800_a1-optimized.cl
@@ -115,7 +115,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -331,7 +331,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11800_a1-pure.cl b/OpenCL/m11800_a1-pure.cl
index c3536fe88..f0e72ee9f 100644
--- a/OpenCL/m11800_a1-pure.cl
+++ b/OpenCL/m11800_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -123,7 +123,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11800_a3-optimized.cl b/OpenCL/m11800_a3-optimized.cl
index a84cff195..6aead8978 100644
--- a/OpenCL/m11800_a3-optimized.cl
+++ b/OpenCL/m11800_a3-optimized.cl
@@ -284,7 +284,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -348,7 +348,7 @@ KERNEL_FQ void m11800_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -412,7 +412,7 @@ KERNEL_FQ void m11800_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -476,7 +476,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -540,7 +540,7 @@ KERNEL_FQ void m11800_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -604,7 +604,7 @@ KERNEL_FQ void m11800_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m11800_a3-pure.cl b/OpenCL/m11800_a3-pure.cl
index 139534859..6fb8c4def 100644
--- a/OpenCL/m11800_a3-pure.cl
+++ b/OpenCL/m11800_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -136,7 +136,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11850_a0-pure.cl b/OpenCL/m11850_a0-pure.cl
index bac9e9850..a23082c72 100644
--- a/OpenCL/m11850_a0-pure.cl
+++ b/OpenCL/m11850_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -136,7 +136,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11850_a1-pure.cl b/OpenCL/m11850_a1-pure.cl
index ab3e39343..a650278e6 100644
--- a/OpenCL/m11850_a1-pure.cl
+++ b/OpenCL/m11850_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -159,7 +159,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11850_a3-pure.cl b/OpenCL/m11850_a3-pure.cl
index ef375e832..35e3510c6 100644
--- a/OpenCL/m11850_a3-pure.cl
+++ b/OpenCL/m11850_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -145,7 +145,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11860_a0-pure.cl b/OpenCL/m11860_a0-pure.cl
index 5bdaab01c..76348136d 100644
--- a/OpenCL/m11860_a0-pure.cl
+++ b/OpenCL/m11860_a0-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -138,7 +138,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11860_a1-pure.cl b/OpenCL/m11860_a1-pure.cl
index d7ff33c36..c11a5c745 100644
--- a/OpenCL/m11860_a1-pure.cl
+++ b/OpenCL/m11860_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -161,7 +161,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11860_a3-pure.cl b/OpenCL/m11860_a3-pure.cl
index bdb20ec48..5e0dbc785 100644
--- a/OpenCL/m11860_a3-pure.cl
+++ b/OpenCL/m11860_a3-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -147,7 +147,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m11900-pure.cl b/OpenCL/m11900-pure.cl
index fb2fae2c6..3c7956cf3 100644
--- a/OpenCL/m11900-pure.cl
+++ b/OpenCL/m11900-pure.cl
@@ -75,7 +75,7 @@ KERNEL_FQ void m11900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   md5_hmac_ctx_t md5_hmac_ctx;
 
@@ -139,7 +139,7 @@ KERNEL_FQ void m11900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[4];
   u32x opad[4];
@@ -221,7 +221,7 @@ KERNEL_FQ void m11900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m12000-pure.cl b/OpenCL/m12000-pure.cl
index 741cc95f2..69de1e709 100644
--- a/OpenCL/m12000-pure.cl
+++ b/OpenCL/m12000-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m12000_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -145,7 +145,7 @@ KERNEL_FQ void m12000_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -234,7 +234,7 @@ KERNEL_FQ void m12000_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m12200-pure.cl b/OpenCL/m12200-pure.cl
index d99e0a67c..8afbf8a58 100644
--- a/OpenCL/m12200-pure.cl
+++ b/OpenCL/m12200-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m12200_init (KERN_ATTR_TMPS (ecryptfs_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t ctx;
 
@@ -57,7 +57,7 @@ KERNEL_FQ void m12200_loop (KERN_ATTR_TMPS (ecryptfs_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x t0 = pack64v (tmps, out, gid, 0);
   u64x t1 = pack64v (tmps, out, gid, 1);
@@ -170,7 +170,7 @@ KERNEL_FQ void m12200_comp (KERN_ATTR_TMPS (ecryptfs_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m12300-pure.cl b/OpenCL/m12300-pure.cl
index 5971c6d45..38c1a0c83 100644
--- a/OpenCL/m12300-pure.cl
+++ b/OpenCL/m12300-pure.cl
@@ -93,7 +93,7 @@ KERNEL_FQ void m12300_init (KERN_ATTR_TMPS (oraclet_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -228,7 +228,7 @@ KERNEL_FQ void m12300_loop (KERN_ATTR_TMPS (oraclet_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -358,7 +358,7 @@ KERNEL_FQ void m12300_comp (KERN_ATTR_TMPS (oraclet_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl
index e328cbdd9..9f656ded8 100644
--- a/OpenCL/m12400-pure.cl
+++ b/OpenCL/m12400-pure.cl
@@ -537,7 +537,7 @@ KERNEL_FQ void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * word
@@ -673,7 +673,7 @@ KERNEL_FQ void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -738,7 +738,7 @@ KERNEL_FQ void m12400_comp (KERN_ATTR_TMPS (bsdicrypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m12500-optimized.cl b/OpenCL/m12500-optimized.cl
index 692a2c285..2e10557e5 100644
--- a/OpenCL/m12500-optimized.cl
+++ b/OpenCL/m12500-optimized.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].dgst[0][0] = SHA1M_A;
   tmps[gid].dgst[0][1] = SHA1M_B;
@@ -52,7 +52,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf[10];
 
@@ -294,7 +294,7 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl
index 402384531..d09f151f7 100644
--- a/OpenCL/m12500-pure.cl
+++ b/OpenCL/m12500-pure.cl
@@ -736,7 +736,7 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].dgst[0] = SHA1M_A;
   tmps[gid].dgst[1] = SHA1M_B;
@@ -798,7 +798,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -964,7 +964,7 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m12600_a0-optimized.cl b/OpenCL/m12600_a0-optimized.cl
index 9031b842c..2b94a305d 100644
--- a/OpenCL/m12600_a0-optimized.cl
+++ b/OpenCL/m12600_a0-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -396,7 +396,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m12600_a0-pure.cl b/OpenCL/m12600_a0-pure.cl
index d6b97da2c..f0d4b325c 100644
--- a/OpenCL/m12600_a0-pure.cl
+++ b/OpenCL/m12600_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -192,7 +192,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m12600_a1-optimized.cl b/OpenCL/m12600_a1-optimized.cl
index bb64693d2..f52185dbe 100644
--- a/OpenCL/m12600_a1-optimized.cl
+++ b/OpenCL/m12600_a1-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -452,7 +452,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m12600_a1-pure.cl b/OpenCL/m12600_a1-pure.cl
index cfdd72fed..70640b9ac 100644
--- a/OpenCL/m12600_a1-pure.cl
+++ b/OpenCL/m12600_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -188,7 +188,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m12600_a3-optimized.cl b/OpenCL/m12600_a3-optimized.cl
index 65807a720..d46794785 100644
--- a/OpenCL/m12600_a3-optimized.cl
+++ b/OpenCL/m12600_a3-optimized.cl
@@ -651,7 +651,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -721,7 +721,7 @@ KERNEL_FQ void m12600_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -791,7 +791,7 @@ KERNEL_FQ void m12600_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -861,7 +861,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -931,7 +931,7 @@ KERNEL_FQ void m12600_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1001,7 +1001,7 @@ KERNEL_FQ void m12600_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m12600_a3-pure.cl b/OpenCL/m12600_a3-pure.cl
index fa6b4fbb7..46051f5e5 100644
--- a/OpenCL/m12600_a3-pure.cl
+++ b/OpenCL/m12600_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -201,7 +201,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m12700-pure.cl b/OpenCL/m12700-pure.cl
index 8dd14019f..f413b8589 100644
--- a/OpenCL/m12700-pure.cl
+++ b/OpenCL/m12700-pure.cl
@@ -86,7 +86,7 @@ KERNEL_FQ void m12700_init (KERN_ATTR_TMPS (mywallet_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -171,7 +171,7 @@ KERNEL_FQ void m12700_loop (KERN_ATTR_TMPS (mywallet_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -309,7 +309,7 @@ KERNEL_FQ void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * AES part
diff --git a/OpenCL/m12800-pure.cl b/OpenCL/m12800-pure.cl
index 30658368c..84b727d01 100644
--- a/OpenCL/m12800-pure.cl
+++ b/OpenCL/m12800-pure.cl
@@ -103,7 +103,7 @@ KERNEL_FQ void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * generate nthash
@@ -248,7 +248,7 @@ KERNEL_FQ void m12800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -358,7 +358,7 @@ KERNEL_FQ void m12800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m12900-pure.cl b/OpenCL/m12900-pure.cl
index dec25c8cf..1c151e0a5 100644
--- a/OpenCL/m12900-pure.cl
+++ b/OpenCL/m12900-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m12900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -180,7 +180,7 @@ KERNEL_FQ void m12900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -290,7 +290,7 @@ KERNEL_FQ void m12900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m13000-pure.cl b/OpenCL/m13000-pure.cl
index 1e60d9afc..c6ca7bb54 100644
--- a/OpenCL/m13000-pure.cl
+++ b/OpenCL/m13000-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m13000_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -157,7 +157,7 @@ KERNEL_FQ void m13000_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -267,7 +267,7 @@ KERNEL_FQ void m13000_comp (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl
index f4887f827..9e0704044 100644
--- a/OpenCL/m13100_a0-optimized.cl
+++ b/OpenCL/m13100_a0-optimized.cl
@@ -462,7 +462,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -558,7 +558,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13100_a0-pure.cl b/OpenCL/m13100_a0-pure.cl
index 9b2de8a22..ee4cbcb1b 100644
--- a/OpenCL/m13100_a0-pure.cl
+++ b/OpenCL/m13100_a0-pure.cl
@@ -274,7 +274,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -334,7 +334,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13100_a1-optimized.cl b/OpenCL/m13100_a1-optimized.cl
index 7bb72c3e0..bdd2a237c 100644
--- a/OpenCL/m13100_a1-optimized.cl
+++ b/OpenCL/m13100_a1-optimized.cl
@@ -465,7 +465,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -610,7 +610,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m13100_a1-pure.cl b/OpenCL/m13100_a1-pure.cl
index d459fc36d..f59f425d4 100644
--- a/OpenCL/m13100_a1-pure.cl
+++ b/OpenCL/m13100_a1-pure.cl
@@ -272,7 +272,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -330,7 +330,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13100_a3-optimized.cl b/OpenCL/m13100_a3-optimized.cl
index 50886dc36..63e2692e6 100644
--- a/OpenCL/m13100_a3-optimized.cl
+++ b/OpenCL/m13100_a3-optimized.cl
@@ -519,7 +519,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -569,7 +569,7 @@ KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -623,7 +623,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -673,7 +673,7 @@ KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m13100_a3-pure.cl b/OpenCL/m13100_a3-pure.cl
index 00950c885..2cb54d014 100644
--- a/OpenCL/m13100_a3-pure.cl
+++ b/OpenCL/m13100_a3-pure.cl
@@ -272,7 +272,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -343,7 +343,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13200-pure.cl b/OpenCL/m13200-pure.cl
index 93e3eb209..af64190ce 100644
--- a/OpenCL/m13200-pure.cl
+++ b/OpenCL/m13200-pure.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * KEK
@@ -131,7 +131,7 @@ KERNEL_FQ void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[4];
 
@@ -219,7 +219,7 @@ KERNEL_FQ void m13200_comp (KERN_ATTR_TMPS (axcrypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m13300_a0-optimized.cl b/OpenCL/m13300_a0-optimized.cl
index 1689368b0..37fb5d397 100644
--- a/OpenCL/m13300_a0-optimized.cl
+++ b/OpenCL/m13300_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -217,7 +217,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m13300_a0-pure.cl b/OpenCL/m13300_a0-pure.cl
index 676adc73e..83429546b 100644
--- a/OpenCL/m13300_a0-pure.cl
+++ b/OpenCL/m13300_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -71,7 +71,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13300_a1-optimized.cl b/OpenCL/m13300_a1-optimized.cl
index 073d50649..a82ad3edc 100644
--- a/OpenCL/m13300_a1-optimized.cl
+++ b/OpenCL/m13300_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -273,7 +273,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m13300_a1-pure.cl b/OpenCL/m13300_a1-pure.cl
index b15e4355d..a1df62a2c 100644
--- a/OpenCL/m13300_a1-pure.cl
+++ b/OpenCL/m13300_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -67,7 +67,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13300_a3-optimized.cl b/OpenCL/m13300_a3-optimized.cl
index 619d436eb..a54f5565d 100644
--- a/OpenCL/m13300_a3-optimized.cl
+++ b/OpenCL/m13300_a3-optimized.cl
@@ -536,7 +536,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -574,7 +574,7 @@ KERNEL_FQ void m13300_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -612,7 +612,7 @@ KERNEL_FQ void m13300_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -650,7 +650,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -688,7 +688,7 @@ KERNEL_FQ void m13300_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -726,7 +726,7 @@ KERNEL_FQ void m13300_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m13300_a3-pure.cl b/OpenCL/m13300_a3-pure.cl
index fd11b271a..2a5ce914e 100644
--- a/OpenCL/m13300_a3-pure.cl
+++ b/OpenCL/m13300_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13400-pure.cl b/OpenCL/m13400-pure.cl
index 38e12ba3e..d3d382aa4 100644
--- a/OpenCL/m13400-pure.cl
+++ b/OpenCL/m13400-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t ctx;
 
@@ -203,7 +203,7 @@ KERNEL_FQ void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /* Construct AES key */
 
@@ -309,7 +309,7 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /* hash output... */
 
diff --git a/OpenCL/m13500_a0-optimized.cl b/OpenCL/m13500_a0-optimized.cl
index bfc8f8e7e..6f8c9b750 100644
--- a/OpenCL/m13500_a0-optimized.cl
+++ b/OpenCL/m13500_a0-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -466,7 +466,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m13500_a0-pure.cl b/OpenCL/m13500_a0-pure.cl
index 4497cc52e..a43b8f4e1 100644
--- a/OpenCL/m13500_a0-pure.cl
+++ b/OpenCL/m13500_a0-pure.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_RULES_ESALT (pstoken_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -110,7 +110,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_RULES_ESALT (pstoken_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13500_a1-optimized.cl b/OpenCL/m13500_a1-optimized.cl
index b607f0677..7e9c4a270 100644
--- a/OpenCL/m13500_a1-optimized.cl
+++ b/OpenCL/m13500_a1-optimized.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -516,7 +516,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m13500_a1-pure.cl b/OpenCL/m13500_a1-pure.cl
index fafdbf752..e5d6fc3a3 100644
--- a/OpenCL/m13500_a1-pure.cl
+++ b/OpenCL/m13500_a1-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_ESALT (pstoken_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -104,7 +104,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_ESALT (pstoken_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13500_a3-optimized.cl b/OpenCL/m13500_a3-optimized.cl
index 9e88f983f..a20ef84fc 100644
--- a/OpenCL/m13500_a3-optimized.cl
+++ b/OpenCL/m13500_a3-optimized.cl
@@ -831,7 +831,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -878,7 +878,7 @@ KERNEL_FQ void m13500_m08 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -925,7 +925,7 @@ KERNEL_FQ void m13500_m16 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -972,7 +972,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1019,7 +1019,7 @@ KERNEL_FQ void m13500_s08 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -1066,7 +1066,7 @@ KERNEL_FQ void m13500_s16 (KERN_ATTR_ESALT (pstoken_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m13500_a3-pure.cl b/OpenCL/m13500_a3-pure.cl
index 3213f874c..045128e1a 100644
--- a/OpenCL/m13500_a3-pure.cl
+++ b/OpenCL/m13500_a3-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -121,7 +121,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13600-pure.cl b/OpenCL/m13600-pure.cl
index 184d1a5f9..096d9fcdb 100644
--- a/OpenCL/m13600-pure.cl
+++ b/OpenCL/m13600-pure.cl
@@ -87,7 +87,7 @@ KERNEL_FQ void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -192,7 +192,7 @@ KERNEL_FQ void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -310,7 +310,7 @@ KERNEL_FQ void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m13711-pure.cl b/OpenCL/m13711-pure.cl
index 6b0bfaf97..c9f2410fe 100644
--- a/OpenCL/m13711-pure.cl
+++ b/OpenCL/m13711-pure.cl
@@ -146,7 +146,7 @@ KERNEL_FQ void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -259,7 +259,7 @@ KERNEL_FQ void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -443,7 +443,7 @@ KERNEL_FQ void m13711_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -515,7 +515,7 @@ KERNEL_FQ void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13712-pure.cl b/OpenCL/m13712-pure.cl
index 6d80df323..3f110f439 100644
--- a/OpenCL/m13712-pure.cl
+++ b/OpenCL/m13712-pure.cl
@@ -197,7 +197,7 @@ KERNEL_FQ void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -310,7 +310,7 @@ KERNEL_FQ void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -494,7 +494,7 @@ KERNEL_FQ void m13712_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -571,7 +571,7 @@ KERNEL_FQ void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13713-pure.cl b/OpenCL/m13713-pure.cl
index d4bdbdef4..db1d1e6fd 100644
--- a/OpenCL/m13713-pure.cl
+++ b/OpenCL/m13713-pure.cl
@@ -262,7 +262,7 @@ KERNEL_FQ void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -375,7 +375,7 @@ KERNEL_FQ void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -559,7 +559,7 @@ KERNEL_FQ void m13713_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -641,7 +641,7 @@ KERNEL_FQ void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13721-pure.cl b/OpenCL/m13721-pure.cl
index 999f7bc35..d63d458c4 100644
--- a/OpenCL/m13721-pure.cl
+++ b/OpenCL/m13721-pure.cl
@@ -168,7 +168,7 @@ KERNEL_FQ void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -313,7 +313,7 @@ KERNEL_FQ void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -541,7 +541,7 @@ KERNEL_FQ void m13721_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -613,7 +613,7 @@ KERNEL_FQ void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13722-pure.cl b/OpenCL/m13722-pure.cl
index 671e06be1..ffc8c3a6c 100644
--- a/OpenCL/m13722-pure.cl
+++ b/OpenCL/m13722-pure.cl
@@ -219,7 +219,7 @@ KERNEL_FQ void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -364,7 +364,7 @@ KERNEL_FQ void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -592,7 +592,7 @@ KERNEL_FQ void m13722_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -669,7 +669,7 @@ KERNEL_FQ void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13723-pure.cl b/OpenCL/m13723-pure.cl
index 821a7cc42..70efb8bd6 100644
--- a/OpenCL/m13723-pure.cl
+++ b/OpenCL/m13723-pure.cl
@@ -284,7 +284,7 @@ KERNEL_FQ void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -429,7 +429,7 @@ KERNEL_FQ void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -657,7 +657,7 @@ KERNEL_FQ void m13723_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -739,7 +739,7 @@ KERNEL_FQ void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13731-pure.cl b/OpenCL/m13731-pure.cl
index a0aaae4c9..be826b492 100644
--- a/OpenCL/m13731-pure.cl
+++ b/OpenCL/m13731-pure.cl
@@ -248,7 +248,7 @@ KERNEL_FQ void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -449,7 +449,7 @@ KERNEL_FQ void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -721,7 +721,7 @@ KERNEL_FQ void m13731_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -793,7 +793,7 @@ KERNEL_FQ void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13732-pure.cl b/OpenCL/m13732-pure.cl
index 7372b8465..872d95c34 100644
--- a/OpenCL/m13732-pure.cl
+++ b/OpenCL/m13732-pure.cl
@@ -299,7 +299,7 @@ KERNEL_FQ void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -500,7 +500,7 @@ KERNEL_FQ void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -772,7 +772,7 @@ KERNEL_FQ void m13732_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -849,7 +849,7 @@ KERNEL_FQ void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13733-pure.cl b/OpenCL/m13733-pure.cl
index 7480ef646..7c00d7112 100644
--- a/OpenCL/m13733-pure.cl
+++ b/OpenCL/m13733-pure.cl
@@ -364,7 +364,7 @@ KERNEL_FQ void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -565,7 +565,7 @@ KERNEL_FQ void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -837,7 +837,7 @@ KERNEL_FQ void m13733_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -919,7 +919,7 @@ KERNEL_FQ void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13751-pure.cl b/OpenCL/m13751-pure.cl
index 6b0481ccc..8465b6c0f 100644
--- a/OpenCL/m13751-pure.cl
+++ b/OpenCL/m13751-pure.cl
@@ -152,7 +152,7 @@ KERNEL_FQ void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -281,7 +281,7 @@ KERNEL_FQ void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -518,7 +518,7 @@ KERNEL_FQ void m13751_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -590,7 +590,7 @@ KERNEL_FQ void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13752-pure.cl b/OpenCL/m13752-pure.cl
index 20179bac8..0babdfc39 100644
--- a/OpenCL/m13752-pure.cl
+++ b/OpenCL/m13752-pure.cl
@@ -203,7 +203,7 @@ KERNEL_FQ void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -332,7 +332,7 @@ KERNEL_FQ void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -540,7 +540,7 @@ KERNEL_FQ void m13752_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -617,7 +617,7 @@ KERNEL_FQ void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13753-pure.cl b/OpenCL/m13753-pure.cl
index dcc55ba27..6216db30b 100644
--- a/OpenCL/m13753-pure.cl
+++ b/OpenCL/m13753-pure.cl
@@ -268,7 +268,7 @@ KERNEL_FQ void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -397,7 +397,7 @@ KERNEL_FQ void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -605,7 +605,7 @@ KERNEL_FQ void m13753_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -687,7 +687,7 @@ KERNEL_FQ void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13771-pure.cl b/OpenCL/m13771-pure.cl
index 446464e01..56c320460 100644
--- a/OpenCL/m13771-pure.cl
+++ b/OpenCL/m13771-pure.cl
@@ -218,7 +218,7 @@ KERNEL_FQ void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -391,7 +391,7 @@ KERNEL_FQ void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -620,7 +620,7 @@ KERNEL_FQ void m13771_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13772-pure.cl b/OpenCL/m13772-pure.cl
index c154ba34e..d0f94d4f7 100644
--- a/OpenCL/m13772-pure.cl
+++ b/OpenCL/m13772-pure.cl
@@ -269,7 +269,7 @@ KERNEL_FQ void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -442,7 +442,7 @@ KERNEL_FQ void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -671,7 +671,7 @@ KERNEL_FQ void m13772_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -748,7 +748,7 @@ KERNEL_FQ void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13773-pure.cl b/OpenCL/m13773-pure.cl
index 45f7e3225..b8ffb599c 100644
--- a/OpenCL/m13773-pure.cl
+++ b/OpenCL/m13773-pure.cl
@@ -334,7 +334,7 @@ KERNEL_FQ void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -507,7 +507,7 @@ KERNEL_FQ void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   // this is the pim range check
   // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations)
@@ -736,7 +736,7 @@ KERNEL_FQ void m13773_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pim_check = tmps[gid].pim_check;
 
@@ -818,7 +818,7 @@ KERNEL_FQ void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if (tmps[gid].pim)
   {
diff --git a/OpenCL/m13800_a0-optimized.cl b/OpenCL/m13800_a0-optimized.cl
index dc6c0752f..5687d1eca 100644
--- a/OpenCL/m13800_a0-optimized.cl
+++ b/OpenCL/m13800_a0-optimized.cl
@@ -451,7 +451,7 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * loop
@@ -647,7 +647,7 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13800_a0-pure.cl b/OpenCL/m13800_a0-pure.cl
index 81e794c6c..9ad9b35a8 100644
--- a/OpenCL/m13800_a0-pure.cl
+++ b/OpenCL/m13800_a0-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -77,7 +77,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13800_a1-optimized.cl b/OpenCL/m13800_a1-optimized.cl
index ed37affb3..0899ee771 100644
--- a/OpenCL/m13800_a1-optimized.cl
+++ b/OpenCL/m13800_a1-optimized.cl
@@ -449,7 +449,7 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * loop
@@ -701,7 +701,7 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13800_a1-pure.cl b/OpenCL/m13800_a1-pure.cl
index 6ec0d29c2..06c6fdf66 100644
--- a/OpenCL/m13800_a1-pure.cl
+++ b/OpenCL/m13800_a1-pure.cl
@@ -29,7 +29,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_ESALT (win8phone_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -73,7 +73,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_ESALT (win8phone_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13800_a3-optimized.cl b/OpenCL/m13800_a3-optimized.cl
index 231671160..614bfd7bd 100644
--- a/OpenCL/m13800_a3-optimized.cl
+++ b/OpenCL/m13800_a3-optimized.cl
@@ -763,7 +763,7 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -820,7 +820,7 @@ KERNEL_FQ void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -877,7 +877,7 @@ KERNEL_FQ void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -934,7 +934,7 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -991,7 +991,7 @@ KERNEL_FQ void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -1048,7 +1048,7 @@ KERNEL_FQ void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m13800_a3-pure.cl b/OpenCL/m13800_a3-pure.cl
index 2c34235ff..649b1f795 100644
--- a/OpenCL/m13800_a3-pure.cl
+++ b/OpenCL/m13800_a3-pure.cl
@@ -29,7 +29,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13900_a0-optimized.cl b/OpenCL/m13900_a0-optimized.cl
index 6e4e05906..2939d1f90 100644
--- a/OpenCL/m13900_a0-optimized.cl
+++ b/OpenCL/m13900_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -282,7 +282,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13900_a0-pure.cl b/OpenCL/m13900_a0-pure.cl
index 5c6a77b86..236afb4f5 100644
--- a/OpenCL/m13900_a0-pure.cl
+++ b/OpenCL/m13900_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -206,7 +206,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13900_a1-optimized.cl b/OpenCL/m13900_a1-optimized.cl
index adecf4bf1..f0596518b 100644
--- a/OpenCL/m13900_a1-optimized.cl
+++ b/OpenCL/m13900_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -338,7 +338,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13900_a1-pure.cl b/OpenCL/m13900_a1-pure.cl
index 24ba1c6a5..35d32bf69 100644
--- a/OpenCL/m13900_a1-pure.cl
+++ b/OpenCL/m13900_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -202,7 +202,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m13900_a3-optimized.cl b/OpenCL/m13900_a3-optimized.cl
index 4067fc91a..92b421f23 100644
--- a/OpenCL/m13900_a3-optimized.cl
+++ b/OpenCL/m13900_a3-optimized.cl
@@ -442,7 +442,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -512,7 +512,7 @@ KERNEL_FQ void m13900_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -582,7 +582,7 @@ KERNEL_FQ void m13900_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -652,7 +652,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -722,7 +722,7 @@ KERNEL_FQ void m13900_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -792,7 +792,7 @@ KERNEL_FQ void m13900_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m13900_a3-pure.cl b/OpenCL/m13900_a3-pure.cl
index fe37efa21..7c89184f0 100644
--- a/OpenCL/m13900_a3-pure.cl
+++ b/OpenCL/m13900_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -219,7 +219,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14000_a0-pure.cl b/OpenCL/m14000_a0-pure.cl
index 4458075cc..0ecf5d910 100644
--- a/OpenCL/m14000_a0-pure.cl
+++ b/OpenCL/m14000_a0-pure.cl
@@ -537,7 +537,7 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -642,7 +642,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14000_a1-pure.cl b/OpenCL/m14000_a1-pure.cl
index 89e8418a0..9447624ec 100644
--- a/OpenCL/m14000_a1-pure.cl
+++ b/OpenCL/m14000_a1-pure.cl
@@ -527,7 +527,7 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -675,7 +675,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14100_a0-pure.cl b/OpenCL/m14100_a0-pure.cl
index 120d894fd..d90034bbe 100644
--- a/OpenCL/m14100_a0-pure.cl
+++ b/OpenCL/m14100_a0-pure.cl
@@ -581,7 +581,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -716,7 +716,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14100_a1-pure.cl b/OpenCL/m14100_a1-pure.cl
index d6868ded0..b9d084ca6 100644
--- a/OpenCL/m14100_a1-pure.cl
+++ b/OpenCL/m14100_a1-pure.cl
@@ -571,7 +571,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -754,7 +754,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14100_a3-pure.cl b/OpenCL/m14100_a3-pure.cl
index 6373bbf43..fc478ea92 100644
--- a/OpenCL/m14100_a3-pure.cl
+++ b/OpenCL/m14100_a3-pure.cl
@@ -776,7 +776,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -850,7 +850,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14400_a0-optimized.cl b/OpenCL/m14400_a0-optimized.cl
index da48a7653..8be2df908 100644
--- a/OpenCL/m14400_a0-optimized.cl
+++ b/OpenCL/m14400_a0-optimized.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -416,7 +416,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14400_a0-pure.cl b/OpenCL/m14400_a0-pure.cl
index 6c089b91c..405c184a8 100644
--- a/OpenCL/m14400_a0-pure.cl
+++ b/OpenCL/m14400_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -302,7 +302,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14400_a1-optimized.cl b/OpenCL/m14400_a1-optimized.cl
index f8a416ca0..99740cc3b 100644
--- a/OpenCL/m14400_a1-optimized.cl
+++ b/OpenCL/m14400_a1-optimized.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -480,7 +480,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14400_a1-pure.cl b/OpenCL/m14400_a1-pure.cl
index 8ffceb92a..d948ad924 100644
--- a/OpenCL/m14400_a1-pure.cl
+++ b/OpenCL/m14400_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -298,7 +298,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14400_a3-optimized.cl b/OpenCL/m14400_a3-optimized.cl
index e2f732bfa..be347dbe4 100644
--- a/OpenCL/m14400_a3-optimized.cl
+++ b/OpenCL/m14400_a3-optimized.cl
@@ -655,7 +655,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -725,7 +725,7 @@ KERNEL_FQ void m14400_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -795,7 +795,7 @@ KERNEL_FQ void m14400_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -865,7 +865,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -935,7 +935,7 @@ KERNEL_FQ void m14400_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1005,7 +1005,7 @@ KERNEL_FQ void m14400_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14400_a3-pure.cl b/OpenCL/m14400_a3-pure.cl
index 4bab7c3ff..c0d14bd35 100644
--- a/OpenCL/m14400_a3-pure.cl
+++ b/OpenCL/m14400_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -323,7 +323,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14511_a0-pure.cl b/OpenCL/m14511_a0-pure.cl
index 4b302fd4a..a29725676 100644
--- a/OpenCL/m14511_a0-pure.cl
+++ b/OpenCL/m14511_a0-pure.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -245,7 +245,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
   #endif
 
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14511_a1-pure.cl b/OpenCL/m14511_a1-pure.cl
index 39b7b6b67..a07b1dc12 100644
--- a/OpenCL/m14511_a1-pure.cl
+++ b/OpenCL/m14511_a1-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -254,7 +254,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14511_a3-pure.cl b/OpenCL/m14511_a3-pure.cl
index dcab86b9f..41e44ef24 100644
--- a/OpenCL/m14511_a3-pure.cl
+++ b/OpenCL/m14511_a3-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -247,7 +247,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14512_a0-pure.cl b/OpenCL/m14512_a0-pure.cl
index 9a3fd2d19..ee1c273cf 100644
--- a/OpenCL/m14512_a0-pure.cl
+++ b/OpenCL/m14512_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -172,7 +172,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14512_a1-pure.cl b/OpenCL/m14512_a1-pure.cl
index e0075b9b9..641e22ad6 100644
--- a/OpenCL/m14512_a1-pure.cl
+++ b/OpenCL/m14512_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -182,7 +182,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14512_a3-pure.cl b/OpenCL/m14512_a3-pure.cl
index 17feee44c..64cf685bd 100644
--- a/OpenCL/m14512_a3-pure.cl
+++ b/OpenCL/m14512_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -175,7 +175,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14513_a0-pure.cl b/OpenCL/m14513_a0-pure.cl
index 12c34136b..cf781b2fd 100644
--- a/OpenCL/m14513_a0-pure.cl
+++ b/OpenCL/m14513_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -173,7 +173,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14513_a1-pure.cl b/OpenCL/m14513_a1-pure.cl
index 9f497dc56..f2f8c20fe 100644
--- a/OpenCL/m14513_a1-pure.cl
+++ b/OpenCL/m14513_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -183,7 +183,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14513_a3-pure.cl b/OpenCL/m14513_a3-pure.cl
index d6fd9a055..cab71629d 100644
--- a/OpenCL/m14513_a3-pure.cl
+++ b/OpenCL/m14513_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -176,7 +176,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14521_a0-pure.cl b/OpenCL/m14521_a0-pure.cl
index 848372152..b8ae8fdfd 100644
--- a/OpenCL/m14521_a0-pure.cl
+++ b/OpenCL/m14521_a0-pure.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -226,7 +226,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
   #endif
 
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14521_a1-pure.cl b/OpenCL/m14521_a1-pure.cl
index d646c6368..11a13b5b8 100644
--- a/OpenCL/m14521_a1-pure.cl
+++ b/OpenCL/m14521_a1-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -221,7 +221,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14521_a3-pure.cl b/OpenCL/m14521_a3-pure.cl
index 88aa55646..5f3e7c630 100644
--- a/OpenCL/m14521_a3-pure.cl
+++ b/OpenCL/m14521_a3-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -234,7 +234,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14522_a0-pure.cl b/OpenCL/m14522_a0-pure.cl
index b8ebe619f..d0aa53063 100644
--- a/OpenCL/m14522_a0-pure.cl
+++ b/OpenCL/m14522_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -153,7 +153,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14522_a1-pure.cl b/OpenCL/m14522_a1-pure.cl
index eb2f48a1e..472849241 100644
--- a/OpenCL/m14522_a1-pure.cl
+++ b/OpenCL/m14522_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -149,7 +149,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14522_a3-pure.cl b/OpenCL/m14522_a3-pure.cl
index a10db5c66..569926654 100644
--- a/OpenCL/m14522_a3-pure.cl
+++ b/OpenCL/m14522_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -162,7 +162,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14523_a0-pure.cl b/OpenCL/m14523_a0-pure.cl
index 71001d97b..20ca68938 100644
--- a/OpenCL/m14523_a0-pure.cl
+++ b/OpenCL/m14523_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -154,7 +154,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14523_a1-pure.cl b/OpenCL/m14523_a1-pure.cl
index 1229970fa..792565b69 100644
--- a/OpenCL/m14523_a1-pure.cl
+++ b/OpenCL/m14523_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -150,7 +150,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14523_a3-pure.cl b/OpenCL/m14523_a3-pure.cl
index f8b93c4b7..99275a1d2 100644
--- a/OpenCL/m14523_a3-pure.cl
+++ b/OpenCL/m14523_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -163,7 +163,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14531_a0-pure.cl b/OpenCL/m14531_a0-pure.cl
index 0b43682bd..8ed001204 100644
--- a/OpenCL/m14531_a0-pure.cl
+++ b/OpenCL/m14531_a0-pure.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -225,7 +225,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14531_a1-pure.cl b/OpenCL/m14531_a1-pure.cl
index b13e77d29..3e41b7ebe 100644
--- a/OpenCL/m14531_a1-pure.cl
+++ b/OpenCL/m14531_a1-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -221,7 +221,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14531_a3-pure.cl b/OpenCL/m14531_a3-pure.cl
index 07e56dc31..97f7a4015 100644
--- a/OpenCL/m14531_a3-pure.cl
+++ b/OpenCL/m14531_a3-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -234,7 +234,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14532_a0-pure.cl b/OpenCL/m14532_a0-pure.cl
index 58c1537fa..169f3508f 100644
--- a/OpenCL/m14532_a0-pure.cl
+++ b/OpenCL/m14532_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -153,7 +153,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14532_a1-pure.cl b/OpenCL/m14532_a1-pure.cl
index 1ca055c83..07d899dbf 100644
--- a/OpenCL/m14532_a1-pure.cl
+++ b/OpenCL/m14532_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -149,7 +149,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14532_a3-pure.cl b/OpenCL/m14532_a3-pure.cl
index e189c94f7..8f044d18e 100644
--- a/OpenCL/m14532_a3-pure.cl
+++ b/OpenCL/m14532_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -162,7 +162,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14533_a0-pure.cl b/OpenCL/m14533_a0-pure.cl
index 90f91fbc7..7959303da 100644
--- a/OpenCL/m14533_a0-pure.cl
+++ b/OpenCL/m14533_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -154,7 +154,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14533_a1-pure.cl b/OpenCL/m14533_a1-pure.cl
index 6b3cb3d8a..729ba136c 100644
--- a/OpenCL/m14533_a1-pure.cl
+++ b/OpenCL/m14533_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -150,7 +150,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14533_a3-pure.cl b/OpenCL/m14533_a3-pure.cl
index ac03fb9a0..237d36376 100644
--- a/OpenCL/m14533_a3-pure.cl
+++ b/OpenCL/m14533_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -163,7 +163,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14541_a0-pure.cl b/OpenCL/m14541_a0-pure.cl
index ba50e7b7c..685542c35 100644
--- a/OpenCL/m14541_a0-pure.cl
+++ b/OpenCL/m14541_a0-pure.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -245,7 +245,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
   #endif
 
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14541_a1-pure.cl b/OpenCL/m14541_a1-pure.cl
index bf4b33d3d..d2790269f 100644
--- a/OpenCL/m14541_a1-pure.cl
+++ b/OpenCL/m14541_a1-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -254,7 +254,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14541_a3-pure.cl b/OpenCL/m14541_a3-pure.cl
index 5a6f97925..30152610d 100644
--- a/OpenCL/m14541_a3-pure.cl
+++ b/OpenCL/m14541_a3-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -247,7 +247,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14542_a0-pure.cl b/OpenCL/m14542_a0-pure.cl
index 6a2695649..3d3a35fa1 100644
--- a/OpenCL/m14542_a0-pure.cl
+++ b/OpenCL/m14542_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -172,7 +172,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14542_a1-pure.cl b/OpenCL/m14542_a1-pure.cl
index 3916c7822..8b010cf57 100644
--- a/OpenCL/m14542_a1-pure.cl
+++ b/OpenCL/m14542_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -182,7 +182,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14542_a3-pure.cl b/OpenCL/m14542_a3-pure.cl
index 2c5628988..103ed5a90 100644
--- a/OpenCL/m14542_a3-pure.cl
+++ b/OpenCL/m14542_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -175,7 +175,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14543_a0-pure.cl b/OpenCL/m14543_a0-pure.cl
index 2161c33a6..c0910c6a0 100644
--- a/OpenCL/m14543_a0-pure.cl
+++ b/OpenCL/m14543_a0-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -173,7 +173,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14543_a1-pure.cl b/OpenCL/m14543_a1-pure.cl
index 8a518f8ea..3c7f262db 100644
--- a/OpenCL/m14543_a1-pure.cl
+++ b/OpenCL/m14543_a1-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -183,7 +183,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14543_a3-pure.cl b/OpenCL/m14543_a3-pure.cl
index b63ab2fb8..ed49b66fd 100644
--- a/OpenCL/m14543_a3-pure.cl
+++ b/OpenCL/m14543_a3-pure.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -176,7 +176,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14551_a0-pure.cl b/OpenCL/m14551_a0-pure.cl
index 7edec58e4..5c3afc99e 100644
--- a/OpenCL/m14551_a0-pure.cl
+++ b/OpenCL/m14551_a0-pure.cl
@@ -95,7 +95,7 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -280,7 +280,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
   #endif
 
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14551_a1-pure.cl b/OpenCL/m14551_a1-pure.cl
index 434d1a94b..131bd7861 100644
--- a/OpenCL/m14551_a1-pure.cl
+++ b/OpenCL/m14551_a1-pure.cl
@@ -93,7 +93,7 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -275,7 +275,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14551_a3-pure.cl b/OpenCL/m14551_a3-pure.cl
index 1f371b446..318262888 100644
--- a/OpenCL/m14551_a3-pure.cl
+++ b/OpenCL/m14551_a3-pure.cl
@@ -93,7 +93,7 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -288,7 +288,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14552_a0-pure.cl b/OpenCL/m14552_a0-pure.cl
index 62805f40c..a9e76974d 100644
--- a/OpenCL/m14552_a0-pure.cl
+++ b/OpenCL/m14552_a0-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -243,7 +243,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14552_a1-pure.cl b/OpenCL/m14552_a1-pure.cl
index ef2419e67..b510cb956 100644
--- a/OpenCL/m14552_a1-pure.cl
+++ b/OpenCL/m14552_a1-pure.cl
@@ -75,7 +75,7 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -239,7 +239,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14552_a3-pure.cl b/OpenCL/m14552_a3-pure.cl
index 01be245fe..bf59e7e92 100644
--- a/OpenCL/m14552_a3-pure.cl
+++ b/OpenCL/m14552_a3-pure.cl
@@ -75,7 +75,7 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -252,7 +252,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14553_a0-pure.cl b/OpenCL/m14553_a0-pure.cl
index 1a1508f2e..955afca67 100644
--- a/OpenCL/m14553_a0-pure.cl
+++ b/OpenCL/m14553_a0-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -244,7 +244,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14553_a1-pure.cl b/OpenCL/m14553_a1-pure.cl
index 212459b9e..6b9d1e400 100644
--- a/OpenCL/m14553_a1-pure.cl
+++ b/OpenCL/m14553_a1-pure.cl
@@ -75,7 +75,7 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -240,7 +240,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14553_a3-pure.cl b/OpenCL/m14553_a3-pure.cl
index b7d205d53..a6b350c9c 100644
--- a/OpenCL/m14553_a3-pure.cl
+++ b/OpenCL/m14553_a3-pure.cl
@@ -75,7 +75,7 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -253,7 +253,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl
index debda1379..5d93b0475 100644
--- a/OpenCL/m14611-pure.cl
+++ b/OpenCL/m14611-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m14611_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -349,7 +349,7 @@ KERNEL_FQ void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl
index 69c695214..81d1eb6d7 100644
--- a/OpenCL/m14612-pure.cl
+++ b/OpenCL/m14612-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m14612_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -296,7 +296,7 @@ KERNEL_FQ void m14612_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl
index 074f19f33..5e1098447 100644
--- a/OpenCL/m14613-pure.cl
+++ b/OpenCL/m14613-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m14613_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -296,7 +296,7 @@ KERNEL_FQ void m14613_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl
index 514637eda..e5c152a08 100644
--- a/OpenCL/m14621-pure.cl
+++ b/OpenCL/m14621-pure.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m14621_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -227,7 +227,7 @@ KERNEL_FQ void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -388,7 +388,7 @@ KERNEL_FQ void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl
index 2e7cb4623..728f0c5b6 100644
--- a/OpenCL/m14622-pure.cl
+++ b/OpenCL/m14622-pure.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m14622_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -227,7 +227,7 @@ KERNEL_FQ void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -335,7 +335,7 @@ KERNEL_FQ void m14622_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl
index f477cdd2e..c50d1735e 100644
--- a/OpenCL/m14623-pure.cl
+++ b/OpenCL/m14623-pure.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m14623_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -227,7 +227,7 @@ KERNEL_FQ void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -335,7 +335,7 @@ KERNEL_FQ void m14623_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl
index 65628d775..576528ac7 100644
--- a/OpenCL/m14631-pure.cl
+++ b/OpenCL/m14631-pure.cl
@@ -161,7 +161,7 @@ KERNEL_FQ void m14631_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -263,7 +263,7 @@ KERNEL_FQ void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -444,7 +444,7 @@ KERNEL_FQ void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl
index a823670fd..243a87e56 100644
--- a/OpenCL/m14632-pure.cl
+++ b/OpenCL/m14632-pure.cl
@@ -161,7 +161,7 @@ KERNEL_FQ void m14632_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -263,7 +263,7 @@ KERNEL_FQ void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -391,7 +391,7 @@ KERNEL_FQ void m14632_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl
index a4ae2f25e..a9c68610f 100644
--- a/OpenCL/m14633-pure.cl
+++ b/OpenCL/m14633-pure.cl
@@ -161,7 +161,7 @@ KERNEL_FQ void m14633_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -263,7 +263,7 @@ KERNEL_FQ void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -391,7 +391,7 @@ KERNEL_FQ void m14633_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl
index 3062f93f7..7234af4bd 100644
--- a/OpenCL/m14641-pure.cl
+++ b/OpenCL/m14641-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m14641_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   ripemd160_hmac_ctx_t ripemd160_hmac_ctx;
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -349,7 +349,7 @@ KERNEL_FQ void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl
index be033eaa5..89046986a 100644
--- a/OpenCL/m14642-pure.cl
+++ b/OpenCL/m14642-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m14642_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   ripemd160_hmac_ctx_t ripemd160_hmac_ctx;
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -296,7 +296,7 @@ KERNEL_FQ void m14642_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl
index 3a33c8cf1..35cbbaf84 100644
--- a/OpenCL/m14643-pure.cl
+++ b/OpenCL/m14643-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m14643_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   ripemd160_hmac_ctx_t ripemd160_hmac_ctx;
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -296,7 +296,7 @@ KERNEL_FQ void m14643_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // decrypt AF with first pbkdf2 result
   // merge AF to masterkey
diff --git a/OpenCL/m14700-pure.cl b/OpenCL/m14700-pure.cl
index 68ec6d977..614e28bc6 100644
--- a/OpenCL/m14700-pure.cl
+++ b/OpenCL/m14700-pure.cl
@@ -79,7 +79,7 @@ KERNEL_FQ void m14700_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -147,7 +147,7 @@ KERNEL_FQ void m14700_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -285,7 +285,7 @@ KERNEL_FQ void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
diff --git a/OpenCL/m14800-pure.cl b/OpenCL/m14800-pure.cl
index 831caf717..8d6bd5376 100644
--- a/OpenCL/m14800-pure.cl
+++ b/OpenCL/m14800-pure.cl
@@ -119,7 +119,7 @@ KERNEL_FQ void m14800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -216,7 +216,7 @@ KERNEL_FQ void m14800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -326,7 +326,7 @@ KERNEL_FQ void m14800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_b
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
@@ -411,7 +411,7 @@ KERNEL_FQ void m14800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_b
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -549,7 +549,7 @@ KERNEL_FQ void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl
index 61cf4ad48..b6f1a1bf5 100644
--- a/OpenCL/m14900_a0-optimized.cl
+++ b/OpenCL/m14900_a0-optimized.cl
@@ -128,7 +128,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -219,7 +219,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14900_a1-optimized.cl b/OpenCL/m14900_a1-optimized.cl
index 6c962c8d5..aed600e3f 100644
--- a/OpenCL/m14900_a1-optimized.cl
+++ b/OpenCL/m14900_a1-optimized.cl
@@ -126,7 +126,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -281,7 +281,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m14900_a3-optimized.cl b/OpenCL/m14900_a3-optimized.cl
index 68a08bdd2..89896e7b0 100644
--- a/OpenCL/m14900_a3-optimized.cl
+++ b/OpenCL/m14900_a3-optimized.cl
@@ -234,7 +234,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -308,7 +308,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl
index edcdf32d2..8b49c590a 100644
--- a/OpenCL/m15000_a0-optimized.cl
+++ b/OpenCL/m15000_a0-optimized.cl
@@ -129,7 +129,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -334,7 +334,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m15000_a0-pure.cl b/OpenCL/m15000_a0-pure.cl
index 49f2488df..6b2d0905d 100644
--- a/OpenCL/m15000_a0-pure.cl
+++ b/OpenCL/m15000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -80,7 +80,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m15000_a1-optimized.cl b/OpenCL/m15000_a1-optimized.cl
index c486044a0..9daf6dee5 100644
--- a/OpenCL/m15000_a1-optimized.cl
+++ b/OpenCL/m15000_a1-optimized.cl
@@ -127,7 +127,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -392,7 +392,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m15000_a1-pure.cl b/OpenCL/m15000_a1-pure.cl
index 09996733c..f136080fd 100644
--- a/OpenCL/m15000_a1-pure.cl
+++ b/OpenCL/m15000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -76,7 +76,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m15000_a3-optimized.cl b/OpenCL/m15000_a3-optimized.cl
index 7e63e0af6..57e252871 100644
--- a/OpenCL/m15000_a3-optimized.cl
+++ b/OpenCL/m15000_a3-optimized.cl
@@ -451,7 +451,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -489,7 +489,7 @@ KERNEL_FQ void m15000_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -527,7 +527,7 @@ KERNEL_FQ void m15000_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -565,7 +565,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -603,7 +603,7 @@ KERNEL_FQ void m15000_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -641,7 +641,7 @@ KERNEL_FQ void m15000_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m15000_a3-pure.cl b/OpenCL/m15000_a3-pure.cl
index 76569c693..dd356b65c 100644
--- a/OpenCL/m15000_a3-pure.cl
+++ b/OpenCL/m15000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -89,7 +89,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m15100-pure.cl b/OpenCL/m15100-pure.cl
index 92a06ad7b..e65797515 100644
--- a/OpenCL/m15100-pure.cl
+++ b/OpenCL/m15100-pure.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m15100_init (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -105,7 +105,7 @@ KERNEL_FQ void m15100_loop (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -172,7 +172,7 @@ KERNEL_FQ void m15100_comp (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m15300-pure.cl b/OpenCL/m15300-pure.cl
index 3ad5a3f19..502942a7b 100644
--- a/OpenCL/m15300-pure.cl
+++ b/OpenCL/m15300-pure.cl
@@ -94,7 +94,7 @@ KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -291,7 +291,7 @@ KERNEL_FQ void m15300_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t))
 
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -417,7 +417,7 @@ KERNEL_FQ void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m15400_a0-optimized.cl b/OpenCL/m15400_a0-optimized.cl
index c331f4480..ae4e919cc 100644
--- a/OpenCL/m15400_a0-optimized.cl
+++ b/OpenCL/m15400_a0-optimized.cl
@@ -248,7 +248,7 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -326,7 +326,7 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m15400_a1-optimized.cl b/OpenCL/m15400_a1-optimized.cl
index 2cae238e7..00b62decc 100644
--- a/OpenCL/m15400_a1-optimized.cl
+++ b/OpenCL/m15400_a1-optimized.cl
@@ -373,7 +373,7 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m15500_a0-optimized.cl b/OpenCL/m15500_a0-optimized.cl
index 5812bd89d..4029bb943 100644
--- a/OpenCL/m15500_a0-optimized.cl
+++ b/OpenCL/m15500_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -286,7 +286,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m15500_a0-pure.cl b/OpenCL/m15500_a0-pure.cl
index cca5eeb6d..27d51ca94 100644
--- a/OpenCL/m15500_a0-pure.cl
+++ b/OpenCL/m15500_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -86,7 +86,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m15500_a1-optimized.cl b/OpenCL/m15500_a1-optimized.cl
index 8bf457d3b..a2e2098c0 100644
--- a/OpenCL/m15500_a1-optimized.cl
+++ b/OpenCL/m15500_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -344,7 +344,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m15500_a1-pure.cl b/OpenCL/m15500_a1-pure.cl
index 6f2ee30da..4ba1b266b 100644
--- a/OpenCL/m15500_a1-pure.cl
+++ b/OpenCL/m15500_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -82,7 +82,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m15500_a3-optimized.cl b/OpenCL/m15500_a3-optimized.cl
index 25d649d32..4210069d8 100644
--- a/OpenCL/m15500_a3-optimized.cl
+++ b/OpenCL/m15500_a3-optimized.cl
@@ -594,7 +594,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -632,7 +632,7 @@ KERNEL_FQ void m15500_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -670,7 +670,7 @@ KERNEL_FQ void m15500_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -708,7 +708,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -746,7 +746,7 @@ KERNEL_FQ void m15500_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -784,7 +784,7 @@ KERNEL_FQ void m15500_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m15500_a3-pure.cl b/OpenCL/m15500_a3-pure.cl
index 2208f90d0..2817dd952 100644
--- a/OpenCL/m15500_a3-pure.cl
+++ b/OpenCL/m15500_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m15600-pure.cl b/OpenCL/m15600-pure.cl
index 415df1e73..431b0985d 100644
--- a/OpenCL/m15600-pure.cl
+++ b/OpenCL/m15600-pure.cl
@@ -213,7 +213,7 @@ KERNEL_FQ void m15600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -293,7 +293,7 @@ KERNEL_FQ void m15600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -403,7 +403,7 @@ KERNEL_FQ void m15600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m15700-pure.cl b/OpenCL/m15700-pure.cl
index 1d75081d3..fc973ec04 100644
--- a/OpenCL/m15700-pure.cl
+++ b/OpenCL/m15700-pure.cl
@@ -390,7 +390,7 @@ KERNEL_FQ void m15700_init (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -495,7 +495,7 @@ KERNEL_FQ void m15700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // SCRYPT part, init V
 
@@ -522,7 +522,7 @@ KERNEL_FQ void m15700_loop (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf;
   GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf;
@@ -551,7 +551,7 @@ KERNEL_FQ void m15700_comp (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * 2nd pbkdf2, creates B
diff --git a/OpenCL/m15900-pure.cl b/OpenCL/m15900-pure.cl
index db6d9dab6..7d20504c2 100644
--- a/OpenCL/m15900-pure.cl
+++ b/OpenCL/m15900-pure.cl
@@ -117,7 +117,7 @@ KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -379,7 +379,7 @@ KERNEL_FQ void m15900_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t))
 
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -558,7 +558,7 @@ KERNEL_FQ void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m16000_a0-pure.cl b/OpenCL/m16000_a0-pure.cl
index 7725951cf..e8139c487 100644
--- a/OpenCL/m16000_a0-pure.cl
+++ b/OpenCL/m16000_a0-pure.cl
@@ -541,7 +541,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -634,7 +634,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16000_a1-pure.cl b/OpenCL/m16000_a1-pure.cl
index 2dc8d104e..f3fee64b9 100644
--- a/OpenCL/m16000_a1-pure.cl
+++ b/OpenCL/m16000_a1-pure.cl
@@ -539,7 +539,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -711,7 +711,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16000_a3-pure.cl b/OpenCL/m16000_a3-pure.cl
index 769e4fed9..0dbf8ee99 100644
--- a/OpenCL/m16000_a3-pure.cl
+++ b/OpenCL/m16000_a3-pure.cl
@@ -539,7 +539,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -660,7 +660,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16100_a0-optimized.cl b/OpenCL/m16100_a0-optimized.cl
index 9b89a3883..32f46c31b 100644
--- a/OpenCL/m16100_a0-optimized.cl
+++ b/OpenCL/m16100_a0-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -326,7 +326,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m16100_a0-pure.cl b/OpenCL/m16100_a0-pure.cl
index f5f6a3a5c..f625f8ddd 100644
--- a/OpenCL/m16100_a0-pure.cl
+++ b/OpenCL/m16100_a0-pure.cl
@@ -36,7 +36,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -198,7 +198,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16100_a1-optimized.cl b/OpenCL/m16100_a1-optimized.cl
index e9ed7138b..7fb04fb1f 100644
--- a/OpenCL/m16100_a1-optimized.cl
+++ b/OpenCL/m16100_a1-optimized.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -385,7 +385,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m16100_a1-pure.cl b/OpenCL/m16100_a1-pure.cl
index 95525c7b9..9f60766b6 100644
--- a/OpenCL/m16100_a1-pure.cl
+++ b/OpenCL/m16100_a1-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -191,7 +191,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16100_a3-optimized.cl b/OpenCL/m16100_a3-optimized.cl
index ee6ce37c9..727823d6b 100644
--- a/OpenCL/m16100_a3-optimized.cl
+++ b/OpenCL/m16100_a3-optimized.cl
@@ -539,7 +539,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -586,7 +586,7 @@ KERNEL_FQ void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -633,7 +633,7 @@ KERNEL_FQ void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -680,7 +680,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -727,7 +727,7 @@ KERNEL_FQ void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -774,7 +774,7 @@ KERNEL_FQ void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m16100_a3-pure.cl b/OpenCL/m16100_a3-pure.cl
index f7cbb0bd4..f5d247797 100644
--- a/OpenCL/m16100_a3-pure.cl
+++ b/OpenCL/m16100_a3-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -208,7 +208,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16200-pure.cl b/OpenCL/m16200-pure.cl
index 891f0a432..590984954 100644
--- a/OpenCL/m16200-pure.cl
+++ b/OpenCL/m16200-pure.cl
@@ -87,7 +87,7 @@ KERNEL_FQ void m16200_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -167,7 +167,7 @@ KERNEL_FQ void m16200_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -326,7 +326,7 @@ KERNEL_FQ void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[4];
 
diff --git a/OpenCL/m16300-pure.cl b/OpenCL/m16300-pure.cl
index 007e4e560..84e1bd303 100644
--- a/OpenCL/m16300-pure.cl
+++ b/OpenCL/m16300-pure.cl
@@ -215,7 +215,7 @@ KERNEL_FQ void m16300_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -295,7 +295,7 @@ KERNEL_FQ void m16300_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -458,7 +458,7 @@ KERNEL_FQ void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /*
    * AES-CBC-128 decrypt
diff --git a/OpenCL/m16400_a0-optimized.cl b/OpenCL/m16400_a0-optimized.cl
index f1928fcd8..7e5121e62 100644
--- a/OpenCL/m16400_a0-optimized.cl
+++ b/OpenCL/m16400_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -177,7 +177,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m16400_a0-pure.cl b/OpenCL/m16400_a0-pure.cl
index 7c7896d6f..18b9ec19c 100644
--- a/OpenCL/m16400_a0-pure.cl
+++ b/OpenCL/m16400_a0-pure.cl
@@ -185,7 +185,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -229,7 +229,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16400_a1-optimized.cl b/OpenCL/m16400_a1-optimized.cl
index e445077a5..b6c4b54cf 100644
--- a/OpenCL/m16400_a1-optimized.cl
+++ b/OpenCL/m16400_a1-optimized.cl
@@ -29,7 +29,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -223,7 +223,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m16400_a1-pure.cl b/OpenCL/m16400_a1-pure.cl
index 655047b14..5495dadc6 100644
--- a/OpenCL/m16400_a1-pure.cl
+++ b/OpenCL/m16400_a1-pure.cl
@@ -183,7 +183,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -225,7 +225,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16400_a3-optimized.cl b/OpenCL/m16400_a3-optimized.cl
index 0106b37da..032fbd269 100644
--- a/OpenCL/m16400_a3-optimized.cl
+++ b/OpenCL/m16400_a3-optimized.cl
@@ -477,7 +477,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -515,7 +515,7 @@ KERNEL_FQ void m16400_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -553,7 +553,7 @@ KERNEL_FQ void m16400_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -591,7 +591,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -629,7 +629,7 @@ KERNEL_FQ void m16400_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -667,7 +667,7 @@ KERNEL_FQ void m16400_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m16400_a3-pure.cl b/OpenCL/m16400_a3-pure.cl
index 015fef21c..1f94cd402 100644
--- a/OpenCL/m16400_a3-pure.cl
+++ b/OpenCL/m16400_a3-pure.cl
@@ -184,7 +184,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -239,7 +239,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16511_a0-pure.cl b/OpenCL/m16511_a0-pure.cl
index 5b7f9ca65..24eb3a62c 100644
--- a/OpenCL/m16511_a0-pure.cl
+++ b/OpenCL/m16511_a0-pure.cl
@@ -34,7 +34,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16511_a1-pure.cl b/OpenCL/m16511_a1-pure.cl
index b4538c6d5..394964128 100644
--- a/OpenCL/m16511_a1-pure.cl
+++ b/OpenCL/m16511_a1-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16511_a3-pure.cl b/OpenCL/m16511_a3-pure.cl
index 860f01b3a..ac95f3422 100644
--- a/OpenCL/m16511_a3-pure.cl
+++ b/OpenCL/m16511_a3-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16512_a0-pure.cl b/OpenCL/m16512_a0-pure.cl
index 4ea19e8e3..6e251fdb4 100644
--- a/OpenCL/m16512_a0-pure.cl
+++ b/OpenCL/m16512_a0-pure.cl
@@ -34,7 +34,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16512_a1-pure.cl b/OpenCL/m16512_a1-pure.cl
index f3509783b..e1a43f998 100644
--- a/OpenCL/m16512_a1-pure.cl
+++ b/OpenCL/m16512_a1-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16512_a3-pure.cl b/OpenCL/m16512_a3-pure.cl
index e4fa094f1..37634b80e 100644
--- a/OpenCL/m16512_a3-pure.cl
+++ b/OpenCL/m16512_a3-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16513_a0-pure.cl b/OpenCL/m16513_a0-pure.cl
index 50b9d0054..0dc001fb0 100644
--- a/OpenCL/m16513_a0-pure.cl
+++ b/OpenCL/m16513_a0-pure.cl
@@ -34,7 +34,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16513_a1-pure.cl b/OpenCL/m16513_a1-pure.cl
index 14d729af0..5157b066e 100644
--- a/OpenCL/m16513_a1-pure.cl
+++ b/OpenCL/m16513_a1-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16513_a3-pure.cl b/OpenCL/m16513_a3-pure.cl
index 166b55ec7..5afc304c1 100644
--- a/OpenCL/m16513_a3-pure.cl
+++ b/OpenCL/m16513_a3-pure.cl
@@ -32,7 +32,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -87,7 +87,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m16600_a0-optimized.cl b/OpenCL/m16600_a0-optimized.cl
index 7fd8e6ea7..b86a07d96 100644
--- a/OpenCL/m16600_a0-optimized.cl
+++ b/OpenCL/m16600_a0-optimized.cl
@@ -86,7 +86,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -498,7 +498,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16600_a0-pure.cl b/OpenCL/m16600_a0-pure.cl
index 7ac22f3b7..012706f62 100644
--- a/OpenCL/m16600_a0-pure.cl
+++ b/OpenCL/m16600_a0-pure.cl
@@ -86,7 +86,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -304,7 +304,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16600_a1-optimized.cl b/OpenCL/m16600_a1-optimized.cl
index 6511dd687..30918f4f9 100644
--- a/OpenCL/m16600_a1-optimized.cl
+++ b/OpenCL/m16600_a1-optimized.cl
@@ -84,7 +84,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -554,7 +554,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16600_a1-pure.cl b/OpenCL/m16600_a1-pure.cl
index d91fb852f..8893f7a29 100644
--- a/OpenCL/m16600_a1-pure.cl
+++ b/OpenCL/m16600_a1-pure.cl
@@ -84,7 +84,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -300,7 +300,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16600_a3-optimized.cl b/OpenCL/m16600_a3-optimized.cl
index a9972ded5..860786cd9 100644
--- a/OpenCL/m16600_a3-optimized.cl
+++ b/OpenCL/m16600_a3-optimized.cl
@@ -267,7 +267,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -362,7 +362,7 @@ KERNEL_FQ void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -457,7 +457,7 @@ KERNEL_FQ void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -552,7 +552,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -647,7 +647,7 @@ KERNEL_FQ void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -742,7 +742,7 @@ KERNEL_FQ void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16600_a3-pure.cl b/OpenCL/m16600_a3-pure.cl
index 425459d90..728bde8f5 100644
--- a/OpenCL/m16600_a3-pure.cl
+++ b/OpenCL/m16600_a3-pure.cl
@@ -84,7 +84,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -313,7 +313,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m16800-pure.cl b/OpenCL/m16800-pure.cl
index 98767291c..4b24d310a 100644
--- a/OpenCL/m16800-pure.cl
+++ b/OpenCL/m16800-pure.cl
@@ -89,7 +89,7 @@ KERNEL_FQ void m16800_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx0;
 
@@ -193,7 +193,7 @@ KERNEL_FQ void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -341,7 +341,7 @@ KERNEL_FQ void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m16801-pure.cl b/OpenCL/m16801-pure.cl
index 498117936..9373d2e67 100644
--- a/OpenCL/m16801-pure.cl
+++ b/OpenCL/m16801-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m16801_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 in[16];
 
@@ -108,7 +108,7 @@ KERNEL_FQ void m16801_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 }
 
 KERNEL_FQ void m16801_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t))
@@ -120,7 +120,7 @@ KERNEL_FQ void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m16900-pure.cl b/OpenCL/m16900-pure.cl
index d10ae73cb..5593705c1 100644
--- a/OpenCL/m16900-pure.cl
+++ b/OpenCL/m16900-pure.cl
@@ -86,7 +86,7 @@ KERNEL_FQ void m16900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -166,7 +166,7 @@ KERNEL_FQ void m16900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -276,7 +276,7 @@ KERNEL_FQ void m16900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m17010-pure.cl b/OpenCL/m17010-pure.cl
index 905a88818..239c89b1b 100644
--- a/OpenCL/m17010-pure.cl
+++ b/OpenCL/m17010-pure.cl
@@ -215,7 +215,7 @@ KERNEL_FQ void m17010_init (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 pw_len = pws[gid].pw_len;
   const u32 salted_pw_len = (salt_bufs[SALT_POS_HOST].salt_len + pw_len);
@@ -264,7 +264,7 @@ KERNEL_FQ void m17010_loop_prepare (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].w0[0] = 0;
   tmps[gid].w0[1] = 0;
@@ -290,7 +290,7 @@ KERNEL_FQ void m17010_loop (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // get the prepared buffer from the gpg_tmp_t struct into a local buffer
   u32 salted_pw_block[80];
@@ -406,7 +406,7 @@ KERNEL_FQ void m17010_aux1 (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // retrieve and use the SHA-1 as the key for AES
 
@@ -476,7 +476,7 @@ KERNEL_FQ void m17010_aux2 (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // retrieve and use the SHA-1 as the key for AES
 
diff --git a/OpenCL/m17200_a0-pure.cl b/OpenCL/m17200_a0-pure.cl
index b0d1ddd6e..641235c8f 100644
--- a/OpenCL/m17200_a0-pure.cl
+++ b/OpenCL/m17200_a0-pure.cl
@@ -561,7 +561,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -799,7 +799,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17200_a1-pure.cl b/OpenCL/m17200_a1-pure.cl
index 05cc05c87..6e7527895 100644
--- a/OpenCL/m17200_a1-pure.cl
+++ b/OpenCL/m17200_a1-pure.cl
@@ -559,7 +559,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -801,7 +801,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17200_a3-pure.cl b/OpenCL/m17200_a3-pure.cl
index 12238c680..abde9d382 100644
--- a/OpenCL/m17200_a3-pure.cl
+++ b/OpenCL/m17200_a3-pure.cl
@@ -560,7 +560,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -814,7 +814,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17210_a0-pure.cl b/OpenCL/m17210_a0-pure.cl
index 72d375a46..d4b9d1e4b 100644
--- a/OpenCL/m17210_a0-pure.cl
+++ b/OpenCL/m17210_a0-pure.cl
@@ -252,7 +252,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -491,7 +491,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17210_a1-pure.cl b/OpenCL/m17210_a1-pure.cl
index 5b4a51e47..96ad17fd2 100644
--- a/OpenCL/m17210_a1-pure.cl
+++ b/OpenCL/m17210_a1-pure.cl
@@ -250,7 +250,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -491,7 +491,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17210_a3-pure.cl b/OpenCL/m17210_a3-pure.cl
index 2bbaaf024..0ee325a0b 100644
--- a/OpenCL/m17210_a3-pure.cl
+++ b/OpenCL/m17210_a3-pure.cl
@@ -250,7 +250,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -503,7 +503,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17220_a0-pure.cl b/OpenCL/m17220_a0-pure.cl
index dc2592c1e..00dbbd396 100644
--- a/OpenCL/m17220_a0-pure.cl
+++ b/OpenCL/m17220_a0-pure.cl
@@ -559,7 +559,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -824,7 +824,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m17220_a1-pure.cl b/OpenCL/m17220_a1-pure.cl
index aef0d2ced..459d76c45 100644
--- a/OpenCL/m17220_a1-pure.cl
+++ b/OpenCL/m17220_a1-pure.cl
@@ -557,7 +557,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
@@ -824,7 +824,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17220_a3-pure.cl b/OpenCL/m17220_a3-pure.cl
index d612c3626..5c1ec989c 100644
--- a/OpenCL/m17220_a3-pure.cl
+++ b/OpenCL/m17220_a3-pure.cl
@@ -557,7 +557,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -836,7 +836,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m17225_a0-pure.cl b/OpenCL/m17225_a0-pure.cl
index 237b29da5..e735d6d11 100644
--- a/OpenCL/m17225_a0-pure.cl
+++ b/OpenCL/m17225_a0-pure.cl
@@ -559,7 +559,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -887,7 +887,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m17225_a1-pure.cl b/OpenCL/m17225_a1-pure.cl
index 635e7697f..afbefc483 100644
--- a/OpenCL/m17225_a1-pure.cl
+++ b/OpenCL/m17225_a1-pure.cl
@@ -557,7 +557,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
@@ -886,7 +886,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17225_a3-pure.cl b/OpenCL/m17225_a3-pure.cl
index 4ec736a51..533c2afa4 100644
--- a/OpenCL/m17225_a3-pure.cl
+++ b/OpenCL/m17225_a3-pure.cl
@@ -557,7 +557,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -898,7 +898,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m17230_a0-pure.cl b/OpenCL/m17230_a0-pure.cl
index 135bce718..7c08dddc3 100644
--- a/OpenCL/m17230_a0-pure.cl
+++ b/OpenCL/m17230_a0-pure.cl
@@ -252,7 +252,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -422,7 +422,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m17230_a1-pure.cl b/OpenCL/m17230_a1-pure.cl
index ddac95eab..3ffc7744f 100644
--- a/OpenCL/m17230_a1-pure.cl
+++ b/OpenCL/m17230_a1-pure.cl
@@ -250,7 +250,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
@@ -422,7 +422,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * prefetch from global memory
diff --git a/OpenCL/m17230_a3-pure.cl b/OpenCL/m17230_a3-pure.cl
index 46e5a8949..4f0008a05 100644
--- a/OpenCL/m17230_a3-pure.cl
+++ b/OpenCL/m17230_a3-pure.cl
@@ -250,7 +250,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -436,7 +436,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m17300_a0-optimized.cl b/OpenCL/m17300_a0-optimized.cl
index c9d50fa42..8a0af093a 100644
--- a/OpenCL/m17300_a0-optimized.cl
+++ b/OpenCL/m17300_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17300_a1-optimized.cl b/OpenCL/m17300_a1-optimized.cl
index 771e939ea..12e26f2fe 100644
--- a/OpenCL/m17300_a1-optimized.cl
+++ b/OpenCL/m17300_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17300_a3-optimized.cl b/OpenCL/m17300_a3-optimized.cl
index 3290cabd0..c159654e3 100644
--- a/OpenCL/m17300_a3-optimized.cl
+++ b/OpenCL/m17300_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17300_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17300_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17300_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17300_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m17400_a0-optimized.cl b/OpenCL/m17400_a0-optimized.cl
index f6d3b883d..36d91be1e 100644
--- a/OpenCL/m17400_a0-optimized.cl
+++ b/OpenCL/m17400_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17400_a1-optimized.cl b/OpenCL/m17400_a1-optimized.cl
index 437223264..87cd38b4e 100644
--- a/OpenCL/m17400_a1-optimized.cl
+++ b/OpenCL/m17400_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17400_a3-optimized.cl b/OpenCL/m17400_a3-optimized.cl
index bfb92f850..7ea5c2e66 100644
--- a/OpenCL/m17400_a3-optimized.cl
+++ b/OpenCL/m17400_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17400_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17400_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17400_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17400_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m17500_a0-optimized.cl b/OpenCL/m17500_a0-optimized.cl
index db051d3ca..783f92278 100644
--- a/OpenCL/m17500_a0-optimized.cl
+++ b/OpenCL/m17500_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17500_a1-optimized.cl b/OpenCL/m17500_a1-optimized.cl
index df22d1592..bc226e425 100644
--- a/OpenCL/m17500_a1-optimized.cl
+++ b/OpenCL/m17500_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17500_a3-optimized.cl b/OpenCL/m17500_a3-optimized.cl
index cb56d74cd..418bcd63d 100644
--- a/OpenCL/m17500_a3-optimized.cl
+++ b/OpenCL/m17500_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17500_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17500_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17500_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17500_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m17600_a0-optimized.cl b/OpenCL/m17600_a0-optimized.cl
index 3263f9b63..d0c1c81f9 100644
--- a/OpenCL/m17600_a0-optimized.cl
+++ b/OpenCL/m17600_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17600_a1-optimized.cl b/OpenCL/m17600_a1-optimized.cl
index 961d8c641..da9b3fc48 100644
--- a/OpenCL/m17600_a1-optimized.cl
+++ b/OpenCL/m17600_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17600_a3-optimized.cl b/OpenCL/m17600_a3-optimized.cl
index e7a66cb38..463fb8592 100644
--- a/OpenCL/m17600_a3-optimized.cl
+++ b/OpenCL/m17600_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17600_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17600_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17600_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17600_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m17700_a0-optimized.cl b/OpenCL/m17700_a0-optimized.cl
index 78cda655c..3f0cad256 100644
--- a/OpenCL/m17700_a0-optimized.cl
+++ b/OpenCL/m17700_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17700_a1-optimized.cl b/OpenCL/m17700_a1-optimized.cl
index 249284fd1..408063471 100644
--- a/OpenCL/m17700_a1-optimized.cl
+++ b/OpenCL/m17700_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17700_a3-optimized.cl b/OpenCL/m17700_a3-optimized.cl
index c09114d48..801796b8f 100644
--- a/OpenCL/m17700_a3-optimized.cl
+++ b/OpenCL/m17700_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17700_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17700_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17700_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17700_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m17800_a0-optimized.cl b/OpenCL/m17800_a0-optimized.cl
index 89208d59c..69f4d2326 100644
--- a/OpenCL/m17800_a0-optimized.cl
+++ b/OpenCL/m17800_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17800_a1-optimized.cl b/OpenCL/m17800_a1-optimized.cl
index 7fd3f92aa..24cc448ab 100644
--- a/OpenCL/m17800_a1-optimized.cl
+++ b/OpenCL/m17800_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17800_a3-optimized.cl b/OpenCL/m17800_a3-optimized.cl
index c3d5144e3..8a9332354 100644
--- a/OpenCL/m17800_a3-optimized.cl
+++ b/OpenCL/m17800_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17800_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17800_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17800_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17800_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m17900_a0-optimized.cl b/OpenCL/m17900_a0-optimized.cl
index edf22f55b..a0c04028b 100644
--- a/OpenCL/m17900_a0-optimized.cl
+++ b/OpenCL/m17900_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17900_a1-optimized.cl b/OpenCL/m17900_a1-optimized.cl
index b0599f939..a18f6f39a 100644
--- a/OpenCL/m17900_a1-optimized.cl
+++ b/OpenCL/m17900_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m17900_a3-optimized.cl b/OpenCL/m17900_a3-optimized.cl
index eb056479e..0130dbcf1 100644
--- a/OpenCL/m17900_a3-optimized.cl
+++ b/OpenCL/m17900_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m17900_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m17900_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m17900_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m17900_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m18000_a0-optimized.cl b/OpenCL/m18000_a0-optimized.cl
index d266dfb11..7f8e4481e 100644
--- a/OpenCL/m18000_a0-optimized.cl
+++ b/OpenCL/m18000_a0-optimized.cl
@@ -43,7 +43,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -261,7 +261,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m18000_a1-optimized.cl b/OpenCL/m18000_a1-optimized.cl
index 62bfbcc79..62af594fc 100644
--- a/OpenCL/m18000_a1-optimized.cl
+++ b/OpenCL/m18000_a1-optimized.cl
@@ -41,7 +41,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -318,7 +318,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m18000_a3-optimized.cl b/OpenCL/m18000_a3-optimized.cl
index b5623cebc..03d0d8046 100644
--- a/OpenCL/m18000_a3-optimized.cl
+++ b/OpenCL/m18000_a3-optimized.cl
@@ -419,7 +419,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -466,7 +466,7 @@ KERNEL_FQ void m18000_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -513,7 +513,7 @@ KERNEL_FQ void m18000_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -560,7 +560,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -607,7 +607,7 @@ KERNEL_FQ void m18000_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -654,7 +654,7 @@ KERNEL_FQ void m18000_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m18100_a0-pure.cl b/OpenCL/m18100_a0-pure.cl
index 796efeda5..04cc6dd05 100644
--- a/OpenCL/m18100_a0-pure.cl
+++ b/OpenCL/m18100_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -102,7 +102,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18100_a1-pure.cl b/OpenCL/m18100_a1-pure.cl
index 6e08f1393..a1c24fad0 100644
--- a/OpenCL/m18100_a1-pure.cl
+++ b/OpenCL/m18100_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -125,7 +125,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18100_a3-pure.cl b/OpenCL/m18100_a3-pure.cl
index 84573247b..50b0982e8 100644
--- a/OpenCL/m18100_a3-pure.cl
+++ b/OpenCL/m18100_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -112,7 +112,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18200_a0-optimized.cl b/OpenCL/m18200_a0-optimized.cl
index 942d89552..63561ce47 100644
--- a/OpenCL/m18200_a0-optimized.cl
+++ b/OpenCL/m18200_a0-optimized.cl
@@ -460,7 +460,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -556,7 +556,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m18200_a0-pure.cl b/OpenCL/m18200_a0-pure.cl
index c7bf1af5e..0b1494a4f 100644
--- a/OpenCL/m18200_a0-pure.cl
+++ b/OpenCL/m18200_a0-pure.cl
@@ -272,7 +272,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -332,7 +332,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m18200_a1-optimized.cl b/OpenCL/m18200_a1-optimized.cl
index e8953e107..f75d56956 100644
--- a/OpenCL/m18200_a1-optimized.cl
+++ b/OpenCL/m18200_a1-optimized.cl
@@ -463,7 +463,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -608,7 +608,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m18200_a1-pure.cl b/OpenCL/m18200_a1-pure.cl
index 3a67131da..b0204771d 100644
--- a/OpenCL/m18200_a1-pure.cl
+++ b/OpenCL/m18200_a1-pure.cl
@@ -270,7 +270,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -328,7 +328,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m18200_a3-optimized.cl b/OpenCL/m18200_a3-optimized.cl
index 446d26b1e..44dd9f087 100644
--- a/OpenCL/m18200_a3-optimized.cl
+++ b/OpenCL/m18200_a3-optimized.cl
@@ -517,7 +517,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -567,7 +567,7 @@ KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -621,7 +621,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -671,7 +671,7 @@ KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m18200_a3-pure.cl b/OpenCL/m18200_a3-pure.cl
index 0ec0ed521..41af3c036 100644
--- a/OpenCL/m18200_a3-pure.cl
+++ b/OpenCL/m18200_a3-pure.cl
@@ -270,7 +270,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -341,7 +341,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m18300-pure.cl b/OpenCL/m18300-pure.cl
index 645437f42..796420c1d 100644
--- a/OpenCL/m18300-pure.cl
+++ b/OpenCL/m18300-pure.cl
@@ -87,7 +87,7 @@ KERNEL_FQ void m18300_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -167,7 +167,7 @@ KERNEL_FQ void m18300_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -326,7 +326,7 @@ KERNEL_FQ void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m18400-pure.cl b/OpenCL/m18400-pure.cl
index 80756134d..87b48d329 100644
--- a/OpenCL/m18400-pure.cl
+++ b/OpenCL/m18400-pure.cl
@@ -82,7 +82,7 @@ KERNEL_FQ void m18400_init (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t sha256_ctx;
 
@@ -183,7 +183,7 @@ KERNEL_FQ void m18400_loop (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -322,7 +322,7 @@ KERNEL_FQ void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m18500_a0-pure.cl b/OpenCL/m18500_a0-pure.cl
index a80390539..0a3a2e434 100644
--- a/OpenCL/m18500_a0-pure.cl
+++ b/OpenCL/m18500_a0-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -168,7 +168,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18500_a1-pure.cl b/OpenCL/m18500_a1-pure.cl
index bcc2f98ad..c4dccbde5 100644
--- a/OpenCL/m18500_a1-pure.cl
+++ b/OpenCL/m18500_a1-pure.cl
@@ -52,7 +52,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18500_a3-pure.cl b/OpenCL/m18500_a3-pure.cl
index b257c1826..1eed9e917 100644
--- a/OpenCL/m18500_a3-pure.cl
+++ b/OpenCL/m18500_a3-pure.cl
@@ -50,7 +50,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -177,7 +177,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl
index 6373da9ed..cc1f2a647 100644
--- a/OpenCL/m18600-pure.cl
+++ b/OpenCL/m18600-pure.cl
@@ -459,7 +459,7 @@ KERNEL_FQ void m18600_init (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t sha1_ctx;
 
@@ -557,7 +557,7 @@ KERNEL_FQ void m18600_loop (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -641,7 +641,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE_COMP) m18600_comp (KERN_ATTR_
   const u64 lid = get_local_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m18700_a0-optimized.cl b/OpenCL/m18700_a0-optimized.cl
index c962009ec..2d91c0d95 100644
--- a/OpenCL/m18700_a0-optimized.cl
+++ b/OpenCL/m18700_a0-optimized.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -126,7 +126,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m18700_a0-pure.cl b/OpenCL/m18700_a0-pure.cl
index 42f40399b..9c7bbb8ad 100644
--- a/OpenCL/m18700_a0-pure.cl
+++ b/OpenCL/m18700_a0-pure.cl
@@ -63,7 +63,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18700_a1-optimized.cl b/OpenCL/m18700_a1-optimized.cl
index 51063e2af..3849d2bff 100644
--- a/OpenCL/m18700_a1-optimized.cl
+++ b/OpenCL/m18700_a1-optimized.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * loop
@@ -119,7 +119,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18700_a1-pure.cl b/OpenCL/m18700_a1-pure.cl
index 2a7e5ed60..4565440e5 100644
--- a/OpenCL/m18700_a1-pure.cl
+++ b/OpenCL/m18700_a1-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * loop
@@ -100,7 +100,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18700_a3-optimized.cl b/OpenCL/m18700_a3-optimized.cl
index cba3f8a6c..2be64d46e 100644
--- a/OpenCL/m18700_a3-optimized.cl
+++ b/OpenCL/m18700_a3-optimized.cl
@@ -154,7 +154,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -192,7 +192,7 @@ KERNEL_FQ void m18700_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -230,7 +230,7 @@ KERNEL_FQ void m18700_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -268,7 +268,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -306,7 +306,7 @@ KERNEL_FQ void m18700_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -344,7 +344,7 @@ KERNEL_FQ void m18700_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m18700_a3-pure.cl b/OpenCL/m18700_a3-pure.cl
index 95e819a8f..d5f655919 100644
--- a/OpenCL/m18700_a3-pure.cl
+++ b/OpenCL/m18700_a3-pure.cl
@@ -79,7 +79,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -126,7 +126,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m18800-pure.cl b/OpenCL/m18800-pure.cl
index 4d0c02601..73b2a70c5 100644
--- a/OpenCL/m18800-pure.cl
+++ b/OpenCL/m18800-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m18800_init (KERN_ATTR_TMPS (bsp_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t ctx;
 
@@ -57,7 +57,7 @@ KERNEL_FQ void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x digest[8];
 
@@ -124,7 +124,7 @@ KERNEL_FQ void m18800_comp (KERN_ATTR_TMPS (bsp_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m18900-pure.cl b/OpenCL/m18900-pure.cl
index 750e33d31..a8eaf5f39 100644
--- a/OpenCL/m18900-pure.cl
+++ b/OpenCL/m18900-pure.cl
@@ -84,7 +84,7 @@ KERNEL_FQ void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -152,7 +152,7 @@ KERNEL_FQ void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -290,7 +290,7 @@ KERNEL_FQ void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
diff --git a/OpenCL/m19000-pure.cl b/OpenCL/m19000-pure.cl
index 2b69f1dab..42f1c4e1b 100644
--- a/OpenCL/m19000-pure.cl
+++ b/OpenCL/m19000-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m19000_init (KERN_ATTR_TMPS (qnx_md5_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -56,7 +56,7 @@ KERNEL_FQ void m19000_loop (KERN_ATTR_TMPS (qnx_md5_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   md5_ctx_t md5_ctx = tmps[gid].md5_ctx;
 
@@ -77,7 +77,7 @@ KERNEL_FQ void m19000_comp (KERN_ATTR_TMPS (qnx_md5_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   md5_ctx_t md5_ctx = tmps[gid].md5_ctx;
 
diff --git a/OpenCL/m19100-pure.cl b/OpenCL/m19100-pure.cl
index ce4aec930..caee31384 100644
--- a/OpenCL/m19100-pure.cl
+++ b/OpenCL/m19100-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m19100_init (KERN_ATTR_TMPS (qnx_sha256_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -56,7 +56,7 @@ KERNEL_FQ void m19100_loop (KERN_ATTR_TMPS (qnx_sha256_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t sha256_ctx = tmps[gid].sha256_ctx;
 
@@ -77,7 +77,7 @@ KERNEL_FQ void m19100_comp (KERN_ATTR_TMPS (qnx_sha256_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_ctx_t sha256_ctx = tmps[gid].sha256_ctx;
 
diff --git a/OpenCL/m19200-pure.cl b/OpenCL/m19200-pure.cl
index 66ae6a8c3..ff8f36cba 100644
--- a/OpenCL/m19200-pure.cl
+++ b/OpenCL/m19200-pure.cl
@@ -372,7 +372,7 @@ KERNEL_FQ void m19200_init (KERN_ATTR_TMPS (qnx_sha512_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -398,7 +398,7 @@ KERNEL_FQ void m19200_loop (KERN_ATTR_TMPS (qnx_sha512_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t sha512_ctx = tmps[gid].sha512_ctx;
   u32 sav = tmps[gid].sav;
@@ -421,7 +421,7 @@ KERNEL_FQ void m19200_comp (KERN_ATTR_TMPS (qnx_sha512_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t sha512_ctx = tmps[gid].sha512_ctx;
 
diff --git a/OpenCL/m19300_a0-pure.cl b/OpenCL/m19300_a0-pure.cl
index fcd32d456..d4bcf555d 100644
--- a/OpenCL/m19300_a0-pure.cl
+++ b/OpenCL/m19300_a0-pure.cl
@@ -35,7 +35,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -94,7 +94,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m19300_a1-pure.cl b/OpenCL/m19300_a1-pure.cl
index 40d4ccc1c..f59b71a79 100644
--- a/OpenCL/m19300_a1-pure.cl
+++ b/OpenCL/m19300_a1-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_ESALT (sha1_double_salt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -88,7 +88,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_ESALT (sha1_double_salt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m19300_a3-pure.cl b/OpenCL/m19300_a3-pure.cl
index 93d2105f8..63b9f472c 100644
--- a/OpenCL/m19300_a3-pure.cl
+++ b/OpenCL/m19300_a3-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -105,7 +105,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m19500_a0-pure.cl b/OpenCL/m19500_a0-pure.cl
index ff9bfaaa9..8dfd01630 100644
--- a/OpenCL/m19500_a0-pure.cl
+++ b/OpenCL/m19500_a0-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -200,7 +200,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m19500_a1-pure.cl b/OpenCL/m19500_a1-pure.cl
index 059eb593b..860474558 100644
--- a/OpenCL/m19500_a1-pure.cl
+++ b/OpenCL/m19500_a1-pure.cl
@@ -63,7 +63,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -194,7 +194,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m19500_a3-pure.cl b/OpenCL/m19500_a3-pure.cl
index e43c916cf..90e501160 100644
--- a/OpenCL/m19500_a3-pure.cl
+++ b/OpenCL/m19500_a3-pure.cl
@@ -63,7 +63,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -209,7 +209,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m19600-pure.cl b/OpenCL/m19600-pure.cl
index a3d9383ec..88e9f04df 100644
--- a/OpenCL/m19600-pure.cl
+++ b/OpenCL/m19600-pure.cl
@@ -123,7 +123,7 @@ KERNEL_FQ void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -200,7 +200,7 @@ KERNEL_FQ void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
    */
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -342,7 +342,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /*
     at this point, the output ('seed') will be used to generate AES keys:
diff --git a/OpenCL/m19700-pure.cl b/OpenCL/m19700-pure.cl
index 5879697b0..64779017d 100644
--- a/OpenCL/m19700-pure.cl
+++ b/OpenCL/m19700-pure.cl
@@ -123,7 +123,7 @@ KERNEL_FQ void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -200,7 +200,7 @@ KERNEL_FQ void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
    */
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -342,7 +342,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /*
     at this point, the output ('seed') will be used to generate AES keys:
diff --git a/OpenCL/m19800-pure.cl b/OpenCL/m19800-pure.cl
index ee249576e..ff626911b 100644
--- a/OpenCL/m19800-pure.cl
+++ b/OpenCL/m19800-pure.cl
@@ -123,7 +123,7 @@ KERNEL_FQ void m19800_init (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -200,7 +200,7 @@ KERNEL_FQ void m19800_loop (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t))
    */
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -342,7 +342,7 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /*
     at this point, the output ('seed') will be used to generate AES keys:
diff --git a/OpenCL/m19900-pure.cl b/OpenCL/m19900-pure.cl
index 3715a8d71..b925be3e5 100644
--- a/OpenCL/m19900-pure.cl
+++ b/OpenCL/m19900-pure.cl
@@ -123,7 +123,7 @@ KERNEL_FQ void m19900_init (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -201,7 +201,7 @@ KERNEL_FQ void m19900_loop (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t))
 
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -343,7 +343,7 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /*
     at this point, the output ('seed') will be used to generate AES keys:
diff --git a/OpenCL/m20011-pure.cl b/OpenCL/m20011-pure.cl
index c8adea625..17c02e062 100644
--- a/OpenCL/m20011-pure.cl
+++ b/OpenCL/m20011-pure.cl
@@ -100,7 +100,7 @@ KERNEL_FQ void m20011_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -200,7 +200,7 @@ KERNEL_FQ void m20011_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -379,7 +379,7 @@ KERNEL_FQ void m20011_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define il_pos 0
 
diff --git a/OpenCL/m20012-pure.cl b/OpenCL/m20012-pure.cl
index 578716a5b..d1f9bbbe0 100644
--- a/OpenCL/m20012-pure.cl
+++ b/OpenCL/m20012-pure.cl
@@ -100,7 +100,7 @@ KERNEL_FQ void m20012_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -200,7 +200,7 @@ KERNEL_FQ void m20012_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -379,7 +379,7 @@ KERNEL_FQ void m20012_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define il_pos 0
 
diff --git a/OpenCL/m20013-pure.cl b/OpenCL/m20013-pure.cl
index 0cc495ada..ef5e80325 100644
--- a/OpenCL/m20013-pure.cl
+++ b/OpenCL/m20013-pure.cl
@@ -100,7 +100,7 @@ KERNEL_FQ void m20013_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -200,7 +200,7 @@ KERNEL_FQ void m20013_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -379,7 +379,7 @@ KERNEL_FQ void m20013_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   #define il_pos 0
 
diff --git a/OpenCL/m20500_a0-pure.cl b/OpenCL/m20500_a0-pure.cl
index 185ba610a..64fb546df 100644
--- a/OpenCL/m20500_a0-pure.cl
+++ b/OpenCL/m20500_a0-pure.cl
@@ -174,7 +174,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -248,7 +248,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20500_a1-pure.cl b/OpenCL/m20500_a1-pure.cl
index 7166c268b..086a6614d 100644
--- a/OpenCL/m20500_a1-pure.cl
+++ b/OpenCL/m20500_a1-pure.cl
@@ -172,7 +172,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -248,7 +248,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20500_a3-pure.cl b/OpenCL/m20500_a3-pure.cl
index 2cf9c4787..9cea8b4e3 100644
--- a/OpenCL/m20500_a3-pure.cl
+++ b/OpenCL/m20500_a3-pure.cl
@@ -268,7 +268,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -382,7 +382,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20510_a0-pure.cl b/OpenCL/m20510_a0-pure.cl
index 6626c4e04..24207e3a1 100644
--- a/OpenCL/m20510_a0-pure.cl
+++ b/OpenCL/m20510_a0-pure.cl
@@ -511,7 +511,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20510_a1-pure.cl b/OpenCL/m20510_a1-pure.cl
index 23568d728..8e67a3494 100644
--- a/OpenCL/m20510_a1-pure.cl
+++ b/OpenCL/m20510_a1-pure.cl
@@ -509,7 +509,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20510_a3-pure.cl b/OpenCL/m20510_a3-pure.cl
index 1ab821259..4e29fea6c 100644
--- a/OpenCL/m20510_a3-pure.cl
+++ b/OpenCL/m20510_a3-pure.cl
@@ -509,7 +509,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20600-pure.cl b/OpenCL/m20600-pure.cl
index 5930fd72d..75d9baef8 100644
--- a/OpenCL/m20600-pure.cl
+++ b/OpenCL/m20600-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m20600_init (KERN_ATTR_TMPS (omt_sha256_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * init
@@ -67,7 +67,7 @@ KERNEL_FQ void m20600_loop (KERN_ATTR_TMPS (omt_sha256_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   /**
    * init
@@ -144,7 +144,7 @@ KERNEL_FQ void m20600_comp (KERN_ATTR_TMPS (omt_sha256_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20710_a0-optimized.cl b/OpenCL/m20710_a0-optimized.cl
index 0a9822a96..7622fa625 100644
--- a/OpenCL/m20710_a0-optimized.cl
+++ b/OpenCL/m20710_a0-optimized.cl
@@ -69,7 +69,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -655,7 +655,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20710_a0-pure.cl b/OpenCL/m20710_a0-pure.cl
index 8b41613bc..20c75b9b4 100644
--- a/OpenCL/m20710_a0-pure.cl
+++ b/OpenCL/m20710_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20710_a1-optimized.cl b/OpenCL/m20710_a1-optimized.cl
index b246c514f..232e0e6af 100644
--- a/OpenCL/m20710_a1-optimized.cl
+++ b/OpenCL/m20710_a1-optimized.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -711,7 +711,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20710_a1-pure.cl b/OpenCL/m20710_a1-pure.cl
index 1fe69ce69..66a3f08d9 100644
--- a/OpenCL/m20710_a1-pure.cl
+++ b/OpenCL/m20710_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -163,7 +163,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20710_a3-optimized.cl b/OpenCL/m20710_a3-optimized.cl
index e8584bbb6..115f43b6e 100644
--- a/OpenCL/m20710_a3-optimized.cl
+++ b/OpenCL/m20710_a3-optimized.cl
@@ -1156,7 +1156,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1217,7 +1217,7 @@ KERNEL_FQ void m20710_m08 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1278,7 +1278,7 @@ KERNEL_FQ void m20710_m16 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1339,7 +1339,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1400,7 +1400,7 @@ KERNEL_FQ void m20710_s08 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1461,7 +1461,7 @@ KERNEL_FQ void m20710_s16 (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m20710_a3-pure.cl b/OpenCL/m20710_a3-pure.cl
index 4f009312d..1922512c0 100644
--- a/OpenCL/m20710_a3-pure.cl
+++ b/OpenCL/m20710_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -176,7 +176,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20720_a0-pure.cl b/OpenCL/m20720_a0-pure.cl
index dc8a007cf..021b8b048 100644
--- a/OpenCL/m20720_a0-pure.cl
+++ b/OpenCL/m20720_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20720_a1-pure.cl b/OpenCL/m20720_a1-pure.cl
index df3cf63f9..701389d96 100644
--- a/OpenCL/m20720_a1-pure.cl
+++ b/OpenCL/m20720_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -163,7 +163,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20720_a3-pure.cl b/OpenCL/m20720_a3-pure.cl
index 98e7dcb35..8efda5b1b 100644
--- a/OpenCL/m20720_a3-pure.cl
+++ b/OpenCL/m20720_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -176,7 +176,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20800_a0-optimized.cl b/OpenCL/m20800_a0-optimized.cl
index f3ced6638..56528a882 100644
--- a/OpenCL/m20800_a0-optimized.cl
+++ b/OpenCL/m20800_a0-optimized.cl
@@ -70,7 +70,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -341,7 +341,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20800_a0-pure.cl b/OpenCL/m20800_a0-pure.cl
index c0cf773fb..07510e0b8 100644
--- a/OpenCL/m20800_a0-pure.cl
+++ b/OpenCL/m20800_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -157,7 +157,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20800_a1-optimized.cl b/OpenCL/m20800_a1-optimized.cl
index 65cb2a043..3993baa87 100644
--- a/OpenCL/m20800_a1-optimized.cl
+++ b/OpenCL/m20800_a1-optimized.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -394,7 +394,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20800_a1-pure.cl b/OpenCL/m20800_a1-pure.cl
index 022e41013..5b8381b46 100644
--- a/OpenCL/m20800_a1-pure.cl
+++ b/OpenCL/m20800_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -153,7 +153,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20800_a3-optimized.cl b/OpenCL/m20800_a3-optimized.cl
index 63e2d3bbb..53397b4c3 100644
--- a/OpenCL/m20800_a3-optimized.cl
+++ b/OpenCL/m20800_a3-optimized.cl
@@ -573,7 +573,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -643,7 +643,7 @@ KERNEL_FQ void m20800_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -713,7 +713,7 @@ KERNEL_FQ void m20800_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -783,7 +783,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -853,7 +853,7 @@ KERNEL_FQ void m20800_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -923,7 +923,7 @@ KERNEL_FQ void m20800_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m20800_a3-pure.cl b/OpenCL/m20800_a3-pure.cl
index ee654c557..1d364a48a 100644
--- a/OpenCL/m20800_a3-pure.cl
+++ b/OpenCL/m20800_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -166,7 +166,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20900_a0-optimized.cl b/OpenCL/m20900_a0-optimized.cl
index af7824916..be13f2171 100644
--- a/OpenCL/m20900_a0-optimized.cl
+++ b/OpenCL/m20900_a0-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -766,7 +766,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20900_a0-pure.cl b/OpenCL/m20900_a0-pure.cl
index 9c3410793..33cedf652 100644
--- a/OpenCL/m20900_a0-pure.cl
+++ b/OpenCL/m20900_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -236,7 +236,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20900_a1-optimized.cl b/OpenCL/m20900_a1-optimized.cl
index 099f287b0..82bc47ade 100644
--- a/OpenCL/m20900_a1-optimized.cl
+++ b/OpenCL/m20900_a1-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -822,7 +822,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m20900_a1-pure.cl b/OpenCL/m20900_a1-pure.cl
index fd053f8e0..66d3718eb 100644
--- a/OpenCL/m20900_a1-pure.cl
+++ b/OpenCL/m20900_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -236,7 +236,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m20900_a3-optimized.cl b/OpenCL/m20900_a3-optimized.cl
index 32f38a275..734471dd8 100644
--- a/OpenCL/m20900_a3-optimized.cl
+++ b/OpenCL/m20900_a3-optimized.cl
@@ -1391,7 +1391,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1461,7 +1461,7 @@ KERNEL_FQ void m20900_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1531,7 +1531,7 @@ KERNEL_FQ void m20900_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1601,7 +1601,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1671,7 +1671,7 @@ KERNEL_FQ void m20900_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1741,7 +1741,7 @@ KERNEL_FQ void m20900_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m20900_a3-pure.cl b/OpenCL/m20900_a3-pure.cl
index dc1ed44bd..c717f7f19 100644
--- a/OpenCL/m20900_a3-pure.cl
+++ b/OpenCL/m20900_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -245,7 +245,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21000_a0-optimized.cl b/OpenCL/m21000_a0-optimized.cl
index 8af216879..17326ed17 100644
--- a/OpenCL/m21000_a0-optimized.cl
+++ b/OpenCL/m21000_a0-optimized.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -288,7 +288,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m21000_a0-pure.cl b/OpenCL/m21000_a0-pure.cl
index 448b003f1..49a4c5d86 100644
--- a/OpenCL/m21000_a0-pure.cl
+++ b/OpenCL/m21000_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -96,7 +96,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21000_a1-optimized.cl b/OpenCL/m21000_a1-optimized.cl
index 69b164fa4..987d237e8 100644
--- a/OpenCL/m21000_a1-optimized.cl
+++ b/OpenCL/m21000_a1-optimized.cl
@@ -232,7 +232,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -419,7 +419,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m21000_a1-pure.cl b/OpenCL/m21000_a1-pure.cl
index 5de4b1fed..96a690d7e 100644
--- a/OpenCL/m21000_a1-pure.cl
+++ b/OpenCL/m21000_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -92,7 +92,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21000_a3-optimized.cl b/OpenCL/m21000_a3-optimized.cl
index 352a46e2f..1813159c0 100644
--- a/OpenCL/m21000_a3-optimized.cl
+++ b/OpenCL/m21000_a3-optimized.cl
@@ -424,7 +424,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -462,7 +462,7 @@ KERNEL_FQ void m21000_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -500,7 +500,7 @@ KERNEL_FQ void m21000_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -538,7 +538,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -576,7 +576,7 @@ KERNEL_FQ void m21000_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -614,7 +614,7 @@ KERNEL_FQ void m21000_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m21000_a3-pure.cl b/OpenCL/m21000_a3-pure.cl
index 307e26fd9..7cc974c38 100644
--- a/OpenCL/m21000_a3-pure.cl
+++ b/OpenCL/m21000_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -105,7 +105,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21100_a0-optimized.cl b/OpenCL/m21100_a0-optimized.cl
index 1a79c4ab1..b1bcf4388 100644
--- a/OpenCL/m21100_a0-optimized.cl
+++ b/OpenCL/m21100_a0-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -421,7 +421,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m21100_a0-pure.cl b/OpenCL/m21100_a0-pure.cl
index 5f1d71609..d56e6bf81 100644
--- a/OpenCL/m21100_a0-pure.cl
+++ b/OpenCL/m21100_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -173,7 +173,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21100_a1-optimized.cl b/OpenCL/m21100_a1-optimized.cl
index 896a6bd55..9c0e21f8a 100644
--- a/OpenCL/m21100_a1-optimized.cl
+++ b/OpenCL/m21100_a1-optimized.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -477,7 +477,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m21100_a1-pure.cl b/OpenCL/m21100_a1-pure.cl
index a77d760b3..94af2433a 100644
--- a/OpenCL/m21100_a1-pure.cl
+++ b/OpenCL/m21100_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -169,7 +169,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21100_a3-optimized.cl b/OpenCL/m21100_a3-optimized.cl
index f67d78e33..1018aea03 100644
--- a/OpenCL/m21100_a3-optimized.cl
+++ b/OpenCL/m21100_a3-optimized.cl
@@ -667,7 +667,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -737,7 +737,7 @@ KERNEL_FQ void m21100_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -807,7 +807,7 @@ KERNEL_FQ void m21100_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -877,7 +877,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -947,7 +947,7 @@ KERNEL_FQ void m21100_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1017,7 +1017,7 @@ KERNEL_FQ void m21100_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m21100_a3-pure.cl b/OpenCL/m21100_a3-pure.cl
index 772248965..0fb4c176a 100644
--- a/OpenCL/m21100_a3-pure.cl
+++ b/OpenCL/m21100_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -182,7 +182,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21200_a0-optimized.cl b/OpenCL/m21200_a0-optimized.cl
index cfdf5ec58..117f5dd97 100644
--- a/OpenCL/m21200_a0-optimized.cl
+++ b/OpenCL/m21200_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -477,7 +477,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m21200_a0-pure.cl b/OpenCL/m21200_a0-pure.cl
index 8749ff55c..22e603258 100644
--- a/OpenCL/m21200_a0-pure.cl
+++ b/OpenCL/m21200_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -193,7 +193,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21200_a1-optimized.cl b/OpenCL/m21200_a1-optimized.cl
index 90c93cefd..42135f335 100644
--- a/OpenCL/m21200_a1-optimized.cl
+++ b/OpenCL/m21200_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -533,7 +533,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m21200_a1-pure.cl b/OpenCL/m21200_a1-pure.cl
index 89c2961c0..92ff4b201 100644
--- a/OpenCL/m21200_a1-pure.cl
+++ b/OpenCL/m21200_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -189,7 +189,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21200_a3-optimized.cl b/OpenCL/m21200_a3-optimized.cl
index ea931464e..aa9124d92 100644
--- a/OpenCL/m21200_a3-optimized.cl
+++ b/OpenCL/m21200_a3-optimized.cl
@@ -814,7 +814,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -884,7 +884,7 @@ KERNEL_FQ void m21200_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -954,7 +954,7 @@ KERNEL_FQ void m21200_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1024,7 +1024,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1094,7 +1094,7 @@ KERNEL_FQ void m21200_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1164,7 +1164,7 @@ KERNEL_FQ void m21200_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m21200_a3-pure.cl b/OpenCL/m21200_a3-pure.cl
index d9725b340..e32ac2179 100644
--- a/OpenCL/m21200_a3-pure.cl
+++ b/OpenCL/m21200_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -200,7 +200,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21300_a0-pure.cl b/OpenCL/m21300_a0-pure.cl
index c3da03402..58e331d82 100644
--- a/OpenCL/m21300_a0-pure.cl
+++ b/OpenCL/m21300_a0-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -173,7 +173,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21300_a1-pure.cl b/OpenCL/m21300_a1-pure.cl
index c1c9350cb..938d8f3f5 100644
--- a/OpenCL/m21300_a1-pure.cl
+++ b/OpenCL/m21300_a1-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -167,7 +167,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21300_a3-pure.cl b/OpenCL/m21300_a3-pure.cl
index 7ba6cc6fd..b79de64bf 100644
--- a/OpenCL/m21300_a3-pure.cl
+++ b/OpenCL/m21300_a3-pure.cl
@@ -54,7 +54,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -186,7 +186,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21400_a0-optimized.cl b/OpenCL/m21400_a0-optimized.cl
index 6d7c27a45..e2aa5b7a3 100644
--- a/OpenCL/m21400_a0-optimized.cl
+++ b/OpenCL/m21400_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -299,7 +299,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m21400_a0-pure.cl b/OpenCL/m21400_a0-pure.cl
index 480827a1f..b8eec3320 100644
--- a/OpenCL/m21400_a0-pure.cl
+++ b/OpenCL/m21400_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -100,7 +100,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21400_a1-optimized.cl b/OpenCL/m21400_a1-optimized.cl
index d9db39016..f308fe75f 100644
--- a/OpenCL/m21400_a1-optimized.cl
+++ b/OpenCL/m21400_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -355,7 +355,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m21400_a1-pure.cl b/OpenCL/m21400_a1-pure.cl
index bae678430..d32022f2e 100644
--- a/OpenCL/m21400_a1-pure.cl
+++ b/OpenCL/m21400_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -96,7 +96,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21400_a3-optimized.cl b/OpenCL/m21400_a3-optimized.cl
index c1c068f2e..83ada07be 100644
--- a/OpenCL/m21400_a3-optimized.cl
+++ b/OpenCL/m21400_a3-optimized.cl
@@ -507,7 +507,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -545,7 +545,7 @@ KERNEL_FQ void m21400_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -583,7 +583,7 @@ KERNEL_FQ void m21400_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -621,7 +621,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -659,7 +659,7 @@ KERNEL_FQ void m21400_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -697,7 +697,7 @@ KERNEL_FQ void m21400_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m21400_a3-pure.cl b/OpenCL/m21400_a3-pure.cl
index 09fdaca3c..1bf25c4fb 100644
--- a/OpenCL/m21400_a3-pure.cl
+++ b/OpenCL/m21400_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -109,7 +109,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21420_a0-pure.cl b/OpenCL/m21420_a0-pure.cl
index 762e1006d..966509a6f 100644
--- a/OpenCL/m21420_a0-pure.cl
+++ b/OpenCL/m21420_a0-pure.cl
@@ -26,7 +26,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -121,7 +121,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21420_a1-pure.cl b/OpenCL/m21420_a1-pure.cl
index 27ba02168..707139c6b 100644
--- a/OpenCL/m21420_a1-pure.cl
+++ b/OpenCL/m21420_a1-pure.cl
@@ -24,7 +24,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -117,7 +117,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21420_a3-pure.cl b/OpenCL/m21420_a3-pure.cl
index 3295982bd..183617ebc 100644
--- a/OpenCL/m21420_a3-pure.cl
+++ b/OpenCL/m21420_a3-pure.cl
@@ -24,7 +24,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -130,7 +130,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m21500-pure.cl b/OpenCL/m21500-pure.cl
index a270c241d..567692fa5 100644
--- a/OpenCL/m21500-pure.cl
+++ b/OpenCL/m21500-pure.cl
@@ -78,7 +78,7 @@ KERNEL_FQ void m21500_init (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -146,7 +146,7 @@ KERNEL_FQ void m21500_loop (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -235,7 +235,7 @@ KERNEL_FQ void m21500_comp (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m21600-pure.cl b/OpenCL/m21600-pure.cl
index 3125fc4b3..66d828e9c 100644
--- a/OpenCL/m21600-pure.cl
+++ b/OpenCL/m21600-pure.cl
@@ -93,7 +93,7 @@ KERNEL_FQ void m21600_init (KERN_ATTR_TMPS (web2py_sha512_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -193,7 +193,7 @@ KERNEL_FQ void m21600_loop (KERN_ATTR_TMPS (web2py_sha512_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -323,7 +323,7 @@ KERNEL_FQ void m21600_comp (KERN_ATTR_TMPS (web2py_sha512_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m21700-pure.cl b/OpenCL/m21700-pure.cl
index bdfd294c4..1c6297d64 100644
--- a/OpenCL/m21700-pure.cl
+++ b/OpenCL/m21700-pure.cl
@@ -103,7 +103,7 @@ KERNEL_FQ void m21700_init (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -196,7 +196,7 @@ KERNEL_FQ void m21700_loop (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -323,7 +323,7 @@ KERNEL_FQ void m21700_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u64 out[8];
 
diff --git a/OpenCL/m21800-pure.cl b/OpenCL/m21800-pure.cl
index 7e2d5dd74..010f642eb 100644
--- a/OpenCL/m21800-pure.cl
+++ b/OpenCL/m21800-pure.cl
@@ -104,7 +104,7 @@ KERNEL_FQ void m21800_init (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -197,7 +197,7 @@ KERNEL_FQ void m21800_loop (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -373,7 +373,7 @@ KERNEL_FQ void m21800_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
 
   /*
diff --git a/OpenCL/m22000-pure.cl b/OpenCL/m22000-pure.cl
index 530ceabd5..a6a1be2ab 100644
--- a/OpenCL/m22000-pure.cl
+++ b/OpenCL/m22000-pure.cl
@@ -153,7 +153,7 @@ KERNEL_FQ void m22000_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx0;
 
@@ -257,7 +257,7 @@ KERNEL_FQ void m22000_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -405,7 +405,7 @@ KERNEL_FQ void m22000_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -595,7 +595,7 @@ KERNEL_FQ void m22000_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -811,7 +811,7 @@ KERNEL_FQ void m22000_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -1066,7 +1066,7 @@ KERNEL_FQ void m22000_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m22001-pure.cl b/OpenCL/m22001-pure.cl
index 9abcdc9c7..3d40741f9 100644
--- a/OpenCL/m22001-pure.cl
+++ b/OpenCL/m22001-pure.cl
@@ -162,7 +162,7 @@ KERNEL_FQ void m22001_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 in[16];
 
@@ -218,7 +218,7 @@ KERNEL_FQ void m22001_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -408,7 +408,7 @@ KERNEL_FQ void m22001_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -624,7 +624,7 @@ KERNEL_FQ void m22001_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out0[4];
   u32 out1[4];
@@ -879,7 +879,7 @@ KERNEL_FQ void m22001_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m22100-pure.cl b/OpenCL/m22100-pure.cl
index 543539716..f49b02b4d 100644
--- a/OpenCL/m22100-pure.cl
+++ b/OpenCL/m22100-pure.cl
@@ -141,7 +141,7 @@ KERNEL_FQ void m22100_init (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // sha256 of utf16le converted password:
 
@@ -404,7 +404,7 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /*
    * AES decrypt the data_buf
diff --git a/OpenCL/m22200_a0-optimized.cl b/OpenCL/m22200_a0-optimized.cl
index 069d612d7..beb1e341a 100644
--- a/OpenCL/m22200_a0-optimized.cl
+++ b/OpenCL/m22200_a0-optimized.cl
@@ -136,7 +136,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -259,7 +259,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m22200_a0-pure.cl b/OpenCL/m22200_a0-pure.cl
index 7a7a224ec..c266dbdb0 100644
--- a/OpenCL/m22200_a0-pure.cl
+++ b/OpenCL/m22200_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -77,7 +77,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22200_a1-optimized.cl b/OpenCL/m22200_a1-optimized.cl
index 3bf4460be..38dbcb4a8 100644
--- a/OpenCL/m22200_a1-optimized.cl
+++ b/OpenCL/m22200_a1-optimized.cl
@@ -134,7 +134,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -329,7 +329,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m22200_a1-pure.cl b/OpenCL/m22200_a1-pure.cl
index 0cc06a0f4..8d125c993 100644
--- a/OpenCL/m22200_a1-pure.cl
+++ b/OpenCL/m22200_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -72,7 +72,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22200_a3-optimized.cl b/OpenCL/m22200_a3-optimized.cl
index be4da018d..0a13327ac 100644
--- a/OpenCL/m22200_a3-optimized.cl
+++ b/OpenCL/m22200_a3-optimized.cl
@@ -296,7 +296,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -360,7 +360,7 @@ KERNEL_FQ void m22200_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -432,7 +432,7 @@ KERNEL_FQ void m22200_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -519,7 +519,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -583,7 +583,7 @@ KERNEL_FQ void m22200_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -655,7 +655,7 @@ KERNEL_FQ void m22200_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m22200_a3-pure.cl b/OpenCL/m22200_a3-pure.cl
index ff6dafb0b..be111e80f 100644
--- a/OpenCL/m22200_a3-pure.cl
+++ b/OpenCL/m22200_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -88,7 +88,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22300_a0-optimized.cl b/OpenCL/m22300_a0-optimized.cl
index 763c752ca..d3435e4c6 100644
--- a/OpenCL/m22300_a0-optimized.cl
+++ b/OpenCL/m22300_a0-optimized.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -299,7 +299,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m22300_a0-pure.cl b/OpenCL/m22300_a0-pure.cl
index d8e32f240..7b83a7ac9 100644
--- a/OpenCL/m22300_a0-pure.cl
+++ b/OpenCL/m22300_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -84,7 +84,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22300_a1-optimized.cl b/OpenCL/m22300_a1-optimized.cl
index 89c47f313..1c3377d07 100644
--- a/OpenCL/m22300_a1-optimized.cl
+++ b/OpenCL/m22300_a1-optimized.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -357,7 +357,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m22300_a1-pure.cl b/OpenCL/m22300_a1-pure.cl
index f20100747..228957afa 100644
--- a/OpenCL/m22300_a1-pure.cl
+++ b/OpenCL/m22300_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -78,7 +78,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22300_a3-optimized.cl b/OpenCL/m22300_a3-optimized.cl
index ff4179f53..cab74aa5d 100644
--- a/OpenCL/m22300_a3-optimized.cl
+++ b/OpenCL/m22300_a3-optimized.cl
@@ -551,7 +551,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -598,7 +598,7 @@ KERNEL_FQ void m22300_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -645,7 +645,7 @@ KERNEL_FQ void m22300_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -692,7 +692,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -739,7 +739,7 @@ KERNEL_FQ void m22300_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -786,7 +786,7 @@ KERNEL_FQ void m22300_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m22300_a3-pure.cl b/OpenCL/m22300_a3-pure.cl
index 4f5979fe0..01282152b 100644
--- a/OpenCL/m22300_a3-pure.cl
+++ b/OpenCL/m22300_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22400-pure.cl b/OpenCL/m22400-pure.cl
index fe4feb900..2bd93d3a7 100644
--- a/OpenCL/m22400-pure.cl
+++ b/OpenCL/m22400-pure.cl
@@ -39,7 +39,7 @@ KERNEL_FQ void m22400_init (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // salt:
 
@@ -112,7 +112,7 @@ KERNEL_FQ void m22400_loop (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // init
 
@@ -216,7 +216,7 @@ KERNEL_FQ void m22400_comp (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // digest
 
diff --git a/OpenCL/m22500_a0-optimized.cl b/OpenCL/m22500_a0-optimized.cl
index 9c663089e..1d3cf3ee9 100644
--- a/OpenCL/m22500_a0-optimized.cl
+++ b/OpenCL/m22500_a0-optimized.cl
@@ -90,7 +90,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -685,7 +685,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m22500_a0-pure.cl b/OpenCL/m22500_a0-pure.cl
index 1197d87e1..f57a79bc8 100644
--- a/OpenCL/m22500_a0-pure.cl
+++ b/OpenCL/m22500_a0-pure.cl
@@ -90,7 +90,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   COPY_PW (pws[gid]);
 
@@ -386,7 +386,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   COPY_PW (pws[gid]);
 
diff --git a/OpenCL/m22500_a1-optimized.cl b/OpenCL/m22500_a1-optimized.cl
index 0c7d4e12c..09203c283 100644
--- a/OpenCL/m22500_a1-optimized.cl
+++ b/OpenCL/m22500_a1-optimized.cl
@@ -89,7 +89,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -744,7 +744,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m22500_a1-pure.cl b/OpenCL/m22500_a1-pure.cl
index 6d44603df..fe3d1643c 100644
--- a/OpenCL/m22500_a1-pure.cl
+++ b/OpenCL/m22500_a1-pure.cl
@@ -88,7 +88,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -390,7 +390,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
diff --git a/OpenCL/m22500_a3-optimized.cl b/OpenCL/m22500_a3-optimized.cl
index 0ded3b719..286f47054 100644
--- a/OpenCL/m22500_a3-optimized.cl
+++ b/OpenCL/m22500_a3-optimized.cl
@@ -665,7 +665,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -760,7 +760,7 @@ KERNEL_FQ void m22500_m08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -855,7 +855,7 @@ KERNEL_FQ void m22500_m16 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -950,7 +950,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1045,7 +1045,7 @@ KERNEL_FQ void m22500_s08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1140,7 +1140,7 @@ KERNEL_FQ void m22500_s16 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m22500_a3-pure.cl b/OpenCL/m22500_a3-pure.cl
index 5381c343c..ef36c38e8 100644
--- a/OpenCL/m22500_a3-pure.cl
+++ b/OpenCL/m22500_a3-pure.cl
@@ -88,7 +88,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -399,7 +399,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m22600-pure.cl b/OpenCL/m22600-pure.cl
index 15c8b6458..da7a92b9c 100644
--- a/OpenCL/m22600-pure.cl
+++ b/OpenCL/m22600-pure.cl
@@ -116,7 +116,7 @@ KERNEL_FQ void m22600_init (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -186,7 +186,7 @@ KERNEL_FQ void m22600_loop (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -328,7 +328,7 @@ KERNEL_FQ void m22600_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 message_key[4];
 
diff --git a/OpenCL/m22700-pure.cl b/OpenCL/m22700-pure.cl
index 06336b474..421d213d2 100644
--- a/OpenCL/m22700-pure.cl
+++ b/OpenCL/m22700-pure.cl
@@ -302,7 +302,7 @@ KERNEL_FQ void m22700_init (KERN_ATTR_TMPS (scrypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[128] = { 0 };
 
@@ -430,7 +430,7 @@ KERNEL_FQ void m22700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // SCRYPT part, init V
 
@@ -457,7 +457,7 @@ KERNEL_FQ void m22700_loop (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf;
   GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf;
@@ -534,7 +534,7 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * 2nd pbkdf2, creates B
diff --git a/OpenCL/m22911_a0-pure.cl b/OpenCL/m22911_a0-pure.cl
index 5ee07c1f0..0e6c482d2 100644
--- a/OpenCL/m22911_a0-pure.cl
+++ b/OpenCL/m22911_a0-pure.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -273,7 +273,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22911_a1-pure.cl b/OpenCL/m22911_a1-pure.cl
index de4854d54..b2f4dc4f2 100644
--- a/OpenCL/m22911_a1-pure.cl
+++ b/OpenCL/m22911_a1-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -269,7 +269,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22911_a3-pure.cl b/OpenCL/m22911_a3-pure.cl
index 7437f07f0..32c512fcd 100644
--- a/OpenCL/m22911_a3-pure.cl
+++ b/OpenCL/m22911_a3-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -286,7 +286,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22921_a0-pure.cl b/OpenCL/m22921_a0-pure.cl
index 370a7239b..91b7c4980 100644
--- a/OpenCL/m22921_a0-pure.cl
+++ b/OpenCL/m22921_a0-pure.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -240,7 +240,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22921_a1-pure.cl b/OpenCL/m22921_a1-pure.cl
index b8f0e3b72..51b92eabf 100644
--- a/OpenCL/m22921_a1-pure.cl
+++ b/OpenCL/m22921_a1-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -234,7 +234,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22921_a3-pure.cl b/OpenCL/m22921_a3-pure.cl
index 9b6439b7c..c05cf8953 100644
--- a/OpenCL/m22921_a3-pure.cl
+++ b/OpenCL/m22921_a3-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -254,7 +254,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22931_a0-pure.cl b/OpenCL/m22931_a0-pure.cl
index ba469ee3c..2b740b8e3 100644
--- a/OpenCL/m22931_a0-pure.cl
+++ b/OpenCL/m22931_a0-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -290,7 +290,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22931_a1-pure.cl b/OpenCL/m22931_a1-pure.cl
index 76bb4f297..0005b7f9c 100644
--- a/OpenCL/m22931_a1-pure.cl
+++ b/OpenCL/m22931_a1-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -284,7 +284,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22931_a3-pure.cl b/OpenCL/m22931_a3-pure.cl
index ea2032c65..160243267 100644
--- a/OpenCL/m22931_a3-pure.cl
+++ b/OpenCL/m22931_a3-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -303,7 +303,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22941_a0-pure.cl b/OpenCL/m22941_a0-pure.cl
index adf853436..121aab24d 100644
--- a/OpenCL/m22941_a0-pure.cl
+++ b/OpenCL/m22941_a0-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -310,7 +310,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22941_a1-pure.cl b/OpenCL/m22941_a1-pure.cl
index e550889a0..69c9b2dc7 100644
--- a/OpenCL/m22941_a1-pure.cl
+++ b/OpenCL/m22941_a1-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -306,7 +306,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22941_a3-pure.cl b/OpenCL/m22941_a3-pure.cl
index 80af1bbb8..be1ca037f 100644
--- a/OpenCL/m22941_a3-pure.cl
+++ b/OpenCL/m22941_a3-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -323,7 +323,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22951_a0-pure.cl b/OpenCL/m22951_a0-pure.cl
index eb4b7e97c..9e7e8ef9b 100644
--- a/OpenCL/m22951_a0-pure.cl
+++ b/OpenCL/m22951_a0-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -314,7 +314,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_RULES_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22951_a1-pure.cl b/OpenCL/m22951_a1-pure.cl
index dd57c8863..026fd2e05 100644
--- a/OpenCL/m22951_a1-pure.cl
+++ b/OpenCL/m22951_a1-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -310,7 +310,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m22951_a3-pure.cl b/OpenCL/m22951_a3-pure.cl
index c3149e0d0..779169e66 100644
--- a/OpenCL/m22951_a3-pure.cl
+++ b/OpenCL/m22951_a3-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
@@ -327,7 +327,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_VECTOR_ESALT (pem_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m23001_a0-optimized.cl b/OpenCL/m23001_a0-optimized.cl
index 55d28148d..b895019b1 100644
--- a/OpenCL/m23001_a0-optimized.cl
+++ b/OpenCL/m23001_a0-optimized.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -417,7 +417,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m23001_a0-pure.cl b/OpenCL/m23001_a0-pure.cl
index 097675b0a..c22bc86be 100644
--- a/OpenCL/m23001_a0-pure.cl
+++ b/OpenCL/m23001_a0-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -275,7 +275,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23001_a1-optimized.cl b/OpenCL/m23001_a1-optimized.cl
index d1559a683..4d1a6fb5a 100644
--- a/OpenCL/m23001_a1-optimized.cl
+++ b/OpenCL/m23001_a1-optimized.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -473,7 +473,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m23001_a1-pure.cl b/OpenCL/m23001_a1-pure.cl
index bb097e401..f5dcf3d05 100644
--- a/OpenCL/m23001_a1-pure.cl
+++ b/OpenCL/m23001_a1-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -271,7 +271,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23001_a3-optimized.cl b/OpenCL/m23001_a3-optimized.cl
index 2e3fa120d..33ea4095f 100644
--- a/OpenCL/m23001_a3-optimized.cl
+++ b/OpenCL/m23001_a3-optimized.cl
@@ -793,7 +793,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -884,7 +884,7 @@ KERNEL_FQ void m23001_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -975,7 +975,7 @@ KERNEL_FQ void m23001_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1066,7 +1066,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1157,7 +1157,7 @@ KERNEL_FQ void m23001_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1248,7 +1248,7 @@ KERNEL_FQ void m23001_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m23001_a3-pure.cl b/OpenCL/m23001_a3-pure.cl
index c4b94635b..f25a8bbcf 100644
--- a/OpenCL/m23001_a3-pure.cl
+++ b/OpenCL/m23001_a3-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -284,7 +284,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23002_a0-optimized.cl b/OpenCL/m23002_a0-optimized.cl
index b08d041e5..cf52a233c 100644
--- a/OpenCL/m23002_a0-optimized.cl
+++ b/OpenCL/m23002_a0-optimized.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -470,7 +470,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m23002_a0-pure.cl b/OpenCL/m23002_a0-pure.cl
index 6e2afe922..5d052379a 100644
--- a/OpenCL/m23002_a0-pure.cl
+++ b/OpenCL/m23002_a0-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -328,7 +328,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23002_a1-optimized.cl b/OpenCL/m23002_a1-optimized.cl
index d7d33c96b..017a12c58 100644
--- a/OpenCL/m23002_a1-optimized.cl
+++ b/OpenCL/m23002_a1-optimized.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -526,7 +526,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m23002_a1-pure.cl b/OpenCL/m23002_a1-pure.cl
index fa53fc9ae..324eb0d70 100644
--- a/OpenCL/m23002_a1-pure.cl
+++ b/OpenCL/m23002_a1-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -324,7 +324,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23002_a3-optimized.cl b/OpenCL/m23002_a3-optimized.cl
index 8850bff6f..8e5d9911f 100644
--- a/OpenCL/m23002_a3-optimized.cl
+++ b/OpenCL/m23002_a3-optimized.cl
@@ -899,7 +899,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -990,7 +990,7 @@ KERNEL_FQ void m23002_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1081,7 +1081,7 @@ KERNEL_FQ void m23002_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1172,7 +1172,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1263,7 +1263,7 @@ KERNEL_FQ void m23002_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1354,7 +1354,7 @@ KERNEL_FQ void m23002_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m23002_a3-pure.cl b/OpenCL/m23002_a3-pure.cl
index 92fb323cd..8ce3dae4c 100644
--- a/OpenCL/m23002_a3-pure.cl
+++ b/OpenCL/m23002_a3-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -337,7 +337,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23003_a0-optimized.cl b/OpenCL/m23003_a0-optimized.cl
index 4e8489bf1..7f1c77ab9 100644
--- a/OpenCL/m23003_a0-optimized.cl
+++ b/OpenCL/m23003_a0-optimized.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -472,7 +472,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m23003_a0-pure.cl b/OpenCL/m23003_a0-pure.cl
index cfcb50dd3..d22f6f582 100644
--- a/OpenCL/m23003_a0-pure.cl
+++ b/OpenCL/m23003_a0-pure.cl
@@ -83,7 +83,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -330,7 +330,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_RULES_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23003_a1-optimized.cl b/OpenCL/m23003_a1-optimized.cl
index 2a0cb34fe..9efb154df 100644
--- a/OpenCL/m23003_a1-optimized.cl
+++ b/OpenCL/m23003_a1-optimized.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -528,7 +528,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m23003_a1-pure.cl b/OpenCL/m23003_a1-pure.cl
index 56f894fe9..a975ad1e7 100644
--- a/OpenCL/m23003_a1-pure.cl
+++ b/OpenCL/m23003_a1-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -326,7 +326,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23003_a3-optimized.cl b/OpenCL/m23003_a3-optimized.cl
index 2762ac546..930efe6cf 100644
--- a/OpenCL/m23003_a3-optimized.cl
+++ b/OpenCL/m23003_a3-optimized.cl
@@ -903,7 +903,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -994,7 +994,7 @@ KERNEL_FQ void m23003_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1085,7 +1085,7 @@ KERNEL_FQ void m23003_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1176,7 +1176,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1267,7 +1267,7 @@ KERNEL_FQ void m23003_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -1358,7 +1358,7 @@ KERNEL_FQ void m23003_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m23003_a3-pure.cl b/OpenCL/m23003_a3-pure.cl
index 4f5adca51..9c8cbd1f3 100644
--- a/OpenCL/m23003_a3-pure.cl
+++ b/OpenCL/m23003_a3-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -339,7 +339,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23100-pure.cl b/OpenCL/m23100-pure.cl
index a3b1e9179..08d9ab0cd 100644
--- a/OpenCL/m23100-pure.cl
+++ b/OpenCL/m23100-pure.cl
@@ -76,7 +76,7 @@ KERNEL_FQ void m23100_init (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -144,7 +144,7 @@ KERNEL_FQ void m23100_loop (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -274,7 +274,7 @@ KERNEL_FQ void m23100_comp (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 key[6];
 
diff --git a/OpenCL/m23200-pure.cl b/OpenCL/m23200-pure.cl
index 8ebe57a94..df66ed1e6 100644
--- a/OpenCL/m23200-pure.cl
+++ b/OpenCL/m23200-pure.cl
@@ -71,7 +71,7 @@ KERNEL_FQ void m23200_init (KERN_ATTR_TMPS (xmpp_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -139,7 +139,7 @@ KERNEL_FQ void m23200_loop (KERN_ATTR_TMPS (xmpp_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -228,7 +228,7 @@ KERNEL_FQ void m23200_comp (KERN_ATTR_TMPS (xmpp_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m23300-pure.cl b/OpenCL/m23300-pure.cl
index b031e12b9..4e6ccba4e 100644
--- a/OpenCL/m23300-pure.cl
+++ b/OpenCL/m23300-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m23300_init (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -162,7 +162,7 @@ KERNEL_FQ void m23300_loop (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -300,7 +300,7 @@ KERNEL_FQ void m23300_comp (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * AES part
diff --git a/OpenCL/m23400-pure.cl b/OpenCL/m23400-pure.cl
index b3304f508..1e24cf86e 100644
--- a/OpenCL/m23400-pure.cl
+++ b/OpenCL/m23400-pure.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m23400_init (KERN_ATTR_TMPS (bitwarden_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -154,7 +154,7 @@ KERNEL_FQ void m23400_loop (KERN_ATTR_TMPS (bitwarden_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -261,7 +261,7 @@ KERNEL_FQ void m23400_comp (KERN_ATTR_TMPS (bitwarden_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out[16] = { 0 };
 
diff --git a/OpenCL/m23500-pure.cl b/OpenCL/m23500-pure.cl
index d1728f68b..0b5c7f77e 100644
--- a/OpenCL/m23500-pure.cl
+++ b/OpenCL/m23500-pure.cl
@@ -101,7 +101,7 @@ KERNEL_FQ void m23500_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -201,7 +201,7 @@ KERNEL_FQ void m23500_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -331,7 +331,7 @@ KERNEL_FQ void m23500_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out[16];
 
@@ -438,7 +438,7 @@ KERNEL_FQ void m23500_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[4];
 
@@ -506,7 +506,7 @@ KERNEL_FQ void m23500_comp (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if ((tmps[gid].data[0] == 0xa6a6a6a6) &&
       (tmps[gid].data[1] == 0xa6a6a6a6))
diff --git a/OpenCL/m23600-pure.cl b/OpenCL/m23600-pure.cl
index 3d7bb29a7..faf7972a2 100644
--- a/OpenCL/m23600-pure.cl
+++ b/OpenCL/m23600-pure.cl
@@ -101,7 +101,7 @@ KERNEL_FQ void m23600_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -201,7 +201,7 @@ KERNEL_FQ void m23600_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -331,7 +331,7 @@ KERNEL_FQ void m23600_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 out[16];
 
@@ -450,7 +450,7 @@ KERNEL_FQ void m23600_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
@@ -522,7 +522,7 @@ KERNEL_FQ void m23600_comp (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   if ((tmps[gid].data[0] == 0xa6a6a6a6) &&
       (tmps[gid].data[1] == 0xa6a6a6a6))
diff --git a/OpenCL/m23700-optimized.cl b/OpenCL/m23700-optimized.cl
index 663db8091..3d1dbc8bb 100644
--- a/OpenCL/m23700-optimized.cl
+++ b/OpenCL/m23700-optimized.cl
@@ -145,7 +145,7 @@ KERNEL_FQ void m23700_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].dgst[0][0] = SHA1M_A;
   tmps[gid].dgst[0][1] = SHA1M_B;
@@ -159,7 +159,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf[10];
 
@@ -494,7 +494,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf[10];
 
@@ -743,7 +743,7 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23700-pure.cl b/OpenCL/m23700-pure.cl
index ff27fbabc..3e86dee71 100644
--- a/OpenCL/m23700-pure.cl
+++ b/OpenCL/m23700-pure.cl
@@ -844,7 +844,7 @@ KERNEL_FQ void m23700_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].dgst[0] = SHA1M_A;
   tmps[gid].dgst[1] = SHA1M_B;
@@ -906,7 +906,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1080,7 +1080,7 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t))
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m23800-optimized.cl b/OpenCL/m23800-optimized.cl
index 833b7bfab..2233359dd 100644
--- a/OpenCL/m23800-optimized.cl
+++ b/OpenCL/m23800-optimized.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m23800_init (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].dgst[0][0] = SHA1M_A;
   tmps[gid].dgst[0][1] = SHA1M_B;
@@ -69,7 +69,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf[10];
 
@@ -311,7 +311,7 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -493,7 +493,7 @@ KERNEL_FQ void m23800_comp (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 crc32 = hooks[gid].crc32;
 
diff --git a/OpenCL/m23800-pure.cl b/OpenCL/m23800-pure.cl
index 20ce4e216..4800768dc 100644
--- a/OpenCL/m23800-pure.cl
+++ b/OpenCL/m23800-pure.cl
@@ -755,7 +755,7 @@ KERNEL_FQ void m23800_init (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   tmps[gid].dgst[0] = SHA1M_A;
   tmps[gid].dgst[1] = SHA1M_B;
@@ -817,7 +817,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -984,7 +984,7 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -1088,7 +1088,7 @@ KERNEL_FQ void m23800_comp (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t,
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 crc32 = hooks[gid].crc32;
 
diff --git a/OpenCL/m23900-pure.cl b/OpenCL/m23900-pure.cl
index 2f6a32359..42cd9a410 100644
--- a/OpenCL/m23900-pure.cl
+++ b/OpenCL/m23900-pure.cl
@@ -33,7 +33,7 @@ KERNEL_FQ void m23900_init (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const int salt_pw_len = 8 + MIN (pws[gid].pw_len, 56);
 
@@ -107,7 +107,7 @@ KERNEL_FQ void m23900_loop (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const int salt_pw_len = 8 + MIN (pws[gid].pw_len, 56);
 
@@ -308,7 +308,7 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // final transform of sha256:
 
diff --git a/OpenCL/m24100-pure.cl b/OpenCL/m24100-pure.cl
index 47842620f..b0373e28a 100644
--- a/OpenCL/m24100-pure.cl
+++ b/OpenCL/m24100-pure.cl
@@ -100,7 +100,7 @@ KERNEL_FQ void m24100_init (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   md5_ctx_t md5_ctx;
 
@@ -203,7 +203,7 @@ KERNEL_FQ void m24100_loop (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -292,7 +292,7 @@ KERNEL_FQ void m24100_comp (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m24200-pure.cl b/OpenCL/m24200-pure.cl
index d6901e0a3..381ab4aa9 100644
--- a/OpenCL/m24200-pure.cl
+++ b/OpenCL/m24200-pure.cl
@@ -86,7 +86,7 @@ KERNEL_FQ void m24200_init (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -166,7 +166,7 @@ KERNEL_FQ void m24200_loop (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -276,7 +276,7 @@ KERNEL_FQ void m24200_comp (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m24300_a0-optimized.cl b/OpenCL/m24300_a0-optimized.cl
index acacfdaaf..e5f095066 100644
--- a/OpenCL/m24300_a0-optimized.cl
+++ b/OpenCL/m24300_a0-optimized.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -670,7 +670,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m24300_a0-pure.cl b/OpenCL/m24300_a0-pure.cl
index 0cc66b150..f0673d6a8 100644
--- a/OpenCL/m24300_a0-pure.cl
+++ b/OpenCL/m24300_a0-pure.cl
@@ -55,7 +55,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -169,7 +169,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_RULES ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24300_a1-optimized.cl b/OpenCL/m24300_a1-optimized.cl
index c1ea5bebc..8a62a2a68 100644
--- a/OpenCL/m24300_a1-optimized.cl
+++ b/OpenCL/m24300_a1-optimized.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -724,7 +724,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m24300_a1-pure.cl b/OpenCL/m24300_a1-pure.cl
index 37fa725b9..2a3886534 100644
--- a/OpenCL/m24300_a1-pure.cl
+++ b/OpenCL/m24300_a1-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -165,7 +165,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24300_a3-optimized.cl b/OpenCL/m24300_a3-optimized.cl
index ed1541bc0..44e6ae353 100644
--- a/OpenCL/m24300_a3-optimized.cl
+++ b/OpenCL/m24300_a3-optimized.cl
@@ -1195,7 +1195,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1265,7 +1265,7 @@ KERNEL_FQ void m24300_m08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1335,7 +1335,7 @@ KERNEL_FQ void m24300_m16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1405,7 +1405,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1475,7 +1475,7 @@ KERNEL_FQ void m24300_s08 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -1545,7 +1545,7 @@ KERNEL_FQ void m24300_s16 (KERN_ATTR_BASIC ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m24300_a3-pure.cl b/OpenCL/m24300_a3-pure.cl
index 7b72fcce1..754c235c9 100644
--- a/OpenCL/m24300_a3-pure.cl
+++ b/OpenCL/m24300_a3-pure.cl
@@ -53,7 +53,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -189,7 +189,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_VECTOR ())
 
   SYNC_THREADS ();
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24410-pure.cl b/OpenCL/m24410-pure.cl
index ffe67a9ac..1215fea54 100644
--- a/OpenCL/m24410-pure.cl
+++ b/OpenCL/m24410-pure.cl
@@ -84,7 +84,7 @@ KERNEL_FQ void m24410_init (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -159,7 +159,7 @@ KERNEL_FQ void m24410_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -331,7 +331,7 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m24420-pure.cl b/OpenCL/m24420-pure.cl
index b87fe96a4..daf6b9967 100644
--- a/OpenCL/m24420-pure.cl
+++ b/OpenCL/m24420-pure.cl
@@ -90,7 +90,7 @@ KERNEL_FQ void m24420_init (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -170,7 +170,7 @@ KERNEL_FQ void m24420_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -356,7 +356,7 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m24500-pure.cl b/OpenCL/m24500-pure.cl
index d019c15a9..f8c6ec257 100644
--- a/OpenCL/m24500-pure.cl
+++ b/OpenCL/m24500-pure.cl
@@ -139,7 +139,7 @@ KERNEL_FQ void m24500_init (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; // 32
 
@@ -270,7 +270,7 @@ KERNEL_FQ void m24500_loop (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -453,7 +453,7 @@ KERNEL_FQ void m24500_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 data_key[4];
 
diff --git a/OpenCL/m24610-pure.cl b/OpenCL/m24610-pure.cl
index bdb99151e..1966267b1 100644
--- a/OpenCL/m24610-pure.cl
+++ b/OpenCL/m24610-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m24610_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -149,7 +149,7 @@ KERNEL_FQ void m24610_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -287,7 +287,7 @@ KERNEL_FQ void m24610_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m24620-pure.cl b/OpenCL/m24620-pure.cl
index a280530df..557097f35 100644
--- a/OpenCL/m24620-pure.cl
+++ b/OpenCL/m24620-pure.cl
@@ -87,7 +87,7 @@ KERNEL_FQ void m24620_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -167,7 +167,7 @@ KERNEL_FQ void m24620_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -326,7 +326,7 @@ KERNEL_FQ void m24620_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m24630-pure.cl b/OpenCL/m24630-pure.cl
index ea58d5285..430478ced 100644
--- a/OpenCL/m24630-pure.cl
+++ b/OpenCL/m24630-pure.cl
@@ -103,7 +103,7 @@ KERNEL_FQ void m24630_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_hmac_ctx_t sha512_hmac_ctx;
 
@@ -203,7 +203,7 @@ KERNEL_FQ void m24630_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x ipad[8];
   u64x opad[8];
@@ -382,7 +382,7 @@ KERNEL_FQ void m24630_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m24700_a0-optimized.cl b/OpenCL/m24700_a0-optimized.cl
index 17a603b3c..294b83ab5 100644
--- a/OpenCL/m24700_a0-optimized.cl
+++ b/OpenCL/m24700_a0-optimized.cl
@@ -24,7 +24,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -256,7 +256,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m24700_a0-pure.cl b/OpenCL/m24700_a0-pure.cl
index d229cafec..3995f04a0 100644
--- a/OpenCL/m24700_a0-pure.cl
+++ b/OpenCL/m24700_a0-pure.cl
@@ -24,7 +24,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -81,7 +81,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24700_a1-optimized.cl b/OpenCL/m24700_a1-optimized.cl
index ad46f881d..5e0b4c112 100644
--- a/OpenCL/m24700_a1-optimized.cl
+++ b/OpenCL/m24700_a1-optimized.cl
@@ -22,7 +22,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -313,7 +313,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m24700_a1-pure.cl b/OpenCL/m24700_a1-pure.cl
index 53903e9f6..eacf4ce9c 100644
--- a/OpenCL/m24700_a1-pure.cl
+++ b/OpenCL/m24700_a1-pure.cl
@@ -22,7 +22,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -77,7 +77,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24700_a3-optimized.cl b/OpenCL/m24700_a3-optimized.cl
index 6dc0ab2cc..838ce2ca1 100644
--- a/OpenCL/m24700_a3-optimized.cl
+++ b/OpenCL/m24700_a3-optimized.cl
@@ -519,7 +519,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_BASIC ())
 
   const u32 pw_len = pws[gid].pw_len & 63;
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -570,7 +570,7 @@ KERNEL_FQ void m24700_m08 (KERN_ATTR_BASIC ())
 
   const u32 pw_len = pws[gid].pw_len & 63;
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -621,7 +621,7 @@ KERNEL_FQ void m24700_m16 (KERN_ATTR_BASIC ())
 
   const u32 pw_len = pws[gid].pw_len & 63;
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -672,7 +672,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ())
 
   const u32 pw_len = pws[gid].pw_len & 63;
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -723,7 +723,7 @@ KERNEL_FQ void m24700_s08 (KERN_ATTR_BASIC ())
 
   const u32 pw_len = pws[gid].pw_len & 63;
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
@@ -774,7 +774,7 @@ KERNEL_FQ void m24700_s16 (KERN_ATTR_BASIC ())
 
   const u32 pw_len = pws[gid].pw_len & 63;
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * main
diff --git a/OpenCL/m24700_a3-pure.cl b/OpenCL/m24700_a3-pure.cl
index 82034a5fc..ddf4ac2d0 100644
--- a/OpenCL/m24700_a3-pure.cl
+++ b/OpenCL/m24700_a3-pure.cl
@@ -22,7 +22,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -90,7 +90,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24800_a0-optimized.cl b/OpenCL/m24800_a0-optimized.cl
index 21049a243..35840a58e 100644
--- a/OpenCL/m24800_a0-optimized.cl
+++ b/OpenCL/m24800_a0-optimized.cl
@@ -119,7 +119,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -241,7 +241,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m24800_a0-pure.cl b/OpenCL/m24800_a0-pure.cl
index 7034e9f1c..414c01b12 100644
--- a/OpenCL/m24800_a0-pure.cl
+++ b/OpenCL/m24800_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -79,7 +79,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24800_a1-optimized.cl b/OpenCL/m24800_a1-optimized.cl
index 27b7f7d7b..2ea24410e 100644
--- a/OpenCL/m24800_a1-optimized.cl
+++ b/OpenCL/m24800_a1-optimized.cl
@@ -117,7 +117,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -291,7 +291,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m24800_a1-pure.cl b/OpenCL/m24800_a1-pure.cl
index 3a6141cbc..0c6f046f2 100644
--- a/OpenCL/m24800_a1-pure.cl
+++ b/OpenCL/m24800_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -102,7 +102,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24800_a3-optimized.cl b/OpenCL/m24800_a3-optimized.cl
index e8588cf7b..c2b7b0224 100644
--- a/OpenCL/m24800_a3-optimized.cl
+++ b/OpenCL/m24800_a3-optimized.cl
@@ -337,7 +337,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -384,7 +384,7 @@ KERNEL_FQ void m24800_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -431,7 +431,7 @@ KERNEL_FQ void m24800_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -478,7 +478,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -525,7 +525,7 @@ KERNEL_FQ void m24800_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -572,7 +572,7 @@ KERNEL_FQ void m24800_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m24800_a3-pure.cl b/OpenCL/m24800_a3-pure.cl
index 711192165..0da6c29e7 100644
--- a/OpenCL/m24800_a3-pure.cl
+++ b/OpenCL/m24800_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -88,7 +88,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m24900_a0-optimized.cl b/OpenCL/m24900_a0-optimized.cl
index 3e28ffdc1..9b1c3c8a9 100644
--- a/OpenCL/m24900_a0-optimized.cl
+++ b/OpenCL/m24900_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -184,7 +184,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m24900_a1-optimized.cl b/OpenCL/m24900_a1-optimized.cl
index 11423230b..e7fd82632 100644
--- a/OpenCL/m24900_a1-optimized.cl
+++ b/OpenCL/m24900_a1-optimized.cl
@@ -29,7 +29,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -242,7 +242,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m24900_a3-optimized.cl b/OpenCL/m24900_a3-optimized.cl
index b6ad4802c..e925710da 100644
--- a/OpenCL/m24900_a3-optimized.cl
+++ b/OpenCL/m24900_a3-optimized.cl
@@ -324,7 +324,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -371,7 +371,7 @@ KERNEL_FQ void m24900_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -418,7 +418,7 @@ KERNEL_FQ void m24900_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -465,7 +465,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -512,7 +512,7 @@ KERNEL_FQ void m24900_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -559,7 +559,7 @@ KERNEL_FQ void m24900_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m25000-pure.cl b/OpenCL/m25000-pure.cl
index 192e69f96..7d01d5859 100644
--- a/OpenCL/m25000-pure.cl
+++ b/OpenCL/m25000-pure.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m25000_init (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -173,7 +173,7 @@ KERNEL_FQ void m25000_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 h_md5[4];
 
@@ -345,7 +345,7 @@ KERNEL_FQ void m25000_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m25100-pure.cl b/OpenCL/m25100-pure.cl
index 2fe4e3616..dc3c19282 100644
--- a/OpenCL/m25100-pure.cl
+++ b/OpenCL/m25100-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m25100_init (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -139,7 +139,7 @@ KERNEL_FQ void m25100_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 h[4];
 
@@ -236,7 +236,7 @@ KERNEL_FQ void m25100_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m25200-pure.cl b/OpenCL/m25200-pure.cl
index bebc4b25a..e96677d4a 100644
--- a/OpenCL/m25200-pure.cl
+++ b/OpenCL/m25200-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m25200_init (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -140,7 +140,7 @@ KERNEL_FQ void m25200_loop (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 h[5];
 
@@ -239,7 +239,7 @@ KERNEL_FQ void m25200_comp (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m25300-pure.cl b/OpenCL/m25300-pure.cl
index 5d453c142..473235e43 100644
--- a/OpenCL/m25300-pure.cl
+++ b/OpenCL/m25300-pure.cl
@@ -31,7 +31,7 @@ KERNEL_FQ void m25300_init (KERN_ATTR_TMPS (office2016_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha512_ctx_t ctx;
 
@@ -57,7 +57,7 @@ KERNEL_FQ void m25300_loop (KERN_ATTR_TMPS (office2016_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u64x t0 = pack64v (tmps, out, gid, 0);
   u64x t1 = pack64v (tmps, out, gid, 1);
@@ -167,7 +167,7 @@ KERNEL_FQ void m25300_comp (KERN_ATTR_TMPS (office2016_tmp_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 r0 = l32_from_64_S (tmps[gid].out[7]);
   const u32 r1 = h32_from_64_S (tmps[gid].out[7]);
diff --git a/OpenCL/m25400-pure.cl b/OpenCL/m25400-pure.cl
index 05bf362f2..144e7a1f2 100644
--- a/OpenCL/m25400-pure.cl
+++ b/OpenCL/m25400-pure.cl
@@ -56,7 +56,7 @@ KERNEL_FQ void m25400_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
   const u64 gid = get_global_id (0);
   //const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -194,7 +194,7 @@ KERNEL_FQ void m25400_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * shared
@@ -326,7 +326,7 @@ KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t))
    */
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m25500-pure.cl b/OpenCL/m25500-pure.cl
index 959f0d918..a299508fa 100644
--- a/OpenCL/m25500-pure.cl
+++ b/OpenCL/m25500-pure.cl
@@ -89,7 +89,7 @@ KERNEL_FQ void m25500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -169,7 +169,7 @@ KERNEL_FQ void m25500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -310,7 +310,7 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // keys
 
@@ -442,7 +442,7 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // keys
 
diff --git a/OpenCL/m25600-pure.cl b/OpenCL/m25600-pure.cl
index 5bb283556..c94fce7aa 100644
--- a/OpenCL/m25600-pure.cl
+++ b/OpenCL/m25600-pure.cl
@@ -456,7 +456,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_init (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   md5_ctx_t ctx0;
 
@@ -695,7 +695,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_loop (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load
 
@@ -898,7 +898,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_comp (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load
 
diff --git a/OpenCL/m25700_a0-optimized.cl b/OpenCL/m25700_a0-optimized.cl
index ebf59ed49..0243ea3ab 100644
--- a/OpenCL/m25700_a0-optimized.cl
+++ b/OpenCL/m25700_a0-optimized.cl
@@ -70,7 +70,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -135,7 +135,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m25700_a1-optimized.cl b/OpenCL/m25700_a1-optimized.cl
index 424ea372a..86ebecab0 100644
--- a/OpenCL/m25700_a1-optimized.cl
+++ b/OpenCL/m25700_a1-optimized.cl
@@ -64,7 +64,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -185,7 +185,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m25700_a3-optimized.cl b/OpenCL/m25700_a3-optimized.cl
index f1bb50115..2d9caeb6d 100644
--- a/OpenCL/m25700_a3-optimized.cl
+++ b/OpenCL/m25700_a3-optimized.cl
@@ -171,7 +171,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -209,7 +209,7 @@ KERNEL_FQ void m25700_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -247,7 +247,7 @@ KERNEL_FQ void m25700_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -285,7 +285,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -323,7 +323,7 @@ KERNEL_FQ void m25700_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -361,7 +361,7 @@ KERNEL_FQ void m25700_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m25800-pure.cl b/OpenCL/m25800-pure.cl
index 73014553a..25402c008 100644
--- a/OpenCL/m25800-pure.cl
+++ b/OpenCL/m25800-pure.cl
@@ -456,7 +456,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_init (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t ctx0;
 
@@ -698,7 +698,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_loop (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load
 
@@ -901,7 +901,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_comp (KERN_ATTR_TMPS
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load
 
diff --git a/OpenCL/m25900-pure.cl b/OpenCL/m25900-pure.cl
index a2f1739cd..28f77518a 100644
--- a/OpenCL/m25900-pure.cl
+++ b/OpenCL/m25900-pure.cl
@@ -108,7 +108,7 @@ KERNEL_FQ void m25900_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t))
 
   const u64 gid = get_global_id(0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -188,7 +188,7 @@ KERNEL_FQ void m25900_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t))
 {
   const u64 gid = get_global_id(0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -351,7 +351,7 @@ KERNEL_FQ void m25900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, blocks_t)
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 key[4];
 
diff --git a/OpenCL/m26000_a0-pure.cl b/OpenCL/m26000_a0-pure.cl
index a502c6b9a..f4f118754 100644
--- a/OpenCL/m26000_a0-pure.cl
+++ b/OpenCL/m26000_a0-pure.cl
@@ -68,7 +68,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -410,7 +410,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26000_a1-pure.cl b/OpenCL/m26000_a1-pure.cl
index 9998cc54b..b12774852 100644
--- a/OpenCL/m26000_a1-pure.cl
+++ b/OpenCL/m26000_a1-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_ESALT (mozilla_3des_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -433,7 +433,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_ESALT (mozilla_3des_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26000_a3-pure.cl b/OpenCL/m26000_a3-pure.cl
index 43212e4f6..ea9ab0ccf 100644
--- a/OpenCL/m26000_a3-pure.cl
+++ b/OpenCL/m26000_a3-pure.cl
@@ -66,7 +66,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -419,7 +419,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26100-pure.cl b/OpenCL/m26100-pure.cl
index fe72b7973..426cf9b19 100644
--- a/OpenCL/m26100-pure.cl
+++ b/OpenCL/m26100-pure.cl
@@ -86,7 +86,7 @@ KERNEL_FQ void m26100_init (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_ctx_t ctx;
 
@@ -207,7 +207,7 @@ KERNEL_FQ void m26100_loop (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -366,7 +366,7 @@ KERNEL_FQ void m26100_comp (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m26200_a0-pure.cl b/OpenCL/m26200_a0-pure.cl
index 644418396..b5b4ec5bd 100644
--- a/OpenCL/m26200_a0-pure.cl
+++ b/OpenCL/m26200_a0-pure.cl
@@ -44,7 +44,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -137,7 +137,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26200_a1-pure.cl b/OpenCL/m26200_a1-pure.cl
index c66ae5e72..4e24b1a64 100644
--- a/OpenCL/m26200_a1-pure.cl
+++ b/OpenCL/m26200_a1-pure.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -202,7 +202,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26200_a3-pure.cl b/OpenCL/m26200_a3-pure.cl
index 5307c44c7..34165c6b6 100644
--- a/OpenCL/m26200_a3-pure.cl
+++ b/OpenCL/m26200_a3-pure.cl
@@ -42,7 +42,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -146,7 +146,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26300_a0-pure.cl b/OpenCL/m26300_a0-pure.cl
index d8b1679c4..77a9b0f3e 100644
--- a/OpenCL/m26300_a0-pure.cl
+++ b/OpenCL/m26300_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -101,7 +101,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26300_a1-pure.cl b/OpenCL/m26300_a1-pure.cl
index 92825031e..cd00ec863 100644
--- a/OpenCL/m26300_a1-pure.cl
+++ b/OpenCL/m26300_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -95,7 +95,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26300_a3-pure.cl b/OpenCL/m26300_a3-pure.cl
index 4d6c62c4d..ff94211bc 100644
--- a/OpenCL/m26300_a3-pure.cl
+++ b/OpenCL/m26300_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -112,7 +112,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m26401_a0-optimized.cl b/OpenCL/m26401_a0-optimized.cl
index 5335e4570..5e4dccce0 100644
--- a/OpenCL/m26401_a0-optimized.cl
+++ b/OpenCL/m26401_a0-optimized.cl
@@ -73,7 +73,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -207,7 +207,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m26401_a1-optimized.cl b/OpenCL/m26401_a1-optimized.cl
index 3e036f803..f802d2fcf 100644
--- a/OpenCL/m26401_a1-optimized.cl
+++ b/OpenCL/m26401_a1-optimized.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -259,7 +259,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m26401_a3-optimized.cl b/OpenCL/m26401_a3-optimized.cl
index 35469683e..de0fd9b08 100644
--- a/OpenCL/m26401_a3-optimized.cl
+++ b/OpenCL/m26401_a3-optimized.cl
@@ -199,7 +199,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -290,7 +290,7 @@ KERNEL_FQ void m26401_m08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -385,7 +385,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -476,7 +476,7 @@ KERNEL_FQ void m26401_s08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m26402_a0-optimized.cl b/OpenCL/m26402_a0-optimized.cl
index dfffdce9a..5c169f7c7 100644
--- a/OpenCL/m26402_a0-optimized.cl
+++ b/OpenCL/m26402_a0-optimized.cl
@@ -73,7 +73,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -209,7 +209,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m26402_a1-optimized.cl b/OpenCL/m26402_a1-optimized.cl
index c84deba29..abdbc0d41 100644
--- a/OpenCL/m26402_a1-optimized.cl
+++ b/OpenCL/m26402_a1-optimized.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -265,7 +265,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m26402_a3-optimized.cl b/OpenCL/m26402_a3-optimized.cl
index c662f8ea6..e32d93f7a 100644
--- a/OpenCL/m26402_a3-optimized.cl
+++ b/OpenCL/m26402_a3-optimized.cl
@@ -203,7 +203,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -294,7 +294,7 @@ KERNEL_FQ void m26402_m08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -389,7 +389,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -480,7 +480,7 @@ KERNEL_FQ void m26402_s08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m26403_a0-optimized.cl b/OpenCL/m26403_a0-optimized.cl
index bb4ef8dec..b83acec27 100644
--- a/OpenCL/m26403_a0-optimized.cl
+++ b/OpenCL/m26403_a0-optimized.cl
@@ -73,7 +73,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
@@ -211,7 +211,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * modifier
diff --git a/OpenCL/m26403_a1-optimized.cl b/OpenCL/m26403_a1-optimized.cl
index d6ac9c89e..f19b875b6 100644
--- a/OpenCL/m26403_a1-optimized.cl
+++ b/OpenCL/m26403_a1-optimized.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -271,7 +271,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m26403_a3-optimized.cl b/OpenCL/m26403_a3-optimized.cl
index c7a2a23a9..98e288ef4 100644
--- a/OpenCL/m26403_a3-optimized.cl
+++ b/OpenCL/m26403_a3-optimized.cl
@@ -207,7 +207,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -298,7 +298,7 @@ KERNEL_FQ void m26403_m08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -389,7 +389,7 @@ KERNEL_FQ void m26403_m16 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -480,7 +480,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -571,7 +571,7 @@ KERNEL_FQ void m26403_s08 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -662,7 +662,7 @@ KERNEL_FQ void m26403_s16 (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m26500-pure.cl b/OpenCL/m26500-pure.cl
index fb7f3f949..b8195e3e4 100644
--- a/OpenCL/m26500-pure.cl
+++ b/OpenCL/m26500-pure.cl
@@ -81,7 +81,7 @@ KERNEL_FQ void m26500_init (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx0;
 
@@ -206,7 +206,7 @@ KERNEL_FQ void m26500_loop (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // load stuff
 
@@ -355,7 +355,7 @@ KERNEL_FQ void m26500_comp (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
diff --git a/OpenCL/m26600-pure.cl b/OpenCL/m26600-pure.cl
index 28d1e2186..46e3c4461 100644
--- a/OpenCL/m26600-pure.cl
+++ b/OpenCL/m26600-pure.cl
@@ -89,7 +89,7 @@ KERNEL_FQ void m26600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -169,7 +169,7 @@ KERNEL_FQ void m26600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -310,7 +310,7 @@ KERNEL_FQ void m26600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // keys
 
diff --git a/OpenCL/m26700-pure.cl b/OpenCL/m26700-pure.cl
index a0e179de2..a4cb6f550 100644
--- a/OpenCL/m26700-pure.cl
+++ b/OpenCL/m26700-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m26700_init (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -143,7 +143,7 @@ KERNEL_FQ void m26700_loop (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 h[8];
 
@@ -248,7 +248,7 @@ KERNEL_FQ void m26700_comp (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m26800-pure.cl b/OpenCL/m26800-pure.cl
index d3f89652b..cf885e3ab 100644
--- a/OpenCL/m26800-pure.cl
+++ b/OpenCL/m26800-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m26800_init (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -143,7 +143,7 @@ KERNEL_FQ void m26800_loop (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 h[8];
 
@@ -248,7 +248,7 @@ KERNEL_FQ void m26800_comp (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m26900-pure.cl b/OpenCL/m26900-pure.cl
index 83a11b590..1afc0fb50 100644
--- a/OpenCL/m26900-pure.cl
+++ b/OpenCL/m26900-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m26900_init (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -159,7 +159,7 @@ KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u64 h[8];
 
@@ -304,7 +304,7 @@ KERNEL_FQ void m26900_comp (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m27000-pure.cl b/OpenCL/m27000-pure.cl
index e26b5be69..2a4c72827 100644
--- a/OpenCL/m27000-pure.cl
+++ b/OpenCL/m27000-pure.cl
@@ -538,7 +538,7 @@ KERNEL_FQ void m27000_init (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 lsz = get_local_size (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * salt
@@ -627,7 +627,7 @@ KERNEL_FQ void m27000_comp (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m27100-pure.cl b/OpenCL/m27100-pure.cl
index 6cf942650..668819cc4 100644
--- a/OpenCL/m27100-pure.cl
+++ b/OpenCL/m27100-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m27100_init (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t))
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -115,7 +115,7 @@ KERNEL_FQ void m27100_comp (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m27200_a0-optimized.cl b/OpenCL/m27200_a0-optimized.cl
index 76c08feda..8c1054501 100644
--- a/OpenCL/m27200_a0-optimized.cl
+++ b/OpenCL/m27200_a0-optimized.cl
@@ -30,7 +30,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -273,7 +273,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m27200_a0-pure.cl b/OpenCL/m27200_a0-pure.cl
index 91b767f3c..07cb481d1 100644
--- a/OpenCL/m27200_a0-pure.cl
+++ b/OpenCL/m27200_a0-pure.cl
@@ -25,7 +25,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
@@ -81,7 +81,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_RULES ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
diff --git a/OpenCL/m27200_a1-optimized.cl b/OpenCL/m27200_a1-optimized.cl
index 747ef241b..176faf333 100644
--- a/OpenCL/m27200_a1-optimized.cl
+++ b/OpenCL/m27200_a1-optimized.cl
@@ -28,7 +28,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -331,7 +331,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m27200_a1-pure.cl b/OpenCL/m27200_a1-pure.cl
index 07347d86a..5b4492bd9 100644
--- a/OpenCL/m27200_a1-pure.cl
+++ b/OpenCL/m27200_a1-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
@@ -75,7 +75,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_BASIC ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
diff --git a/OpenCL/m27200_a3-optimized.cl b/OpenCL/m27200_a3-optimized.cl
index b147e175f..1ac5e3b50 100644
--- a/OpenCL/m27200_a3-optimized.cl
+++ b/OpenCL/m27200_a3-optimized.cl
@@ -553,7 +553,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -600,7 +600,7 @@ KERNEL_FQ void m27200_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -647,7 +647,7 @@ KERNEL_FQ void m27200_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -694,7 +694,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -741,7 +741,7 @@ KERNEL_FQ void m27200_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
@@ -788,7 +788,7 @@ KERNEL_FQ void m27200_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
 
diff --git a/OpenCL/m27200_a3-pure.cl b/OpenCL/m27200_a3-pure.cl
index 4c3d9e66d..ddadd0f96 100644
--- a/OpenCL/m27200_a3-pure.cl
+++ b/OpenCL/m27200_a3-pure.cl
@@ -23,7 +23,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32x dash_vector[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
   const u32 dash_scalar[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -94,7 +94,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_VECTOR ())
   const u64 lid = get_local_id (0);
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32x dash_vector[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
   const u32 dash_scalar[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
diff --git a/OpenCL/m27300-pure.cl b/OpenCL/m27300-pure.cl
index 24892c382..48bb372fa 100644
--- a/OpenCL/m27300-pure.cl
+++ b/OpenCL/m27300-pure.cl
@@ -62,7 +62,7 @@ KERNEL_FQ void m27300_init (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -159,7 +159,7 @@ KERNEL_FQ void m27300_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u64 h[8];
 
@@ -304,7 +304,7 @@ KERNEL_FQ void m27300_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w0[4];
   u32 w1[4];
diff --git a/OpenCL/m27400-pure.cl b/OpenCL/m27400-pure.cl
index ab2f455e3..07c2d5030 100644
--- a/OpenCL/m27400-pure.cl
+++ b/OpenCL/m27400-pure.cl
@@ -80,7 +80,7 @@ KERNEL_FQ void m27400_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha1_hmac_ctx_t sha1_hmac_ctx;
 
@@ -148,7 +148,7 @@ KERNEL_FQ void m27400_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[5];
   u32x opad[5];
@@ -290,7 +290,7 @@ KERNEL_FQ void m27400_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 ukey[8];
 
diff --git a/OpenCL/m27500-pure.cl b/OpenCL/m27500-pure.cl
index 4d8bbbd43..b8a6e8247 100644
--- a/OpenCL/m27500-pure.cl
+++ b/OpenCL/m27500-pure.cl
@@ -100,7 +100,7 @@ KERNEL_FQ void m27500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -180,7 +180,7 @@ KERNEL_FQ void m27500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -339,7 +339,7 @@ KERNEL_FQ void m27500_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
@@ -542,7 +542,7 @@ KERNEL_FQ void m27500_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -648,7 +648,7 @@ KERNEL_FQ void m27500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 r0 = tmps[gid].out[0];
   const u32 r1 = tmps[gid].out[1];
diff --git a/OpenCL/m27600-pure.cl b/OpenCL/m27600-pure.cl
index f2f1af602..1bd1c2139 100644
--- a/OpenCL/m27600-pure.cl
+++ b/OpenCL/m27600-pure.cl
@@ -100,7 +100,7 @@ KERNEL_FQ void m27600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -180,7 +180,7 @@ KERNEL_FQ void m27600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -339,7 +339,7 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * aes
@@ -620,7 +620,7 @@ KERNEL_FQ void m27600_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -726,7 +726,7 @@ KERNEL_FQ void m27600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t))
 {
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u32 r0 = tmps[gid].out[0];
   const u32 r1 = tmps[gid].out[1];
diff --git a/OpenCL/m27700-pure.cl b/OpenCL/m27700-pure.cl
index 9732fabdb..c6eaefabf 100644
--- a/OpenCL/m27700-pure.cl
+++ b/OpenCL/m27700-pure.cl
@@ -252,7 +252,7 @@ KERNEL_FQ void m27700_init (KERN_ATTR_TMPS (scrypt_tmp_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[128] = { 0 };
 
@@ -381,7 +381,7 @@ KERNEL_FQ void m27700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // SCRYPT part, init V
 
@@ -408,7 +408,7 @@ KERNEL_FQ void m27700_loop (KERN_ATTR_TMPS (scrypt_tmp_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf;
   GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf;
@@ -485,7 +485,7 @@ KERNEL_FQ void m27700_comp (KERN_ATTR_TMPS (scrypt_tmp_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * 2nd pbkdf2, creates B
diff --git a/OpenCL/m27800_a0-optimized.cl b/OpenCL/m27800_a0-optimized.cl
index 5ed860da9..751266d88 100644
--- a/OpenCL/m27800_a0-optimized.cl
+++ b/OpenCL/m27800_a0-optimized.cl
@@ -77,7 +77,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -142,7 +142,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m27800_a1-optimized.cl b/OpenCL/m27800_a1-optimized.cl
index 7835afed4..9be8af558 100644
--- a/OpenCL/m27800_a1-optimized.cl
+++ b/OpenCL/m27800_a1-optimized.cl
@@ -70,7 +70,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -191,7 +191,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_BASIC ())
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
diff --git a/OpenCL/m27800_a3-optimized.cl b/OpenCL/m27800_a3-optimized.cl
index ec4f9e0c9..130b90c42 100644
--- a/OpenCL/m27800_a3-optimized.cl
+++ b/OpenCL/m27800_a3-optimized.cl
@@ -185,7 +185,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -223,7 +223,7 @@ KERNEL_FQ void m27800_m08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -261,7 +261,7 @@ KERNEL_FQ void m27800_m16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -299,7 +299,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -337,7 +337,7 @@ KERNEL_FQ void m27800_s08 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -375,7 +375,7 @@ KERNEL_FQ void m27800_s16 (KERN_ATTR_VECTOR ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m27900_a0-optimized.cl b/OpenCL/m27900_a0-optimized.cl
index c12f3bc34..706e5c31f 100644
--- a/OpenCL/m27900_a0-optimized.cl
+++ b/OpenCL/m27900_a0-optimized.cl
@@ -149,7 +149,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -237,7 +237,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_RULES ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m27900_a1-optimized.cl b/OpenCL/m27900_a1-optimized.cl
index 97852e7af..62b701807 100644
--- a/OpenCL/m27900_a1-optimized.cl
+++ b/OpenCL/m27900_a1-optimized.cl
@@ -147,7 +147,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
@@ -295,7 +295,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 pw_buf0[4];
   u32 pw_buf1[4];
diff --git a/OpenCL/m27900_a3-optimized.cl b/OpenCL/m27900_a3-optimized.cl
index 2dd986c3b..9824e2833 100644
--- a/OpenCL/m27900_a3-optimized.cl
+++ b/OpenCL/m27900_a3-optimized.cl
@@ -269,7 +269,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -307,7 +307,7 @@ KERNEL_FQ void m27900_m08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -345,7 +345,7 @@ KERNEL_FQ void m27900_m16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -383,7 +383,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -421,7 +421,7 @@ KERNEL_FQ void m27900_s08 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
@@ -459,7 +459,7 @@ KERNEL_FQ void m27900_s16 (KERN_ATTR_BASIC ())
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   u32 w[16];
 
diff --git a/OpenCL/m28000_a0-optimized.cl b/OpenCL/m28000_a0-optimized.cl
index 41ed297d2..f1605e26d 100644
--- a/OpenCL/m28000_a0-optimized.cl
+++ b/OpenCL/m28000_a0-optimized.cl
@@ -226,7 +226,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_RULES_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -338,7 +338,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_RULES_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
diff --git a/OpenCL/m28000_a1-optimized.cl b/OpenCL/m28000_a1-optimized.cl
index 4af584bbc..59b3aea58 100644
--- a/OpenCL/m28000_a1-optimized.cl
+++ b/OpenCL/m28000_a1-optimized.cl
@@ -224,7 +224,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -396,7 +396,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
diff --git a/OpenCL/m28000_a3-optimized.cl b/OpenCL/m28000_a3-optimized.cl
index d5bf0cb5c..4ef5700ab 100644
--- a/OpenCL/m28000_a3-optimized.cl
+++ b/OpenCL/m28000_a3-optimized.cl
@@ -358,7 +358,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -423,7 +423,7 @@ KERNEL_FQ void m28000_m08 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -488,7 +488,7 @@ KERNEL_FQ void m28000_m16 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -553,7 +553,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -618,7 +618,7 @@ KERNEL_FQ void m28000_s08 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
@@ -683,7 +683,7 @@ KERNEL_FQ void m28000_s16 (KERN_ATTR_ESALT (crc64_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * Base
diff --git a/OpenCL/m28100-pure.cl b/OpenCL/m28100-pure.cl
index 8d302ec12..56ec71b3f 100644
--- a/OpenCL/m28100-pure.cl
+++ b/OpenCL/m28100-pure.cl
@@ -96,7 +96,7 @@ KERNEL_FQ void m28100_init (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -207,7 +207,7 @@ KERNEL_FQ void m28100_loop (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t))
 {
   const u64 gid = get_global_id (0);
 
-  if ((gid * VECT_SIZE) >= GID_MAX) return;
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
 
   u32x ipad[8];
   u32x opad[8];
@@ -317,7 +317,7 @@ KERNEL_FQ void m28100_comp (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   const u64 lid = get_local_id (0);
 
diff --git a/OpenCL/m28200-pure.cl b/OpenCL/m28200-pure.cl
index bc8686aa5..e94153e13 100644
--- a/OpenCL/m28200-pure.cl
+++ b/OpenCL/m28200-pure.cl
@@ -264,7 +264,7 @@ KERNEL_FQ void m28200_init (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t))
 
   const u64 gid = get_global_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   sha256_hmac_ctx_t sha256_hmac_ctx;
 
@@ -369,7 +369,7 @@ KERNEL_FQ void m28200_loop_prepare (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   // SCRYPT part, init V
 
@@ -396,7 +396,7 @@ KERNEL_FQ void m28200_loop (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t))
   const u64 gid = get_global_id (0);
   const u64 lid = get_local_id (0);
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf;
   GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf;
@@ -473,7 +473,7 @@ KERNEL_FQ void m28200_comp (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t))
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * 2nd pbkdf2, creates B
diff --git a/OpenCL/m28300_a0-pure.cl b/OpenCL/m28300_a0-pure.cl
index 4db6527a4..b151e93b8 100644
--- a/OpenCL/m28300_a0-pure.cl
+++ b/OpenCL/m28300_a0-pure.cl
@@ -67,7 +67,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -215,7 +215,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_RULES ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m28300_a1-pure.cl b/OpenCL/m28300_a1-pure.cl
index c01c77344..4c24e9b74 100644
--- a/OpenCL/m28300_a1-pure.cl
+++ b/OpenCL/m28300_a1-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -211,7 +211,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_BASIC ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest
diff --git a/OpenCL/m28300_a3-pure.cl b/OpenCL/m28300_a3-pure.cl
index cfa88118a..ec9fd9ca2 100644
--- a/OpenCL/m28300_a3-pure.cl
+++ b/OpenCL/m28300_a3-pure.cl
@@ -65,7 +65,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * base
@@ -224,7 +224,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_VECTOR ())
 
   #endif
 
-  if (gid >= GID_MAX) return;
+  if (gid >= GID_CNT) return;
 
   /**
    * digest