Tested combination of X86 and SPIR backends on sgemm visc.

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

@@ -10,7 +10,7 @@ CXXFLAGS=$(LANG_CXXFLAGS) $(PLATFORM_CXXFLAGS) $(APP_CXXFLAGS)
 LDFLAGS=$(LANG_LDFLAGS) $(PLATFORM_LDFLAGS) $(APP_LDFLAGS)
 
 # VISC
-LIBCLC_LIB_PATH = $(LLVM_SRC_ROOT)/../../libclc-install/lib/clc
+LIBCLC_LIB_PATH = $(LLVM_SRC_ROOT)/../libclc/built_libs
 VISC_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/visc-rt
 
 VISC_RT_LIB = $(VISC_RT_PATH)/visc-rt.ll
@@ -18,7 +18,7 @@ VISC_RT_LIB = $(VISC_RT_PATH)/visc-rt.ll
 LIBCLC_NVPTX_LIB = $(LIBCLC_LIB_PATH)/nvptx64--nvidiacl.bc
 #LIBCLC_NVPTX_LIB = nvptx64--nvidiacl.bc
 
-LLVM_34_AS = /home/psrivas2/Utilities/llvm-src/install/release_34/bin/llvm-as
+LLVM_34_AS = /opt/llvm/bin/llvm-as
 
 TESTGEN_OPTFLAGS = -load LLVMGenVISC.so -genvisc -globaldce
 KERNEL_GEN_FLAGS = -O3 -target nvptx64-nvidia-nvcl
@@ -30,6 +30,13 @@ ifeq ($(TARGET),x86)
 else ifeq ($(TARGET),seq)
   DEVICE = CPU_TARGET
   VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-x86 -clearDFG
+else ifeq ($(TARGET),seqx86)
+  DEVICE = CPU_OR_SPIR_TARGET
+  VISC_OPTFLAGS = -load LLVMBuildDFG.so -load LLVMLocalMem.so -load LLVMDFG2LLVM_SPIR.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -localmem -dfg2llvm-spir -dfg2llvm-x86 -clearDFG
+  CFLAGS += -DOPENCL_CPU
+else ifeq ($(TARGET),seqgpu)
+  DEVICE = CPU_OR_GPU_TARGET
+  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
 else
   DEVICE = GPU_TARGET
   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
@@ -54,6 +61,10 @@ else
     VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-spir
   else ifeq ($(TARGET),seq)
     VISC_OPTFLAGS += -visc-timers-x86
+  else ifeq ($(TARGET),seqx86)
+    VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-spir
+  else ifeq ($(TARGET),seqgpu)
+    VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-ptx
   else
     VISC_OPTFLAGS += -visc-timers-x86 -visc-timers-ptx
   endif
@@ -113,6 +124,12 @@ KERNEL_OPT = $(BUILDDIR)/$(APP).kernels.opt.ll
 ifeq ($(TARGET),x86)
   SPIR_ASSEMBLY = $(TEST_OBJS).kernels.bc
 else ifeq ($(TARGET),seq)
+else ifeq ($(TARGET),seqx86)
+  SPIR_ASSEMBLY = $(TEST_OBJS).kernels.bc
+else ifeq ($(TARGET),seqgpu)
+  KERNEL_LINKED = $(BUILDDIR)/$(APP).kernels.linked.ll
+  #KERNEL = $(TEST_OBJS).kernels.ll
+  PTX_ASSEMBLY = $(TEST_OBJS).nvptx.s
 else
   KERNEL_LINKED = $(BUILDDIR)/$(APP).kernels.linked.ll
   #KERNEL = $(TEST_OBJS).kernels.ll