From 0d944ac87eb9810f3821d8781fd3ee0ac1911f8d Mon Sep 17 00:00:00 2001
From: Evghenii <egaburov@dds.nl>
Date: Sun, 5 Jan 2014 19:04:40 +0100
Subject: [PATCH] use trunk llvm, use openmp in tasksys

---
 Makefile                 | 2 +-
 examples_ptx/common.mk   | 2 ++
 examples_ptx/tasksys.cpp | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d0c327ea..69b8423c 100644
--- a/Makefile
+++ b/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
diff --git a/examples_ptx/common.mk b/examples_ptx/common.mk
index 81b1a770..b89b6ff6 100644
--- a/examples_ptx/common.mk
+++ b/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++
diff --git a/examples_ptx/tasksys.cpp b/examples_ptx/tasksys.cpp
index 77269f9f..1aae61f4 100644
--- a/examples_ptx/tasksys.cpp
+++ b/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