diff --git a/hpvm/test/dnn_benchmarks/.gitignore b/hpvm/benchmarks/dnn_benchmarks/.gitignore
similarity index 100%
rename from hpvm/test/dnn_benchmarks/.gitignore
rename to hpvm/benchmarks/dnn_benchmarks/.gitignore
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/CMakeLists.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/CMakeLists.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/CMakeLists.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/CMakeLists.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/quant_ranges_rt.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/quant_ranges_rt.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/quant_ranges_rt.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/quant_ranges_rt.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/tuner_confs.txt b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/tuner_confs.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/tuner_confs.txt
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/data/tuner_confs.txt
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/check_dnn_acc.py b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/check_dnn_acc.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/check_dnn_acc.py
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/check_dnn_acc.py
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/lit.cfg.py b/hpvm/benchmarks/dnn_benchmarks/hpvm-c/lit.cfg.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/hpvm-c/lit.cfg.py
rename to hpvm/benchmarks/dnn_benchmarks/hpvm-c/lit.cfg.py
diff --git a/hpvm/test/dnn_benchmarks/keras/.gitkeep b/hpvm/benchmarks/dnn_benchmarks/keras/.gitkeep
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/.gitkeep
rename to hpvm/benchmarks/dnn_benchmarks/keras/.gitkeep
diff --git a/hpvm/test/dnn_benchmarks/keras/Benchmark.py b/hpvm/benchmarks/dnn_benchmarks/keras/Benchmark.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/Benchmark.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/Benchmark.py
diff --git a/hpvm/test/dnn_benchmarks/keras/CMakeLists.txt b/hpvm/benchmarks/dnn_benchmarks/keras/CMakeLists.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/CMakeLists.txt
rename to hpvm/benchmarks/dnn_benchmarks/keras/CMakeLists.txt
diff --git a/hpvm/test/dnn_benchmarks/keras/Config.py b/hpvm/benchmarks/dnn_benchmarks/keras/Config.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/Config.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/Config.py
diff --git a/hpvm/test/dnn_benchmarks/keras/README.md b/hpvm/benchmarks/dnn_benchmarks/keras/README.md
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/README.md
rename to hpvm/benchmarks/dnn_benchmarks/keras/README.md
diff --git a/hpvm/test/dnn_benchmarks/keras/alexnet.py b/hpvm/benchmarks/dnn_benchmarks/keras/alexnet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/alexnet.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/alexnet.py
diff --git a/hpvm/test/dnn_benchmarks/keras/alexnet2.py b/hpvm/benchmarks/dnn_benchmarks/keras/alexnet2.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/alexnet2.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/alexnet2.py
diff --git a/hpvm/test/dnn_benchmarks/keras/alexnet_imagenet.py b/hpvm/benchmarks/dnn_benchmarks/keras/alexnet_imagenet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/alexnet_imagenet.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/alexnet_imagenet.py
diff --git a/hpvm/test/dnn_benchmarks/keras/alexnet_imagenet.test b/hpvm/benchmarks/dnn_benchmarks/keras/alexnet_imagenet.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/alexnet_imagenet.test
rename to hpvm/benchmarks/dnn_benchmarks/keras/alexnet_imagenet.test
diff --git a/hpvm/test/dnn_benchmarks/keras/lenet.py b/hpvm/benchmarks/dnn_benchmarks/keras/lenet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/lenet.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/lenet.py
diff --git a/hpvm/test/dnn_benchmarks/keras/lit.cfg.py b/hpvm/benchmarks/dnn_benchmarks/keras/lit.cfg.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/lit.cfg.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/lit.cfg.py
diff --git a/hpvm/test/dnn_benchmarks/keras/mobilenet_cifar10.py b/hpvm/benchmarks/dnn_benchmarks/keras/mobilenet_cifar10.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/mobilenet_cifar10.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/mobilenet_cifar10.py
diff --git a/hpvm/test/dnn_benchmarks/keras/mobilenet_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/keras/mobilenet_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/mobilenet_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/keras/mobilenet_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/keras/resnet18_cifar10.py b/hpvm/benchmarks/dnn_benchmarks/keras/resnet18_cifar10.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/resnet18_cifar10.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/resnet18_cifar10.py
diff --git a/hpvm/test/dnn_benchmarks/keras/resnet18_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/keras/resnet18_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/resnet18_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/keras/resnet18_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/keras/resnet50_imagenet.py b/hpvm/benchmarks/dnn_benchmarks/keras/resnet50_imagenet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/resnet50_imagenet.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/resnet50_imagenet.py
diff --git a/hpvm/test/dnn_benchmarks/keras/test_benchmarks.py b/hpvm/benchmarks/dnn_benchmarks/keras/test_benchmarks.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/test_benchmarks.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/test_benchmarks.py
diff --git a/hpvm/test/dnn_benchmarks/keras/vgg16_cifar10.py b/hpvm/benchmarks/dnn_benchmarks/keras/vgg16_cifar10.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/vgg16_cifar10.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/vgg16_cifar10.py
diff --git a/hpvm/test/dnn_benchmarks/keras/vgg16_cifar100.py b/hpvm/benchmarks/dnn_benchmarks/keras/vgg16_cifar100.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/vgg16_cifar100.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/vgg16_cifar100.py
diff --git a/hpvm/test/dnn_benchmarks/keras/vgg16_cifar100.test b/hpvm/benchmarks/dnn_benchmarks/keras/vgg16_cifar100.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/vgg16_cifar100.test
rename to hpvm/benchmarks/dnn_benchmarks/keras/vgg16_cifar100.test
diff --git a/hpvm/test/dnn_benchmarks/keras/vgg16_imagenet.py b/hpvm/benchmarks/dnn_benchmarks/keras/vgg16_imagenet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/keras/vgg16_imagenet.py
rename to hpvm/benchmarks/dnn_benchmarks/keras/vgg16_imagenet.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/CMakeLists.txt b/hpvm/benchmarks/dnn_benchmarks/pytorch/CMakeLists.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/CMakeLists.txt
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/CMakeLists.txt
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/__init__.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/__init__.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/__init__.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/__init__.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/_container.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/_container.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/_container.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/_container.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/alexnet.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/alexnet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/alexnet.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/alexnet.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/datasets.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/datasets.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/datasets.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/datasets.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/lenet.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/lenet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/lenet.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/lenet.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/mobilenet.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/mobilenet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/mobilenet.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/mobilenet.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/resnet.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/resnet.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/resnet.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/resnet.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/dnn/vgg16.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/vgg16.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/dnn/vgg16.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/dnn/vgg16.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/alexnet2_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/alexnet2_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/alexnet2_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/alexnet2_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/alexnet_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/alexnet_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/alexnet_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/alexnet_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/alexnet_imagenet.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/alexnet_imagenet.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/alexnet_imagenet.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/alexnet_imagenet.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/lenet_mnist.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/lenet_mnist.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/lenet_mnist.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/lenet_mnist.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/lit.cfg.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/lit.cfg.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/lit.cfg.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/lit.cfg.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/mobilenet_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/mobilenet_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/mobilenet_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/mobilenet_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/resnet18_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/resnet18_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/resnet18_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/resnet18_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/resnet50_imagenet.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/resnet50_imagenet.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/resnet50_imagenet.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/resnet50_imagenet.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/test_frontend.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/test_frontend.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/test_frontend.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/test_frontend.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar100.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar100.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar100.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/vgg16_cifar100.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_frontend/vgg16_imagenet.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/vgg16_imagenet.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_frontend/vgg16_imagenet.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_frontend/vgg16_imagenet.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/alexnet2_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/alexnet2_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/alexnet2_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/alexnet2_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/alexnet_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/alexnet_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/alexnet_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/alexnet_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/lenet_mnist.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/lenet_mnist.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/lenet_mnist.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/lenet_mnist.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/lit.cfg.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/lit.cfg.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/lit.cfg.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/lit.cfg.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/mobilenet_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/mobilenet_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/mobilenet_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/mobilenet_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/resnet18_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/resnet18_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/resnet18_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/resnet18_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_profiling/test_profiling.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/test_profiling.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_profiling/test_profiling.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_profiling/test_profiling.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/alexnet_imagenet.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/alexnet_imagenet.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/alexnet_imagenet.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/alexnet_imagenet.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/lenet_mnist_p1.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/lenet_mnist_p1.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/lenet_mnist_p1.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/lenet_mnist_p1.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/lit.cfg.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/lit.cfg.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/lit.cfg.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/lit.cfg.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/mobilenet_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/mobilenet_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/mobilenet_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/mobilenet_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/resnet18_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/resnet18_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/resnet18_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/resnet18_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/test_tuning.py b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/test_tuning.py
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/test_tuning.py
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/test_tuning.py
diff --git a/hpvm/test/dnn_benchmarks/pytorch/test_tuning/vgg16_cifar10.test b/hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/vgg16_cifar10.test
similarity index 100%
rename from hpvm/test/dnn_benchmarks/pytorch/test_tuning/vgg16_cifar10.test
rename to hpvm/benchmarks/dnn_benchmarks/pytorch/test_tuning/vgg16_cifar10.test
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/CMakeLists.txt b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/CMakeLists.txt
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/CMakeLists.txt
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/CMakeLists.txt
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc b/hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc
similarity index 100%
rename from hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc
rename to hpvm/benchmarks/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc
diff --git a/hpvm/test/CMakeLists.txt b/hpvm/test/CMakeLists.txt
index 816e9ecbf9abe61d55756f93d4dcbae938d97863..9380d5e2e262b3090c749bc4e37f37ac383c6006 100644
--- a/hpvm/test/CMakeLists.txt
+++ b/hpvm/test/CMakeLists.txt
@@ -9,8 +9,4 @@ add_subdirectory(hpvm_pass)  # Passes test suite
 
 if(HPVM_USE_CUDA)  # Compile these only if CUDA exists.
   add_subdirectory(hpvm-tensor-rt)  # Unit tests of tensor_runtime
-  add_subdirectory(dnn_benchmarks/hpvm-c)  # HPVM-C DNN accuracy test suite
-  add_subdirectory(dnn_benchmarks/keras)  # Keras frontend test suite
-  add_subdirectory(dnn_benchmarks/pytorch)  # Torch frontend test suites (3 of them)
-  add_subdirectory(dnn_benchmarks/tensor-rt-src)  # tensor_runtime DNN (build only, no tests)
 endif()