ocl: removed experimental/outdated code (#913)

Author: hfp

src/acc/opencl/acc_opencl_event.c

@@ -9,16 +9,6 @@
 #if defined(__OPENCL)
 #  include "acc_opencl.h"
 
-#  if !defined(ACC_OPENCL_EVENT_FLUSH) && 0
-#    define ACC_OPENCL_EVENT_FLUSH
-#  endif
-#  if !defined(ACC_OPENCL_EVENT_CHAIN) && 0
-#    define ACC_OPENCL_EVENT_CHAIN
-#  endif
-#  if !defined(ACC_OPENCL_EVENT_WAIT) && 0
-#    define ACC_OPENCL_EVENT_WAIT
-#  endif
-
 
 #  if defined(__cplusplus)
 extern "C" {
@@ -89,19 +79,10 @@ int c_dbcsr_acc_stream_wait_event(void* stream, void* event) { /* wait for an ev
 #  if defined(CL_VERSION_1_2)
     cl_event clevent_result = NULL;
     result = clEnqueueBarrierWithWaitList(str->queue, 1, &clevent, &clevent_result);
-    if (EXIT_SUCCESS == result) {
-#    if defined(ACC_OPENCL_EVENT_CHAIN)
-      result = clReleaseEvent(clevent);
-      assert(NULL != clevent_result);
-      *(cl_event*)event = (EXIT_SUCCESS == result ? clevent_result : NULL);
-#    endif
-    }
-    else
 #  else
     result = clEnqueueWaitForEvents(str->queue, 1, &clevent);
-    if (EXIT_SUCCESS != result)
 #  endif
-    {
+    if (EXIT_SUCCESS != result) {
       ACC_OPENCL_EXPECT(EXIT_SUCCESS == clReleaseEvent(clevent));
       *(cl_event*)event = NULL;
     }
@@ -129,26 +110,11 @@ int c_dbcsr_acc_event_record(void* event, void* stream) {
   str = (NULL != stream ? ACC_OPENCL_STREAM(stream) : c_dbcsr_acc_opencl_stream_default());
   assert(NULL != str && NULL != str->queue && NULL != event);
   clevent = *ACC_OPENCL_EVENT(event);
-#  if defined(ACC_OPENCL_EVENT_FLUSH)
-  result = clFlush(str->queue);
-  if (EXIT_SUCCESS == result)
-#  endif
-  {
 #  if defined(CL_VERSION_1_2)
-#    if defined(ACC_OPENCL_EVENT_WAIT)
-    if (NULL != clevent) result = clEnqueueMarkerWithWaitList(str->queue, 1, &clevent, &clevent_result);
-    else
-#    endif
-    {
-      result = clEnqueueMarkerWithWaitList(str->queue, 0, NULL, &clevent_result);
-    }
+  result = clEnqueueMarkerWithWaitList(str->queue, 0, NULL, &clevent_result);
 #  else
-#    if defined(ACC_OPENCL_EVENT_WAIT)
-    if (NULL != clevent) result = clEnqueueWaitForEvents(str->queue, 1, &clevent);
-#    endif
-    if (EXIT_SUCCESS == result) result = clEnqueueMarker(str->queue, &clevent_result);
+  result = clEnqueueMarker(str->queue, &clevent_result);
 #  endif
-  }
   if (NULL != clevent) {
     const int result_release = clReleaseEvent(clevent);
     if (EXIT_SUCCESS == result) result = result_release;

src/acc/opencl/acc_opencl_stream.c

@@ -261,7 +261,20 @@ int c_dbcsr_acc_stream_sync(void* stream) {
 #  endif
   str = (NULL != stream ? ACC_OPENCL_STREAM(stream) : c_dbcsr_acc_opencl_stream_default());
   assert(NULL != str && NULL != str->queue);
-  result = clFinish(str->queue);
+  if (0 == (16 & c_dbcsr_acc_opencl_config.wa)) result = clFinish(str->queue);
+  else {
+    cl_event event = NULL;
+#  if defined(CL_VERSION_1_2)
+    result = clEnqueueMarkerWithWaitList(str->queue, 0, NULL, &event);
+#  else
+    result = clEnqueueMarker(str->queue, &event);
+#  endif
+    if (EXIT_SUCCESS == result) {
+      assert(NULL != event);
+      result = clWaitForEvents(1, &event);
+    }
+    if (NULL != event) ACC_OPENCL_EXPECT(EXIT_SUCCESS == clReleaseEvent(event));
+  }
 #  if defined(__DBCSR_ACC) && defined(ACC_OPENCL_PROFILE_DBCSR)
   c_dbcsr_timestop(&routine_handle);
 #  endif

src/acc/opencl/smm/opencl_libsmm.c

@@ -1143,7 +1143,7 @@ int opencl_libsmm_acc_process(const int* host_param_stack, const int* dev_param_
               (NULL == env_nz || '\0' == *env_nz) ? (0 != defaults ? /*default*/ 0 : config->nz) : atoi(env_nz), 0, 1);
             new_config.al = LIBXSMM_CLMP(/* bug: AL=1 */
               (NULL == env_al || '\0' == *env_al)
-                ? (0 == (32 & c_dbcsr_acc_opencl_config.wa) ? (0 != defaults ? 0 : config->al) : 0)
+                ? (0 == (64 & c_dbcsr_acc_opencl_config.wa) ? (0 != defaults ? /*default*/ 0 : config->al) : 0)
                 : atoi(env_al),
               0, 1);
             new_config.tb = LIBXSMM_CLMP(
@@ -1154,7 +1154,7 @@ int opencl_libsmm_acc_process(const int* host_param_stack, const int* dev_param_
               (NULL == env_ap || '\0' == *env_ap) ? (0 != defaults ? /*default*/ 0 : config->ap) : atoi(env_ap), 0, 1);
             new_config.aa = LIBXSMM_CLMP(/* bug: AA=2 XF=1 */
               (NULL == env_aa || '\0' == *env_aa) ? (0 != defaults ? default_aa : config->aa) : atoi(env_aa), 0,
-              (0 == (16 & c_dbcsr_acc_opencl_config.wa) || 0 == new_config.flags) ? 2 : 1);
+              (0 == (32 & c_dbcsr_acc_opencl_config.wa) || 0 == new_config.flags) ? 2 : 1);
             new_config.ab = LIBXSMM_CLMP(
               (NULL == env_ab || '\0' == *env_ab) ? (0 != defaults ? default_ab : config->ab) : atoi(env_ab), 0, 2);
             new_config.ac = LIBXSMM_CLMP(