diff --git a/llvm/test/VISC/CTestSuite/Makefile b/llvm/tools/hpvm/test/VISC/CTestSuite/Makefile
similarity index 100%
rename from llvm/test/VISC/CTestSuite/Makefile
rename to llvm/tools/hpvm/test/VISC/CTestSuite/Makefile
diff --git a/llvm/test/VISC/CTestSuite/RUN.script b/llvm/tools/hpvm/test/VISC/CTestSuite/RUN.script
similarity index 100%
rename from llvm/test/VISC/CTestSuite/RUN.script
rename to llvm/tools/hpvm/test/VISC/CTestSuite/RUN.script
diff --git a/llvm/test/VISC/CTestSuite/gemm.c b/llvm/tools/hpvm/test/VISC/CTestSuite/gemm.c
similarity index 100%
rename from llvm/test/VISC/CTestSuite/gemm.c
rename to llvm/tools/hpvm/test/VISC/CTestSuite/gemm.c
diff --git a/llvm/test/VISC/CTestSuite/gemm_2.c b/llvm/tools/hpvm/test/VISC/CTestSuite/gemm_2.c
similarity index 100%
rename from llvm/test/VISC/CTestSuite/gemm_2.c
rename to llvm/tools/hpvm/test/VISC/CTestSuite/gemm_2.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/README.md b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/README.md
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/README.md
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/README.md
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs_base.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs_base.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs_base.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_promise.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet/src/alexnet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs2.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs2.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs2.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs2.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs_full.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs_full.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs_full.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/data/tuner_confs_full.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_promise.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet2/src/alexnet2_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/src/alexnet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/src/alexnet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/src/alexnet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/alexnet_dsoc/src/alexnet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam-vision-native b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam-vision-native
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam-vision-native
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam-vision-native
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/cam_pipe_utility.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/defs.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/defs.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/defs.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/defs.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/dma_interface.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/gem5_harness.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/gem5_harness.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/gem5_harness.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/gem5_harness.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/load_cam_model.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main_old.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main_old.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main_old.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/main_old.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/new_main.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/new_main.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/new_main.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/new_main.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/pipe_stages.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/rename.sh b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/rename.sh
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/rename.sh
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/rename.sh
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.c b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.c
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.c
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.c
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/utility.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/visc.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/visc.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/visc.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/cava_test/src/visc.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/src/fcl.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/src/fcl.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/src/fcl.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/fcl/src/fcl.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/approximate.py b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/approximate.py
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/approximate.py
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/approximate.py
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/opentuner_run.sh b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/opentuner_run.sh
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/opentuner_run.sh
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/bin/opentuner_run.sh
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/promise_flags b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/promise_flags
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/promise_flags
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/promise_flags
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs_base.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs_base.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs_base.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/.#fcl.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/.#fcl.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/.#fcl.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/.#fcl.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet_promise.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet/src/lenet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/bin/setup_paths.sh b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/bin/setup_paths.sh
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/bin/setup_paths.sh
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/bin/setup_paths.sh
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/promise_flags b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/promise_flags
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/promise_flags
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/promise_flags
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/tuner_confs.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/tuner_confs.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/tuner_confs.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/data/tuner_confs.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/src/lenet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/src/lenet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/src/lenet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_base/src/lenet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/src/lenet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/src/lenet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/src/lenet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_batchnorm/src/lenet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/approximate.py b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/approximate.py
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/approximate.py
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/approximate.py
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/opentuner_run.sh b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/opentuner_run.sh
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/opentuner_run.sh
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/opentuner_run.sh
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/setup_tyler_paths.sh b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/setup_tyler_paths.sh
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/setup_tyler_paths.sh
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/bin/setup_tyler_paths.sh
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/approxhpvm_src.cc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/approxhpvm_src.cc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/approxhpvm_src.cc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/approxhpvm_src.cc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_1_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_2_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/conv2d_3_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_1_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/dense_2_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/input.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/input.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/input.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/input.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/labels.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/labels.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/labels.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/labels.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/promise_src.cc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/promise_src.cc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/promise_src.cc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/promise_src.cc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/src.cc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/src.cc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/src.cc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/data/lenet_hpvm/src.cc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/.#fcl.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/.#fcl.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/.#fcl.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/.#fcl.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/lenet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/lenet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/lenet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_dsoc/src/lenet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_promise.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/lenet_mnist/src/lenet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/approxhpvm_src.cc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/approxhpvm_src.cc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/approxhpvm_src.cc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/approxhpvm_src.cc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_1_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_2_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_3_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/conv2d_4_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_1_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_b.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_b.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_b.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_b.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_w.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_w.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_w.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/dense_2_w.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/input.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/input.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/input.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/input.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/labels.bin b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/labels.bin
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/labels.bin
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/labels.bin
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layer_composition.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layer_composition.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layer_composition.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layer_composition.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layers.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layers.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layers.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/layers.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/promise_src.cc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/promise_src.cc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/promise_src.cc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/promise_src.cc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/src.cc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/src.cc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/src.cc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/data/weights/src.cc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/src/mini_era_cv.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/src/mini_era_cv.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/src/mini_era_cv.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mini_era_cv/src/mini_era_cv.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_multi2.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/tuner_confs_base.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/tuner_confs_base.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/tuner_confs_base.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_promise.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet/src/mobilenet_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/mobilenet_shallow/src/mobilenet_shallow_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/tuner_confs_base.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/tuner_confs_base.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/tuner_confs_base.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_promise.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_promise.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/resnet18/src/resnet18_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/final_accuracy b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/final_accuracy
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/final_accuracy
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/final_accuracy
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.ll b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.ll
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.ll
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.ll
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.opt.bc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.opt.bc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.opt.bc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.opt.bc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.visc.ll b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.visc.ll
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.visc.ll
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10.visc.ll
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked.bc b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked.bc
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked.bc
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_linked.bc
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_tune b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_tune
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_tune
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/build/vgg16_cifar10_tune
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/tuner_confs_base.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/tuner_confs_base.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/tuner_confs_base.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/data/tuner_confs_base.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/Makefile
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_pareto_confs_batch220.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_pareto_confs_batch220.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_pareto_confs_batch220.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_pareto_confs_batch220.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_multi.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_multi.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_single.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_single.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_single.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/autotuner_data/tuner_promise_confs_batch220_single.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/data/quant_ranges_rt.txt
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_promise.cpp b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/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/tools/hpvm/test/VISC/DNN_Benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_promise.cpp
diff --git a/llvm/test/VISC/DNN_Benchmarks/common/bin/setup_tyler_paths.sh b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/bin/setup_tyler_paths.sh
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/common/bin/setup_tyler_paths.sh
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/bin/setup_tyler_paths.sh
diff --git a/llvm/test/VISC/DNN_Benchmarks/common/include/tensorTypes.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/include/tensorTypes.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/common/include/tensorTypes.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/include/tensorTypes.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/common/include/tensorUtils.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/include/tensorUtils.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/common/include/tensorUtils.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/include/tensorUtils.h
diff --git a/llvm/test/VISC/DNN_Benchmarks/common/include/visc.h b/llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/include/visc.h
similarity index 100%
rename from llvm/test/VISC/DNN_Benchmarks/common/include/visc.h
rename to llvm/tools/hpvm/test/VISC/DNN_Benchmarks/common/include/visc.h
diff --git a/llvm/test/VISC/MatrixMultiplication/Makefile b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/Makefile
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/Makefile
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/Makefile
diff --git a/llvm/test/VISC/MatrixMultiplication/gemm.c b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/gemm.c
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/gemm.c
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/gemm.c
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm.ll b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm.ll
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/visc_gemm.ll
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm.ll
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level.ll b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level.ll
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level.ll
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level.ll
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_host.ll b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_host.ll
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_host.ll
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_host.ll
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_outedge.ll b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_outedge.ll
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_outedge.ll
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_outedge.ll
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_param.ll b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_param.ll
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_param.ll
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_2_level_param.ll
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll b/llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll
similarity index 100%
rename from llvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll
rename to llvm/tools/hpvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll
diff --git a/llvm/test/VISC/edge/CMakeLists.txt b/llvm/tools/hpvm/test/VISC/edge/CMakeLists.txt
similarity index 100%
rename from llvm/test/VISC/edge/CMakeLists.txt
rename to llvm/tools/hpvm/test/VISC/edge/CMakeLists.txt
diff --git a/llvm/test/VISC/edge/ESO_Very_Large_Telescope.jpg b/llvm/tools/hpvm/test/VISC/edge/ESO_Very_Large_Telescope.jpg
similarity index 100%
rename from llvm/test/VISC/edge/ESO_Very_Large_Telescope.jpg
rename to llvm/tools/hpvm/test/VISC/edge/ESO_Very_Large_Telescope.jpg
diff --git a/llvm/test/VISC/edge/EdgeDetect.cpp b/llvm/tools/hpvm/test/VISC/edge/EdgeDetect.cpp
similarity index 100%
rename from llvm/test/VISC/edge/EdgeDetect.cpp
rename to llvm/tools/hpvm/test/VISC/edge/EdgeDetect.cpp
diff --git a/llvm/test/VISC/edge/PipelineEdgeDetect.cpp b/llvm/tools/hpvm/test/VISC/edge/PipelineEdgeDetect.cpp
similarity index 100%
rename from llvm/test/VISC/edge/PipelineEdgeDetect.cpp
rename to llvm/tools/hpvm/test/VISC/edge/PipelineEdgeDetect.cpp
diff --git a/llvm/test/VISC/edge/edgetest_10.png b/llvm/tools/hpvm/test/VISC/edge/edgetest_10.png
similarity index 100%
rename from llvm/test/VISC/edge/edgetest_10.png
rename to llvm/tools/hpvm/test/VISC/edge/edgetest_10.png
diff --git a/llvm/test/VISC/edge/house.png b/llvm/tools/hpvm/test/VISC/edge/house.png
similarity index 100%
rename from llvm/test/VISC/edge/house.png
rename to llvm/tools/hpvm/test/VISC/edge/house.png
diff --git a/llvm/test/VISC/edge/time.h b/llvm/tools/hpvm/test/VISC/edge/time.h
similarity index 100%
rename from llvm/test/VISC/edge/time.h
rename to llvm/tools/hpvm/test/VISC/edge/time.h
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul/Makefile b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/Makefile
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul/Makefile
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/Makefile
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul/gemm_opencl.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/gemm_opencl.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul/gemm_opencl.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/gemm_opencl.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul/matrixMul.cl b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/matrixMul.cl
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul/matrixMul.cl
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/matrixMul.cl
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul/sgemm.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/sgemm.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul/sgemm.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/sgemm.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul/visc_gemm_opencl.ll b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/visc_gemm_opencl.ll
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul/visc_gemm_opencl.ll
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul/visc_gemm_opencl.ll
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_bc/Makefile b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/Makefile
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_bc/Makefile
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/Makefile
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_bc/gemm_opencl.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/gemm_opencl.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_bc/gemm_opencl.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/gemm_opencl.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_bc/matrixMul_bc.cl b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/matrixMul_bc.cl
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_bc/matrixMul_bc.cl
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/matrixMul_bc.cl
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_bc/sgemm.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/sgemm.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_bc/sgemm.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_bc/sgemm.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh/Makefile b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/Makefile
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh/Makefile
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/Makefile
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh/gemm_opencl.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/gemm_opencl.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh/gemm_opencl.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/gemm_opencl.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh/matrixMul_sh.cl b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/matrixMul_sh.cl
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh/matrixMul_sh.cl
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/matrixMul_sh.cl
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh/sgemm.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/sgemm.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh/sgemm.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh/sgemm.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/Makefile b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/Makefile
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/Makefile
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/Makefile
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl
diff --git a/llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/sgemm.c b/llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/sgemm.c
similarity index 100%
rename from llvm/test/VISC/gemm_opencl/matrixMul_sh_bc/sgemm.c
rename to llvm/tools/hpvm/test/VISC/gemm_opencl/matrixMul_sh_bc/sgemm.c
diff --git a/llvm/test/VISC/lit.local.cfg b/llvm/tools/hpvm/test/VISC/lit.local.cfg
similarity index 100%
rename from llvm/test/VISC/lit.local.cfg
rename to llvm/tools/hpvm/test/VISC/lit.local.cfg
diff --git a/llvm/test/VISC/parboil/.ycm_extra_conf.py b/llvm/tools/hpvm/test/VISC/parboil/.ycm_extra_conf.py
similarity index 100%
rename from llvm/test/VISC/parboil/.ycm_extra_conf.py
rename to llvm/tools/hpvm/test/VISC/parboil/.ycm_extra_conf.py
diff --git a/llvm/test/VISC/parboil/DIRECTORIES b/llvm/tools/hpvm/test/VISC/parboil/DIRECTORIES
similarity index 100%
rename from llvm/test/VISC/parboil/DIRECTORIES
rename to llvm/tools/hpvm/test/VISC/parboil/DIRECTORIES
diff --git a/llvm/test/VISC/parboil/LICENSE b/llvm/tools/hpvm/test/VISC/parboil/LICENSE
similarity index 100%
rename from llvm/test/VISC/parboil/LICENSE
rename to llvm/tools/hpvm/test/VISC/parboil/LICENSE
diff --git a/llvm/test/VISC/parboil/README b/llvm/tools/hpvm/test/VISC/parboil/README
similarity index 100%
rename from llvm/test/VISC/parboil/README
rename to llvm/tools/hpvm/test/VISC/parboil/README
diff --git a/llvm/test/VISC/parboil/README.benchmarks b/llvm/tools/hpvm/test/VISC/parboil/README.benchmarks
similarity index 100%
rename from llvm/test/VISC/parboil/README.benchmarks
rename to llvm/tools/hpvm/test/VISC/parboil/README.benchmarks
diff --git a/llvm/test/VISC/parboil/README.buildsystem b/llvm/tools/hpvm/test/VISC/parboil/README.buildsystem
similarity index 100%
rename from llvm/test/VISC/parboil/README.buildsystem
rename to llvm/tools/hpvm/test/VISC/parboil/README.buildsystem
diff --git a/llvm/test/VISC/parboil/RUN.parboil.script b/llvm/tools/hpvm/test/VISC/parboil/RUN.parboil.script
similarity index 100%
rename from llvm/test/VISC/parboil/RUN.parboil.script
rename to llvm/tools/hpvm/test/VISC/parboil/RUN.parboil.script
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/.__afs3805 b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/.__afs3805
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/.__afs3805
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/.__afs3805
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/.__afs809D b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/.__afs809D
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/.__afs809D
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/.__afs809D
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/omp_base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_base/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/visc/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/visc/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/visc/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/visc/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/bfs/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/bfs/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/bfs/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/base/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/base/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/base/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/cuda_base/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/omp_base/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_base/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/atom.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/atom.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/atom.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/atom.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutcpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutcpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutcpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutcpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/excl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/excl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/excl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/excl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/output.h
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/readatom.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/readatom.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/src/visc/readatom.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/src/visc/readatom.c
diff --git a/llvm/test/VISC/parboil/benchmarks/cutcp/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/cutcp/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/cutcp/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/histo.host.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/histo.host.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/histo.host.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/histo.host.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/histo.nvptx.s b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/histo.nvptx.s
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/histo.nvptx.s
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/histo.nvptx.s
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/base/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/base/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/base/util.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/util.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/base/util.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/util.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/base/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/base/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/base/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_final.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_final.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_final.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_final.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_prescan.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_prescan.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_prescan.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/histo_prescan.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_final.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_final.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_final.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_final.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/cuda_base/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/omp_base/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_final.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_final.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_final.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_final.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_main.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_main.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_main.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_main.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_base/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/opencl_nvidia/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/FauxBlock.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.c
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/threaded/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/visc/bmp.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/bmp.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/visc/bmp.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/bmp.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/visc/util.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/util.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/visc/util.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/util.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/visc/util.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/util.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/visc/util.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc/util.h
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/src/visc_one/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc_one/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/src/visc_one/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/src/visc_one/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/histo/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/histo/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/histo/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/.gitignore b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/.gitignore
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/.gitignore
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/.gitignore
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/CREDITS.TXT b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/CREDITS.TXT
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/CREDITS.TXT
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/CREDITS.TXT
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/LICENSE b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/LICENSE
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/LICENSE
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/LICENSE
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config.example b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config.example
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config.example
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/Makefile.config.example
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/README.md b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/README.md
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/README.md
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/README.md
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/convert.sh b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/convert.sh
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/convert.sh
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/convert.sh
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-face/README.md b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-face/README.md
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-face/README.md
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-face/README.md
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/cmodule.py b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/cmodule.py
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/cmodule.py
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/cmodule.py
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/convert_image.py b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/convert_image.py
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/convert_image.py
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/convert_image.py
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/numpy.i b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/numpy.i
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/numpy.i
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/numpy.i
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/split_trace.py b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/split_trace.py
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/split_trace.py
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/scripts/split_trace.py
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam-vision-native b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam-vision-native
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam-vision-native
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam-vision-native
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/defs.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/defs.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/defs.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/defs.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/dma_interface.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/gem5_harness.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/gem5_harness.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/gem5_harness.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/gem5_harness.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/load_cam_model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/pipe_stages.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/rename.sh b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/rename.sh
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/rename.sh
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/rename.sh
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.c
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/utility.h
diff --git a/llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/visc.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/visc.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/hpvm-cava/src/visc.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/hpvm-cava/src/visc.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/README b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/README
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/README
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/README
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/cluster.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/cluster.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/cluster.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/cluster.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/getopt.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/read_input.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/read_input.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/read_input.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/read_input.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/rmse.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/rmse.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/rmse.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/rmse.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/run b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/run
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/run
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/run
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/unistd.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/unistd.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/unistd.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/opencl/unistd.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/README b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/README
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/README
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/README
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/cluster.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/cluster.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/cluster.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/cluster.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/getopt.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/read_input.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/read_input.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/read_input.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/read_input.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/rmse.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/rmse.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/rmse.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/rmse.c
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/run b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/run
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/run
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/run
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/unistd.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/unistd.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/src/visc/unistd.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/src/visc/unistd.h
diff --git a/llvm/test/VISC/parboil/benchmarks/kmeans/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/kmeans/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/kmeans/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cpu/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/cuda_base/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/omp_cpu/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_base/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/layout_config.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/layout_config.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/layout_config.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/layout_config.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm_macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm_macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm_macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/lbm_macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/src/visc/main.h
diff --git a/llvm/test/VISC/parboil/benchmarks/lbm/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/lbm/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/lbm/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/linear-svm/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/linear-svm/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/linear-svm/linear-svm.visc.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/linear-svm.visc.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/linear-svm/linear-svm.visc.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/linear-svm.visc.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/linear-svm/src/visc_cm/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/llvm-40-34.py b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/llvm-40-34.py
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/llvm-40-34.py
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/llvm-40-34.py
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/merge-tests/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/merge-tests/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/merge-tests/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/cuda/sort.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/src/visc/sort.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-gridding/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-gridding/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-gridding/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/computeQ.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/computeQ.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/computeQ.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/computeQ.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/recycle/base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/computeQ.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/computeQ.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/computeQ.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/computeQ.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/computeQ.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/computeQ.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/computeQ.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/computeQ.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/computeQ.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/kernels.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/kernels.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/kernels.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/kernels.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/src/visc/macros.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/visc/macros.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/src/visc/macros.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/src/visc/macros.h
diff --git a/llvm/test/VISC/parboil/benchmarks/mri-q/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/mri-q/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/mri-q/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/src/opencl/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/nodeSwap/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/nodeSwap/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/nodeSwap/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/copyToVersions.sh b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/copyToVersions.sh
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/copyToVersions.sh
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/copyToVersions.sh
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/run.sh b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/run.sh
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/run.sh
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/run.sh
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/runscript.sh b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/runscript.sh
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/runscript.sh
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/runscript.sh
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Gradient/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/GradientMerged/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/Laplacian/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc.pldi b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc.pldi
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc.pldi
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main.cc.pldi
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main_demo.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main_demo.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main_demo.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc/main_demo.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscGPU/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscScalar/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/viscVector/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_demo/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/src/visc_parallel/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/pipeline/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/pipeline/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/pipeline/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/base/sad_cpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/sad_cpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/base/sad_cpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/base/sad_cpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad_cpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad_cpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad_cpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cpu/sad_cpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/largerBlocks.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda/sad4.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/cuda_base/sad4.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/image.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/image.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/image.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/image.c
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/image.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/image.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/image.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/image.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/sad.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/sad.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/sad.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/sad.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/src/visc/sad_kernel.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/sad/tools/compute-one-sad.py b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/tools/compute-one-sad.py
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sad/tools/compute-one-sad.py
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sad/tools/compute-one-sad.py
diff --git a/llvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile.config b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile.config
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile.config
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/Makefile.config
diff --git a/llvm/test/VISC/parboil/benchmarks/saxpy_test/src/defs.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/src/defs.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/saxpy_test/src/defs.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/src/defs.h
diff --git a/llvm/test/VISC/parboil/benchmarks/saxpy_test/src/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/src/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/saxpy_test/src/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/src/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/saxpy_test/src/visc.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/src/visc.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/saxpy_test/src/visc.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/saxpy_test/src/visc.h
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/base/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/base/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_opt/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_sh/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/sgemm/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/sgemm/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/test.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/test.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/test.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/common_src/convert-dataset/test.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/spmv_jds.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/spmv_jds.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda/spmv_jds.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda/spmv_jds.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/readme.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/readme.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/readme.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati/readme.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_base/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/gpu_info.h
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/spmv/vectorgen/vectorgen.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/vectorgen/vectorgen.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/spmv/vectorgen/vectorgen.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/spmv/vectorgen/vectorgen.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/cuerr.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/cuerr.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/cuerr.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/cuerr.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/cuerr.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/cuerr.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/cuerr.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/cuerr.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/cuda_fermi/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/kernels.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_default/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_large/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_opt/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_strided/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_base_vec/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_fermi/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/opencl_nvidia/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/file.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc/stencil.cpp b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/stencil.cpp
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc/stencil.cpp
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc/stencil.cpp
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/common.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/common.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/common.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/common.h
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.c
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll
diff --git a/llvm/test/VISC/parboil/benchmarks/stencil/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/stencil/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/stencil/tools/compare-output
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/DESCRIPTION b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/DESCRIPTION
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/DESCRIPTION
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/DESCRIPTION
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_io.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_io.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_io.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/base/model_io.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model_io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model_io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model_io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/model_io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/main.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/main.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/main.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/main.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/main.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/main.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/main.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/main.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_io.c b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_io.c
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_io.c
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/omp_base/model_io.c
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/Makefile b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/Makefile
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/args.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/main.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/main.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/main.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/main.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.cc b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.cc
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.cc
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.cc
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.h b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.h
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.h
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/src/visc/model.h
diff --git a/llvm/test/VISC/parboil/benchmarks/tpacf/tools/compare-output b/llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/tools/compare-output
similarity index 100%
rename from llvm/test/VISC/parboil/benchmarks/tpacf/tools/compare-output
rename to llvm/tools/hpvm/test/VISC/parboil/benchmarks/tpacf/tools/compare-output
diff --git a/llvm/test/VISC/parboil/common/Makefile.conf b/llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf
similarity index 100%
rename from llvm/test/VISC/parboil/common/Makefile.conf
rename to llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf
diff --git a/llvm/test/VISC/parboil/common/Makefile.conf.example-ati b/llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf.example-ati
similarity index 100%
rename from llvm/test/VISC/parboil/common/Makefile.conf.example-ati
rename to llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf.example-ati
diff --git a/llvm/test/VISC/parboil/common/Makefile.conf.example-mcuda b/llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf.example-mcuda
similarity index 100%
rename from llvm/test/VISC/parboil/common/Makefile.conf.example-mcuda
rename to llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf.example-mcuda
diff --git a/llvm/test/VISC/parboil/common/Makefile.conf.example-nvidia b/llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf.example-nvidia
similarity index 100%
rename from llvm/test/VISC/parboil/common/Makefile.conf.example-nvidia
rename to llvm/tools/hpvm/test/VISC/parboil/common/Makefile.conf.example-nvidia
diff --git a/llvm/test/VISC/parboil/common/include/parboil.h b/llvm/tools/hpvm/test/VISC/parboil/common/include/parboil.h
similarity index 100%
rename from llvm/test/VISC/parboil/common/include/parboil.h
rename to llvm/tools/hpvm/test/VISC/parboil/common/include/parboil.h
diff --git a/llvm/test/VISC/parboil/common/include/visc.h b/llvm/tools/hpvm/test/VISC/parboil/common/include/visc.h
similarity index 100%
rename from llvm/test/VISC/parboil/common/include/visc.h
rename to llvm/tools/hpvm/test/VISC/parboil/common/include/visc.h
diff --git a/llvm/test/VISC/parboil/common/mk/Makefile b/llvm/tools/hpvm/test/VISC/parboil/common/mk/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/common/mk/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/common/mk/Makefile
diff --git a/llvm/test/VISC/parboil/common/mk/c.mk b/llvm/tools/hpvm/test/VISC/parboil/common/mk/c.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/mk/c.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/mk/c.mk
diff --git a/llvm/test/VISC/parboil/common/mk/cuda.mk b/llvm/tools/hpvm/test/VISC/parboil/common/mk/cuda.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/mk/cuda.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/mk/cuda.mk
diff --git a/llvm/test/VISC/parboil/common/mk/opencl.mk b/llvm/tools/hpvm/test/VISC/parboil/common/mk/opencl.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/mk/opencl.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/mk/opencl.mk
diff --git a/llvm/test/VISC/parboil/common/mk/visc.mk b/llvm/tools/hpvm/test/VISC/parboil/common/mk/visc.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/mk/visc.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/mk/visc.mk
diff --git a/llvm/test/VISC/parboil/common/platform/c.default.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/c.default.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/c.default.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/c.default.mk
diff --git a/llvm/test/VISC/parboil/common/platform/c.gcc.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/c.gcc.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/c.gcc.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/c.gcc.mk
diff --git a/llvm/test/VISC/parboil/common/platform/cuda.arch20.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.arch20.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/cuda.arch20.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.arch20.mk
diff --git a/llvm/test/VISC/parboil/common/platform/cuda.default.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.default.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/cuda.default.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.default.mk
diff --git a/llvm/test/VISC/parboil/common/platform/cuda.mcuda.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.mcuda.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/cuda.mcuda.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.mcuda.mk
diff --git a/llvm/test/VISC/parboil/common/platform/cuda.nvcc.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.nvcc.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/cuda.nvcc.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/cuda.nvcc.mk
diff --git a/llvm/test/VISC/parboil/common/platform/opencl.default.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/opencl.default.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/opencl.default.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/opencl.default.mk
diff --git a/llvm/test/VISC/parboil/common/platform/opencl.gcc.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/opencl.gcc.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/opencl.gcc.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/opencl.gcc.mk
diff --git a/llvm/test/VISC/parboil/common/platform/visc.default.mk b/llvm/tools/hpvm/test/VISC/parboil/common/platform/visc.default.mk
similarity index 100%
rename from llvm/test/VISC/parboil/common/platform/visc.default.mk
rename to llvm/tools/hpvm/test/VISC/parboil/common/platform/visc.default.mk
diff --git a/llvm/test/VISC/parboil/common/python/binaryfilecompare.py b/llvm/tools/hpvm/test/VISC/parboil/common/python/binaryfilecompare.py
similarity index 100%
rename from llvm/test/VISC/parboil/common/python/binaryfilecompare.py
rename to llvm/tools/hpvm/test/VISC/parboil/common/python/binaryfilecompare.py
diff --git a/llvm/test/VISC/parboil/common/python/filecompare.py b/llvm/tools/hpvm/test/VISC/parboil/common/python/filecompare.py
similarity index 100%
rename from llvm/test/VISC/parboil/common/python/filecompare.py
rename to llvm/tools/hpvm/test/VISC/parboil/common/python/filecompare.py
diff --git a/llvm/test/VISC/parboil/common/python/textfilecompare.py b/llvm/tools/hpvm/test/VISC/parboil/common/python/textfilecompare.py
similarity index 100%
rename from llvm/test/VISC/parboil/common/python/textfilecompare.py
rename to llvm/tools/hpvm/test/VISC/parboil/common/python/textfilecompare.py
diff --git a/llvm/test/VISC/parboil/common/src/Makefile b/llvm/tools/hpvm/test/VISC/parboil/common/src/Makefile
similarity index 100%
rename from llvm/test/VISC/parboil/common/src/Makefile
rename to llvm/tools/hpvm/test/VISC/parboil/common/src/Makefile
diff --git a/llvm/test/VISC/parboil/common/src/parboil.c b/llvm/tools/hpvm/test/VISC/parboil/common/src/parboil.c
similarity index 100%
rename from llvm/test/VISC/parboil/common/src/parboil.c
rename to llvm/tools/hpvm/test/VISC/parboil/common/src/parboil.c
diff --git a/llvm/test/VISC/parboil/common/src/parboil_cuda.c b/llvm/tools/hpvm/test/VISC/parboil/common/src/parboil_cuda.c
similarity index 100%
rename from llvm/test/VISC/parboil/common/src/parboil_cuda.c
rename to llvm/tools/hpvm/test/VISC/parboil/common/src/parboil_cuda.c
diff --git a/llvm/test/VISC/parboil/common/src/parboil_opencl.c b/llvm/tools/hpvm/test/VISC/parboil/common/src/parboil_opencl.c
similarity index 100%
rename from llvm/test/VISC/parboil/common/src/parboil_opencl.c
rename to llvm/tools/hpvm/test/VISC/parboil/common/src/parboil_opencl.c
diff --git a/llvm/test/VISC/parboil/common/src/subtimerREADME.txt b/llvm/tools/hpvm/test/VISC/parboil/common/src/subtimerREADME.txt
similarity index 100%
rename from llvm/test/VISC/parboil/common/src/subtimerREADME.txt
rename to llvm/tools/hpvm/test/VISC/parboil/common/src/subtimerREADME.txt
diff --git a/llvm/test/VISC/parboil/config b/llvm/tools/hpvm/test/VISC/parboil/config
similarity index 100%
rename from llvm/test/VISC/parboil/config
rename to llvm/tools/hpvm/test/VISC/parboil/config
diff --git a/llvm/test/VISC/parboil/driver/__init__.py b/llvm/tools/hpvm/test/VISC/parboil/driver/__init__.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/__init__.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/__init__.py
diff --git a/llvm/test/VISC/parboil/driver/actions.py b/llvm/tools/hpvm/test/VISC/parboil/driver/actions.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/actions.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/actions.py
diff --git a/llvm/test/VISC/parboil/driver/benchmark.py b/llvm/tools/hpvm/test/VISC/parboil/driver/benchmark.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/benchmark.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/benchmark.py
diff --git a/llvm/test/VISC/parboil/driver/benchmark.py-darcs-backup0 b/llvm/tools/hpvm/test/VISC/parboil/driver/benchmark.py-darcs-backup0
similarity index 100%
rename from llvm/test/VISC/parboil/driver/benchmark.py-darcs-backup0
rename to llvm/tools/hpvm/test/VISC/parboil/driver/benchmark.py-darcs-backup0
diff --git a/llvm/test/VISC/parboil/driver/error.py b/llvm/tools/hpvm/test/VISC/parboil/driver/error.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/error.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/error.py
diff --git a/llvm/test/VISC/parboil/driver/futures.py b/llvm/tools/hpvm/test/VISC/parboil/driver/futures.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/futures.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/futures.py
diff --git a/llvm/test/VISC/parboil/driver/globals.py b/llvm/tools/hpvm/test/VISC/parboil/driver/globals.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/globals.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/globals.py
diff --git a/llvm/test/VISC/parboil/driver/options.py b/llvm/tools/hpvm/test/VISC/parboil/driver/options.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/options.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/options.py
diff --git a/llvm/test/VISC/parboil/driver/parboilfile.py b/llvm/tools/hpvm/test/VISC/parboil/driver/parboilfile.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/parboilfile.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/parboilfile.py
diff --git a/llvm/test/VISC/parboil/driver/parboilfile.py-darcs-backup0 b/llvm/tools/hpvm/test/VISC/parboil/driver/parboilfile.py-darcs-backup0
similarity index 100%
rename from llvm/test/VISC/parboil/driver/parboilfile.py-darcs-backup0
rename to llvm/tools/hpvm/test/VISC/parboil/driver/parboilfile.py-darcs-backup0
diff --git a/llvm/test/VISC/parboil/driver/ppkg.benchmarks b/llvm/tools/hpvm/test/VISC/parboil/driver/ppkg.benchmarks
similarity index 100%
rename from llvm/test/VISC/parboil/driver/ppkg.benchmarks
rename to llvm/tools/hpvm/test/VISC/parboil/driver/ppkg.benchmarks
diff --git a/llvm/test/VISC/parboil/driver/ppkg.ignore b/llvm/tools/hpvm/test/VISC/parboil/driver/ppkg.ignore
similarity index 100%
rename from llvm/test/VISC/parboil/driver/ppkg.ignore
rename to llvm/tools/hpvm/test/VISC/parboil/driver/ppkg.ignore
diff --git a/llvm/test/VISC/parboil/driver/ppkg.py b/llvm/tools/hpvm/test/VISC/parboil/driver/ppkg.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/ppkg.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/ppkg.py
diff --git a/llvm/test/VISC/parboil/driver/process.py b/llvm/tools/hpvm/test/VISC/parboil/driver/process.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/process.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/process.py
diff --git a/llvm/test/VISC/parboil/driver/sanity_check.py b/llvm/tools/hpvm/test/VISC/parboil/driver/sanity_check.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/sanity_check.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/sanity_check.py
diff --git a/llvm/test/VISC/parboil/driver/text.py b/llvm/tools/hpvm/test/VISC/parboil/driver/text.py
similarity index 100%
rename from llvm/test/VISC/parboil/driver/text.py
rename to llvm/tools/hpvm/test/VISC/parboil/driver/text.py
diff --git a/llvm/test/VISC/parboil/parboil b/llvm/tools/hpvm/test/VISC/parboil/parboil
similarity index 100%
rename from llvm/test/VISC/parboil/parboil
rename to llvm/tools/hpvm/test/VISC/parboil/parboil
diff --git a/llvm/test/VISC/parboil/parboilParser.py b/llvm/tools/hpvm/test/VISC/parboil/parboilParser.py
similarity index 100%
rename from llvm/test/VISC/parboil/parboilParser.py
rename to llvm/tools/hpvm/test/VISC/parboil/parboilParser.py
diff --git a/llvm/test/VISC/singleVecNode/Makefile b/llvm/tools/hpvm/test/VISC/singleVecNode/Makefile
similarity index 100%
rename from llvm/test/VISC/singleVecNode/Makefile
rename to llvm/tools/hpvm/test/VISC/singleVecNode/Makefile
diff --git a/llvm/test/VISC/singleVecNode/singleVecNode.c b/llvm/tools/hpvm/test/VISC/singleVecNode/singleVecNode.c
similarity index 100%
rename from llvm/test/VISC/singleVecNode/singleVecNode.c
rename to llvm/tools/hpvm/test/VISC/singleVecNode/singleVecNode.c
diff --git a/llvm/test/VISC/singleVecNode/visc_singleVecNode.ll b/llvm/tools/hpvm/test/VISC/singleVecNode/visc_singleVecNode.ll
similarity index 100%
rename from llvm/test/VISC/singleVecNode/visc_singleVecNode.ll
rename to llvm/tools/hpvm/test/VISC/singleVecNode/visc_singleVecNode.ll
diff --git a/llvm/test/VISC/testKernel/kernel-spir32.ll b/llvm/tools/hpvm/test/VISC/testKernel/kernel-spir32.ll
similarity index 100%
rename from llvm/test/VISC/testKernel/kernel-spir32.ll
rename to llvm/tools/hpvm/test/VISC/testKernel/kernel-spir32.ll
diff --git a/llvm/test/VISC/testKernel/kernel-spir64.ll b/llvm/tools/hpvm/test/VISC/testKernel/kernel-spir64.ll
similarity index 100%
rename from llvm/test/VISC/testKernel/kernel-spir64.ll
rename to llvm/tools/hpvm/test/VISC/testKernel/kernel-spir64.ll
diff --git a/llvm/test/VISC/testKernel/kernel.asm b/llvm/tools/hpvm/test/VISC/testKernel/kernel.asm
similarity index 100%
rename from llvm/test/VISC/testKernel/kernel.asm
rename to llvm/tools/hpvm/test/VISC/testKernel/kernel.asm
diff --git a/llvm/test/VISC/testKernel/kernel.cl b/llvm/tools/hpvm/test/VISC/testKernel/kernel.cl
similarity index 100%
rename from llvm/test/VISC/testKernel/kernel.cl
rename to llvm/tools/hpvm/test/VISC/testKernel/kernel.cl
diff --git a/llvm/test/VISC/testKernel/kernel.ll b/llvm/tools/hpvm/test/VISC/testKernel/kernel.ll
similarity index 100%
rename from llvm/test/VISC/testKernel/kernel.ll
rename to llvm/tools/hpvm/test/VISC/testKernel/kernel.ll
diff --git a/llvm/test/VISC/unitTests/3level.ll b/llvm/tools/hpvm/test/VISC/unitTests/3level.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/3level.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/3level.ll
diff --git a/llvm/test/VISC/unitTests/Makefile b/llvm/tools/hpvm/test/VISC/unitTests/Makefile
similarity index 100%
rename from llvm/test/VISC/unitTests/Makefile
rename to llvm/tools/hpvm/test/VISC/unitTests/Makefile
diff --git a/llvm/test/VISC/unitTests/lit.local.cfg b/llvm/tools/hpvm/test/VISC/unitTests/lit.local.cfg
similarity index 100%
rename from llvm/test/VISC/unitTests/lit.local.cfg
rename to llvm/tools/hpvm/test/VISC/unitTests/lit.local.cfg
diff --git a/llvm/test/VISC/unitTests/query2D.ll b/llvm/tools/hpvm/test/VISC/unitTests/query2D.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/query2D.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/query2D.ll
diff --git a/llvm/test/VISC/unitTests/query3D.ll b/llvm/tools/hpvm/test/VISC/unitTests/query3D.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/query3D.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/query3D.ll
diff --git a/llvm/test/VISC/unitTests/queryNodeInst.ll b/llvm/tools/hpvm/test/VISC/unitTests/queryNodeInst.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/queryNodeInst.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/queryNodeInst.ll
diff --git a/llvm/test/VISC/unitTests/queryNumDim.ll b/llvm/tools/hpvm/test/VISC/unitTests/queryNumDim.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/queryNumDim.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/queryNumDim.ll
diff --git a/llvm/test/VISC/unitTests/queryNumNodeInst.ll b/llvm/tools/hpvm/test/VISC/unitTests/queryNumNodeInst.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/queryNumNodeInst.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/queryNumNodeInst.ll
diff --git a/llvm/test/VISC/unitTests/singleNode.ll b/llvm/tools/hpvm/test/VISC/unitTests/singleNode.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/singleNode.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/singleNode.ll
diff --git a/llvm/test/VISC/unitTests/singleNodeStream.ll b/llvm/tools/hpvm/test/VISC/unitTests/singleNodeStream.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/singleNodeStream.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/singleNodeStream.ll
diff --git a/llvm/test/VISC/unitTests/twoLaunch.ll b/llvm/tools/hpvm/test/VISC/unitTests/twoLaunch.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/twoLaunch.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/twoLaunch.ll
diff --git a/llvm/test/VISC/unitTests/twoNode.ll b/llvm/tools/hpvm/test/VISC/unitTests/twoNode.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/twoNode.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/twoNode.ll
diff --git a/llvm/test/VISC/unitTests/twoNodeConnect.ll b/llvm/tools/hpvm/test/VISC/unitTests/twoNodeConnect.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/twoNodeConnect.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/twoNodeConnect.ll
diff --git a/llvm/test/VISC/unitTests/twoNodeQuery.ll b/llvm/tools/hpvm/test/VISC/unitTests/twoNodeQuery.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/twoNodeQuery.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/twoNodeQuery.ll
diff --git a/llvm/test/VISC/unitTests/twoNodeStream.ll b/llvm/tools/hpvm/test/VISC/unitTests/twoNodeStream.ll
similarity index 100%
rename from llvm/test/VISC/unitTests/twoNodeStream.ll
rename to llvm/tools/hpvm/test/VISC/unitTests/twoNodeStream.ll
diff --git a/llvm/test/VISC/vectorAdd/Makefile b/llvm/tools/hpvm/test/VISC/vectorAdd/Makefile
similarity index 100%
rename from llvm/test/VISC/vectorAdd/Makefile
rename to llvm/tools/hpvm/test/VISC/vectorAdd/Makefile
diff --git a/llvm/test/VISC/vectorAdd/old_visc_vecadd.ll b/llvm/tools/hpvm/test/VISC/vectorAdd/old_visc_vecadd.ll
similarity index 100%
rename from llvm/test/VISC/vectorAdd/old_visc_vecadd.ll
rename to llvm/tools/hpvm/test/VISC/vectorAdd/old_visc_vecadd.ll
diff --git a/llvm/test/VISC/vectorAdd/vecadd.c b/llvm/tools/hpvm/test/VISC/vectorAdd/vecadd.c
similarity index 100%
rename from llvm/test/VISC/vectorAdd/vecadd.c
rename to llvm/tools/hpvm/test/VISC/vectorAdd/vecadd.c
diff --git a/llvm/test/VISC/vectorAdd/vecadd.ll b/llvm/tools/hpvm/test/VISC/vectorAdd/vecadd.ll
similarity index 100%
rename from llvm/test/VISC/vectorAdd/vecadd.ll
rename to llvm/tools/hpvm/test/VISC/vectorAdd/vecadd.ll
diff --git a/llvm/test/VISC/vectorAdd/visc_vecadd.ll b/llvm/tools/hpvm/test/VISC/vectorAdd/visc_vecadd.ll
similarity index 100%
rename from llvm/test/VISC/vectorAdd/visc_vecadd.ll
rename to llvm/tools/hpvm/test/VISC/vectorAdd/visc_vecadd.ll