use trunk llvm, use openmp in tasksys

Makefile

@@ -36,7 +36,7 @@
 
 # If you have your own special version of llvm and/or clang, change
 # 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)
 
 # Enable ARM by request

examples_ptx/common.mk

@@ -4,8 +4,10 @@ TASK_LIB=-lpthread
 TASK_OBJ=objs/tasksys.o objs/ispc_malloc.o
 
 CXX=clang++
+CXX=icc -openmp
 CXXFLAGS+=-Iobjs/ -O2
 CC=clang
+CC=icc -openmp
 CCFLAGS+=-Iobjs/ -O2
 
 LIBS=-lm $(TASK_LIB) -lstdc++

examples_ptx/tasksys.cpp

@@ -59,7 +59,9 @@
 #define ISPC_USE_PTHREADS
 #define ISPC_USE_PTHREADS_FULLY_SUBSCRIBED
 #define ISPC_USE_CILK
+*/
 #define ISPC_USE_OMP
+/*
 #define ISPC_USE_TBB_TASK_GROUP
 #define ISPC_USE_TBB_PARALLEL_FOR