diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/Makefile b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/Makefile
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_confs_batch220.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/quant_ranges.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/quant_ranges.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/quant_ranges_rt.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/quant_ranges_rt.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/tuner_confs_base.txt b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/tuner_confs_base.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/tuner_confs_base.txt
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/src/mobilenet_shallow.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/src/mobilenet_shallow.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/src/mobilenet_shallow_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/mobilenet_shallow/src/mobilenet_shallow_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/alexnet2_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/alexnet2_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/alexnet_imagenet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/alexnet_imagenet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/alexnet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/alexnet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_mnist_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/lenet_mnist_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_mnist_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/lenet_mnist_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/mobilenet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/mobilenet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/resnet18_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/resnet18_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/vgg16_cifar100_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/vgg16_cifar100_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_promise.cpp b/llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/vgg16_cifar10_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_promise.cpp
rename to llvm/test/VISC/DNN_Benchmarks/benchmarks/legacy/promise_src/vgg16_cifar10_promise.cpp