From c2df319bc1a26ad2acb003f46de5998cc48163d9 Mon Sep 17 00:00:00 2001 From: Hashim Sharif <hsharif3@tyler.cs.illinois.edu> Date: Thu, 19 Nov 2020 16:32:19 -0600 Subject: [PATCH] Adding missing OpenMP linker flag to Benchmark Makefiles --- llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile | 2 +- llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile | 2 +- .../VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/Makefile | 2 +- llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile | 2 +- llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile | 2 +- llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile | 2 +- .../VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile | 2 +- llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile | 2 +- .../test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile | 2 +- .../test/VISC/DNN_Benchmarks/benchmarks/vgg16_imagenet/Makefile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile index 83b4dc9431..7f154abc8c 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile @@ -22,7 +22,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lOpenCL +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile index 51587b9f20..fc0495605d 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile @@ -22,7 +22,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/Makefile index 067625c731..877eebf877 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/Makefile @@ -22,7 +22,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile index d59730dadd..7f7b84d7e2 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile @@ -21,7 +21,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile index 1b1941b74b..3eaa899095 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile @@ -22,7 +22,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lOpenCL +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile index 80ecf7c2e8..1b92bacec1 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile @@ -22,7 +22,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile index bdfaed927c..823ea6c86a 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile @@ -20,7 +20,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile index 84feae3927..84539b3b05 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile @@ -23,7 +23,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile index 0af61fea2e..ff73a63071 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile @@ -22,7 +22,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_imagenet/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_imagenet/Makefile index 58123d87df..067491b1c1 100644 --- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_imagenet/Makefile +++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_imagenet/Makefile @@ -20,7 +20,7 @@ TENSOR_AUTOTUNER_DIR = $(LLVM_SRC_ROOT)/projects/hpvm-tensor-rt/lib/libtensor_au CC_FLAGS = -I $(LLVM_INCLUDE_DIR) -I $(TENSOR_INCLUDE_DIR) -I $(TENSOR_RT_INCLUDE_DIR) -I $(CUDA_INCLUDE_PATH) -fno-exceptions -ffast-math -std=c++11 -O3 CCFLAGS += -DDEVICE=CUDNN_TARGET -LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs +LINKER_FLAGS = -lpthread -lcudart -lcurand -lcudnn -lcublas -lcufft -lOpenCL -lstdc++fs -lomp HPVM_LIB_DIR = $(HPVM_BUILD_DIR)/lib -- GitLab