From 07e0c2e763511bba998173b5cb998fe918bd9653 Mon Sep 17 00:00:00 2001 From: Philipp Ammann Date: Tue, 8 May 2018 10:06:40 +0200 Subject: [PATCH 1/3] Add TBB headers and library path --- sort-bench/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sort-bench/Makefile b/sort-bench/Makefile index d180774..70abe31 100755 --- a/sort-bench/Makefile +++ b/sort-bench/Makefile @@ -37,11 +37,11 @@ run: all build/tbb-lowlevel.x: tbb/sortbench.h sortbench.cc @mkdir -p build - icpc $(CXXFLAGS) -o $@ -DUSE_TBB_LOWLEVEL sortbench.cc -ltbb + icpc $(CXXFLAGS) $(TBB_INC) -L$(TBB_LIBDIR) -o $@ -DUSE_TBB_LOWLEVEL sortbench.cc -ltbb build/tbb-highlevel.x: tbb/sortbench.h sortbench.cc @mkdir -p build - icpc $(CXXFLAGS) -o $@ -DUSE_TBB_HIGHLEVEL sortbench.cc -ltbb + icpc $(CXXFLAGS) $(TBB_INC) -L$(TBB_LIBDIR) -o $@ -DUSE_TBB_HIGHLEVEL sortbench.cc -ltbb build/openmp.x: openmp/sortbench.h sortbench.cc icpc $(CXXFLAGS) -o $@ -DUSE_OPENMP -qopenmp sortbench.cc From 1225cd0d0aa6910cc02c649ab78bb406d88b45d0 Mon Sep 17 00:00:00 2001 From: Philipp Ammann Date: Tue, 8 May 2018 10:20:24 +0200 Subject: [PATCH 2/3] use ICC for GOMP test --- sort-bench/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sort-bench/Makefile b/sort-bench/Makefile index 70abe31..5d6cfe6 100755 --- a/sort-bench/Makefile +++ b/sort-bench/Makefile @@ -48,7 +48,7 @@ build/openmp.x: openmp/sortbench.h sortbench.cc build/gomp.x: openmp/sortbench.h sortbench.cc @mkdir -p build - g++ $(CXXFLAGS) -o $@ -DUSE_OPENMP -fopenmp sortbench.cc + icpc $(CXXFLAGS) -o $@ -DUSE_OPENMP -fopenmp sortbench.cc build/dash.x: dash/sortbench.h sortbench.cc @mkdir -p build From 6e664b0ffd2643a4851750499b41229698ee963a Mon Sep 17 00:00:00 2001 From: Philipp Ammann Date: Tue, 8 May 2018 10:28:28 +0200 Subject: [PATCH 3/3] only assign CXXFLAGS when none have been defined in env --- sort-bench/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sort-bench/Makefile b/sort-bench/Makefile index 5d6cfe6..43b40e2 100755 --- a/sort-bench/Makefile +++ b/sort-bench/Makefile @@ -8,7 +8,7 @@ DASHROOT?=$(HOME)/opt/dash-0.3.0 DASHCXX=$(DASHROOT)/bin/dash-mpic++ -dash:verbose #CXXFLAGS = -O3 -std=c++11 -I./external -I. -Wall -DENABLE_LOGGING -CXXFLAGS = -O3 -std=c++11 -I./external -I. -DNDEBUG +CXXFLAGS ?= -O3 -std=c++11 -I./external -I. -DNDEBUG SIZE ?= $$((500 * (2**20)))