[Openmp-commits] [openmp] r309418 - Fix comments and build messages concerning TSX

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Fri Jul 28 12:05:17 2017
New Revision: 309418

URL: http://llvm.org/viewvc/llvm-project?rev=309418&view=rev
Log:
Fix comments and build messages concerning TSX

Modified:
    openmp/trunk/runtime/Build_With_CMake.txt
    openmp/trunk/runtime/CMakeLists.txt
    openmp/trunk/runtime/src/kmp_os.h

Modified: openmp/trunk/runtime/Build_With_CMake.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/Build_With_CMake.txt?rev=309418&r1=309417&r2=309418&view=diff
==============================================================================
--- openmp/trunk/runtime/Build_With_CMake.txt (original)
+++ openmp/trunk/runtime/Build_With_CMake.txt Fri Jul 28 12:05:17 2017
@@ -127,9 +127,10 @@ Intel(R) MIC Architecture, can be knf or
 Should the Fortran modules be created (requires Fortran compiler)
 
 -DLIBOMP_USE_ADAPTIVE_LOCKS=on|off
-Should adaptive (TSX-based) locks be included?
-These are x86 specific.  This feature is turned on by default
-for i386 and x86_64.  Otherwise, it is turned off.
+Should adaptive (Intel(R) Transactional Synchronization Extensions
+(Intel(R) TSX) based) locks be included?  These are x86 specific.
+This feature is turned on by default for IA-32 architecture and
+Intel(R) 64 architecture.  Otherwise, it is turned off.
 
 -DLIBOMP_USE_INTERNODE_ALIGNMENT=off|on
 Should 4096-byte alignment be used for certain data structures?

Modified: openmp/trunk/runtime/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/CMakeLists.txt?rev=309418&r1=309417&r2=309418&view=diff
==============================================================================
--- openmp/trunk/runtime/CMakeLists.txt (original)
+++ openmp/trunk/runtime/CMakeLists.txt Fri Jul 28 12:05:17 2017
@@ -279,12 +279,13 @@ set(LIBOMP_USE_DEBUGGER FALSE CACHE BOOL
 set(LIBOMP_USE_STDCPPLIB FALSE CACHE BOOL
   "Should we link to C++ library?")
 
-# TSX (x86) based locks have __asm code which can be troublesome for some compilers.
+# Intel(R) Transactional Synchronization Extensions (Intel(R) TSX) based locks have
+# __asm code which can be troublesome for some compilers.  This feature is also x86 specific.
 # TODO: Make this a real feature check
 set(LIBOMP_USE_ADAPTIVE_LOCKS "${LIBOMP_HAVE_ADAPTIVE_LOCKS}" CACHE BOOL
-  "Should TSX-based lock be compiled (adaptive lock in kmp_lock.cpp).  These are x86 specific.")
+  "Should Intel(R) TSX lock be compiled (adaptive lock in kmp_lock.cpp).  These are x86 specific.")
 if(LIBOMP_USE_ADAPTIVE_LOCKS AND (NOT LIBOMP_HAVE_ADAPTIVE_LOCKS))
-  libomp_error_say("Adaptive locks (TSX) functionality requested but not available")
+  libomp_error_say("Adaptive locks (Intel(R) TSX) functionality is only supported on x86 Architecture")
 endif()
 
 # - stats-gathering enables OpenMP stats where things like the number of

Modified: openmp/trunk/runtime/src/kmp_os.h
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_os.h?rev=309418&r1=309417&r2=309418&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_os.h (original)
+++ openmp/trunk/runtime/src/kmp_os.h Fri Jul 28 12:05:17 2017
@@ -834,7 +834,8 @@ typedef void (*microtask_t)(int *gtid, i
 #define KMP_USE_DYNAMIC_LOCK 1
 #endif
 
-// Enable TSX if dynamic user lock is turned on
+// Enable Intel(R) Transactional Synchronization Extensions (Intel(R) TSX) if
+// dynamic user lock is turned on
 #if KMP_USE_DYNAMIC_LOCK
 // Visual studio can't handle the asm sections in this code
 #define KMP_USE_TSX (KMP_ARCH_X86 || KMP_ARCH_X86_64) && !KMP_COMPILER_MSVC