use trunk llvm, use openmp in tasksys
This commit is contained in:
2
Makefile
2
Makefile
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
# If you have your own special version of llvm and/or clang, change
|
# If you have your own special version of llvm and/or clang, change
|
||||||
# these variables to match.
|
# these variables to match.
|
||||||
LLVM_CONFIG=$(shell which $(HOME)/usr/local/llvm/bin-3.2/bin/llvm-config)
|
LLVM_CONFIG=$(shell which $(HOME)/usr/local/llvm/bin-trunk/bin/llvm-config)
|
||||||
CLANG_INCLUDE=$(shell $(LLVM_CONFIG) --includedir)
|
CLANG_INCLUDE=$(shell $(LLVM_CONFIG) --includedir)
|
||||||
|
|
||||||
# Enable ARM by request
|
# Enable ARM by request
|
||||||
|
|||||||
@@ -4,8 +4,10 @@ TASK_LIB=-lpthread
|
|||||||
TASK_OBJ=objs/tasksys.o objs/ispc_malloc.o
|
TASK_OBJ=objs/tasksys.o objs/ispc_malloc.o
|
||||||
|
|
||||||
CXX=clang++
|
CXX=clang++
|
||||||
|
CXX=icc -openmp
|
||||||
CXXFLAGS+=-Iobjs/ -O2
|
CXXFLAGS+=-Iobjs/ -O2
|
||||||
CC=clang
|
CC=clang
|
||||||
|
CC=icc -openmp
|
||||||
CCFLAGS+=-Iobjs/ -O2
|
CCFLAGS+=-Iobjs/ -O2
|
||||||
|
|
||||||
LIBS=-lm $(TASK_LIB) -lstdc++
|
LIBS=-lm $(TASK_LIB) -lstdc++
|
||||||
|
|||||||
@@ -59,7 +59,9 @@
|
|||||||
#define ISPC_USE_PTHREADS
|
#define ISPC_USE_PTHREADS
|
||||||
#define ISPC_USE_PTHREADS_FULLY_SUBSCRIBED
|
#define ISPC_USE_PTHREADS_FULLY_SUBSCRIBED
|
||||||
#define ISPC_USE_CILK
|
#define ISPC_USE_CILK
|
||||||
|
*/
|
||||||
#define ISPC_USE_OMP
|
#define ISPC_USE_OMP
|
||||||
|
/*
|
||||||
#define ISPC_USE_TBB_TASK_GROUP
|
#define ISPC_USE_TBB_TASK_GROUP
|
||||||
#define ISPC_USE_TBB_PARALLEL_FOR
|
#define ISPC_USE_TBB_PARALLEL_FOR
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user