[Openmp-commits] [openmp] r236632 - D7631: added regression tests for hinted locks - to be integrated into testsuite.

[Andrey Churbanov]

Author: achurbanov
Date: Wed May  6 14:40:54 2015
New Revision: 236632

URL: http://llvm.org/viewvc/llvm-project?rev=236632&view=rev
Log:
D7631: added regression tests for hinted locks - to be integrated into testsuite.

Added:
    openmp/trunk/testsuite/tests_to_integrate/
    openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c   (with props)
    openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f   (with props)

Added: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c?rev=236632&view=auto
==============================================================================
--- openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c (added)
+++ openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c Wed May  6 14:40:54 2015
@@ -0,0 +1,67 @@
+/******************************************************************************\
+  Extended version of omp_set_unset_lock.c for testing hinted locks.
+  Check to make sure OpenMP locks guarantee mutual 
+  exclusion for multiple threads.
+\******************************************************************************/
+	
+#include <stdio.h>
+#include <stdlib.h>
+#include <omp.h>
+
+void cscall(int id, int n[1000], int *passed, omp_lock_t *lock) {
+    int i;
+
+    omp_set_lock( lock );
+    for (i = 0; i < 1000; i++) {
+        n[i] = id;
+    }
+    for (i = 0; i < 1000; i++) {
+        if ( n[i] != id ) {
+            *passed = 0;
+        }
+    }
+    omp_unset_lock( lock );
+}
+
+int hinted_lock(kmp_lock_hint_t hint) {
+    int passed, n[1000], j, id;
+    omp_lock_t lock;
+    
+    passed = 1;
+
+    kmp_init_lock_hinted(&lock, hint);
+
+    #pragma omp parallel shared(n, passed, lock) private(id, j)	
+    {
+        id = omp_get_thread_num();
+        for (j = 1; j <= 10000; j++) {
+            cscall( id, n, &passed, &lock );
+        }
+    }
+
+    omp_destroy_lock(&lock);
+
+    if (passed) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+int main() {
+    int ret = 0;
+    ret += hinted_lock(kmp_lock_hint_none);
+    ret += hinted_lock(kmp_lock_hint_contended);
+    ret += hinted_lock(kmp_lock_hint_uncontended);
+    ret += hinted_lock(kmp_lock_hint_nonspeculative);
+    ret += hinted_lock(kmp_lock_hint_speculative);
+    // This one will emit Warning on machines with no TSX. 
+    ret += hinted_lock(kmp_lock_hint_adaptive);
+    if (ret) {
+        printf(" Test %s failed\n", __FILE__);
+        return 1;
+    } else {
+        printf(" Test %s passed\n", __FILE__);
+        return 0;
+    }
+}

Propchange: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Rev URL

Propchange: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f?rev=236632&view=auto
==============================================================================
--- openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f (added)
+++ openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f Wed May  6 14:40:54 2015
@@ -0,0 +1,90 @@
+!
+! Modified version of omp_set_unset_lock.F, using hinted lock API
+!
+      program omp_set_unset_lock_hinted
+
+      integer ret
+#if defined(_OPENMP)
+      include 'omp_lib.h'
+
+      ret = 0
+      call hinted_lock(kmp_lock_hint_none, ret)
+      call hinted_lock(kmp_lock_hint_contended, ret)
+      call hinted_lock(kmp_lock_hint_uncontended, ret)
+      call hinted_lock(kmp_lock_hint_nonspeculative, ret)
+      call hinted_lock(kmp_lock_hint_speculative, ret)
+      call hinted_lock(kmp_lock_hint_adaptive, ret)
+#else
+      ret = 0
+#endif
+
+      if (ret .eq. 0) then
+          print *, 'Test omp_set_unset_lock_hinted.f passed'
+      else
+          print *, 'Test omp_set_unset_lock_hinted.f failed'
+      endif
+
+      stop
+      end
+
+      subroutine hinted_lock(lock_hint, ret)
+#if defined(_OPENMP)
+      include 'omp_lib.h'
+      integer(omp_lock_kind) lock
+      integer(kmp_lock_hint_kind) lock_hint
+#else
+      integer lock
+      integer lock_hint
+#endif
+      integer ret
+      logical passed
+      integer n(1000), j, id
+      
+      passed = .TRUE.
+
+      call kmp_init_lock_hinted(lock, lock_hint)
+
+!$omp  parallel
+!$omp&     shared       (n,passed,lock)
+!$omp&     private      (id,j)      
+#if defined(_OPENMP) && !defined(_ASSURE)
+      id = omp_get_thread_num()
+#else
+      id = 0
+#endif
+#if defined(_ASSURE)
+      do j = 1, 10
+#else
+      do j = 1, 10000
+#endif
+          call cscall(id, n, passed, lock)
+      enddo
+!$omp  end parallel
+
+      call omp_destroy_lock(lock)
+
+      if (.not. passed) then
+          ret = ret + 1
+      endif
+
+      end
+
+      subroutine cscall(id, n, passed, lock)
+#if defined(_OPENMP)
+        include 'omp_lib.h'
+      integer(omp_lock_kind) lock
+#else
+      integer lock
+#endif
+      integer id, i, n(1000)
+      logical passed
+
+      call omp_set_lock(lock)
+      do i = 1,1000
+          n(i) = id
+      enddo
+      do i = 1,1000
+          if (n(i) .ne. id) passed = .FALSE.
+      enddo
+      call omp_unset_lock(lock)
+      end

Propchange: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Rev URL

Propchange: openmp/trunk/testsuite/tests_to_integrate/omp_set_unset_lock_hinted.f
------------------------------------------------------------------------------
    svn:mime-type = text/plain