diff --git a/llvm/test/VISC/parboil/common/mk/visc.mk b/llvm/test/VISC/parboil/common/mk/visc.mk
index 954fc1563ecf5327f06d265b7236a0b29328ec4e..6c71fa2b69086b581d60661fa036af525f05ddad 100644
--- a/llvm/test/VISC/parboil/common/mk/visc.mk
+++ b/llvm/test/VISC/parboil/common/mk/visc.mk
@@ -21,8 +21,11 @@ KERNEL_GEN_FLAGS = -O3 -target nvptx
 
 ifeq ($(TARGET),x86)
   VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMDFG2LLVM_SPIR.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-spir -dfg2llvm-x86 -clearDFG
+  CFLAGS += -DOPENCL_CPU
+else ifeq ($(TARGET),seq)
+  VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-x86 -clearDFG
 else
-  VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMDFG2LLVM_NVPTX.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-nvptx -dfg2llvm-x86 -clearDFG
+  VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMLocalMem.so -load LLVMDFG2LLVM_NVPTX.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -localmem -dfg2llvm-nvptx -dfg2llvm-x86 -clearDFG
 endif
 
 HOST_LINKFLAGS =
@@ -39,6 +42,8 @@ else ifeq ($(TIMER),no)
 else
   ifeq ($(TARGET),x86)
     VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-spir
+  else ifeq ($(TARGET),seq)
+    VISC_OPTFLAGS += -visc-timers-x86
   else
     VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-ptx
   endif
@@ -98,6 +103,7 @@ ifneq ($(TARGET),x86)
 endif
 HOST_LINKED = $(BUILDDIR)/$(APP).linked.ll
 HOST = $(BUILDDIR)/$(APP).host.ll
+
 APP_BINS = $(PTX_ASSEMBLY) $(BIN) $(KERNEL)
 
 ifeq ($(DEBUGGER),)
@@ -127,10 +133,12 @@ clean :
 	if [ -a $(BIN) ]; then rm $(BIN); fi
 	if [ -a DataflowGraph.dot ]; then rm DataflowGraph.dot*; fi
 	if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi
+	if [ -d $(RUNDIR) ]; then rm -rf $(RUNDIR); fi
 
 #$(APP_BINS) : $(PTX_ASSEMBLY) $(BIN)
-#	echo Generating $(APP_BINS) ...
+	#echo Generating $(APP_BINS) ...
 
+#TODO: Fix this. Remove echo to actually compile kernel to ptx
 $(PTX_ASSEMBLY) : $(KERNEL_LINKED)
 	$(CC) $(KERNEL_GEN_FLAGS) -S $< -o $@