From de2a54ad17d27d5f9bc28115446a62fe4da03594 Mon Sep 17 00:00:00 2001
From: Hashim Sharif <hsharif3@tyler.cs.illinois.edu>
Date: Fri, 20 Nov 2020 01:41:56 -0600
Subject: [PATCH] Adding working ResNet50 sources but faulty tuner config file
---
.../benchmarks/resnet50_imagenet/Makefile | 3 +++
.../resnet50_imagenet/data/tuner_confs.txt | 12 +++++++++---
.../resnet50_imagenet/src/resnet50_imagenet_loop.cpp | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile
index 823ea6c86a..609901a4e2 100644
--- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile
+++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/Makefile
@@ -1,3 +1,4 @@
+
DNN_BENCHMARK_ROOT = $(LLVM_SRC_ROOT)/test/VISC/DNN_Benchmarks
HPVM_BUILD_DIR = $(LLVM_BUILD_ROOT)
@@ -39,6 +40,7 @@ CONF_FILE_PATH=$(LLVM_SRC_ROOT)/test/VISC/DNN_Benchmarks/benchmarks/$(APP)/data/
VISC_OPTFLAGS3 = -load $(HPVM_LIB_DIR)/LLVMBuildDFG.so -load $(HPVM_LIB_DIR)/LLVMInPlaceDFGAnalysis.so -load $(HPVM_LIB_DIR)/LLVMDFG2LLVM_WrapperAPI.so -load $(HPVM_LIB_DIR)/LLVMDFG2LLVM_X86.so -load $(HPVM_LIB_DIR)/LLVMFuseHPVMTensorNodes.so -load $(HPVM_LIB_DIR)/LLVMClearDFG.so -inplace -hpvm-fuse -dfg2llvm-wrapperapi -quantization-levels-filename=$(WRAPPER_API_QUANT_FILE_PATH) -configuration-inputs-filename=$(CONF_FILE_PATH) -dfg2llvm-x86 -clearDFG
+
TARGET = $(BUILD_DIR)/$(APP).opt.bc
SOURCES = $(SRC_DIR)/$(APP).cpp
VISC_RT_PATH = $(LLVM_SRC_ROOT)/../build/projects/visc-rt/visc-rt.ll
@@ -69,6 +71,7 @@ $(BUILD_DIR)/%.opt.bc: $(BUILD_DIR)/%.ll
$(CC) $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked.bc $(TENSOR_LIB_DIR) $(PROFILER_LIB_DIR) $(SOC_SIMULATOR_LIB_DIR) -o $(BUILD_DIR)/$(APP)_loop_wrapperapi_linked $(LINKER_FLAGS)
+
$(BUILD_DIR):
mkdir -p $@
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/data/tuner_confs.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/data/tuner_confs.txt
index ede27ce6f5..b0814ec4b3 100644
--- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/data/tuner_confs.txt
+++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/data/tuner_confs.txt
@@ -4,9 +4,15 @@ conf1 1 1 75.7 0.0
1 gpu conv fp32 11 add fp32 1 relu fp32 1 pool_max fp32 1
2 gpu batchnorm fp32 11
3 gpu conv fp32 11 add fp32 1
-4 gpu batchnorm fp32 11
-5 gpu relu fp32 11
-6 gpu conv fp32 11 add fp32 1
+4 gpu conv fp32 11 add fp32 1
+5 gpu batchnorm fp32 11
+6 gpu batchnorm fp32 11
+7 gpu relu fp32 11
+8 gpu conv fp32 11 add fp32 1
+9 gpu batchnorm fp32 11
+10 gpu relu fp32 11
+11 gpu conv fp32 11 add fp32 1
+12 gpu batchnorm fp32 11
7 gpu batchnorm fp32 11
8 gpu relu fp32 11
9 gpu conv fp32 11 add fp32 1
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp
index e43896f7d2..916f0440a7 100644
--- a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp
+++ b/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp
@@ -1834,7 +1834,7 @@ void var_227_node(void* t1, size_t bytes_t1, void* t2, size_t bytes_t2) {
}
void var_228_node(void* t1, size_t bytes_t1) {
- __visc__hint(visc::CUDNN_TARGET);
+ __visc__hint(visc::PROMISE_TARGET);
__visc__attributes(1, t1, 0);
void* r = __visc__tensor_softmax(t1);
--
GitLab