Modifications to visc makefile to use SPIR backend when TARGET=X86

llvm/test/VISC/parboil/common/mk/visc.mk

@@ -20,7 +20,7 @@ TESTGEN_OPTFLAGS = -load LLVMGenVISC.so -genvisc -globaldce
 KERNEL_GEN_FLAGS = -O3 -target nvptx
 
 ifeq ($(TARGET),x86)
-  VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-x86 -clearDFG
+  VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMDFG2LLVM_SPIR.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-spir -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
 endif
@@ -33,10 +33,12 @@ else ifeq ($(TIMER),ptx)
   VISC_OPTFLAGS += -visc-timers-ptx
 else ifeq ($(TIMER),gen)
   TESTGEN_OPTFLAGS += -visc-timers-gen
+else ifeq ($(TIMER),spir)
+  TESTGEN_OPTFLAGS += -visc-timers-spir
 else ifeq ($(TIMER),no)
 else
   ifeq ($(TARGET),x86)
-    VISC_OPTFLAGS += -visc-timers-x86
+    VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-spir
   else
     VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-ptx
   endif
@@ -88,14 +90,15 @@ endif
 OBJS = $(call INBUILDDIR,$(SRCDIR_OBJS))
 TEST_OBJS = $(call INBUILDDIR,$(VISC_OBJS))
 PARBOIL_OBJS = $(call INBUILDDIR,parboil.ll)
+KERNEL = $(TEST_OBJS).kernels.ll
 ifneq ($(TARGET),x86)
   KERNEL_LINKED = $(BUILDDIR)/$(APP).kernels.linked.ll
-  KERNEL = $(TEST_OBJS).kernels.ll
+  #KERNEL = $(TEST_OBJS).kernels.ll
   PTX_ASSEMBLY = $(TEST_OBJS).nvptx.s
 endif
 HOST_LINKED = $(BUILDDIR)/$(APP).linked.ll
 HOST = $(BUILDDIR)/$(APP).host.ll
-APP_BINS = $(PTX_ASSEMBLY) $(BIN)
+APP_BINS = $(PTX_ASSEMBLY) $(BIN) $(KERNEL)
 
 ifeq ($(DEBUGGER),)
 DEBUGGER=gdb