Browse Source

try to support xeon phi knl

Samuel Thibault 8 years ago
parent
commit
a7760d5cb8
3 changed files with 7 additions and 7 deletions
  1. 4 4
      examples/basic_examples/vector_scal.c
  2. 2 2
      include/starpu_util.h
  3. 1 1
      src/common/utils.h

+ 4 - 4
examples/basic_examples/vector_scal.c

@@ -56,12 +56,12 @@ static struct starpu_codelet cl =
 	.cpu_funcs =
 	{
 		scal_cpu_func
-#if defined(STARPU_HAVE_ICC) && !defined(__KNC__) && !defined(__KNF__)
+#if defined(STARPU_HAVE_ICC) && !defined(__KNF__) && !defined(__KNC__) && !defined(__KNL__) && !defined(__knl__)
 		, scal_cpu_func_icc
 #endif
 #ifdef __SSE__
 		, scal_sse_func
-#if defined(STARPU_HAVE_ICC) && !defined(__KNC__) && !defined(__KNF__)
+#if defined(STARPU_HAVE_ICC) && !defined(__KNF__) && !defined(__KNC__) && !defined(__KNL__) && !defined(__knl__)
 		, scal_sse_func_icc
 #endif
 #endif
@@ -69,12 +69,12 @@ static struct starpu_codelet cl =
 	.cpu_funcs_name =
 	{
 		"scal_cpu_func",
-#if defined(STARPU_HAVE_ICC) && !defined(__KNC__) && !defined(__KNF__)
+#if defined(STARPU_HAVE_ICC) && !defined(__KNF__) && !defined(__KNC__) && !defined(__KNL__) && !defined(__knl__)
 		"scal_cpu_func_icc",
 #endif
 #ifdef __SSE__
 		"scal_sse_func",
-#if defined(STARPU_HAVE_ICC) && !defined(__KNC__) && !defined(__KNF__)
+#if defined(STARPU_HAVE_ICC) && !defined(__KNF__) && !defined(__KNC__) && !defined(__KNL__) && !defined(__knl__)
 		"scal_sse_func_icc"
 #endif
 #endif

+ 2 - 2
include/starpu_util.h

@@ -291,7 +291,7 @@ STARPU_ATOMIC_SOMETHINGL(or, old | value)
 #define STARPU_SYNCHRONIZE() __sync_synchronize()
 #elif defined(__i386__)
 #define STARPU_SYNCHRONIZE() __asm__ __volatile__("lock; addl $0,0(%%esp)" ::: "memory")
-#elif defined(__KNC__) || defined(__KNF__)
+#elif defined(__KNF__) || defined(__KNC__) || defined(__KNL__) || defined(__knl__)
 #define STARPU_SYNCHRONIZE() __asm__ __volatile__("lock; addl $0,0(%%rsp)" ::: "memory")
 #elif defined(__x86_64__)
 #define STARPU_SYNCHRONIZE() __asm__ __volatile__("mfence" ::: "memory")
@@ -302,7 +302,7 @@ STARPU_ATOMIC_SOMETHINGL(or, old | value)
 #if defined(__i386__)
 #define STARPU_RMB() __asm__ __volatile__("lock; addl $0,0(%%esp)" ::: "memory")
 #define STARPU_WMB() __asm__ __volatile__("lock; addl $0,0(%%esp)" ::: "memory")
-#elif defined(__KNC__) || defined(__KNF__)
+#elif defined(__KNF__) || defined(__KNC__) || defined(__KNL__) || defined(__knl__)
 #define STARPU_RMB() __asm__ __volatile__("lock; addl $0,0(%%rsp)" ::: "memory")
 #define STARPU_WMB() __asm__ __volatile__("lock; addl $0,0(%%rsp)" ::: "memory")
 #elif defined(__x86_64__)

+ 1 - 1
src/common/utils.h

@@ -71,7 +71,7 @@
 #define STARPU_HG_DISABLE_CHECKING(variable) VALGRIND_HG_DISABLE_CHECKING(&(variable), sizeof(variable))
 #define STARPU_HG_ENABLE_CHECKING(variable)  VALGRIND_HG_ENABLE_CHECKING(&(variable), sizeof(variable))
 
-#if defined(__KNC__) || defined(__KNF__)
+#if defined(__KNF__) || defined(__KNC__) || defined(__KNL__) || defined(__knl__)
 #define STARPU_DEBUG_PREFIX "[starpu-mic]"
 #else
 #define STARPU_DEBUG_PREFIX "[starpu]"