Skip to content
Snippets Groups Projects
Commit 3b36cf07 authored by Yifan Zhao's avatar Yifan Zhao
Browse files

All benchmarks point to the new visc.h

parent 018de863
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
hpvm/test/hpvm-cava/Makefile
+ 4
− 5
View file @ 3b36cf07
...@@ -25,12 +25,11 @@ BUILD_DIR = build/$(TARGET)_$(VERSION) ...@@ -25,12 +25,11 @@ BUILD_DIR = build/$(TARGET)_$(VERSION)
CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
INCLUDES += -I$(SRC_DIR) \ INCLUDES += -I$(SRC_DIR) -I$(CAM_PIPE_SRC_DIR)
-I$(CAM_PIPE_SRC_DIR) \ INCLUDES += -I$(LLVM_SRC_ROOT)/include -I../include -I$(VISC_BUILD_DIR)/include
ifneq ($(CONFUSE_ROOT),) ifneq ($(CONFUSE_ROOT),)
INCLUDES += -I$(CONFUSE_ROOT)/include INCLUDES += -I$(CONFUSE_ROOT)/include
LFLAGS += -L$(CONFUSE_ROOT)/lib LFLAGS += -L$(CONFUSE_ROOT)/lib
endif endif
EXE = cava-visc-$(VERSION)-$(TARGET) EXE = cava-visc-$(VERSION)-$(TARGET)
......
hpvm/test/parboil/common/platform/visc.default.mk
+ 2
− 2
View file @ 3b36cf07
...@@ -16,10 +16,10 @@ VISC_BUILD_DIR = $(LLVM_SRC_ROOT)/../build ...@@ -16,10 +16,10 @@ VISC_BUILD_DIR = $(LLVM_SRC_ROOT)/../build
# gcc (default) # gcc (default)
CC = $(VISC_BUILD_DIR)/bin/clang CC = $(VISC_BUILD_DIR)/bin/clang
OCLBE = $(VISC_BUILD_DIR)/bin/llvm-cbe OCLBE = $(VISC_BUILD_DIR)/bin/llvm-cbe
PLATFORM_CFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include PLATFORM_CFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include -I../../../include
CXX = $(VISC_BUILD_DIR)/bin/clang++ CXX = $(VISC_BUILD_DIR)/bin/clang++
PLATFORM_CXXFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include PLATFORM_CXXFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include -I../../../include
LINKER = $(VISC_BUILD_DIR)/bin/clang++ LINKER = $(VISC_BUILD_DIR)/bin/clang++
PLATFORM_LDFLAGS = -lm -lpthread -lOpenCL PLATFORM_LDFLAGS = -lm -lpthread -lOpenCL
......
hpvm/test/pipeline/Makefile
+ 5
− 2
View file @ 3b36cf07
...@@ -22,13 +22,16 @@ CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) ...@@ -22,13 +22,16 @@ CURRENT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
EXE = pipeline-$(TARGET) EXE = pipeline-$(TARGET)
INCLUDES += -I$(SRC_DIR) -I$(CAM_PIPE_SRC_DIR)
INCLUDES += -I$(LLVM_SRC_ROOT)/include -I../include -I$(VISC_BUILD_DIR)/include
## BEGIN HPVM MAKEFILE ## BEGIN HPVM MAKEFILE
SRCDIR_OBJS= io.ll SRCDIR_OBJS= io.ll
OBJS_SRC=src/io.cc OBJS_SRC=src/io.cc
VISC_OBJS=main.visc.ll VISC_OBJS=main.visc.ll
APP = $(EXE) APP = $(EXE)
APP_CFLAGS+=-ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize -I$(SRC_DIR) APP_CFLAGS += $(INCLUDES) -ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize
APP_CXXFLAGS+=-ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize -I$(SRC_DIR) APP_CXXFLAGS += $(INCLUDES) -ffast-math -O3 -fno-lax-vector-conversions -fno-vectorize -fno-slp-vectorize
APP_LDFLAGS=`pkg-config opencv --libs` APP_LDFLAGS=`pkg-config opencv --libs`
CFLAGS = $(APP_CFLAGS) $(PLATFORM_CFLAGS) CFLAGS = $(APP_CFLAGS) $(PLATFORM_CFLAGS)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment