Modified parboil makefiles to use new GPU backend (llvm-cbe)

hpvm/test/parboil/common/mk/visc.mk

@@ -133,11 +133,11 @@ else ifeq ($(TARGET),seqx86)
 else ifeq ($(TARGET),seqgpu)
   KERNEL_LINKED = $(BUILDDIR)/$(APP).kernels.linked.ll
   #KERNEL = $(TEST_OBJS).kernels.ll
-  PTX_ASSEMBLY = $(TEST_OBJS).nvptx.s
+  KERNEL_OCL = $(TEST_OBJS).kernels.cl
 else
   KERNEL_LINKED = $(BUILDDIR)/$(APP).kernels.linked.ll
   #KERNEL = $(TEST_OBJS).kernels.ll
-  PTX_ASSEMBLY = $(TEST_OBJS).nvptx.s
+  KERNEL_OCL = $(TEST_OBJS).kernels.cl
 endif
 HOST_LINKED = $(BUILDDIR)/$(APP).linked.ll
 HOST = $(BUILDDIR)/$(APP).host.ll
@@ -150,7 +150,7 @@ endif
 # Rules
 ########################################
 
-default: $(FAILSAFE) $(BUILDDIR) $(PTX_ASSEMBLY) $(SPIR_ASSEMBLY) $(BIN)
+default: $(FAILSAFE) $(BUILDDIR) $(KERNEL_OCL) $(SPIR_ASSEMBLY) $(BIN)
 #default: $(FAILSAFE) $(BUILDDIR) $(BIN)
 
 run : $(RUNDIR)
@@ -173,15 +173,12 @@ clean :
 	if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi
 	if [ -d $(RUNDIR) ]; then rm -rf $(RUNDIR); fi
 
-#$(APP_BINS) : $(PTX_ASSEMBLY) $(BIN)
+#$(APP_BINS) : $(KERNEL_OCL) $(BIN)
 	#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 $@
-
-$(KERNEL_LINKED) : $(KERNEL_OPT)
-	$(LLVM_LINK) $(LIBCLC_NVPTX_LIB) -S $< -o $@
+$(KERNEL_OCL) : $(KERNEL_OPT)
+	$(OCLBE) $< -o $@
 
 $(SPIR_ASSEMBLY) : $(KERNEL_OPT)
 	python $(PYTHON_LLVM_40_34) $< $(BUILDDIR)/kernel_34.ll

hpvm/test/parboil/common/platform/visc.default.mk

@@ -15,6 +15,7 @@
 VISC_BUILD_DIR = $(LLVM_SRC_ROOT)/../build
 # gcc (default)
 CC = $(VISC_BUILD_DIR)/bin/clang
+OCLBE = $(VISC_BUILD_DIR)/bin/llvm-cbe
 PLATFORM_CFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include
 
 CXX = $(VISC_BUILD_DIR)/bin/clang++